Merge pull request #16 from 202ecommerce/develop

Release 2.2.6
202ecommerce · Feb 10, 2023 · 15aa156 · 15aa156
2 parents d03ed0c + 772b97d
commit 15aa156
Show file tree

Hide file tree

Showing 103 changed files with 156 additions and 154 deletions.
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,24 @@
+# Security Policy
+
+The 202ecommerce team and community take security bugs in this PrestaShop modules seriously. We appreciate your efforts to responsibly disclose your findings.
+
+## Supported Versions
+
+Security updates will typically only be applied to the latest release.
+
+## Reporting a Vulnerability
+
+Security issues can be reported by sending an email to [email protected], which will go to security team members.
+The team will send a response indicating the next steps in handling your report.
+After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
+
+When the security team receives a security bug report, they will assign it to a primary handler. 
+This person will coordinate the fix and release process, involving the following steps:
+ - Confirm the problem and determine the affected versions.
+ - Audit code to find any potential similar problems.
+ - Prepare fixes for all releases still under maintenance. These fixes will be released as fast as possible.
+
+
+## Disclosure Policy
+
+In general, public disclosure are made after the issue has been fully identified and a patch is ready to be released.
diff --git a/202/build.xml b/202/build.xml
@@ -31,7 +31,7 @@
     <property name="src-dir" value="${basedir}" />
     <property name="TARGETNAME" value="ebay" />
     <property name="TARGETBRANCH" value="${env.GIT_BRANCH}" />
-    <property name="TARGETVERSION" value="2.2.5" />
+    <property name="TARGETVERSION" value="2.2.6" />
 
     <target name="build" depends="build-common,package-zip,psvalidator" />
 

diff --git a/202/phpstan/phpstan.neon b/202/phpstan/phpstan.neon
@@ -21,6 +21,7 @@ parameters:
   ignoreErrors:
   #PHPStan doesn't understand our method_exists() safeguards.
       - '#Call to an undefined static method Module::hookExec\(\)\.#'
+      - '#Call to an undefined static method Attribute::getAttributeMinimalQty\(\)\.#'
 
   reportUnmatchedIgnoredErrors: false
   level: 1
diff --git a/backward_compatibility/Context.php b/backward_compatibility/Context.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 if ((bool) Configuration::get('PS_MOBILE_DEVICE')) {
     require_once _PS_MODULE_DIR_ . '/mobile_theme/Mobile_Detect.php';
 }

