v1.3.0

AlkimMedia · Nov 2, 2023 · 29f9163 · 29f9163
1 parent 8fb4ad3
commit 29f9163
Show file tree

Hide file tree

Showing 480 changed files with 51,074 additions and 18,980 deletions.
diff --git a/new_dirs/includes/modules/payment/amazon_pay/classes/Helpers/AccountHelper.php b/new_dirs/includes/modules/payment/amazon_pay/classes/Helpers/AccountHelper.php
@@ -2,7 +2,7 @@
 
 namespace AlkimAmazonPay;
 
-use AmazonPayExtendedSdk\Struct\Address;
+use AmazonPayApiSdkExtension\Struct\Address;
 
 class AccountHelper
 {

diff --git a/new_dirs/includes/modules/payment/amazon_pay/classes/Helpers/AmazonPayHelper.php b/new_dirs/includes/modules/payment/amazon_pay/classes/Helpers/AmazonPayHelper.php
@@ -4,7 +4,7 @@
 
 
 
-use AmazonPayExtendedSdk\Client\Client;
+use AmazonPayApiSdkExtension\Client\Client;
 
 class AmazonPayHelper
 {
@@ -20,7 +20,7 @@ public function __construct()
     }
 
     /**
-     * @return \AmazonPayExtendedSdk\Client\Client
+     * @return \AmazonPayApiSdkExtension\Client\Client
      */
     public function getClient()
     {

diff --git a/new_dirs/includes/modules/payment/amazon_pay/classes/Helpers/CheckoutHelper.php b/new_dirs/includes/modules/payment/amazon_pay/classes/Helpers/CheckoutHelper.php
@@ -2,13 +2,13 @@
 
 namespace AlkimAmazonPay;
 
-use AmazonPayExtendedSdk\Struct\AddressRestrictions;
-use AmazonPayExtendedSdk\Struct\CheckoutSession;
-use AmazonPayExtendedSdk\Struct\DeliverySpecifications;
-use AmazonPayExtendedSdk\Struct\MerchantMetadata;
-use AmazonPayExtendedSdk\Struct\PaymentDetails;
-use AmazonPayExtendedSdk\Struct\Price;
-use AmazonPayExtendedSdk\Struct\WebCheckoutDetails;
+use AmazonPayApiSdkExtension\Struct\AddressRestrictions;
+use AmazonPayApiSdkExtension\Struct\CheckoutSession;
+use AmazonPayApiSdkExtension\Struct\DeliverySpecifications;
+use AmazonPayApiSdkExtension\Struct\MerchantMetadata;
+use AmazonPayApiSdkExtension\Struct\PaymentDetails;
+use AmazonPayApiSdkExtension\Struct\Price;
+use AmazonPayApiSdkExtension\Struct\WebCheckoutDetails;
 use order;
 use order_total;
 use shipping;
@@ -33,8 +33,13 @@ public function __construct()
     public function createCheckoutSession()
     {
         try {
+            $storeName = STORE_NAME;
+            $encoding = mb_detect_encoding($storeName, ['UTF-8', 'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-15']);
+            if($encoding !== 'UTF-8'){
+                $storeName = mb_convert_encoding($storeName, 'UTF-8', $encoding);
+            }
+            $storeName = (mb_strlen($storeName) <= 50) ? $storeName : (mb_substr($storeName, 0, 47) . '...');
 
-            $storeName = (strlen(STORE_NAME) <= 50) ? STORE_NAME : (substr(STORE_NAME, 0, 47) . '...');
             $merchantData = new MerchantMetadata();
             $merchantData->setMerchantStoreName($storeName);
             $merchantData->setCustomInformation($this->configHelper->getCustomInformationString());