Plugin Directory

Changeset 2714899


Ignore:
Timestamp:
04/26/2022 12:48:17 PM (4 years ago)
Author:
shoppingfeed
Message:

Update to version 6.1.7 from GitHub

Location:
shopping-feed
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed
  • shopping-feed/tags/6.1.7/readme.txt

    r2712719 r2714899  
    22Contributors: ShoppingFeed, BeAPI
    33Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
    4 Stable tag: 6.1.6
    5 Version: 6.1.6
     4Stable tag: 6.1.7
     5Version: 6.1.7
    66Requires PHP: 5.6
    77Requires at least: 5.2
     
    52526.1.5 Performances improvement : Logger and HTTP connection
    53536.1.6 Release main
     546.1.7 Fix shipping options not saving
    5455
    5556== Description ==
  • shopping-feed/tags/6.1.7/shoppingfeed.php

    r2712719 r2714899  
    88 * Text Domain:     shopping-feed
    99 * Domain Path:     /languages
    10  * Version:         6.1.6
     10 * Version:         6.1.7
    1111 * Requires at least WP: 5.7
    1212 * Requires at least WooCommerce: 5.1.0
     
    2626}
    2727
    28 define( 'SF_VERSION', '6.1.6' );
     28define( 'SF_VERSION', '6.1.7' );
    2929define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
    3030define( 'SF_DB_VERSION', '1.0.0' );
  • shopping-feed/tags/6.1.7/src/Admin/Options.php

    r2670662 r2714899  
    638638
    639639        $shipping_zones = \WC_Shipping_Zones::get_zones();
    640         $selected_shipping_zone = ! empty( $this->sf_shipping_options['zone'] ) ? $this->sf_shipping_options['zone'] : false;
     640        // Ensure retro compatibility
     641        $selected_shipping_zone = ! empty( $this->sf_feed_options['zone'] ) ? $this->sf_feed_options['zone'] : false;
     642        if ( false === $selected_shipping_zone ) {
     643            $selected_shipping_zone = ! empty( $this->sf_shipping_options['zone'] ) ? $this->sf_shipping_options['zone'] : false;
     644        }
    641645        add_settings_field(
    642646            'default_zone',
     
    644648            function () use ( $shipping_zones, $selected_shipping_zone ) {
    645649                ?>
    646                     <input class="hidden" id="selected_shipping_zone" value="<?php echo esc_html( $selected_shipping_zone ); ?>">
    647                     <select id="default_shipping_zone" name="<?php echo esc_html( sprintf( '%s[zone]', self::SF_SHIPPING_OPTIONS ) ); ?>">
     650                    <input class="hidden" id="selected_shipping_zone" value="<?php echo esc_attr( $selected_shipping_zone ); ?>">
     651                    <select id="default_shipping_zone" name="<?php echo esc_attr( sprintf( '%s[zone]', self::SF_FEED_OPTIONS ) ); ?>">
    648652                        <option value=""><?php echo esc_attr_e( 'None', 'shopping-feed' ); ?></option>
    649653                        <?php
     
    652656                                ?>
    653657                            <option
    654                                     value="<?php echo esc_html( $zone['id'] ); ?>"
     658                                    value="<?php echo esc_attr( $zone['id'] ); ?>"
    655659                                <?php selected( $zone['id'], $selected_shipping_zone ); ?>
    656660                            ><?php echo esc_html( $zone['zone_name'] ); ?></option>
     
    671675            __( 'Default Shipping Fees', 'shopping-feed' ),
    672676            function () {
     677                // Ensure retro compatibility
     678                $shipping_fees = isset( $this->sf_feed_options['fees'] ) ? $this->sf_feed_options['fees'] : 0;
     679                if ( 0 === $shipping_fees ) {
     680                    $shipping_fees = isset( $this->sf_shipping_options['fees'] ) ? $this->sf_shipping_options['fees'] : 0;
     681                }
    673682                ?>
    674683                <input type="number"
    675684                       id="shipping_fees"
    676685                       step="any"
    677                        name='<?php echo esc_html( sprintf( '%s[fees]', self::SF_SHIPPING_OPTIONS ) ); ?>'
    678                        value='<?php echo esc_html( isset( $this->sf_shipping_options['fees'] ) ? esc_attr( $this->sf_shipping_options['fees'] ) : 0 ); ?>'>
     686                       name='<?php echo esc_attr( sprintf( '%s[fees]', self::SF_FEED_OPTIONS ) ); ?>'
     687                       value='<?php echo esc_attr( $shipping_fees ); ?>'>
    679688
    680689                <p class="description"
  • shopping-feed/tags/6.1.7/src/ShoppingFeedHelper.php

    r2712684 r2714899  
    235235     */
    236236    public static function get_sf_default_shipping_zone() {
     237        // Ensure retro compatibility
     238        $shipping_configuration = self::get_sf_feed_options();
     239        if ( is_array( $shipping_configuration ) && isset( $shipping_configuration['zone'] ) && ! empty( $shipping_configuration['zone'] ) ) {
     240            return (int) $shipping_configuration['zone'];
     241        }
     242
    237243        $shipping_configuration = self::get_sf_shipping_options();
    238244        if ( ! is_array( $shipping_configuration ) || ! isset( $shipping_configuration['zone'] ) ) {
     
    273279     */
    274280    public static function get_sf_default_shipping_fees() {
     281        $shipping_configuration = self::get_sf_feed_options();
     282        if ( is_array( $shipping_configuration ) && ! empty( $shipping_configuration['fees'] ) && is_numeric( $shipping_configuration['fees'] ) ) {
     283            return (float) $shipping_configuration['fees'];
     284        }
     285
    275286        $shipping_configuration = self::get_sf_feed_options( 'shipping' );
    276287        if ( ! is_array( $shipping_configuration ) || empty( $shipping_configuration['fees'] ) || ! is_numeric( $shipping_configuration['fees'] ) ) {
  • shopping-feed/tags/6.1.7/vendor/autoload.php

    r2712719 r2714899  
    55require_once __DIR__ . '/composer/autoload_real.php';
    66
    7 return ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::getLoader();
     7return ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a::getLoader();
  • shopping-feed/tags/6.1.7/vendor/composer/autoload_real.php

    r2712719 r2714899  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8
     5class ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a
    66{
    77    private static $loader;
     
    2323        }
    2424
    25         spl_autoload_register(array('ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8', 'loadClassLoader'), true, true);
     25        spl_autoload_register(array('ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a', 'loadClassLoader'), true, true);
    2626        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
    27         spl_autoload_unregister(array('ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8', 'loadClassLoader'));
     27        spl_autoload_unregister(array('ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a', 'loadClassLoader'));
    2828
    2929        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
     
    3131            require __DIR__ . '/autoload_static.php';
    3232
    33             call_user_func(\Composer\Autoload\ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::getInitializer($loader));
     33            call_user_func(\Composer\Autoload\ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::getInitializer($loader));
    3434        } else {
    3535            $map = require __DIR__ . '/autoload_namespaces.php';
     
    5252
    5353        if ($useStaticLoader) {
    54             $includeFiles = Composer\Autoload\ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$files;
     54            $includeFiles = Composer\Autoload\ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$files;
    5555        } else {
    5656            $includeFiles = require __DIR__ . '/autoload_files.php';
    5757        }
    5858        foreach ($includeFiles as $fileIdentifier => $file) {
    59             composerRequire2ec5ffcedab1cb57d9fa5623bd4aa4d8($fileIdentifier, $file);
     59            composerRequire28893c9e5d575a18cb76efd0620f926a($fileIdentifier, $file);
    6060        }
    6161
     
    6969 * @return void
    7070 */
    71 function composerRequire2ec5ffcedab1cb57d9fa5623bd4aa4d8($fileIdentifier, $file)
     71function composerRequire28893c9e5d575a18cb76efd0620f926a($fileIdentifier, $file)
    7272{
    7373    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
  • shopping-feed/tags/6.1.7/vendor/composer/autoload_static.php

    r2712719 r2714899  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8
     7class ComposerStaticInit28893c9e5d575a18cb76efd0620f926a
    88{
    99    public static $files = array (
     
    445445    {
    446446        return \Closure::bind(function () use ($loader) {
    447             $loader->prefixLengthsPsr4 = ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$prefixLengthsPsr4;
    448             $loader->prefixDirsPsr4 = ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$prefixDirsPsr4;
    449             $loader->classMap = ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$classMap;
     447            $loader->prefixLengthsPsr4 = ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$prefixLengthsPsr4;
     448            $loader->prefixDirsPsr4 = ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$prefixDirsPsr4;
     449            $loader->classMap = ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$classMap;
    450450
    451451        }, null, ClassLoader::class);
  • shopping-feed/tags/6.1.7/vendor/composer/installed.php

    r2712719 r2714899  
    11<?php return array(
    22    'root' => array(
    3         'pretty_version' => '6.1.6',
    4         'version' => '6.1.6.0',
     3        'pretty_version' => '6.1.7',
     4        'version' => '6.1.7.0',
    55        'type' => 'wordpress-plugin',
    66        'install_path' => __DIR__ . '/../../',
    77        'aliases' => array(),
    8         'reference' => 'c059d68bc50f038592bfee5b827b417f67f9b9bd',
     8        'reference' => '0cbbf45dba3d6fe3ef38d30be4ea528889dc703d',
    99        'name' => 'shoppingfeed/shoppingfeed-for-woocommerce',
    1010        'dev' => false,
     
    102102        ),
    103103        'shoppingfeed/shoppingfeed-for-woocommerce' => array(
    104             'pretty_version' => '6.1.6',
    105             'version' => '6.1.6.0',
     104            'pretty_version' => '6.1.7',
     105            'version' => '6.1.7.0',
    106106            'type' => 'wordpress-plugin',
    107107            'install_path' => __DIR__ . '/../../',
    108108            'aliases' => array(),
    109             'reference' => 'c059d68bc50f038592bfee5b827b417f67f9b9bd',
     109            'reference' => '0cbbf45dba3d6fe3ef38d30be4ea528889dc703d',
    110110            'dev_requirement' => false,
    111111        ),
  • shopping-feed/trunk/readme.txt

    r2712719 r2714899  
    22Contributors: ShoppingFeed, BeAPI
    33Tags: shoppingfeed, marketplace, woocommerce, woocommerce shoppingfeed, create woocommerce products shoppingfeed, products feed, generate shoppingfeed, amazon, Jet, Walmart, many marketplace, import orders
    4 Stable tag: 6.1.6
    5 Version: 6.1.6
     4Stable tag: 6.1.7
     5Version: 6.1.7
    66Requires PHP: 5.6
    77Requires at least: 5.2
     
    52526.1.5 Performances improvement : Logger and HTTP connection
    53536.1.6 Release main
     546.1.7 Fix shipping options not saving
    5455
    5556== Description ==
  • shopping-feed/trunk/shoppingfeed.php

    r2712719 r2714899  
    88 * Text Domain:     shopping-feed
    99 * Domain Path:     /languages
    10  * Version:         6.1.6
     10 * Version:         6.1.7
    1111 * Requires at least WP: 5.7
    1212 * Requires at least WooCommerce: 5.1.0
     
    2626}
    2727
    28 define( 'SF_VERSION', '6.1.6' );
     28define( 'SF_VERSION', '6.1.7' );
    2929define( 'SF_DB_VERSION_SLUG', 'SF_DB_VERSION' );
    3030define( 'SF_DB_VERSION', '1.0.0' );
  • shopping-feed/trunk/src/Admin/Options.php

    r2670662 r2714899  
    638638
    639639        $shipping_zones = \WC_Shipping_Zones::get_zones();
    640         $selected_shipping_zone = ! empty( $this->sf_shipping_options['zone'] ) ? $this->sf_shipping_options['zone'] : false;
     640        // Ensure retro compatibility
     641        $selected_shipping_zone = ! empty( $this->sf_feed_options['zone'] ) ? $this->sf_feed_options['zone'] : false;
     642        if ( false === $selected_shipping_zone ) {
     643            $selected_shipping_zone = ! empty( $this->sf_shipping_options['zone'] ) ? $this->sf_shipping_options['zone'] : false;
     644        }
    641645        add_settings_field(
    642646            'default_zone',
     
    644648            function () use ( $shipping_zones, $selected_shipping_zone ) {
    645649                ?>
    646                     <input class="hidden" id="selected_shipping_zone" value="<?php echo esc_html( $selected_shipping_zone ); ?>">
    647                     <select id="default_shipping_zone" name="<?php echo esc_html( sprintf( '%s[zone]', self::SF_SHIPPING_OPTIONS ) ); ?>">
     650                    <input class="hidden" id="selected_shipping_zone" value="<?php echo esc_attr( $selected_shipping_zone ); ?>">
     651                    <select id="default_shipping_zone" name="<?php echo esc_attr( sprintf( '%s[zone]', self::SF_FEED_OPTIONS ) ); ?>">
    648652                        <option value=""><?php echo esc_attr_e( 'None', 'shopping-feed' ); ?></option>
    649653                        <?php
     
    652656                                ?>
    653657                            <option
    654                                     value="<?php echo esc_html( $zone['id'] ); ?>"
     658                                    value="<?php echo esc_attr( $zone['id'] ); ?>"
    655659                                <?php selected( $zone['id'], $selected_shipping_zone ); ?>
    656660                            ><?php echo esc_html( $zone['zone_name'] ); ?></option>
     
    671675            __( 'Default Shipping Fees', 'shopping-feed' ),
    672676            function () {
     677                // Ensure retro compatibility
     678                $shipping_fees = isset( $this->sf_feed_options['fees'] ) ? $this->sf_feed_options['fees'] : 0;
     679                if ( 0 === $shipping_fees ) {
     680                    $shipping_fees = isset( $this->sf_shipping_options['fees'] ) ? $this->sf_shipping_options['fees'] : 0;
     681                }
    673682                ?>
    674683                <input type="number"
    675684                       id="shipping_fees"
    676685                       step="any"
    677                        name='<?php echo esc_html( sprintf( '%s[fees]', self::SF_SHIPPING_OPTIONS ) ); ?>'
    678                        value='<?php echo esc_html( isset( $this->sf_shipping_options['fees'] ) ? esc_attr( $this->sf_shipping_options['fees'] ) : 0 ); ?>'>
     686                       name='<?php echo esc_attr( sprintf( '%s[fees]', self::SF_FEED_OPTIONS ) ); ?>'
     687                       value='<?php echo esc_attr( $shipping_fees ); ?>'>
    679688
    680689                <p class="description"
  • shopping-feed/trunk/src/ShoppingFeedHelper.php

    r2712684 r2714899  
    235235     */
    236236    public static function get_sf_default_shipping_zone() {
     237        // Ensure retro compatibility
     238        $shipping_configuration = self::get_sf_feed_options();
     239        if ( is_array( $shipping_configuration ) && isset( $shipping_configuration['zone'] ) && ! empty( $shipping_configuration['zone'] ) ) {
     240            return (int) $shipping_configuration['zone'];
     241        }
     242
    237243        $shipping_configuration = self::get_sf_shipping_options();
    238244        if ( ! is_array( $shipping_configuration ) || ! isset( $shipping_configuration['zone'] ) ) {
     
    273279     */
    274280    public static function get_sf_default_shipping_fees() {
     281        $shipping_configuration = self::get_sf_feed_options();
     282        if ( is_array( $shipping_configuration ) && ! empty( $shipping_configuration['fees'] ) && is_numeric( $shipping_configuration['fees'] ) ) {
     283            return (float) $shipping_configuration['fees'];
     284        }
     285
    275286        $shipping_configuration = self::get_sf_feed_options( 'shipping' );
    276287        if ( ! is_array( $shipping_configuration ) || empty( $shipping_configuration['fees'] ) || ! is_numeric( $shipping_configuration['fees'] ) ) {
  • shopping-feed/trunk/vendor/autoload.php

    r2712719 r2714899  
    55require_once __DIR__ . '/composer/autoload_real.php';
    66
    7 return ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::getLoader();
     7return ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a::getLoader();
  • shopping-feed/trunk/vendor/composer/autoload_real.php

    r2712719 r2714899  
    33// autoload_real.php @generated by Composer
    44
    5 class ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8
     5class ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a
    66{
    77    private static $loader;
     
    2323        }
    2424
    25         spl_autoload_register(array('ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8', 'loadClassLoader'), true, true);
     25        spl_autoload_register(array('ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a', 'loadClassLoader'), true, true);
    2626        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
    27         spl_autoload_unregister(array('ComposerAutoloaderInit2ec5ffcedab1cb57d9fa5623bd4aa4d8', 'loadClassLoader'));
     27        spl_autoload_unregister(array('ComposerAutoloaderInit28893c9e5d575a18cb76efd0620f926a', 'loadClassLoader'));
    2828
    2929        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
     
    3131            require __DIR__ . '/autoload_static.php';
    3232
    33             call_user_func(\Composer\Autoload\ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::getInitializer($loader));
     33            call_user_func(\Composer\Autoload\ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::getInitializer($loader));
    3434        } else {
    3535            $map = require __DIR__ . '/autoload_namespaces.php';
     
    5252
    5353        if ($useStaticLoader) {
    54             $includeFiles = Composer\Autoload\ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$files;
     54            $includeFiles = Composer\Autoload\ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$files;
    5555        } else {
    5656            $includeFiles = require __DIR__ . '/autoload_files.php';
    5757        }
    5858        foreach ($includeFiles as $fileIdentifier => $file) {
    59             composerRequire2ec5ffcedab1cb57d9fa5623bd4aa4d8($fileIdentifier, $file);
     59            composerRequire28893c9e5d575a18cb76efd0620f926a($fileIdentifier, $file);
    6060        }
    6161
     
    6969 * @return void
    7070 */
    71 function composerRequire2ec5ffcedab1cb57d9fa5623bd4aa4d8($fileIdentifier, $file)
     71function composerRequire28893c9e5d575a18cb76efd0620f926a($fileIdentifier, $file)
    7272{
    7373    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
  • shopping-feed/trunk/vendor/composer/autoload_static.php

    r2712719 r2714899  
    55namespace Composer\Autoload;
    66
    7 class ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8
     7class ComposerStaticInit28893c9e5d575a18cb76efd0620f926a
    88{
    99    public static $files = array (
     
    445445    {
    446446        return \Closure::bind(function () use ($loader) {
    447             $loader->prefixLengthsPsr4 = ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$prefixLengthsPsr4;
    448             $loader->prefixDirsPsr4 = ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$prefixDirsPsr4;
    449             $loader->classMap = ComposerStaticInit2ec5ffcedab1cb57d9fa5623bd4aa4d8::$classMap;
     447            $loader->prefixLengthsPsr4 = ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$prefixLengthsPsr4;
     448            $loader->prefixDirsPsr4 = ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$prefixDirsPsr4;
     449            $loader->classMap = ComposerStaticInit28893c9e5d575a18cb76efd0620f926a::$classMap;
    450450
    451451        }, null, ClassLoader::class);
  • shopping-feed/trunk/vendor/composer/installed.php

    r2712719 r2714899  
    11<?php return array(
    22    'root' => array(
    3         'pretty_version' => '6.1.6',
    4         'version' => '6.1.6.0',
     3        'pretty_version' => '6.1.7',
     4        'version' => '6.1.7.0',
    55        'type' => 'wordpress-plugin',
    66        'install_path' => __DIR__ . '/../../',
    77        'aliases' => array(),
    8         'reference' => 'c059d68bc50f038592bfee5b827b417f67f9b9bd',
     8        'reference' => '0cbbf45dba3d6fe3ef38d30be4ea528889dc703d',
    99        'name' => 'shoppingfeed/shoppingfeed-for-woocommerce',
    1010        'dev' => false,
     
    102102        ),
    103103        'shoppingfeed/shoppingfeed-for-woocommerce' => array(
    104             'pretty_version' => '6.1.6',
    105             'version' => '6.1.6.0',
     104            'pretty_version' => '6.1.7',
     105            'version' => '6.1.7.0',
    106106            'type' => 'wordpress-plugin',
    107107            'install_path' => __DIR__ . '/../../',
    108108            'aliases' => array(),
    109             'reference' => 'c059d68bc50f038592bfee5b827b417f67f9b9bd',
     109            'reference' => '0cbbf45dba3d6fe3ef38d30be4ea528889dc703d',
    110110            'dev_requirement' => false,
    111111        ),
Note: See TracChangeset for help on using the changeset viewer.