Merge pull request #106 from mijora/Develop

Develop from v2.2.0
mijora · Nov 22, 2024 · baffaf6 · baffaf6
2 parents abbf4c7 + 4035475
commit baffaf6
Show file tree

Hide file tree

Showing 34 changed files with 1,255 additions and 436 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,11 @@
+= 2.2.1 =
+# Fixed
+- Fixed "Omniva orders" page error, when international carriers had never been created before
+- Removed the use of the str_contains function, since this function only appeared in PHP 8.0
+
+# Updated
+- API library to 1.3.1
+
 = 2.2.0 =
 # Fixed
 - Fixed adding a new DB column in the Upgrade function of the version 2.1.0

diff --git a/classes/OmnivaApiInternational.php b/classes/OmnivaApiInternational.php
@@ -169,11 +169,11 @@ public static function isPackageAvailableForItems( $package_key, $country_code,
     /**************************** API related module functions ****************************/
     public static function getPackageKeyFromMethodKey( $method_key )
     {
-        if (str_contains($method_key, 'omnivalt_')) {
+        if (strpos($method_key, 'omnivalt_') !== false) {
             $method_key = str_replace('omnivalt_', '', $method_key);
         }
 
-        if (str_contains($method_key, 'int_')) {
+        if (strpos($method_key, 'int_') !== false) {
             $method_key = str_replace('int_', '', $method_key);
         }
 
@@ -194,7 +194,7 @@ public static function isOmnivaMethodAllowed( $method_key, $receiver_country )
 
     public static function isInternationalMethod( $method_key )
     {
-        if (!str_contains($method_key, 'int_')) {
+        if (strpos($method_key, 'int_') === false) {
             return false;
         }
 

diff --git a/composer.lock b/composer.lock
diff --git a/omnivaltshipping.php b/omnivaltshipping.php
@@ -87,7 +87,7 @@ public function __construct()
     {
         $this->name = 'omnivaltshipping';
         $this->tab = 'shipping_logistics';
-        $this->version = '2.2.0';
+        $this->version = '2.2.1';
         $this->author = 'Mijora';
         $this->need_instance = 0;
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
@@ -1442,7 +1442,10 @@ public static function getCarrierIds($carriers = [])
         $carriers = count($carriers) > 0 ? $carriers : array_keys(OmnivaCarrier::getAllMethods());
         $ref = [];
         foreach ($carriers as $value) {
-            $ref[] = OmnivaCarrier::getReference($value);
+            $carrier_ref_id = OmnivaCarrier::getReference($value);
+            if ($carrier_ref_id) {
+                $ref[] = OmnivaCarrier::getReference($value);
+            }
         }
         $data = [];
         if ($ref) {

diff --git a/vendor/.htaccess b/vendor/.htaccess
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitbd577bb8225a5ed1df8c4c014562ed4d::getLoader();
+return ComposerAutoloaderInitb781158b062661163502a2e8203f16b7::getLoader();