Changeset 1431417

Timestamp:

06/06/2016 12:37:43 PM (10 years ago)

Author:

JohnnyPea

Message:

v1.5.6

Location:

woocommerce-superfaktura/trunk

Files:

• README.txt (modified) (2 diffs)
• class-wc-superfaktura.php (modified) (6 diffs)
• wc-superfaktura.php (modified) (1 diff)

woocommerce-superfaktura/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.0
 Tested up to: 4.5.2
-Stable tag: 1.5.5
+Stable tag: 1.5.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 
 == Changelog ==
+
+= 1.5.6 =
+* Pridaná možnosť nastaviť si ako má vyzerať popis produktu vo faktúre
 
 = 1.5.5 =

woocommerce-superfaktura/trunk/class-wc-superfaktura.php

@@ -24 +24 @@
      * @var     string
      */
-    protected $version = '1.5.5';
+    protected $version = '1.5.6';
 
     /**
@@ -55 +55 @@
      */
     protected $plugin_screen_hook_suffix = null;
+
+    /**
+     * Default product description template
+     * @var string
+     */
+    protected $product_description_template_default;
 
     /**
@@ -74 +80 @@
         //add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
         add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
+
+        // backward compatibility with previous (now gone) option
+        $this->product_description_template_default = '[ATTRIBUTES]' . ( 'yes' === get_option( 'woocommerce_sf_product_description_visibility', 'yes' ) ? "\n[SHORT_DESCR]" : '' );
     }
 
@@ -433 +442 @@
             $item_meta = new WC_Order_Item_Meta($item['item_meta']);
 
-            $variation_desc = '';
-            if($item_meta->meta)
-              $variation_desc = $item_meta->display(true, true, '_', ', ');
-
             $item_data = array(
                 'name'        => $item['name'],
@@ -455 +460 @@
             $product = wc_get_product( $product_id );
 
-            $item_data['description'] = $variation_desc;
-
-            if ( get_option('woocommerce_sf_product_description_visibility') == 'yes' ) {
-                $item_data['description'] .= "\n".wp_strip_all_tags($product->get_post_data()->post_excerpt);
-            }
+            $attributes = $item_meta->meta ? $item_meta->display( true, true, '_', ', ' ) : '';
+            $variation = $product instanceof WC_Product_Variation ? wp_strip_all_tags($product->get_variation_description()) : '';
+            $short_descr = wp_strip_all_tags( $product->get_post_data()->post_excerpt );
+            $template = get_option( 'woocommerce_sf_product_description', $this->product_description_template_default );
+
+            $item_data['description'] = strtr( $template, [
+                '[ATTRIBUTES]' => $attributes,
+                '[VARIATION]' => $variation,
+                '[SHORT_DESCR]' => $short_descr,
+                '[SKU]' => $product->get_sku(), // this may be different SKU that that above (in case of variable product)
+            ] );
 
             if ( $product->is_on_sale() )
@@ -889 +900 @@
            array(
                 'title' => __('Product Description', 'wc-superfaktura'),
-                'id' => 'woocommerce_sf_product_description_visibility',
-                'type' => 'checkbox',
-                'desc' => 'Display a product description.',
-                'default' => 'yes'
+                'desc' => sprintf(__('Available Tags: %s'), '[ATTRIBUTES], [VARIATION], [SHORT_DESCR], [SKU]'),
+                'id' => 'woocommerce_sf_product_description',
+                'css'   => 'width:50%; height: 75px;',
+                'default' => $this->product_description_template_default,
+                'type' => 'textarea',
             ),
             array(

woocommerce-superfaktura/trunk/wc-superfaktura.php

@@ -11 +11 @@
  * Plugin URI:  http://www.platobnebrany.sk/
  * Description: WooCommerce integrácia služby <a href="http://www.superfaktura.sk/api/">SuperFaktúra.sk</a> Máte s modulom technický problém? Napíšte nám na <a href="mailto:[email protected]">[email protected]</a>
- * Version:     1.5.5
+ * Version:     1.5.6
  * Author:      Webikon (Ján Bočínec)
  * Author URI:  http://www.webikon.sk