Changeset 2371116

Timestamp:

08/28/2020 02:47:54 PM (5 years ago)

Author:

shoppingfeed

Message:

add ean support for variations

Location:

shopping-feed/trunk

Files:

• readme.txt (modified) (2 diffs)
• shoppingfeed.php (modified) (2 diffs)
• src/Feed/Generator.php (modified) (1 diff)
• src/Products/Product.php (modified) (2 diffs)

shopping-feed/trunk/readme.txt

@@ -2 +2 @@
 Contributors: ShoppingFeed, BeAPI
 Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
-Stable tag: 6.0.5
-Version: 6.0.5
+Stable tag: 6.0.6
+Version: 6.0.6
 Requires PHP: 5.6
 Requires at least: 5.2
@@ -19 +19 @@
 6.0.4: fix permalink issue
 6.0.5: correct attribute values
+6.0.6: add ean support for variations
 
 == Description ==

shopping-feed/trunk/shoppingfeed.php

@@ -8 +8 @@
  * Text Domain:     shopping-feed
  * Domain Path:     /languages
- * Version:         6.0.5
+ * Version:         6.0.6
  * Requires at least WP: 5.2
  * Requires at least WooCommerce: 3.8 (3.9/4.0)
@@ -26 +26 @@
 }
 
-define( 'SF_VERSION', '6.0.5' );
+define( 'SF_VERSION', '6.0.6' );
 define( 'SF_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'SF_PLUGIN_URL', plugin_dir_url( __FILE__ ) );

shopping-feed/trunk/src/Feed/Generator.php

@@ -229 +229 @@
                         ->setReference( $sf_product_variation['sku'] )
                         ->setPrice( $sf_product_variation['price'] )
-                        ->setQuantity( $sf_product_variation['quantity'] );
+                        ->setQuantity( $sf_product_variation['quantity'] )
+                        ->setGtin( $sf_product_variation['ean'] );
 
                     if ( ! empty( $sf_product_variation['attributes'] ) ) {

shopping-feed/trunk/src/Products/Product.php

@@ -96 +96 @@
      * @return string
      */
-    public function get_ean() {
-        $ean_meta = ShoppingFeedHelper::wc_product_ean();
-
-        if ( empty( $ean_meta ) ) {
-            return '';
-        }
-
-        $ean = $this->product->get_meta( $ean_meta ) ? $this->product->get_meta( $ean_meta ) : '';
-
-        return $ean;
+    public function get_ean( $wc_product = false ) {
+        $ean_meta_key = ShoppingFeedHelper::wc_product_ean();
+
+        if ( empty( $ean_meta_key ) ) {
+            return '';
+        }
+
+        if ( ! empty( $wc_product ) ) {
+            return $wc_product->get_meta( $ean_meta_key ) ? $wc_product->get_meta( $ean_meta_key ) : '';
+        }
+
+        return $this->product->get_meta( $ean_meta_key ) ? $this->product->get_meta( $ean_meta_key ) : '';
     }
 
@@ -309 +311 @@
             $variations = array();
             foreach ( $wc_product_variations as $wc_product_variation ) {
-                $wc_product_variation = new \WC_Product_Variation( $wc_product_variation['variation_id'] );
+                $wc_product_variation  = new \WC_Product_Variation( $wc_product_variation['variation_id'] );
                 $variation             = array();
                 $variation['sku']      = ( 'id' === $this->product_identifier ) ? $wc_product_variation->get_id() : $wc_product_variation->get_sku();
+                $variation['ean']      = $this->get_ean( $wc_product_variation );
                 $variation['quantity'] = ! is_null( $wc_product_variation->get_stock_quantity() ) ? $wc_product_variation->get_stock_quantity() : ShoppingFeedHelper::get_default_product_quantity();
                 $variation['price']    = ! is_null( $wc_product_variation->get_regular_price() ) ? $wc_product_variation->get_regular_price() : $wc_product_variation->get_price();