Changeset 2384510

Timestamp:

09/18/2020 02:24:42 PM (5 years ago)

Author:

shoppingfeed

Message:

Update to version 6.0.9 from GitHub

Location:

shopping-feed

Files:

• tags/6.0.9 (copied) (copied from shopping-feed/trunk)
• tags/6.0.9/assets/css/app.css (modified) (2 diffs)
• tags/6.0.9/readme.txt (modified) (2 diffs)
• tags/6.0.9/shoppingfeed.php (modified) (2 diffs)
• tags/6.0.9/src/Admin/WoocommerceFilters.php (modified) (1 diff)
• tags/6.0.9/src/Feed/Generator.php (modified) (3 diffs)
• tags/6.0.9/src/ShoppingFeedHelper.php (modified) (1 diff)
• tags/6.0.9/vendor (deleted)
• trunk/assets/css/app.css (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/shoppingfeed.php (modified) (2 diffs)
• trunk/src/Admin/WoocommerceFilters.php (modified) (1 diff)
• trunk/src/Feed/Generator.php (modified) (3 diffs)
• trunk/src/ShoppingFeedHelper.php (modified) (1 diff)
• trunk/vendor (deleted)

shopping-feed/tags/6.0.9/assets/css/app.css

@@ -102 +102 @@
   .sf__button__logout.button:hover, .sf__button__logout.button:active, .sf__button__logout.button:focus {
     color: #fff;
-    border-color: #56297b;
-    background-color: #56297b; }
+    border-color: #7035a1;
+    background-color: #7035a1; }
 
 .sf__requirements .success,
@@ -222 +222 @@
       flex-basis: 33%; } }
 
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"app.css","sources":["app.scss","main/_mixins.scss","main/_colors.scss","multi/_multi.scss","main/_sf.scss"],"sourcesContent":["@import \"main/mixins\";\n@import \"main/colors\";\n@import \"multi/multi\";\n@import \"main/sf\";","// Bourbon's essentials mixins\n$em-base: 16px !default;\n// Strip units\n@function strip-units($value) {\n\t@return ($value / ($value * 0 + 1));\n}\n// PX to EM\n@function em($pxval, $base: $em-base) {\n\t@if not unitless($pxval) {\n\t  $pxval: strip-units($pxval);\n\t}\n\t@if not unitless($base) {\n\t  $base: strip-units($base);\n\t}\n\t@return ($pxval / $base) * 1em;\n}\n//Breakpoints\n$breakpoints: (\n    xsm: em(480),\n    sm: em(768),\n    md: em(1024),\n    lg: em(1260),\n    xlg: em(1440)\n);\n\n@mixin breakpoints($breakpoint) {\n    @media screen and (min-width: map-get($map: $breakpoints, $key: $breakpoint)) {\n        @content;\n    }\n}\n// Hover Active Focus pseudo selector mixin\n@mixin hover {\n\t&:hover, &:active, &:focus {\n\t\t@content;\n\t}\n}\n// Smooth text\n@mixin smoothText {\n\t-webkit-font-smoothing: antialiased;\n    -moz-osx-font-smoothing: grayscale;\n}","$white: #fff;\n$black: #000;\n$primary: #632F8E;\n$secondary: #1CB69B;\n$textcolor: #23282D;\n$gray: #9E9E9E;\n$blue: #04274D;\n$pink: #E91E63;\n",".multi-wrapper {\n    border: 1px solid #ccc;\n    border-radius: 3px;\n    width: 100%;\n}\n\n.multi-wrapper .non-selected-wrapper,\n.multi-wrapper .selected-wrapper {\n    box-sizing: border-box;\n    display: inline-block;\n    height: 200px;\n    overflow-y: scroll;\n    padding: 10px;\n    vertical-align: top;\n    width: 50%;\n}\n\n.multi-wrapper .non-selected-wrapper {\n    background: #fafafa;\n    border-right: 1px solid #ccc;\n}\n\n.multi-wrapper .selected-wrapper {\n    background: #fff;\n}\n\n.multi-wrapper .header {\n    color: #4f4f4f;\n    cursor: default;\n    font-weight: bold;\n    margin-bottom: 5px;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item {\n    cursor: pointer;\n    display: block;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item:hover {\n    background: #ececec;\n    border-radius: 2px;\n}\n\n.multi-wrapper .item-group {\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item-group .group-label {\n    display: block;\n    font-size: 0.875rem;\n    opacity: 0.5;\n    padding: 5px 0;\n}\n\n.multi-wrapper .search-input {\n    border: 0;\n    border-bottom: 1px solid #ccc;\n    border-radius: 0;\n    display: block;\n    font-size: 1em;\n    margin: 0;\n    outline: 0;\n    padding: 10px 20px;\n    width: 100%;\n    box-sizing: border-box;\n}\n\n.multi-wrapper .non-selected-wrapper .item.selected {\n    opacity: 0.5;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled,\n.multi-wrapper .selected-wrapper .item.disabled {\n    opacity: 0.5;\n    text-decoration: line-through;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled:hover,\n.multi-wrapper .selected-wrapper .item.disabled:hover {\n    background: inherit;\n    cursor: inherit;\n}",".sf {\n\n  &__logo {\n    overflow: hidden;\n    text-indent: -99999px;\n    background: url(\"../images/sf_logo.svg\") no-repeat center left;\n    background-size: contain;\n    max-width: 297px;\n    height: 53px;\n  }\n\n  &__version {\n    color: $gray;\n    font-size: 12px;\n    line-height: 17px;\n    margin: 5px 0;\n  }\n\n  &__button.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $secondary;\n    background-color: $secondary;\n    @include hover {\n      color: $white;\n      border-color: darken($secondary, 5%);\n      background-color: darken($secondary, 5%);\n    }\n  }\n\n  &__button__logout.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $primary;\n    background-color: $primary;\n    @include hover {\n      color: $white;\n      border-color: darken($primary, 5%);\n      background-color: darken($primary, 5%);\n    }\n  }\n\n  &__requirements {\n    .success,\n    .failed {\n      @include smoothText;\n      position: relative;\n      padding-left: 26px;\n      color: $textcolor;\n\n      &:before {\n        position: absolute;\n        top: 0;\n        left: 0;\n        font-family: dashicons;\n        content: \"\\f147\";\n        display: block;\n        width: 16px;\n        height: 16px;\n        line-height: 16px;\n        font-size: 14px;\n        border-radius: 50%;\n        text-align: center;\n        color: $white;\n        background-color: $secondary;\n      }\n    }\n\n    .failed {\n      color: $textcolor;\n\n      &:before {\n        content: \"\\f335\";\n        background-color: $gray;\n      }\n    }\n\n  }\n\n  &__hero {\n    position: relative;\n    border: 0;\n    border-radius: 2px;\n    background: linear-gradient(180deg, #03274D 0%, #523081 100%);\n    background-size: cover;\n    padding: 30px;\n\n    &:before {\n      content: \"\";\n      display: block;\n      z-index: 1;\n      position: absolute;\n      top: 0;\n      right: 30px;\n      bottom: 0;\n      left: 0;\n      background: url(\"../images/sf_marketing.svg\") no-repeat center right;\n      pointer-events: none;\n    }\n    &--title{\n      font-size: 16px;\n      line-height: 22px;\n      padding-right: 30px;\n      color: $white;\n      font-weight: bold;\n      margin-bottom: 15px;\n    }\n  }\n\n  &__marketing {\n    border-left: 1px solid $primary;\n    padding-left: 26px;\n\n    &--title{\n      color: $primary;\n      font-size: 1.5em;\n      margin: 0;\n      margin-top: 1em;\n    }\n    &--subtitle{\n      color: $gray;\n      font-size: 10px;\n      text-transform: uppercase;\n      letter-spacing: 3.33px;\n      margin: 0;\n      padding-top: 5px;\n    }\n    &--text{\n      color: $textcolor;\n      font-size: 12px;\n      letter-spacing: 0;\n      line-height: 17px;\n    }\n\n    &--download {\n      padding: 1em 0;\n\n      li {\n        line-height: 1.5em;\n      }\n\n      a {\n        @include smoothText;\n        position: relative;\n        padding-left: 26px;\n        color: $blue;\n        font-weight: bold;\n\n        &:before {\n          position: absolute;\n          top: 0;\n          left: 0;\n          font-family: dashicons;\n          content: \"\\f346\";\n          display: block;\n          width: 16px;\n          height: 16px;\n          line-height: 16px;\n          font-size: 14px;\n          border-radius: 50%;\n          text-align: center;\n          color: $white;\n          background-color: $primary;\n        }\n\n        &:hover {\n          color: $primary;\n        }\n      }\n    }\n  }\n\n  &__plugin{\n    .sf__notice--start a{\n      display: none;\n    }\n  }\n\n\n  @include breakpoints(md) {\n    &__columns {\n      display: flex;\n      flex-wrap: wrap;\n    }\n    &__column {\n      flex-basis: 66%;\n\n      &:last-child {\n        flex-basis: 33%;\n      }\n    }\n\n  }\n}\n"],"names":[],"mappings":"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"} */
+/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"app.css","sources":["app.scss","main/_mixins.scss","main/_colors.scss","multi/_multi.scss","main/_sf.scss"],"sourcesContent":["@import \"main/mixins\";\n@import \"main/colors\";\n@import \"multi/multi\";\n@import \"main/sf\";","// Bourbon's essentials mixins\n$em-base: 16px !default;\n// Strip units\n@function strip-units($value) {\n\t@return ($value / ($value * 0 + 1));\n}\n// PX to EM\n@function em($pxval, $base: $em-base) {\n\t@if not unitless($pxval) {\n\t  $pxval: strip-units($pxval);\n\t}\n\t@if not unitless($base) {\n\t  $base: strip-units($base);\n\t}\n\t@return ($pxval / $base) * 1em;\n}\n//Breakpoints\n$breakpoints: (\n    xsm: em(480),\n    sm: em(768),\n    md: em(1024),\n    lg: em(1260),\n    xlg: em(1440)\n);\n\n@mixin breakpoints($breakpoint) {\n    @media screen and (min-width: map-get($map: $breakpoints, $key: $breakpoint)) {\n        @content;\n    }\n}\n// Hover Active Focus pseudo selector mixin\n@mixin hover {\n\t&:hover, &:active, &:focus {\n\t\t@content;\n\t}\n}\n// Smooth text\n@mixin smoothText {\n\t-webkit-font-smoothing: antialiased;\n    -moz-osx-font-smoothing: grayscale;\n}","$white: #fff;\n$black: #000;\n$primary: #632F8E;\n$secondary: #1CB69B;\n$textcolor: #23282D;\n$gray: #9E9E9E;\n$blue: #04274D;\n$pink: #E91E63;\n",".multi-wrapper {\n    border: 1px solid #ccc;\n    border-radius: 3px;\n    width: 100%;\n}\n\n.multi-wrapper .non-selected-wrapper,\n.multi-wrapper .selected-wrapper {\n    box-sizing: border-box;\n    display: inline-block;\n    height: 200px;\n    overflow-y: scroll;\n    padding: 10px;\n    vertical-align: top;\n    width: 50%;\n}\n\n.multi-wrapper .non-selected-wrapper {\n    background: #fafafa;\n    border-right: 1px solid #ccc;\n}\n\n.multi-wrapper .selected-wrapper {\n    background: #fff;\n}\n\n.multi-wrapper .header {\n    color: #4f4f4f;\n    cursor: default;\n    font-weight: bold;\n    margin-bottom: 5px;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item {\n    cursor: pointer;\n    display: block;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item:hover {\n    background: #ececec;\n    border-radius: 2px;\n}\n\n.multi-wrapper .item-group {\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item-group .group-label {\n    display: block;\n    font-size: 0.875rem;\n    opacity: 0.5;\n    padding: 5px 0;\n}\n\n.multi-wrapper .search-input {\n    border: 0;\n    border-bottom: 1px solid #ccc;\n    border-radius: 0;\n    display: block;\n    font-size: 1em;\n    margin: 0;\n    outline: 0;\n    padding: 10px 20px;\n    width: 100%;\n    box-sizing: border-box;\n}\n\n.multi-wrapper .non-selected-wrapper .item.selected {\n    opacity: 0.5;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled,\n.multi-wrapper .selected-wrapper .item.disabled {\n    opacity: 0.5;\n    text-decoration: line-through;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled:hover,\n.multi-wrapper .selected-wrapper .item.disabled:hover {\n    background: inherit;\n    cursor: inherit;\n}",".sf {\n\n  &__logo {\n    overflow: hidden;\n    text-indent: -99999px;\n    background: url(\"../images/sf_logo.svg\") no-repeat center left;\n    background-size: contain;\n    max-width: 297px;\n    height: 53px;\n  }\n\n  &__version {\n    color: $gray;\n    font-size: 12px;\n    line-height: 17px;\n    margin: 5px 0;\n  }\n\n  &__button.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $secondary;\n    background-color: $secondary;\n    @include hover {\n      color: $white;\n      border-color: darken($secondary, 5%);\n      background-color: darken($secondary, 5%);\n    }\n  }\n\n  &__button__logout.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $primary;\n    background-color: $primary;\n    @include hover {\n      color: $white;\n      border-color: lighten($primary, 5%);\n      background-color: lighten($primary, 5%);\n    }\n  }\n\n  &__requirements {\n    .success,\n    .failed {\n      @include smoothText;\n      position: relative;\n      padding-left: 26px;\n      color: $textcolor;\n\n      &:before {\n        position: absolute;\n        top: 0;\n        left: 0;\n        font-family: dashicons;\n        content: \"\\f147\";\n        display: block;\n        width: 16px;\n        height: 16px;\n        line-height: 16px;\n        font-size: 14px;\n        border-radius: 50%;\n        text-align: center;\n        color: $white;\n        background-color: $secondary;\n      }\n    }\n\n    .failed {\n      color: $textcolor;\n\n      &:before {\n        content: \"\\f335\";\n        background-color: $gray;\n      }\n    }\n\n  }\n\n  &__hero {\n    position: relative;\n    border: 0;\n    border-radius: 2px;\n    background: linear-gradient(180deg, #03274D 0%, #523081 100%);\n    background-size: cover;\n    padding: 30px;\n\n    &:before {\n      content: \"\";\n      display: block;\n      z-index: 1;\n      position: absolute;\n      top: 0;\n      right: 30px;\n      bottom: 0;\n      left: 0;\n      background: url(\"../images/sf_marketing.svg\") no-repeat center right;\n      pointer-events: none;\n    }\n    &--title{\n      font-size: 16px;\n      line-height: 22px;\n      padding-right: 30px;\n      color: $white;\n      font-weight: bold;\n      margin-bottom: 15px;\n    }\n  }\n\n  &__marketing {\n    border-left: 1px solid $primary;\n    padding-left: 26px;\n\n    &--title{\n      color: $primary;\n      font-size: 1.5em;\n      margin: 0;\n      margin-top: 1em;\n    }\n    &--subtitle{\n      color: $gray;\n      font-size: 10px;\n      text-transform: uppercase;\n      letter-spacing: 3.33px;\n      margin: 0;\n      padding-top: 5px;\n    }\n    &--text{\n      color: $textcolor;\n      font-size: 12px;\n      letter-spacing: 0;\n      line-height: 17px;\n    }\n\n    &--download {\n      padding: 1em 0;\n\n      li {\n        line-height: 1.5em;\n      }\n\n      a {\n        @include smoothText;\n        position: relative;\n        padding-left: 26px;\n        color: $blue;\n        font-weight: bold;\n\n        &:before {\n          position: absolute;\n          top: 0;\n          left: 0;\n          font-family: dashicons;\n          content: \"\\f346\";\n          display: block;\n          width: 16px;\n          height: 16px;\n          line-height: 16px;\n          font-size: 14px;\n          border-radius: 50%;\n          text-align: center;\n          color: $white;\n          background-color: $primary;\n        }\n\n        &:hover {\n          color: $primary;\n        }\n      }\n    }\n  }\n\n  &__plugin{\n    .sf__notice--start a{\n      display: none;\n    }\n  }\n\n\n  @include breakpoints(md) {\n    &__columns {\n      display: flex;\n      flex-wrap: wrap;\n    }\n    &__column {\n      flex-basis: 66%;\n\n      &:last-child {\n        flex-basis: 33%;\n      }\n    }\n\n  }\n}\n"],"names":[],"mappings":"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"} */

