Merge pull request #62 from buckaroo-it/develop

Update, Test & Release (1.3.0)
buckaroo-it · Feb 6, 2025 · ff74ca8 · ff74ca8
2 parents 81092c5 + 16c81a3
commit ff74ca8
Show file tree

Hide file tree

Showing 19 changed files with 489 additions and 450 deletions.
diff --git a/Block/Totals/Fee.php b/Block/Totals/Fee.php
@@ -12,18 +12,14 @@ class Fee extends \Magento\Framework\View\Element\Template
 {
     protected PaymentFee $feeHelper;
 
-    protected SessionCheckout $sessionCheckout;
-
     public function __construct(
         Context         $context,
         array           $data,
         PaymentFee      $feeHelper,
-        SessionCheckout $sessionCheckout
     )
     {
         parent::__construct($context, $data);
         $this->feeHelper = $feeHelper;
-        $this->sessionCheckout = $sessionCheckout;
     }
 
     /**
@@ -34,12 +30,9 @@ public function __construct(
     public function getTitle(): string
     {
         try {
-            $payment = $this->sessionCheckout
-                ->getQuote()
-                ->getPayment();
-            return $this->feeHelper->getBuckarooPaymentFeeLabel($payment->getMethod());
+            return $this->feeHelper->getBuckarooPaymentFeeLabel();
         } catch (\Throwable $th) {
-            return __('Payment Fee');
+            return 'Payment Fee';
         }
     }
 }
diff --git a/Magewire/Payment/Method/Applepay.php b/Magewire/Payment/Method/Applepay.php
@@ -74,13 +74,15 @@ public function updateData(string $paymentData, string $billingContact)
     {
         try {
             $quote = $this->sessionCheckout->getQuote();
-            $quote->getPayment()->setAdditionalInformation('applepayTransaction', $paymentData);
+            $applePayEncoded = base64_encode($paymentData);
+            $quote->getPayment()->setAdditionalInformation('applepayTransaction', $applePayEncoded);
             $quote->getPayment()->setAdditionalInformation('billingContact', $billingContact);
 
             $this->quoteRepository->save($quote);
         } catch (LocalizedException $exception) {
             $this->dispatchErrorMessage($exception->getMessage());
         }
+        return $paymentData;
     }
     public function evaluateCompletion(EvaluationResultFactory $resultFactory): EvaluationResultInterface
     {
@@ -96,13 +98,10 @@ public function evaluateCompletion(EvaluationResultFactory $resultFactory): Eval
         } catch (LocalizedException $exception) {
             $this->dispatchErrorMessage($exception->getMessage());
         }
-
-
-
         return $resultFactory->createSuccess();
     }
 
-    public function getJsSdkUrl(): string
+    public function getJsSdkUrl()
     {
         try {
             return $this->assetRepo->getUrl('Buckaroo_HyvaCheckout::js/applepay.js');
@@ -149,7 +148,6 @@ private function getTotalLines(): array
                 ];
             }
         }
-
         return $totals;
     }
 

diff --git a/Magewire/Payment/Method/Billink.php b/Magewire/Payment/Method/Billink.php
@@ -65,7 +65,7 @@ public function __construct(
         if($validator->getValidator("nlBeDePhone") === null) {
             $validator->addValidator("nlBeDePhone", new NlBeDePhone());
         }
-      
+
         parent::__construct($validator);
 
         $this->sessionCheckout = $sessionCheckout;
@@ -295,23 +295,26 @@ private function getFullName(): string
     private function getFormValues(): array
     {
         $values = [
-            'tos' => $this->tos,
-            'dateOfBirth' => $this->dateOfBirth,
-            'gender' => $this->gender
+            'tos' => $this->tos
         ];
 
         if ($this->showPhone()) {
             $values = array_merge($values, ['phone' => $this->phone]);
         }
-
+        if(!$this->showB2b()) {
+            $values = array_merge($values, [
+                'dateOfBirth' => $this->dateOfBirth,
+                'gender' => $this->gender
+            ]);
+        }
         if($this->showB2b()) {
             $values = array_merge($values, [
                 'coc' => $this->coc
             ]);
         }
 
-   
-    
+
+
         return $values;
     }
 
@@ -323,12 +326,16 @@ private function getFormValues(): array
     private function getFormRules(): array
     {
         $rules = [
-            'tos' => self::RULES_TOS,
-            'dateOfBirth' => self::RULES_DATE_OF_BIRTH,
-            'gender' => $this->getGenderRules()
+            'tos' => self::RULES_TOS
         ];
 
+        if(!$this->showB2b()) {
+            $rules = array_merge($rules, [
+                'dateOfBirth' => self::RULES_DATE_OF_BIRTH,
+                'gender' => $this->getGenderRules()
+            ]);
 
+        }
         if ($this->showPhone()) {
             $rules = array_merge($rules, ['phone' => $this->getPhoneRules()]);
         }
@@ -344,7 +351,20 @@ private function getFormRules(): array
 
     public function showB2b()
     {
-        return $this->helper->checkCustomerGroup('buckaroo_magento2_billink');
+        $quote =  $this->getQuote();
+        if ($quote === null) {
+            return false;
+        }
+
+        $shippingCountry = $quote->getShippingAddress()->getCountryId();
+        $billingCompany = $quote->getBillingAddress()->getCompany();
+        $shippingCompany = $quote->getShippingAddress()->getCompany();
+
+        return
+            (
+                ($this->getCountryId() === 'NL' && !empty(trim((string)$billingCompany))) ||
+                ($shippingCountry === 'NL' && !empty(trim((string)$shippingCompany)))
+            );
     }
 
 

diff --git a/Magewire/Payment/Method/Giropay.php b/Magewire/Payment/Method/Giropay.php
diff --git a/Plugin/MethodList.php b/Plugin/MethodList.php
@@ -62,7 +62,6 @@ private function getSvgLogo(string $methodCode): string
             "mrcash" => "svg/bancontact.svg",
             "p24" => "svg/przelewy24.svg",
             "sepadirectdebit" => "svg/sepa-directdebit.svg",
-            "sofortbanking" => "svg/sofort.svg",
             "emandate" => "emandate.png",
             "pospayment" => "pos.png",
             "transfer" => "svg/sepa-credittransfer.svg",

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "docs": "https://support.buckaroo.nl"
     },
     "homepage": "https://www.buckaroo.nl",
-    "version" : "v1.2.0",
+    "version" : "v1.3.0",
     "minimum-stability": "stable",
     "autoload": {
         "files": [

diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -4,7 +4,6 @@
         <arguments>
             <argument name="placeOrderServiceList" xsi:type="array">
                 <item name="buckaroo_magento2_belfius" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
-                <item name="buckaroo_magento2_sofortbanking" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_alipay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_wechatpay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_trustly" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
@@ -27,7 +26,6 @@
                 <item name="buckaroo_magento2_afterpay20" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_billink" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_capayablein3" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
-                <item name="buckaroo_magento2_giropay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_tinka" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_sepadirectdebit" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_payperemail" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
@@ -42,7 +40,7 @@
             </argument>
         </arguments>
     </type>
-      <type name="Hyva\Checkout\Model\Form\EntityFormFieldFactory">
+    <type name="Hyva\Checkout\Model\Form\EntityFormFieldFactory">
         <arguments>
             <!-- Hide idin customer fields -->
             <argument name="customFields" xsi:type="array">

diff --git a/view/frontend/layout/hyva_checkout_cart_index.xml b/view/frontend/layout/hyva_checkout_cart_index.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="buckaroo_magento2.checkout.cart.ideal.fast.checkout" remove="true" />
+    </body>
+</page>