Merge pull request #168 from buckaroo-it/BP-3481-Update-test-release-…

…v4.2.1 Bp 3481 update test release v4.2.1
buckaroo-it · Jun 20, 2024 · f895bfd · f895bfd
2 parents 33a2027 + a0f9fea
commit f895bfd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 37 deletions.
diff --git a/buckaroo3.php b/buckaroo3.php
@@ -56,7 +56,7 @@ private function initializeModuleInfo()
     {
         $this->name = 'buckaroo3';
         $this->tab = 'payments_gateways';
-        $this->version = '4.2.0';
+        $this->version = '4.2.1';
         $this->author = 'Buckaroo';
         $this->need_instance = 1;
         $this->bootstrap = true;
@@ -84,7 +84,7 @@ private function initializeDisplayName()
             } elseif (isset($response->status) && $response->status > 0) {
                 $this->displayName = (new RawPaymentMethodRepository())->getPaymentMethodsLabel($response->payment_method);
             } else {
-                $this->displayName = $this->l('Buckaroo Payments (v 4.2.0)');
+                $this->displayName = $this->l('Buckaroo Payments (v 4.2.1)');
             }
         }
     }

diff --git a/config.xml b/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <module>
     <name>buckaroo3</name>
-    <displayName><![CDATA[Buckaroo Payments (v 4.2.0)]]></displayName>
-    <version><![CDATA[4.2.0]]></version>
-    <description><![CDATA[Buckaroo Payment module. Compatible with PrestaShop version 1.7.x + 8.1.4]]></description>
+    <displayName><![CDATA[Buckaroo Payments (v 4.2.1)]]></displayName>
+    <version><![CDATA[4.2.1]]></version>
+    <description><![CDATA[Buckaroo Payment module. Compatible with PrestaShop version 1.7.x + 8.1.6]]></description>
     <author><![CDATA[Buckaroo]]></author>
     <tab><![CDATA[payments_gateways]]></tab>
 	<confirmUninstall><![CDATA[Are you sure you want to delete Buckaroo Payments module?]]></confirmUninstall>

diff --git a/library/checkout/billinkcheckout.php b/library/checkout/billinkcheckout.php
@@ -18,6 +18,7 @@
 include_once _PS_MODULE_DIR_ . 'buckaroo3/classes/CarrierHandler.php';
 
 use Buckaroo\Resources\Constants\RecipientCategory;
+use PrestaShop\Decimal\DecimalNumber;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -100,15 +101,14 @@ public function getBillingAddress()
         ];
 
         if (self::CUSTOMER_TYPE_B2C != $this->customerType
-            && $this->companyExists($this->invoice_address->company) ? $this->invoice_address->company : null) {
+        && $this->companyExists($this->invoice_address->company) ? $this->invoice_address->company : null) {
             $payload['recipient']['careOf'] = $this->invoice_address->company;
             $payload['recipient']['chamberOfCommerce'] = Tools::getValue('customerbillink-coc');
         }
 
         return $payload;
     }
 
-
     public function getRecipientCategory()
     {
         $category = self::CUSTOMER_TYPE_B2C;
@@ -119,23 +119,6 @@ public function getRecipientCategory()
         return $category;
     }
 
-    protected function prepareProductArticles()
-    {
-        $articles = [];
-        foreach ($this->products as $item) {
-            $tmp = [];
-            $tmp['identifier'] = $item['id_product'];
-            $tmp['quantity'] = $item['quantity'];
-            $tmp['price'] = round($item['price_with_reduction'], 2);
-            $tmp['priceExcl'] = round($item['price_with_reduction_without_tax'], 2);
-            $tmp['vatPercentage'] = $item['rate'];
-            $tmp['description'] = $item['name'];
-            $articles[] = $tmp;
-        }
-
-        return $articles;
-    }
-
     public function getBirthDate()
     {
         return date(

diff --git a/library/checkout/checkout.php b/library/checkout/checkout.php
@@ -357,7 +357,7 @@ protected function prepareBuckarooFeeArticle()
         return [
             'identifier' => '0',
             'quantity' => '1',
-            'price' => round($buckarooFee['buckaroo_fee_tax_excl'], 2),
+            'price' => round($buckarooFee['buckaroo_fee_tax_incl'], 2),
             'vatPercentage' => '0',
             'description' => 'buckaroo_fee',
         ];
@@ -370,7 +370,7 @@ protected function prepareProductArticles()
             $article = [
                 'identifier' => $item['id_product'],
                 'quantity' => $item['quantity'],
-                'price' => $item['price_wt']->toPrecision(2),
+                'price' => round($item['price_wt'], 2),
                 'vatPercentage' => $item['rate'],
                 'description' => $item['name'],
             ];

diff --git a/upgrade/upgrade-4.2.1.php b/upgrade/upgrade-4.2.1.php
@@ -41,20 +41,27 @@ function upgrade_module_4_2_1($object)
 
     Db::getInstance()->execute($createTableQuery);
 
-    // Move data from old table to new table
-    $moveDataQuery = 'INSERT INTO `' . _DB_PREFIX_ . 'bk_buckaroo_fee` (reference, id_cart, buckaroo_fee_tax_incl, buckaroo_fee_tax_excl, currency, created_at)
-    SELECT reference, id_cart, buckaroo_fee, buckaroo_fee, currency, created_at
-    FROM `' . _DB_PREFIX_ . 'buckaroo_fee`';
+    // Check if the old table exists
+    $tableExists = Db::getInstance()->executeS('SHOW TABLES LIKE "' . _DB_PREFIX_ . 'buckaroo_fee"');
+    if ($tableExists) {
+        // Move data from old table to new table
+        $moveDataQuery = 'INSERT INTO `' . _DB_PREFIX_ . 'bk_buckaroo_fee` (reference, id_cart, buckaroo_fee_tax_incl, buckaroo_fee_tax_excl, currency, created_at)
+        SELECT reference, id_cart, buckaroo_fee, buckaroo_fee, currency, created_at
+        FROM `' . _DB_PREFIX_ . 'buckaroo_fee`';
 
-    Db::getInstance()->execute($moveDataQuery);
+        Db::getInstance()->execute($moveDataQuery);
 
-    // Delete the old table
-    $deleteOldTableQuery = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'buckaroo_fee`';
-    Db::getInstance()->execute($deleteOldTableQuery);
+        // Delete the old table
+        $deleteOldTableQuery = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'buckaroo_fee`';
+        Db::getInstance()->execute($deleteOldTableQuery);
+    }
 
-    // Example of additional existing operations
-    Db::getInstance()->execute('ALTER TABLE `' . _DB_PREFIX_ . 'bk_giftcards` 
-    ADD is_custom INT(11) DEFAULT 0 NOT NULL;');
+    // Check if the column 'is_custom' already exists in 'bk_giftcards'
+    $columnExists = Db::getInstance()->executeS('SHOW COLUMNS FROM `' . _DB_PREFIX_ . 'bk_giftcards` LIKE "is_custom"');
+    if (empty($columnExists)) {
+        Db::getInstance()->execute('ALTER TABLE `' . _DB_PREFIX_ . 'bk_giftcards` 
+        ADD is_custom INT(11) DEFAULT 0 NOT NULL;');
+    }
 
     Db::getInstance()->execute('DELETE FROM ' . _DB_PREFIX_ . 'bk_payment_methods WHERE name = "tinka"');