shopping-feed/tags/6.0.9/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.8
-Version: 6.0.8
+Stable tag: 6.0.9
+Version: 6.0.9
 Requires PHP: 5.6
 Requires at least: 5.2
@@ -22 +22 @@
 6.0.7: add weight as attribute + fix phone value
 6.0.8: add missing commit
+6.0.9  send WC shipping method name once order shipped
 
 == Description ==

shopping-feed/tags/6.0.9/shoppingfeed.php

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

shopping-feed/tags/6.0.9/src/Admin/WoocommerceFilters.php

@@ -55 +55 @@
     }
 
+
     /**
      * Disable Stock change for SF orders already shipped

shopping-feed/tags/6.0.9/src/Feed/Generator.php

@@ -19 +19 @@
 class Generator {
 
+    /**
+     * Option name to save last generation date
+     */
+    const SF_FEED_LAST_GENERATION_DATE = 'SF_FEED_LAST_GENERATION';
+    /**
+     * @var Generator
+     */
+    private static $instance;
     /** @var Platform */
     private $platform;
-
     private $uri;
-
     /**
      * @var ProductGenerator
      */
     private $generator;
-
-    /**
-     * Option name to save last generation date
-     */
-    const SF_FEED_LAST_GENERATION_DATE = 'SF_FEED_LAST_GENERATION';
-
-    /**
-     * @var Generator
-     */
-    private static $instance;
-
-    /**
-     * Get the singleton instance.
-     *
-     * @return Generator
-     */
-    public static function get_instance() {
-        if ( is_null( self::$instance ) ) {
-            self::$instance = new static();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Singleton instance can't be cloned.
-     */
-    private function __clone() {
-    }
-
-    /**
-     * Singleton instance can't be serialized.
-     */
-    private function __wakeup() {
-    }
 
     /**
@@ -74 +45 @@
         $this->set_filters();
         $this->set_mappers();
+    }
+
+    /**
+     * Set the platform
+     */
+    private function set_platform() {
+        if ( ! isset( $this->platform ) ) {
+            $this->platform = Platform::get_instance();
+        }
+    }
+
+    /**
+     * Set the uri
+     */
+    private function set_uri() {
+        if ( ! isset( $this->uri ) ) {
+            $this->uri = ShoppingFeedHelper::get_tmp_uri( Uri::get_instance()->get_uri() );
+        }
+    }
+
+    /**
+     * Instanciate an instance from ProductGenerator
+     */
+    private function set_generator() {
+        if ( ! isset( $this->generator ) ) {
+            $this->generator = new ProductGenerator();
+            $this->generator->setPlatform( $this->platform->get_name(), $this->platform->get_version() );
+            $this->generator->setUri( $this->uri );
+        }
+    }
+
+    /**
+     * In some case, you may need to pre-process data before to map them.
+     * This can be achieved in mappers or in your dataset, but sometimes things have to be separated, so you can register processors that are executed before mappers, and prepare your data before the mapping process.
+     */
+    private function set_processors() {
+    }
+
+    /**
+     * Filters are designed discard some items from the feed.
+     * Filters are executed after processors, because item must be completely filled before to make the decision to keep it or not.
+     */
+    private function set_filters() {
+        # Ignore all items with undefined price
+        $this->generator->addFilter(
+            function (
+                array $sf_product
+            ) {
+                $sf_product = reset( $sf_product );
+
+                /** @var Product $sf_product */
+                return ! empty( $sf_product->get_price() );
+            }
+        );
+    }
+
+    /**
+     * As stated above, at least one mapper must be registered, this is where you populate the Product instance, which is later converted to XML by the library
+     */
+    private function set_mappers() {
+        //Simple product mapping
+        $this->generator->addMapper(
+            function (
+                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
+            ) {
+                $sf_product = reset( $sf_product );
+                /** @var Product $sf_product */
+                $product->setReference( $sf_product->get_sku() );
+                $product->setName( $sf_product->get_name() );
+                $product->setPrice( $sf_product->get_price() );
+
+                if ( ! empty( $sf_product->get_ean() ) ) {
+                    $product->setGtin( $sf_product->get_ean() );
+                }
+
+                $product->setQuantity( $sf_product->get_quantity() );
+
+                if ( ! empty( $sf_product->get_link() ) ) {
+                    $product->setLink( $sf_product->get_link() );
+                }
+                if ( ! empty( $sf_product->get_discount() ) ) {
+                    $product->addDiscount( $sf_product->get_discount() );
+                }
+                if ( ! empty( $sf_product->get_image_main() ) ) {
+                    $product->setMainImage( $sf_product->get_image_main() );
+                }
+
+                if ( ! empty( $sf_product->get_full_description() ) || ! empty( $sf_product->get_short_description() ) ) {
+                    $product->setDescription( $sf_product->get_full_description(), $sf_product->get_short_description() );
+                }
+
+                if ( ! empty( $sf_product->get_brand_name() ) ) {
+                    $product->setBrand( $sf_product->get_brand_name(), $sf_product->get_brand_link() );
+                }
+
+                if ( ! empty( $sf_product->get_category_name() ) ) {
+                    $product->setCategory( $sf_product->get_category_name(), $sf_product->get_category_link() );
+                }
+
+                if ( ! empty( $sf_product->get_attributes() ) ) {
+                    $product->setAttributes( $sf_product->get_attributes() );
+                }
+
+                if ( ! empty( $sf_product->get_shipping_methods() ) ) {
+                    foreach ( $sf_product->get_shipping_methods() as $shipping_method ) {
+                        $product->addShipping( $shipping_method['cost'], $shipping_method['description'] );
+                    }
+                }
+
+                if ( ! empty( $sf_product->get_images() ) ) {
+                    $product->setAdditionalImages( $sf_product->get_images() );
+                }
+
+            }
+        );
+
+        //Product with variations mapping
+        $this->generator->addMapper(
+            function (
+                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
+            ) {
+                $sf_product = reset( $sf_product );
+                /** @var Product $sf_product */
+
+                if ( empty( $sf_product->get_variations() ) ) {
+                    return;
+                }
+                foreach ( $sf_product->get_variations() as $sf_product_variation ) {
+                    $variation = $product->createVariation();
+
+                    $variation
+                        ->setReference( $sf_product_variation['sku'] )
+                        ->setPrice( $sf_product_variation['price'] )
+                        ->setQuantity( $sf_product_variation['quantity'] )
+                        ->setGtin( $sf_product_variation['ean'] );
+
+                    if ( ! empty( $sf_product_variation['attributes'] ) ) {
+                        $variation
+                            ->setAttributes( $sf_product_variation['attributes'] );
+                    }
+                    if ( ! empty( $sf_product_variation['discount'] ) ) {
+                        $variation
+                            ->addDiscount( $sf_product_variation['discount'] );
+                    }
+                    if ( ! empty( $sf_product_variation['image_main'] ) ) {
+                        $variation
+                            ->setMainImage( $sf_product_variation['image_main'] );
+                    }
+                }
+            }
+        );
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return Generator
+     */
+    public static function get_instance() {
+        if ( is_null( self::$instance ) ) {
+            self::$instance = new static();
+        }
+
+        return self::$instance;
     }
 
@@ -128 +263 @@
 
     /**
-     * In some case, you may need to pre-process data before to map them.
-     * This can be achieved in mappers or in your dataset, but sometimes things have to be separated, so you can register processors that are executed before mappers, and prepare your data before the mapping process.
-     */
-    private function set_processors() {
-    }
-
-    /**
-     * Filters are designed discard some items from the feed.
-     * Filters are executed after processors, because item must be completely filled before to make the decision to keep it or not.
-     */
-    private function set_filters() {
-        # Ignore all items with undefined price
-        $this->generator->addFilter(
-            function (
-                array $sf_product
-            ) {
-                $sf_product = reset( $sf_product );
-
-                /** @var Product $sf_product */
-                return ! empty( $sf_product->get_price() );
-            }
-        );
-    }
-
-    /**
-     * As stated above, at least one mapper must be registered, this is where you populate the Product instance, which is later converted to XML by the library
-     */
-    private function set_mappers() {
-        //Simple product mapping
-        $this->generator->addMapper(
-            function (
-                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
-            ) {
-                $sf_product = reset( $sf_product );
-                /** @var Product $sf_product */
-                $product->setReference( $sf_product->get_sku() );
-                $product->setName( $sf_product->get_name() );
-                $product->setPrice( $sf_product->get_price() );
-
-                if ( ! empty( $sf_product->get_ean() ) ) {
-                    $product->setGtin( $sf_product->get_ean() );
-                }
-
-                $product->setQuantity( $sf_product->get_quantity() );
-
-                if ( ! empty( $sf_product->get_link() ) ) {
-                    $product->setLink( $sf_product->get_link() );
-                }
-                if ( ! empty( $sf_product->get_discount() ) ) {
-                    $product->addDiscount( $sf_product->get_discount() );
-                }
-                if ( ! empty( $sf_product->get_image_main() ) ) {
-                    $product->setMainImage( $sf_product->get_image_main() );
-                }
-
-                if ( ! empty( $sf_product->get_full_description() ) || ! empty( $sf_product->get_short_description() ) ) {
-                    $product->setDescription( $sf_product->get_full_description(), $sf_product->get_short_description() );
-                }
-
-                if ( ! empty( $sf_product->get_brand_name() ) ) {
-                    $product->setBrand( $sf_product->get_brand_name(), $sf_product->get_brand_link() );
-                }
-
-                if ( ! empty( $sf_product->get_category_name() ) ) {
-                    $product->setCategory( $sf_product->get_category_name(), $sf_product->get_category_link() );
-                }
-
-                if ( ! empty( $sf_product->get_attributes() ) ) {
-                    $product->setAttributes( $sf_product->get_attributes() );
-                }
-
-                if ( ! empty( $sf_product->get_shipping_methods() ) ) {
-                    foreach ( $sf_product->get_shipping_methods() as $shipping_method ) {
-                        $product->addShipping( $shipping_method['cost'], $shipping_method['description'] );
-                    }
-                }
-
-                if ( ! empty( $sf_product->get_images() ) ) {
-                    $product->setAdditionalImages( $sf_product->get_images() );
-                }
-
-            }
-        );
-
-        //Product with variations mapping
-        $this->generator->addMapper(
-            function (
-                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
-            ) {
-                $sf_product = reset( $sf_product );
-                /** @var Product $sf_product */
-
-                if ( empty( $sf_product->get_variations() ) ) {
-                    return;
-                }
-                foreach ( $sf_product->get_variations() as $sf_product_variation ) {
-                    $variation = $product->createVariation();
-
-                    $variation
-                        ->setReference( $sf_product_variation['sku'] )
-                        ->setPrice( $sf_product_variation['price'] )
-                        ->setQuantity( $sf_product_variation['quantity'] )
-                        ->setGtin( $sf_product_variation['ean'] );
-
-                    if ( ! empty( $sf_product_variation['attributes'] ) ) {
-                        $variation
-                            ->setAttributes( $sf_product_variation['attributes'] );
-                    }
-                    if ( ! empty( $sf_product_variation['discount'] ) ) {
-                        $variation
-                            ->addDiscount( $sf_product_variation['discount'] );
-                    }
-                    if ( ! empty( $sf_product_variation['image_main'] ) ) {
-                        $variation
-                            ->setMainImage( $sf_product_variation['image_main'] );
-                    }
-                }
-            }
-        );
-    }
-
-    /**
-     * Set the platform
-     */
-    private function set_platform() {
-        if ( ! isset( $this->platform ) ) {
-            $this->platform = Platform::get_instance();
-        }
-    }
-
-    /**
-     * Set the uri
-     */
-    private function set_uri() {
-        if ( ! isset( $this->uri ) ) {
-            $this->uri = ShoppingFeedHelper::get_tmp_uri( Uri::get_instance()->get_uri() );
-        }
-    }
-
-    /**
-     * Instanciate an instance from ProductGenerator
-     */
-    private function set_generator() {
-        if ( ! isset( $this->generator ) ) {
-            $this->generator = new ProductGenerator();
-            $this->generator->setPlatform( $this->platform->get_name(), $this->platform->get_version() );
-            $this->generator->setUri( $this->uri );
-        }
+     * Singleton instance can't be cloned.
+     */
+    private function __clone() {
+    }
+
+    /**
+     * Singleton instance can't be serialized.
+     */
+    private function __wakeup() {
     }
 }

shopping-feed/tags/6.0.9/src/ShoppingFeedHelper.php

@@ -492 +492 @@
         $sf_carrier_id = $sf_shipping['sf_shipping'];
 
-        $sf_carriers = self::get_sf_carriers();
-        if ( empty( $sf_carriers[ $sf_carrier_id ] ) ) {
-            return $wc_order->get_shipping_method();
-        }
-
-        return $sf_carriers[ $sf_carrier_id ];
+        $default_shipping_method = self::get_default_shipping_method();
+        if ( ! is_array( $default_shipping_method ) || empty( $default_shipping_method ) ) {
+            $default_shipping_method = '';
+        }
+        $default_shipping_method = ! is_array( $default_shipping_method ) || empty( $default_shipping_method ) ? '' : $default_shipping_method['method_title'];
+
+        $matching_shipping_method_list = self::get_matching_shipping_method_list();
+        if ( empty( $matching_shipping_method_list[ $sf_carrier_id ] ) ) {
+            return $default_shipping_method;
+        }
+
+        $matching_shipping_method = json_decode( $matching_shipping_method_list[ $sf_carrier_id ], true );
+        if ( ! is_array( $matching_shipping_method ) && empty( $matching_shipping_method ) ) {
+            return $default_shipping_method;
+        }
+
+        return (string) $matching_shipping_method['method_title'];
     }
 

shopping-feed/trunk/assets/css/app.css

@@ -102 +102 @@
   .sf__button__logout.button:hover, .sf__button__logout.button:active, .sf__button__logout.button:focus {
     color: #fff;
-    border-color: #56297b;
-    background-color: #56297b; }
+    border-color: #7035a1;
+    background-color: #7035a1; }
 
 .sf__requirements .success,
@@ -222 +222 @@
       flex-basis: 33%; } }
 
-/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"app.css","sources":["app.scss","main/_mixins.scss","main/_colors.scss","multi/_multi.scss","main/_sf.scss"],"sourcesContent":["@import \"main/mixins\";\n@import \"main/colors\";\n@import \"multi/multi\";\n@import \"main/sf\";","// Bourbon's essentials mixins\n$em-base: 16px !default;\n// Strip units\n@function strip-units($value) {\n\t@return ($value / ($value * 0 + 1));\n}\n// PX to EM\n@function em($pxval, $base: $em-base) {\n\t@if not unitless($pxval) {\n\t  $pxval: strip-units($pxval);\n\t}\n\t@if not unitless($base) {\n\t  $base: strip-units($base);\n\t}\n\t@return ($pxval / $base) * 1em;\n}\n//Breakpoints\n$breakpoints: (\n    xsm: em(480),\n    sm: em(768),\n    md: em(1024),\n    lg: em(1260),\n    xlg: em(1440)\n);\n\n@mixin breakpoints($breakpoint) {\n    @media screen and (min-width: map-get($map: $breakpoints, $key: $breakpoint)) {\n        @content;\n    }\n}\n// Hover Active Focus pseudo selector mixin\n@mixin hover {\n\t&:hover, &:active, &:focus {\n\t\t@content;\n\t}\n}\n// Smooth text\n@mixin smoothText {\n\t-webkit-font-smoothing: antialiased;\n    -moz-osx-font-smoothing: grayscale;\n}","$white: #fff;\n$black: #000;\n$primary: #632F8E;\n$secondary: #1CB69B;\n$textcolor: #23282D;\n$gray: #9E9E9E;\n$blue: #04274D;\n$pink: #E91E63;\n",".multi-wrapper {\n    border: 1px solid #ccc;\n    border-radius: 3px;\n    width: 100%;\n}\n\n.multi-wrapper .non-selected-wrapper,\n.multi-wrapper .selected-wrapper {\n    box-sizing: border-box;\n    display: inline-block;\n    height: 200px;\n    overflow-y: scroll;\n    padding: 10px;\n    vertical-align: top;\n    width: 50%;\n}\n\n.multi-wrapper .non-selected-wrapper {\n    background: #fafafa;\n    border-right: 1px solid #ccc;\n}\n\n.multi-wrapper .selected-wrapper {\n    background: #fff;\n}\n\n.multi-wrapper .header {\n    color: #4f4f4f;\n    cursor: default;\n    font-weight: bold;\n    margin-bottom: 5px;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item {\n    cursor: pointer;\n    display: block;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item:hover {\n    background: #ececec;\n    border-radius: 2px;\n}\n\n.multi-wrapper .item-group {\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item-group .group-label {\n    display: block;\n    font-size: 0.875rem;\n    opacity: 0.5;\n    padding: 5px 0;\n}\n\n.multi-wrapper .search-input {\n    border: 0;\n    border-bottom: 1px solid #ccc;\n    border-radius: 0;\n    display: block;\n    font-size: 1em;\n    margin: 0;\n    outline: 0;\n    padding: 10px 20px;\n    width: 100%;\n    box-sizing: border-box;\n}\n\n.multi-wrapper .non-selected-wrapper .item.selected {\n    opacity: 0.5;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled,\n.multi-wrapper .selected-wrapper .item.disabled {\n    opacity: 0.5;\n    text-decoration: line-through;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled:hover,\n.multi-wrapper .selected-wrapper .item.disabled:hover {\n    background: inherit;\n    cursor: inherit;\n}",".sf {\n\n  &__logo {\n    overflow: hidden;\n    text-indent: -99999px;\n    background: url(\"../images/sf_logo.svg\") no-repeat center left;\n    background-size: contain;\n    max-width: 297px;\n    height: 53px;\n  }\n\n  &__version {\n    color: $gray;\n    font-size: 12px;\n    line-height: 17px;\n    margin: 5px 0;\n  }\n\n  &__button.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $secondary;\n    background-color: $secondary;\n    @include hover {\n      color: $white;\n      border-color: darken($secondary, 5%);\n      background-color: darken($secondary, 5%);\n    }\n  }\n\n  &__button__logout.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $primary;\n    background-color: $primary;\n    @include hover {\n      color: $white;\n      border-color: darken($primary, 5%);\n      background-color: darken($primary, 5%);\n    }\n  }\n\n  &__requirements {\n    .success,\n    .failed {\n      @include smoothText;\n      position: relative;\n      padding-left: 26px;\n      color: $textcolor;\n\n      &:before {\n        position: absolute;\n        top: 0;\n        left: 0;\n        font-family: dashicons;\n        content: \"\\f147\";\n        display: block;\n        width: 16px;\n        height: 16px;\n        line-height: 16px;\n        font-size: 14px;\n        border-radius: 50%;\n        text-align: center;\n        color: $white;\n        background-color: $secondary;\n      }\n    }\n\n    .failed {\n      color: $textcolor;\n\n      &:before {\n        content: \"\\f335\";\n        background-color: $gray;\n      }\n    }\n\n  }\n\n  &__hero {\n    position: relative;\n    border: 0;\n    border-radius: 2px;\n    background: linear-gradient(180deg, #03274D 0%, #523081 100%);\n    background-size: cover;\n    padding: 30px;\n\n    &:before {\n      content: \"\";\n      display: block;\n      z-index: 1;\n      position: absolute;\n      top: 0;\n      right: 30px;\n      bottom: 0;\n      left: 0;\n      background: url(\"../images/sf_marketing.svg\") no-repeat center right;\n      pointer-events: none;\n    }\n    &--title{\n      font-size: 16px;\n      line-height: 22px;\n      padding-right: 30px;\n      color: $white;\n      font-weight: bold;\n      margin-bottom: 15px;\n    }\n  }\n\n  &__marketing {\n    border-left: 1px solid $primary;\n    padding-left: 26px;\n\n    &--title{\n      color: $primary;\n      font-size: 1.5em;\n      margin: 0;\n      margin-top: 1em;\n    }\n    &--subtitle{\n      color: $gray;\n      font-size: 10px;\n      text-transform: uppercase;\n      letter-spacing: 3.33px;\n      margin: 0;\n      padding-top: 5px;\n    }\n    &--text{\n      color: $textcolor;\n      font-size: 12px;\n      letter-spacing: 0;\n      line-height: 17px;\n    }\n\n    &--download {\n      padding: 1em 0;\n\n      li {\n        line-height: 1.5em;\n      }\n\n      a {\n        @include smoothText;\n        position: relative;\n        padding-left: 26px;\n        color: $blue;\n        font-weight: bold;\n\n        &:before {\n          position: absolute;\n          top: 0;\n          left: 0;\n          font-family: dashicons;\n          content: \"\\f346\";\n          display: block;\n          width: 16px;\n          height: 16px;\n          line-height: 16px;\n          font-size: 14px;\n          border-radius: 50%;\n          text-align: center;\n          color: $white;\n          background-color: $primary;\n        }\n\n        &:hover {\n          color: $primary;\n        }\n      }\n    }\n  }\n\n  &__plugin{\n    .sf__notice--start a{\n      display: none;\n    }\n  }\n\n\n  @include breakpoints(md) {\n    &__columns {\n      display: flex;\n      flex-wrap: wrap;\n    }\n    &__column {\n      flex-basis: 66%;\n\n      &:last-child {\n        flex-basis: 33%;\n      }\n    }\n\n  }\n}\n"],"names":[],"mappings":"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"} */
+/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"file":"app.css","sources":["app.scss","main/_mixins.scss","main/_colors.scss","multi/_multi.scss","main/_sf.scss"],"sourcesContent":["@import \"main/mixins\";\n@import \"main/colors\";\n@import \"multi/multi\";\n@import \"main/sf\";","// Bourbon's essentials mixins\n$em-base: 16px !default;\n// Strip units\n@function strip-units($value) {\n\t@return ($value / ($value * 0 + 1));\n}\n// PX to EM\n@function em($pxval, $base: $em-base) {\n\t@if not unitless($pxval) {\n\t  $pxval: strip-units($pxval);\n\t}\n\t@if not unitless($base) {\n\t  $base: strip-units($base);\n\t}\n\t@return ($pxval / $base) * 1em;\n}\n//Breakpoints\n$breakpoints: (\n    xsm: em(480),\n    sm: em(768),\n    md: em(1024),\n    lg: em(1260),\n    xlg: em(1440)\n);\n\n@mixin breakpoints($breakpoint) {\n    @media screen and (min-width: map-get($map: $breakpoints, $key: $breakpoint)) {\n        @content;\n    }\n}\n// Hover Active Focus pseudo selector mixin\n@mixin hover {\n\t&:hover, &:active, &:focus {\n\t\t@content;\n\t}\n}\n// Smooth text\n@mixin smoothText {\n\t-webkit-font-smoothing: antialiased;\n    -moz-osx-font-smoothing: grayscale;\n}","$white: #fff;\n$black: #000;\n$primary: #632F8E;\n$secondary: #1CB69B;\n$textcolor: #23282D;\n$gray: #9E9E9E;\n$blue: #04274D;\n$pink: #E91E63;\n",".multi-wrapper {\n    border: 1px solid #ccc;\n    border-radius: 3px;\n    width: 100%;\n}\n\n.multi-wrapper .non-selected-wrapper,\n.multi-wrapper .selected-wrapper {\n    box-sizing: border-box;\n    display: inline-block;\n    height: 200px;\n    overflow-y: scroll;\n    padding: 10px;\n    vertical-align: top;\n    width: 50%;\n}\n\n.multi-wrapper .non-selected-wrapper {\n    background: #fafafa;\n    border-right: 1px solid #ccc;\n}\n\n.multi-wrapper .selected-wrapper {\n    background: #fff;\n}\n\n.multi-wrapper .header {\n    color: #4f4f4f;\n    cursor: default;\n    font-weight: bold;\n    margin-bottom: 5px;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item {\n    cursor: pointer;\n    display: block;\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item:hover {\n    background: #ececec;\n    border-radius: 2px;\n}\n\n.multi-wrapper .item-group {\n    padding: 5px 10px;\n}\n\n.multi-wrapper .item-group .group-label {\n    display: block;\n    font-size: 0.875rem;\n    opacity: 0.5;\n    padding: 5px 0;\n}\n\n.multi-wrapper .search-input {\n    border: 0;\n    border-bottom: 1px solid #ccc;\n    border-radius: 0;\n    display: block;\n    font-size: 1em;\n    margin: 0;\n    outline: 0;\n    padding: 10px 20px;\n    width: 100%;\n    box-sizing: border-box;\n}\n\n.multi-wrapper .non-selected-wrapper .item.selected {\n    opacity: 0.5;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled,\n.multi-wrapper .selected-wrapper .item.disabled {\n    opacity: 0.5;\n    text-decoration: line-through;\n}\n\n.multi-wrapper .non-selected-wrapper .item.disabled:hover,\n.multi-wrapper .selected-wrapper .item.disabled:hover {\n    background: inherit;\n    cursor: inherit;\n}",".sf {\n\n  &__logo {\n    overflow: hidden;\n    text-indent: -99999px;\n    background: url(\"../images/sf_logo.svg\") no-repeat center left;\n    background-size: contain;\n    max-width: 297px;\n    height: 53px;\n  }\n\n  &__version {\n    color: $gray;\n    font-size: 12px;\n    line-height: 17px;\n    margin: 5px 0;\n  }\n\n  &__button.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $secondary;\n    background-color: $secondary;\n    @include hover {\n      color: $white;\n      border-color: darken($secondary, 5%);\n      background-color: darken($secondary, 5%);\n    }\n  }\n\n  &__button__logout.button {\n    color: $white;\n    text-transform: uppercase;\n    border-color: $primary;\n    background-color: $primary;\n    @include hover {\n      color: $white;\n      border-color: lighten($primary, 5%);\n      background-color: lighten($primary, 5%);\n    }\n  }\n\n  &__requirements {\n    .success,\n    .failed {\n      @include smoothText;\n      position: relative;\n      padding-left: 26px;\n      color: $textcolor;\n\n      &:before {\n        position: absolute;\n        top: 0;\n        left: 0;\n        font-family: dashicons;\n        content: \"\\f147\";\n        display: block;\n        width: 16px;\n        height: 16px;\n        line-height: 16px;\n        font-size: 14px;\n        border-radius: 50%;\n        text-align: center;\n        color: $white;\n        background-color: $secondary;\n      }\n    }\n\n    .failed {\n      color: $textcolor;\n\n      &:before {\n        content: \"\\f335\";\n        background-color: $gray;\n      }\n    }\n\n  }\n\n  &__hero {\n    position: relative;\n    border: 0;\n    border-radius: 2px;\n    background: linear-gradient(180deg, #03274D 0%, #523081 100%);\n    background-size: cover;\n    padding: 30px;\n\n    &:before {\n      content: \"\";\n      display: block;\n      z-index: 1;\n      position: absolute;\n      top: 0;\n      right: 30px;\n      bottom: 0;\n      left: 0;\n      background: url(\"../images/sf_marketing.svg\") no-repeat center right;\n      pointer-events: none;\n    }\n    &--title{\n      font-size: 16px;\n      line-height: 22px;\n      padding-right: 30px;\n      color: $white;\n      font-weight: bold;\n      margin-bottom: 15px;\n    }\n  }\n\n  &__marketing {\n    border-left: 1px solid $primary;\n    padding-left: 26px;\n\n    &--title{\n      color: $primary;\n      font-size: 1.5em;\n      margin: 0;\n      margin-top: 1em;\n    }\n    &--subtitle{\n      color: $gray;\n      font-size: 10px;\n      text-transform: uppercase;\n      letter-spacing: 3.33px;\n      margin: 0;\n      padding-top: 5px;\n    }\n    &--text{\n      color: $textcolor;\n      font-size: 12px;\n      letter-spacing: 0;\n      line-height: 17px;\n    }\n\n    &--download {\n      padding: 1em 0;\n\n      li {\n        line-height: 1.5em;\n      }\n\n      a {\n        @include smoothText;\n        position: relative;\n        padding-left: 26px;\n        color: $blue;\n        font-weight: bold;\n\n        &:before {\n          position: absolute;\n          top: 0;\n          left: 0;\n          font-family: dashicons;\n          content: \"\\f346\";\n          display: block;\n          width: 16px;\n          height: 16px;\n          line-height: 16px;\n          font-size: 14px;\n          border-radius: 50%;\n          text-align: center;\n          color: $white;\n          background-color: $primary;\n        }\n\n        &:hover {\n          color: $primary;\n        }\n      }\n    }\n  }\n\n  &__plugin{\n    .sf__notice--start a{\n      display: none;\n    }\n  }\n\n\n  @include breakpoints(md) {\n    &__columns {\n      display: flex;\n      flex-wrap: wrap;\n    }\n    &__column {\n      flex-basis: 66%;\n\n      &:last-child {\n        flex-basis: 33%;\n      }\n    }\n\n  }\n}\n"],"names":[],"mappings":"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"} */

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.8
-Version: 6.0.8
+Stable tag: 6.0.9
+Version: 6.0.9
 Requires PHP: 5.6
 Requires at least: 5.2