diff --git a/backward_compatibility/Display.php b/backward_compatibility/Display.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 if (version_compare(_PS_VERSION_, '1.7', '>=')) {
     /**
      * Class allow to display tpl on the FO

diff --git a/backward_compatibility/index.php b/backward_compatibility/index.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 

diff --git a/classes/Const/Common.php b/classes/Const/Common.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class Common
 {
     const COUNTRY_DEFAULT = 'EBAY_COUNTRY_DEFAULT';

diff --git a/classes/Const/EbaySiteMap.php b/classes/Const/EbaySiteMap.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbaySiteMap
 {
     public static function get()

diff --git a/classes/Const/ProfileConf.php b/classes/Const/ProfileConf.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class ProfileConf
 {
     const USER_AUTH_TOKEN = 'USER_AUTH_TOKEN';

diff --git a/classes/Const/TlsConf.php b/classes/Const/TlsConf.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class TlsConf
 {
     const STATUS_SUCCESS = 202;

diff --git a/classes/DbEbay.php b/classes/DbEbay.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class DbEbay
 {
     /** @var Db */

diff --git a/classes/EbayAlert.php b/classes/EbayAlert.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayAlert
 {
     private $ebay_profile;

diff --git a/classes/EbayApiLog.php b/classes/EbayApiLog.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayApiLog extends ObjectModel
 {
     public $id_ebay_profile;

diff --git a/classes/EbayBestOffers.php b/classes/EbayBestOffers.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayBestOffers extends ObjectModel
 {
     public $id_ebay_profile;

diff --git a/classes/EbayBussinesPolicies.php b/classes/EbayBussinesPolicies.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayBussinesPolicies
 {
     public static function getPoliciesbyType($type, $id_ebay_profile)

diff --git a/classes/EbayCategory.php b/classes/EbayCategory.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayCategory
 {
     private $id_category; /* PrestaShop category id */

diff --git a/classes/EbayCategoryCondition.php b/classes/EbayCategoryCondition.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 if (file_exists(dirname(__FILE__) . '/EbayRequest.php')) {
     require_once dirname(__FILE__) . '/EbayRequest.php';
 }

diff --git a/classes/EbayCategoryConditionConfiguration.php b/classes/EbayCategoryConditionConfiguration.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayCategoryConditionConfiguration
 {
     const PS_CONDITION_NEW = 1;

diff --git a/classes/EbayCategoryConfiguration.php b/classes/EbayCategoryConfiguration.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayCategoryConfiguration
 {
     /**

diff --git a/classes/EbayCategorySpecificValue.php b/classes/EbayCategorySpecificValue.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayCategorySpecificValue
 {
     public static function insertIgnore($data)

diff --git a/classes/EbayConfiguration.php b/classes/EbayConfiguration.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 if (file_exists(dirname(__FILE__) . '/EbayRequest.php')) {
     require_once dirname(__FILE__) . '/EbayRequest.php';
 }

diff --git a/classes/EbayCountrySpec.php b/classes/EbayCountrySpec.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 if (!in_array('Ebay', get_declared_classes())) {
     require_once dirname(__FILE__) . '/../ebay.php';
 }

diff --git a/classes/EbayDbValidator.php b/classes/EbayDbValidator.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayDbValidator
 {
     private $logs;

diff --git a/classes/EbayDebugTools.php b/classes/EbayDebugTools.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayDebugTools
 {
     public static function updateProfileIdentifier($old, $new)

diff --git a/classes/EbayDeliveryTimeOptions.php b/classes/EbayDeliveryTimeOptions.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayDeliveryTimeOptions
 {
     public static function getAll()

diff --git a/classes/EbayLoadLogs.php b/classes/EbayLoadLogs.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 abstract class EbayLoadLogs
 {
     protected $file;

diff --git a/classes/EbayLog.php b/classes/EbayLog.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayLog extends ObjectModel
 {
     public $type;

diff --git a/classes/EbayLogger.php b/classes/EbayLogger.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayLogger
 {
     const DEBUG = 0;
@@ -268,14 +267,14 @@ private function log($severity, $msg, $context = null, $backtrace = null)
                         'severity' => (int) $severity,
                         'code' => 0,
                         'message' => pSQL($msg),
-                        'context' => $ctx ? pSQL(Tools::jsonEncode($ctx)) : null,
+                        'context' => $ctx ? pSQL(json_encode($ctx)) : null,
                         'backtrace' => $backtrace,
                     ]
                 );
             } else {
                 $sql = 'INSERT INTO ' . _DB_PREFIX_ . 'ebay_logs(`uid`, `datetime`, `severity`, `code`, `message`, `context`, `backtrace`)
 			VALUES(\'' . (int) $this->uid . '\', \'' . $datetime . '\', \'' . (int) $severity . '\', \'0\', \'' . pSQL($msg) . '\',
-			 \'' . pSQL($ctx ? Tools::jsonEncode($ctx) : null) . '\', \'' . pSQL($backtrace) . '\')';
+			 \'' . pSQL($ctx ? json_encode($ctx) : null) . '\', \'' . pSQL($backtrace) . '\')';
 
                 Db::getInstance()->Execute($sql);
             }

diff --git a/classes/EbayOrder.php b/classes/EbayOrder.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayOrder
 {
     private $id_ebay_order;
@@ -533,12 +532,18 @@ public function updateCartQuantities($ebay_profile)
                 }
             }
 
-            // check if product is in this cart
-            //            if (!count($this->carts[$ebay_profile->id_shop]->getProducts(false, $product['id_product'])))
-            //                continue;
-
             $prod = new Product($product['id_product'], false, $id_lang);
-            $minimal_quantity = empty($product['id_product_attribute']) ? $prod->minimal_quantity : (int) Attribute::getAttributeMinimalQty($product['id_product_attribute']);
+
+            if (empty($product['id_product_attribute'])) {
+                $minimal_quantity = $prod->minimal_quantity;
+            } else {
+                // class Attribute renamed to ProductAttribute since PS 8.0
+                if (class_exists('ProductAttribute')) {
+                    $minimal_quantity = ProductAttribute::getAttributeMinimalQty($product['id_product_attribute']);
+                } else {
+                    $minimal_quantity = Attribute::getAttributeMinimalQty($product['id_product_attribute']);
+                }
+            }
 
             if ($product['quantity'] >= $minimal_quantity) {
                 $id_product_attribute = empty($product['id_product_attribute']) ? null : $product['id_product_attribute'];

diff --git a/classes/EbayOrderErrors.php b/classes/EbayOrderErrors.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayOrderErrors extends ObjectModel
 {
     public $error;
@@ -109,7 +108,7 @@ public static function getEbayOrdersCountry()
 
         if ($rows = Db::getInstance()->ExecuteS($q)) {
             foreach ($rows as $row) {
-                $error = Tools::jsonDecode($row['error']);
+                $error = json_decode($row['error']);
                 if ($error->type == 'country') {
                     $result[$error->iso_code][] = $row;
                 }

diff --git a/classes/EbayOrderLog.php b/classes/EbayOrderLog.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayOrderLog extends ObjectModel
 {
     public $id_ebay_profile;

diff --git a/classes/EbayPayment.php b/classes/EbayPayment.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayPayment extends PaymentModule
 {
     public function __construct()

diff --git a/classes/EbayProduct.php b/classes/EbayProduct.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayProduct
 {
     public static function getIdProductRef($id_product, $ebay_identifier, $ebay_site_id, $id_attribute = null, $id_shop = null)

diff --git a/classes/EbayProductConfiguration.php b/classes/EbayProductConfiguration.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayProductConfiguration
 {
     public static function getByProductIdAndProfile($product_id, $id_ebay_profile)

diff --git a/classes/EbayProductImage.php b/classes/EbayProductImage.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 require_once dirname(__FILE__) . '/EbayRequest.php';
 
 class EbayProductImage

diff --git a/classes/EbayProductModified.php b/classes/EbayProductModified.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayProductModified extends ObjectModel
 {
     public $id_product;

diff --git a/classes/EbayProductTemplate.php b/classes/EbayProductTemplate.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayProductTemplate extends ObjectModel
 {
     /**

diff --git a/classes/EbayProfile.php b/classes/EbayProfile.php
@@ -23,7 +23,6 @@
  *  @license Commercial license
  *  International Registered Trademark & Property of PrestaShop SA
  */
-
 class EbayProfile extends ObjectModel
 {
     public $id_lang;
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ @@
      *  @license Commercial license
      *  International Registered Trademark & Property of PrestaShop SA
      */
     class EbayCategoryConfiguration
     {
         /**
@@ Expand Down @@