Merge branch 'refs/heads/develop' into BP-3652-Implement-Buckaroo-Hos…

…ted-Fields # Conflicts: # i18n/de_DE.csv # i18n/nl_NL.csv
buckaroo-it · Sep 27, 2024 · 10f74bf · 10f74bf
2 parents 4fabbcf + 8f6698d
commit 10f74bf
Show file tree

Hide file tree

Showing 39 changed files with 253 additions and 1,059 deletions.
diff --git a/Block/Widget/Button/Toolbar.php b/Block/Widget/Button/Toolbar.php
@@ -48,7 +48,6 @@ class Toolbar
         'buckaroo_magento2_belfius',
         'buckaroo_magento2_transfer',
         'buckaroo_magento2_eps',
-        'buckaroo_magento2_giropay',
         'buckaroo_magento2_kbc',
         'buckaroo_magento2_klarna',
         'buckaroo_magento2_klarnakp',

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -421,7 +421,6 @@ public function getPaymentMethodsList()
             ['value' => 'emandate',       'label' => __('Digital Debit Authorization')],
             ['value' => 'eps',       'label' => __('EPS')],
             ['value' => 'giftcards',       'label' => __('Giftcards')],
-            ['value' => 'giropay',       'label' => __('Giropay')],
             ['value' => 'ideal',       'label' => __('iDEAL')],
             ['value' => 'idealprocessing',       'label' => __('iDEAL Processing')],
             ['value' => 'kbc',       'label' => __('KBC')],

diff --git a/Model/Config/Source/PaymentMethods/AfterExpiry.php b/Model/Config/Source/PaymentMethods/AfterExpiry.php
@@ -37,7 +37,6 @@ public function toOptionArray()
             ['value' => 'dankort',                'label' => __('Dankort')],
             ['value' => 'eps',                    'label' => __('EPS')],
             ['value' => 'giftcard',               'label' => __('Giftcards')],
-            ['value' => 'giropay',                'label' => __('Giropay')],
             ['value' => 'ideal',                  'label' => __('iDEAL')],
             ['value' => 'idealprocessing',        'label' => __('iDEAL Processing')],
             ['value' => 'maestro',                'label' => __('Maestro')],

diff --git a/Model/Config/Source/PaymentMethods/PayLink.php b/Model/Config/Source/PaymentMethods/PayLink.php
@@ -38,7 +38,6 @@ public function toOptionArray()
             ['value' => 'dankort',                'label' => __('Dankort')],
             ['value' => 'eps',                    'label' => __('EPS')],
             ['value' => 'giftcard',               'label' => __('Giftcards')],
-            ['value' => 'giropay',                'label' => __('Giropay')],
             ['value' => 'ideal',                  'label' => __('iDEAL')],
             ['value' => 'idealprocessing',        'label' => __('iDEAL Processing')],
             ['value' => 'maestro',                'label' => __('Maestro')],

diff --git a/Model/Config/Source/PaymentMethods/PayPerEmail.php b/Model/Config/Source/PaymentMethods/PayPerEmail.php
@@ -70,11 +70,6 @@ public function toOptionArray()
                 'label' => __('Giftcards'),
                 'code' => 'buckaroo_magento2_giftcards'
             ],