@@ -22 +22 @@
 6.0.7: add weight as attribute + fix phone value
 6.0.8: add missing commit
+6.0.9  send WC shipping method name once order shipped
 
 == Description ==

shopping-feed/trunk/shoppingfeed.php

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

shopping-feed/trunk/src/Admin/WoocommerceFilters.php

@@ -55 +55 @@
     }
 
+
     /**
      * Disable Stock change for SF orders already shipped

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

@@ -19 +19 @@
 class Generator {
 
+    /**
+     * Option name to save last generation date
+     */
+    const SF_FEED_LAST_GENERATION_DATE = 'SF_FEED_LAST_GENERATION';
+    /**
+     * @var Generator
+     */
+    private static $instance;
     /** @var Platform */
     private $platform;
-
     private $uri;
-
     /**
      * @var ProductGenerator
      */
     private $generator;
-
-    /**
-     * Option name to save last generation date
-     */
-    const SF_FEED_LAST_GENERATION_DATE = 'SF_FEED_LAST_GENERATION';
-
-    /**
-     * @var Generator
-     */
-    private static $instance;
-
-    /**
-     * Get the singleton instance.
-     *
-     * @return Generator
-     */
-    public static function get_instance() {
-        if ( is_null( self::$instance ) ) {
-            self::$instance = new static();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Singleton instance can't be cloned.
-     */
-    private function __clone() {
-    }
-
-    /**
-     * Singleton instance can't be serialized.
-     */
-    private function __wakeup() {
-    }
 
     /**
@@ -74 +45 @@
         $this->set_filters();
         $this->set_mappers();
+    }
+
+    /**
+     * Set the platform
+     */
+    private function set_platform() {
+        if ( ! isset( $this->platform ) ) {
+            $this->platform = Platform::get_instance();
+        }
+    }
+
+    /**
+     * Set the uri
+     */
+    private function set_uri() {
+        if ( ! isset( $this->uri ) ) {
+            $this->uri = ShoppingFeedHelper::get_tmp_uri( Uri::get_instance()->get_uri() );
+        }
+    }
+
+    /**
+     * Instanciate an instance from ProductGenerator
+     */
+    private function set_generator() {
+        if ( ! isset( $this->generator ) ) {
+            $this->generator = new ProductGenerator();
+            $this->generator->setPlatform( $this->platform->get_name(), $this->platform->get_version() );
+            $this->generator->setUri( $this->uri );
+        }
+    }
+
+    /**
+     * In some case, you may need to pre-process data before to map them.
+     * This can be achieved in mappers or in your dataset, but sometimes things have to be separated, so you can register processors that are executed before mappers, and prepare your data before the mapping process.
+     */
+    private function set_processors() {
+    }
+
+    /**
+     * Filters are designed discard some items from the feed.
+     * Filters are executed after processors, because item must be completely filled before to make the decision to keep it or not.
+     */
+    private function set_filters() {
+        # Ignore all items with undefined price
+        $this->generator->addFilter(
+            function (
+                array $sf_product
+            ) {
+                $sf_product = reset( $sf_product );
+
+                /** @var Product $sf_product */
+                return ! empty( $sf_product->get_price() );
+            }
+        );
+    }
+
+    /**
+     * As stated above, at least one mapper must be registered, this is where you populate the Product instance, which is later converted to XML by the library
+     */
+    private function set_mappers() {
+        //Simple product mapping
+        $this->generator->addMapper(
+            function (
+                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
+            ) {
+                $sf_product = reset( $sf_product );
+                /** @var Product $sf_product */
+                $product->setReference( $sf_product->get_sku() );
+                $product->setName( $sf_product->get_name() );
+                $product->setPrice( $sf_product->get_price() );
+
+                if ( ! empty( $sf_product->get_ean() ) ) {
+                    $product->setGtin( $sf_product->get_ean() );
+                }
+
+                $product->setQuantity( $sf_product->get_quantity() );
+
+                if ( ! empty( $sf_product->get_link() ) ) {
+                    $product->setLink( $sf_product->get_link() );
+                }
+                if ( ! empty( $sf_product->get_discount() ) ) {
+                    $product->addDiscount( $sf_product->get_discount() );
+                }
+                if ( ! empty( $sf_product->get_image_main() ) ) {
+                    $product->setMainImage( $sf_product->get_image_main() );
+                }
+
+                if ( ! empty( $sf_product->get_full_description() ) || ! empty( $sf_product->get_short_description() ) ) {
+                    $product->setDescription( $sf_product->get_full_description(), $sf_product->get_short_description() );
+                }
+
+                if ( ! empty( $sf_product->get_brand_name() ) ) {
+                    $product->setBrand( $sf_product->get_brand_name(), $sf_product->get_brand_link() );
+                }
+
+                if ( ! empty( $sf_product->get_category_name() ) ) {
+                    $product->setCategory( $sf_product->get_category_name(), $sf_product->get_category_link() );
+                }
+
+                if ( ! empty( $sf_product->get_attributes() ) ) {
+                    $product->setAttributes( $sf_product->get_attributes() );
+                }
+
+                if ( ! empty( $sf_product->get_shipping_methods() ) ) {
+                    foreach ( $sf_product->get_shipping_methods() as $shipping_method ) {
+                        $product->addShipping( $shipping_method['cost'], $shipping_method['description'] );
+                    }
+                }
+
+                if ( ! empty( $sf_product->get_images() ) ) {
+                    $product->setAdditionalImages( $sf_product->get_images() );
+                }
+
+            }
+        );
+
+        //Product with variations mapping
+        $this->generator->addMapper(
+            function (
+                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
+            ) {
+                $sf_product = reset( $sf_product );
+                /** @var Product $sf_product */
+
+                if ( empty( $sf_product->get_variations() ) ) {
+                    return;
+                }
+                foreach ( $sf_product->get_variations() as $sf_product_variation ) {
+                    $variation = $product->createVariation();
+
+                    $variation
+                        ->setReference( $sf_product_variation['sku'] )
+                        ->setPrice( $sf_product_variation['price'] )
+                        ->setQuantity( $sf_product_variation['quantity'] )
+                        ->setGtin( $sf_product_variation['ean'] );
+
+                    if ( ! empty( $sf_product_variation['attributes'] ) ) {
+                        $variation
+                            ->setAttributes( $sf_product_variation['attributes'] );
+                    }
+                    if ( ! empty( $sf_product_variation['discount'] ) ) {
+                        $variation
+                            ->addDiscount( $sf_product_variation['discount'] );
+                    }
+                    if ( ! empty( $sf_product_variation['image_main'] ) ) {
+                        $variation
+                            ->setMainImage( $sf_product_variation['image_main'] );
+                    }
+                }
+            }
+        );
+    }
+
+    /**
+     * Get the singleton instance.
+     *
+     * @return Generator
+     */
+    public static function get_instance() {
+        if ( is_null( self::$instance ) ) {
+            self::$instance = new static();
+        }
+
+        return self::$instance;
     }
 
@@ -128 +263 @@
 
     /**
-     * In some case, you may need to pre-process data before to map them.
-     * This can be achieved in mappers or in your dataset, but sometimes things have to be separated, so you can register processors that are executed before mappers, and prepare your data before the mapping process.
-     */
-    private function set_processors() {
-    }
-
-    /**
-     * Filters are designed discard some items from the feed.
-     * Filters are executed after processors, because item must be completely filled before to make the decision to keep it or not.
-     */
-    private function set_filters() {
-        # Ignore all items with undefined price
-        $this->generator->addFilter(
-            function (
-                array $sf_product
-            ) {
-                $sf_product = reset( $sf_product );
-
-                /** @var Product $sf_product */
-                return ! empty( $sf_product->get_price() );
-            }
-        );
-    }
-
-    /**
-     * As stated above, at least one mapper must be registered, this is where you populate the Product instance, which is later converted to XML by the library
-     */
-    private function set_mappers() {
-        //Simple product mapping
-        $this->generator->addMapper(
-            function (
-                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
-            ) {
-                $sf_product = reset( $sf_product );
-                /** @var Product $sf_product */
-                $product->setReference( $sf_product->get_sku() );
-                $product->setName( $sf_product->get_name() );
-                $product->setPrice( $sf_product->get_price() );
-
-                if ( ! empty( $sf_product->get_ean() ) ) {
-                    $product->setGtin( $sf_product->get_ean() );
-                }
-
-                $product->setQuantity( $sf_product->get_quantity() );
-
-                if ( ! empty( $sf_product->get_link() ) ) {
-                    $product->setLink( $sf_product->get_link() );
-                }
-                if ( ! empty( $sf_product->get_discount() ) ) {
-                    $product->addDiscount( $sf_product->get_discount() );
-                }
-                if ( ! empty( $sf_product->get_image_main() ) ) {
-                    $product->setMainImage( $sf_product->get_image_main() );
-                }
-
-                if ( ! empty( $sf_product->get_full_description() ) || ! empty( $sf_product->get_short_description() ) ) {
-                    $product->setDescription( $sf_product->get_full_description(), $sf_product->get_short_description() );
-                }
-
-                if ( ! empty( $sf_product->get_brand_name() ) ) {
-                    $product->setBrand( $sf_product->get_brand_name(), $sf_product->get_brand_link() );
-                }
-
-                if ( ! empty( $sf_product->get_category_name() ) ) {
-                    $product->setCategory( $sf_product->get_category_name(), $sf_product->get_category_link() );
-                }
-
-                if ( ! empty( $sf_product->get_attributes() ) ) {
-                    $product->setAttributes( $sf_product->get_attributes() );
-                }
-
-                if ( ! empty( $sf_product->get_shipping_methods() ) ) {
-                    foreach ( $sf_product->get_shipping_methods() as $shipping_method ) {
-                        $product->addShipping( $shipping_method['cost'], $shipping_method['description'] );
-                    }
-                }
-
-                if ( ! empty( $sf_product->get_images() ) ) {
-                    $product->setAdditionalImages( $sf_product->get_images() );
-                }
-
-            }
-        );
-
-        //Product with variations mapping
-        $this->generator->addMapper(
-            function (
-                array $sf_product, \ShoppingFeed\Feed\Product\Product $product
-            ) {
-                $sf_product = reset( $sf_product );
-                /** @var Product $sf_product */
-
-                if ( empty( $sf_product->get_variations() ) ) {
-                    return;
-                }
-                foreach ( $sf_product->get_variations() as $sf_product_variation ) {
-                    $variation = $product->createVariation();
-
-                    $variation
-                        ->setReference( $sf_product_variation['sku'] )
-                        ->setPrice( $sf_product_variation['price'] )
-                        ->setQuantity( $sf_product_variation['quantity'] )
-                        ->setGtin( $sf_product_variation['ean'] );
-
-                    if ( ! empty( $sf_product_variation['attributes'] ) ) {
-                        $variation
-                            ->setAttributes( $sf_product_variation['attributes'] );
-                    }
-                    if ( ! empty( $sf_product_variation['discount'] ) ) {
-                        $variation
-                            ->addDiscount( $sf_product_variation['discount'] );
-                    }
-                    if ( ! empty( $sf_product_variation['image_main'] ) ) {
-                        $variation
-                            ->setMainImage( $sf_product_variation['image_main'] );
-                    }
-                }
-            }
-        );
-    }
-
-    /**
-     * Set the platform
-     */
-    private function set_platform() {
-        if ( ! isset( $this->platform ) ) {
-            $this->platform = Platform::get_instance();
-        }
-    }
-
-    /**
-     * Set the uri
-     */
-    private function set_uri() {
-        if ( ! isset( $this->uri ) ) {
-            $this->uri = ShoppingFeedHelper::get_tmp_uri( Uri::get_instance()->get_uri() );
-        }
-    }
-
-    /**
-     * Instanciate an instance from ProductGenerator
-     */
-    private function set_generator() {
-        if ( ! isset( $this->generator ) ) {
-            $this->generator = new ProductGenerator();
-            $this->generator->setPlatform( $this->platform->get_name(), $this->platform->get_version() );
-            $this->generator->setUri( $this->uri );
-        }
+     * Singleton instance can't be cloned.
+     */
+    private function __clone() {
+    }
+
+    /**
+     * Singleton instance can't be serialized.
+     */
+    private function __wakeup() {
     }
 }

shopping-feed/trunk/src/ShoppingFeedHelper.php

@@ -492 +492 @@
         $sf_carrier_id = $sf_shipping['sf_shipping'];
 
-        $sf_carriers = self::get_sf_carriers();
-        if ( empty( $sf_carriers[ $sf_carrier_id ] ) ) {
-            return $wc_order->get_shipping_method();
-        }
-
-        return $sf_carriers[ $sf_carrier_id ];
+        $default_shipping_method = self::get_default_shipping_method();
+        if ( ! is_array( $default_shipping_method ) || empty( $default_shipping_method ) ) {
+            $default_shipping_method = '';
+        }
+        $default_shipping_method = ! is_array( $default_shipping_method ) || empty( $default_shipping_method ) ? '' : $default_shipping_method['method_title'];
+
+        $matching_shipping_method_list = self::get_matching_shipping_method_list();
+        if ( empty( $matching_shipping_method_list[ $sf_carrier_id ] ) ) {
+            return $default_shipping_method;
+        }
+
+        $matching_shipping_method = json_decode( $matching_shipping_method_list[ $sf_carrier_id ], true );
+        if ( ! is_array( $matching_shipping_method ) && empty( $matching_shipping_method ) ) {
+            return $default_shipping_method;
+        }
+
+        return (string) $matching_shipping_method['method_title'];
     }