Changeset 890024

Timestamp:

04/09/2014 11:44:30 AM (12 years ago)

Author:

pricemesh

Message:

pages integration, woocommerce integration

Location:

pricemesh/trunk

Files:

• admin/pricemesh-admin.php (modified) (8 diffs)
• pricemesh-base.php (modified) (1 diff)
• pricemesh.php (modified) (1 diff)
• public/pricemesh-public.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

pricemesh/trunk/admin/pricemesh-admin.php

@@ -98 +98 @@
      */
     public function enqueue_admin_styles() {
-
-        if($this->is_on_post_screen()){
+        if($this->is_on_supported_screen()){
             wp_enqueue_style( $this->plugin_slug .'pm-metabox-styles', plugins_url('assets/css/metabox.css', __FILE__ ), array(), PricemeshPublic::VERSION );
         }
@@ -123 +122 @@
     public function enqueue_admin_scripts(){
 
-        if($this->is_on_post_screen()){
+        if($this->is_on_supported_screen()){
             wp_enqueue_script($this->plugin_slug.'pm-handlebars', plugins_url('assets/js/handlebars-v1.3.0.js', __FILE__ ), array('jquery'), PricemeshPublic::VERSION );
             wp_enqueue_script($this->plugin_slug.'pm-metabox', plugins_url('assets/js/metabox.js', __FILE__ ), array('jquery'), PricemeshPublic::VERSION );
@@ -322 +321 @@
         $option_name = "WP Robot";
         $option_callback = "settings_3rd_party_wp_robot_callback";
+        add_settings_field(
+            $option, __($option_name, $this->plugin_slug), array($this, $option_callback), $this->plugin_slug, $section
+        );
+        register_setting($group, $option);
+
+        //woocommerce
+        $option = "pricemesh_option_woocommerce_integration";
+        $option_name = "WooCommerce";
+        $option_callback = "settings_3rd_party_woocommerce_callback";
         add_settings_field(
             $option, __($option_name, $this->plugin_slug), array($this, $option_callback), $this->plugin_slug, $section
@@ -552 +560 @@
      */
     public function settings_section_3rd_party_callback(){
-        echo __("Pricemesh kann auf andere Plugins zugreifen und einen Preisvergleich anzeigen, wenn ein Barcode erkannt wird.", $this->plugin_slug);
+        echo __("Pricemesh kann auf andere Plugins zugreifen und zusätzliche Funktionen freischalten.", $this->plugin_slug);
     }
 
@@ -563 +571 @@
         $setting = $opts["wp_robot_integration"];
         if($this->is_wp_robot_installed()){
-            $checked = checked('1', $setting);
-            echo "<input name='pricemesh_option_wp_robot_integration' type='checkbox' value='1' $checked/>";
+            $checked = checked('1', $setting, false);
+
+            echo "<p class='description'>".
+                    "<input name='pricemesh_option_wp_robot_integration' type='checkbox' value='1' $checked/>".
+                    " ".__("Fügt automatisch importierte ASINs zu dem aktuellen Post hinzu.", $this->plugin_slug).
+                 "</p>";
         }else{
             //echo "<input name='pricemesh_option_wp_robot_integration' type='checkbox' value='1' disabled/>";
             echo "<p class='description'>".__("WPRobot ist nicht installiert", $this->plugin_slug)."</p>";
+        }
+    }
+
+    /**
+     * woocommerce callback
+     * @since    1.3.1
+     */
+    public function settings_3rd_party_woocommerce_callback(){
+        $opts = self::get_pricemesh_settings();
+        $setting = $opts["woocommerce_integration"];
+        if($this->is_woocommerce_installed()){
+            $checked = checked('1', $setting, false);
+            echo "<p class='description'>".
+                   "<input name='pricemesh_option_woocommerce_integration' type='checkbox' value='1' $checked/>".
+                    " ".__("Schaltet die Pricemesh auf Produktseiten frei", $this->plugin_slug).
+                "</p>";
+        }else{
+            //echo "<input name='pricemesh_option_wp_robot_integration' type='checkbox' value='1' disabled/>";
+            echo "<p class='description'>".__("WooCommerce ist nicht installiert", $this->plugin_slug)."</p>";
         }
     }
@@ -604 +635 @@
     function is_on_post_screen(){
         $screen = get_current_screen();
-
         if($screen->base == "post"){
+            return True;
+        }
+        return False;
+    }
+
+    /**
+     * Checks if the current page is one of the supported types: post or page
+     *
+     * @since    1.3.1
+     * @return boolean  true if the current screen is of type post or page
+     */
+    function is_on_supported_screen(){
+        $screen = get_current_screen();
+        var_dump($screen->base);
+        if($screen->base == "post" || $screen->base == "page"){
             return True;
         }
@@ -614 +659 @@
         // create our custom meta box
         add_meta_box('pricemesh-meta',__('Pricemesh', 'pricemesh-plugin'), array($this, 'meta_box'),'post','normal','high');
+        add_meta_box('pricemesh-meta',__('Pricemesh', 'pricemesh-plugin'), array($this, 'meta_box'),'page','normal','high');
+        $opts = self::get_pricemesh_settings();
+        if($opts["woocommerce_integration"]){
+            add_meta_box('pricemesh-meta',__('Pricemesh', 'pricemesh-plugin'), array($this, 'meta_box'),'product','normal','high');
+        }
     }
 
@@ -668 +718 @@
     }
 
+    /**
+     * Checks if WooCommerce is installed
+     * @since    1.0.1
+     * @return boolean  true if WooCommerce is installed. false otherwise
+     */
+    function is_woocommerce_installed(){
+        /***
+         * checks if WooCommerce is installed
+         * Note: only works in the admin area.
+         */
+        if(is_plugin_active("woocommerce/woocommerce.php")){
+            return true;
+        }
+        return false;
+    }
+
+
+
 }?>

pricemesh/trunk/pricemesh-base.php

@@ -29 +29 @@
 
             "wp_robot_integration" => get_option("pricemesh_option_wp_robot_integration", 0),
+            "woocommerce_integration" => get_option("pricemesh_option_woocommerce_integration", 0),
         );
     }

pricemesh/trunk/pricemesh.php

@@ -4 +4 @@
 Plugin URI: https://www.pricemesh.io/plugins/wordpress/
 Description: Mit diesem Plugin ist es möglich Wordpress um einen eigenen Preisvergleich zu erweitern.
-Version: 1.3
+Version: 1.3.1
 Author: pricemesh
 Author URI: https://www.pricemesh.io

pricemesh/trunk/public/pricemesh-public.php

@@ -22 +22 @@
      * @var     string
      */
-    const VERSION = '1.3';
+    const VERSION = '1.3.1';
 
     /**
@@ -285 +285 @@
      */
     public function add_pricemesh($content){
-        if(is_single() && $this->is_injection_needed()){
+        if((is_single() || is_page()) && $this->is_injection_needed()){
             $injection_point = $this->get_injection_point();
             if($injection_point == PricemeshRender::IN_CONTENT){
@@ -313 +313 @@
      */
     public static function is_injection_needed(){
-
-        if(is_single()){
+        if(is_single() || is_page()){
             $opts = self::get_pricemesh_settings();
             if(strlen($opts["pids"])>=8 && strlen($opts["token"])>5){

pricemesh/trunk/readme.txt

@@ -3 +3 @@
 Tags: affiliate, commerce, e-commerce, ecommerce, sales, sell, shop, shopping, widgets, wordpress ecommerce, amazon, preisvergleich, ads, advertising
 Requires at least: 3.4
-Tested up to: 3.8
-Stable tag: 1.3
+Tested up to: 3.8.2
+Stable tag: 1.3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -73 +73 @@
 == Changelog ==
 
+= 1.3.1 =
+* Pricemesh kann nun auf Pages eingesetzt werden
+* Integration von WooCommerce Produktseiten
+
 = 1.3 =
 Es gibt nun zahlreiche Möglichkeiten das Design und das Verhalten des Preisvergleichs anzupassen.