-            [
-                'value' => 'giropay',
-                'label' => __('Giropay'),
-                'code' => 'buckaroo_magento2_giropay'
-            ],
             [
                 'value' => 'ideal',
                 'label' => __('iDEAL'),

diff --git a/Model/ConfigProvider/Method/Giropay.php b/Model/ConfigProvider/Method/Giropay.php
diff --git a/Model/Method/Giropay.php b/Model/Method/Giropay.php
diff --git a/Model/Service/Order.php b/Model/Service/Order.php
@@ -29,6 +29,7 @@
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Buckaroo\Magento2\Helper\Data;
 use Magento\Framework\App\ResourceConnection;
+use Laminas\Db\Sql\Expression;
 
 class Order
 {
@@ -43,16 +44,17 @@ class Order
     private Factory $configProviderFactory;
 
     public function __construct(
-        Account $accountConfig,
-        MethodFactory $configProviderMethodFactory,
-        Factory $configProviderFactory,
+        Account                  $accountConfig,
+        MethodFactory            $configProviderMethodFactory,
+        Factory                  $configProviderFactory,
         StoreRepositoryInterface $storeRepository,
-        CollectionFactory $orderFactory,
-        OrderStatusFactory $orderStatusFactory,
-        Data $helper,
-        Log $logging,
-        ResourceConnection $resourceConnection
-    ) {
+        CollectionFactory        $orderFactory,
+        OrderStatusFactory       $orderStatusFactory,
+        Data                     $helper,
+        Log                      $logging,
+        ResourceConnection       $resourceConnection
+    )
+    {
         $this->accountConfig = $accountConfig;
         $this->configProviderMethodFactory = $configProviderMethodFactory;
         $this->configProviderFactory = $configProviderFactory;
@@ -94,11 +96,11 @@ protected function cancelExpiredTransferOrdersPerStore($store)
                     )
                     ->addFieldToFilter(
                         'created_at',
-                        ['lt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . $dueDays . ' DAY')]
+                        ['lt' => new Expression('NOW() - INTERVAL ' . $dueDays . ' DAY')]
                     )
                     ->addFieldToFilter(
                         'created_at',
-                        ['gt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')]
+                        ['gt' => new Expression('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')]
                     );
 
                 $orderCollection->getSelect()
@@ -154,11 +156,11 @@ protected function cancelExpiredPPEOrdersPerStore($store)
                         )
                         ->addFieldToFilter(
                             'created_at',
-                            ['lt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . $dueDays . ' DAY')]
+                            ['lt' => new Expression('NOW() - INTERVAL ' . $dueDays . ' DAY')]
                         )
                         ->addFieldToFilter(
                             'created_at',
-                            ['gt' => new \Zend_Db_Expr('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')]
+                            ['gt' => new Expression('NOW() - INTERVAL ' . ($dueDays + 7) . ' DAY')]
                         );
 
                     $orderCollection->getSelect()
@@ -216,7 +218,7 @@ public function cancel($order, $statusCode)
             $this->logging->addDebug(__METHOD__ . '|20|');
 
             if (in_array($order->getPayment()->getMethodInstance()->buckarooPaymentMethodCode, ['klarnakp'])) {
-                $methodInstanceClass                 = get_class($order->getPayment()->getMethodInstance());
+                $methodInstanceClass = get_class($order->getPayment()->getMethodInstance());
                 $methodInstanceClass::$requestOnVoid = false;
             }
 

diff --git a/Model/Total/Quote/BuckarooAlreadyPay.php b/Model/Total/Quote/BuckarooAlreadyPay.php
@@ -47,46 +47,6 @@ public function __construct(
         $this->giftcardCollection = $giftcardCollection;
     }
 
-    /**
-     * Collect grand total address amount
-     *
-     * @param  \Magento\Quote\Model\Quote                          $quote
-     * @param  \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
-     * @param  \Magento\Quote\Model\Quote\Address\Total            $total
-     * @return $this
-     *
-     * @throws \LogicException
-     */
-    public function collect(
-        \Magento\Quote\Model\Quote $quote,
-        \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment,
-        \Magento\Quote\Model\Quote\Address\Total $total
-    ) {
-        parent::collect($quote, $shippingAssignment, $total);
-
-        // Ensure that shipping assignment has items, otherwise skip processing.
-        if (!$shippingAssignment->getItems()) {
-            return $this;
-        }
-
-        $orderId = $quote->getReservedOrderId();
-        $alreadyPaidAmount = $this->groupTransaction->getAlreadyPaid($orderId);
-
-        // Ensure totals are properly initialized.
-        $total->setTotalAmount($this->getCode(), 0);
-        $total->setBaseTotalAmount($this->getCode(), 0);
-
-        // Adjust the grand total only if the already paid amount is greater than zero.
-        if ($alreadyPaidAmount > 0) {
-            $total->addTotalAmount($this->getCode(), -$alreadyPaidAmount);
-            $total->addBaseTotalAmount($this->getCode(), -$alreadyPaidAmount);
-
-        }
-
-        return $this;
-    }
-
-
     /**
      * Add buckaroo fee information to address
      *

diff --git a/Model/Total/Quote/BuckarooFee.php b/Model/Total/Quote/BuckarooFee.php
@@ -133,8 +133,7 @@ public function collect(
 
         // Check if already paid amount is affecting the calculation
         if ($this->groupTransaction->getAlreadyPaid($orderId) > 0) {
-            // Optionally, you could log or debug here to ensure no early returns affect the fee calculation.
-            $this->logging->addDebug('Already paid detected, but continuing to add fee.');
+            return $this;
         }
 
         // Ensure payment method is set correctly

diff --git a/Model/Total/Quote/BuckarooFeeHyva.php b/Model/Total/Quote/BuckarooFeeHyva.php
@@ -141,8 +141,7 @@ public function collect(
 
         // Check if already paid amount is affecting the calculation
         if ($this->groupTransaction->getAlreadyPaid($orderId) > 0) {
-            // Optionally, you could log or debug here to ensure no early returns affect the fee calculation.
-            $this->logging->addDebug('Already paid detected, but continuing to add fee.');
+            return $this;
         }
 
         // Ensure payment method is set correctly
@@ -172,7 +171,6 @@ public function collect(
         // Set the fee on the total object for further calculations
         $total->setBuckarooFee($paymentFee);
         $total->setBaseBuckarooFee($basePaymentFee);
-        $total->setGrandTotal($total->getGrandTotal() + $paymentFee);
 
         return $this;
     }

diff --git a/Service/Software/Data.php b/Service/Software/Data.php
@@ -36,7 +36,7 @@ class Data
     const MODULE_CODE = 'Buckaroo_Magento2';
 
     /** Version of Module */
-    const BUCKAROO_VERSION = '1.49.4';
+    const BUCKAROO_VERSION = '1.50.1';
 
     /** @var ProductMetadataInterface */
     private $productMetadata;

diff --git a/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php b/Test/Unit/Model/Config/Source/PaymentMethods/AfterExpiryTest.php
@@ -41,9 +41,6 @@ public function toOptionArrayProvider()
             [
                 ['value' => 'giftcard',           'label' => 'Giftcards']
             ],
-            [
-                ['value' => 'giropay',            'label' => 'Giropay']
-            ],
             [
                 ['value' => 'ideal',              'label' => 'iDEAL']
             ],