Merge branch 'develop' into BP-3811-Apple-Pay-PaymentData-missing

buckaroo-it · Dec 3, 2024 · 1bf1b05 · 1bf1b05
2 parents 6ae88b9 + 0b27046
commit 1bf1b05
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 241 deletions.
diff --git a/Magewire/Payment/Method/Creditcard.php b/Magewire/Payment/Method/Creditcard.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/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>
@@ -20,7 +19,6 @@
                 <item name="buckaroo_magento2_klarna" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_klarnain" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_klarnakp" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
-                <item name="buckaroo_magento2_creditcard" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_creditcards" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_afterpay" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
                 <item name="buckaroo_magento2_afterpay2" xsi:type="object">\Buckaroo\HyvaCheckout\Model\Magewire\Payment\PlaceOrderService</item>
@@ -41,7 +39,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>
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
@@ -45,16 +45,6 @@
                 </arguments>
             </block>
 
-            <block name="checkout.payment.method.buckaroo_magento2_creditcard"
-                    as="buckaroo_magento2_creditcard"
-                    template="Buckaroo_HyvaCheckout::component/payment/method/creditcard.phtml">
-                <arguments>
-                    <argument name="magewire" xsi:type="object">
-                        \Buckaroo\HyvaCheckout\Magewire\Payment\Method\Creditcard
-                    </argument>
-                </arguments>
-            </block>
-
              <block name="checkout.payment.method.buckaroo_magento2_afterpay20"
                     as="buckaroo_magento2_afterpay20"
                     template="Buckaroo_HyvaCheckout::component/payment/method/afterpay20.phtml">
@@ -210,6 +200,9 @@
                 class="Buckaroo\HyvaCheckout\Block\Totals\AlreadyPaid"
                 as="buckaroo_already_paid"
                 template="Buckaroo_HyvaCheckout::total-segments/already-paid.phtml"/>
+            <block name="price-summary.total-segment.remaining_amount"
+                as="remaining_amount"
+                template="Buckaroo_HyvaCheckout::checkout/summary/remaining-amount.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/view/frontend/layout/hyva_checkout_index_index.xml b/view/frontend/layout/hyva_checkout_index_index.xml
@@ -11,4 +11,4 @@
             </block>
         </referenceContainer>
     </body>
-</page>
+</page>
diff --git a/view/frontend/templates/checkout/summary/remaining-amount.phtml b/view/frontend/templates/checkout/summary/remaining-amount.phtml
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+
+/** @var Template $block */
+/** @var FormatterViewModel $formatterViewModel */
+/** @var ViewModelRegistry $viewModels */
+/** @var Escaper $escaper */
+
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Template;
+use Hyva\Checkout\ViewModel\Checkout\Formatter as FormatterViewModel;
+use Hyva\Theme\Model\ViewModelRegistry;
+
+$formatterViewModel = $viewModels->require(FormatterViewModel::class);
+$segment = $block->getSegment();
+if ($segment['value'] != 0) {
+    ?>
+    <div class="flex gap-4 justify-between border-t border-gray-400 pt-4 mt-4 md:gap-0">
+        <span class="label font-bold text-xl">
+            <?= $block->escapeHtml($segment['title']) ?>
+        </span>
+        <span class="value text-right font-bold">
+            <?= /* @noEscape */ $formatterViewModel->currency($segment['value'] ?? 0) ?>
+        </span>
+    </div>
+    <?php
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ @@
                 </block>
             </referenceContainer>
         </body>
-    </page>
+    </page>