Skip to content

Commit

Permalink
Merge pull request #61 from buckaroo-it/BP-4174-Removed-checkout-layo…
Browse files Browse the repository at this point in the history
…ut-overwrite-50

Bp 4174 removed checkout layout overwrite 50
  • Loading branch information
vegimcarkaxhija authored Feb 6, 2025
2 parents fcbddf1 + 4bb4e43 commit 16c81a3
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 88 deletions.
98 changes: 48 additions & 50 deletions view/frontend/layout/hyva_checkout_components.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<referenceBlock name="checkout.payment.methods">
<!-- Payment Renderer: iDEAL -->
<block name="checkout.payment.method.buckaroo_magento2_ideal"
as="buckaroo_magento2_ideal"
template="Buckaroo_HyvaCheckout::component/payment/method/ideal.phtml">
as="buckaroo_magento2_ideal"
template="Buckaroo_HyvaCheckout::component/payment/method/ideal.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Ideal
Expand All @@ -16,8 +16,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_idealprocessing"
as="buckaroo_magento2_idealprocessing"
template="Buckaroo_HyvaCheckout::component/payment/method/ideal.phtml">
as="buckaroo_magento2_idealprocessing"
template="Buckaroo_HyvaCheckout::component/payment/method/ideal.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Ideal
Expand All @@ -26,8 +26,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_klarna"
as="buckaroo_magento2_klarna"
template="Buckaroo_HyvaCheckout::component/payment/method/klarna.phtml">
as="buckaroo_magento2_klarna"
template="Buckaroo_HyvaCheckout::component/payment/method/klarna.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Klarna
Expand All @@ -36,8 +36,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_klarnain"
as="buckaroo_magento2_klarnain"
template="Buckaroo_HyvaCheckout::component/payment/method/klarna.phtml">
as="buckaroo_magento2_klarnain"
template="Buckaroo_HyvaCheckout::component/payment/method/klarna.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Klarna
Expand All @@ -46,28 +46,28 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_creditcard"
as="buckaroo_magento2_creditcard"
template="Buckaroo_HyvaCheckout::component/payment/method/creditcard.phtml">
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">
<block name="checkout.payment.method.buckaroo_magento2_afterpay20"
as="buckaroo_magento2_afterpay20"
template="Buckaroo_HyvaCheckout::component/payment/method/afterpay20.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Afterpay20
</argument>
</arguments>
</block>

<block name="checkout.payment.method.buckaroo_magento2_afterpay2"
as="buckaroo_magento2_afterpay2"
template="Buckaroo_HyvaCheckout::component/payment/method/afterpay.phtml">
<block name="checkout.payment.method.buckaroo_magento2_afterpay2"
as="buckaroo_magento2_afterpay2"
template="Buckaroo_HyvaCheckout::component/payment/method/afterpay.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Afterpay2
Expand All @@ -76,8 +76,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_afterpay"
as="buckaroo_magento2_afterpay"
template="Buckaroo_HyvaCheckout::component/payment/method/afterpay.phtml">
as="buckaroo_magento2_afterpay"
template="Buckaroo_HyvaCheckout::component/payment/method/afterpay.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Afterpay
Expand All @@ -86,8 +86,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_billink"
as="buckaroo_magento2_billink"
template="Buckaroo_HyvaCheckout::component/payment/method/billink.phtml">
as="buckaroo_magento2_billink"
template="Buckaroo_HyvaCheckout::component/payment/method/billink.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Billink
Expand All @@ -96,8 +96,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_capayablein3"
as="buckaroo_magento2_capayablein3"
template="Buckaroo_HyvaCheckout::component/payment/method/in3.phtml">
as="buckaroo_magento2_capayablein3"
template="Buckaroo_HyvaCheckout::component/payment/method/in3.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\In3
Expand All @@ -106,8 +106,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_tinka"
as="buckaroo_magento2_tinka"
template="Buckaroo_HyvaCheckout::component/payment/method/tinka.phtml">
as="buckaroo_magento2_tinka"
template="Buckaroo_HyvaCheckout::component/payment/method/tinka.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Tinka
Expand All @@ -116,8 +116,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_sepadirectdebit"
as="buckaroo_magento2_sepadirectdebit"
template="Buckaroo_HyvaCheckout::component/payment/method/sepaDirect.phtml">
as="buckaroo_magento2_sepadirectdebit"
template="Buckaroo_HyvaCheckout::component/payment/method/sepaDirect.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\SepaDirect
Expand All @@ -126,8 +126,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_payperemail"
as="buckaroo_magento2_payperemail"
template="Buckaroo_HyvaCheckout::component/payment/method/payperemail.phtml">
as="buckaroo_magento2_payperemail"
template="Buckaroo_HyvaCheckout::component/payment/method/payperemail.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\PayPerEmail
Expand All @@ -136,8 +136,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_mrcash"
as="buckaroo_magento2_mrcash"
template="Buckaroo_HyvaCheckout::component/payment/method/mrcash.phtml">
as="buckaroo_magento2_mrcash"
template="Buckaroo_HyvaCheckout::component/payment/method/mrcash.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\MrCash
Expand All @@ -146,8 +146,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_creditcards"
as="buckaroo_magento2_creditcards"
template="Buckaroo_HyvaCheckout::component/payment/method/creditcards.phtml">
as="buckaroo_magento2_creditcards"
template="Buckaroo_HyvaCheckout::component/payment/method/creditcards.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Creditcards
Expand All @@ -156,8 +156,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_voucher"
as="buckaroo_magento2_voucher"
template="Buckaroo_HyvaCheckout::component/payment/method/voucher.phtml">
as="buckaroo_magento2_voucher"
template="Buckaroo_HyvaCheckout::component/payment/method/voucher.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Voucher
Expand All @@ -166,8 +166,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_applepay"
as="buckaroo_magento2_applepay"
template="Buckaroo_HyvaCheckout::component/payment/method/applepay.phtml">
as="buckaroo_magento2_applepay"
template="Buckaroo_HyvaCheckout::component/payment/method/applepay.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Applepay
Expand All @@ -176,8 +176,8 @@
</block>

<block name="checkout.payment.method.buckaroo_magento2_giftcards"
as="buckaroo_magento2_giftcards"
template="Buckaroo_HyvaCheckout::component/payment/method/giftcards.phtml">
as="buckaroo_magento2_giftcards"
template="Buckaroo_HyvaCheckout::component/payment/method/giftcards.phtml">
<arguments>
<argument name="magewire" xsi:type="object">
\Buckaroo\HyvaCheckout\Magewire\Payment\Method\Giftcards
Expand All @@ -194,25 +194,23 @@
</argument>
</arguments>
</block>

</referenceBlock>


<referenceBlock name="price-summary.total-segments">
<block name="price-summary.total-segment.pretax_buckaroo_fee"
as="pretax_buckaroo_fee"
template="Buckaroo_HyvaCheckout::total-segments/empty.phtml"/>
as="pretax_buckaroo_fee"
template="Buckaroo_HyvaCheckout::total-segments/empty.phtml"/>
<block name="price-summary.total-segment.buckaroo_fee_hyva"
class="Buckaroo\HyvaCheckout\Block\Totals\Fee"
as="buckaroo_fee_hyva"
template="Buckaroo_HyvaCheckout::total-segments/fee.phtml"/>
class="Buckaroo\HyvaCheckout\Block\Totals\Fee"
as="buckaroo_fee_hyva"
template="Buckaroo_HyvaCheckout::total-segments/fee.phtml"/>
<block name="price-summary.total-segment.buckaroo_already_paid"
class="Buckaroo\HyvaCheckout\Block\Totals\AlreadyPaid"
as="buckaroo_already_paid"
template="Buckaroo_HyvaCheckout::total-segments/already-paid.phtml"/>
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"/>
as="remaining_amount"
template="Buckaroo_HyvaCheckout::checkout/summary/remaining-amount.phtml"/>
</referenceBlock>
</body>
</page>
8 changes: 4 additions & 4 deletions view/frontend/layout/hyva_checkout_index_index.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
layout="checkout"
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
>
<head>
<script src="Buckaroo_HyvaCheckout::js/hide-applepay.js" />
<script src="Buckaroo_HyvaCheckout::js/update-position.js"/>
</head>
<body>
<referenceContainer name="hyva.checkout.api-v1.after">
<block name="checkout.buckaroo_after_api-v1"
as="buckaroo_after_api-v1"
template="Buckaroo_HyvaCheckout::component/payment/after.phtml">
<block name="checkout.buckaroo_after_api-v1"
as="buckaroo_after_api-v1"
template="Buckaroo_HyvaCheckout::component/payment/after.phtml">
</block>
</referenceContainer>
</body>
Expand Down
46 changes: 12 additions & 34 deletions view/frontend/templates/component/payment/after.phtml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<div class="bk-modal-wrap" x-data="buckaroo.modal()" x-init="initModal()">
<div
id="bk-modal"
tabindex="-1"
aria-hidden="true"
class="fixed top-0 left-0 right-0 z-50 justify-center w-full p-4 items-center overflow-x-hidden overflow-y-auto md:inset-0 max-h-full h-full"
x-cloak
x-bind:class="showModal ? 'flex': 'hidden'">
<div class="relative w-full max-w-md max-h-full" @click.outside="close()">
id="bk-modal"
tabindex="-1"
x-ref="modal"
aria-hidden="!showModal"
inert="!showModal"
x-cloak
class="fixed top-0 left-0 right-0 z-50 justify-center w-full p-4 items-center overflow-x-hidden overflow-y-auto md:inset-0 max-h-full h-full"
x-bind:class="showModal ? 'flex' : 'hidden'"
@keydown.window.escape="close()"
>
<div class="relative w-full max-w-md max-h-full" @click.outside="close()">
<!-- Modal content -->
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<!-- Modal header -->
Expand Down Expand Up @@ -41,7 +45,6 @@
</p>
</div>
<!-- Modal footer -->

<div class="flex items-center p-2 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
<template x-if="Array.isArray(buttons)">
<template x-for="(button, index) in buttons" :key="index">
Expand All @@ -64,31 +67,6 @@
</div>
</div>
<script>
document.addEventListener('DOMContentLoaded', function() {
function updatePosition() {
// Select the elements by their class names
const alreadyPaidElement = document.querySelector('.remaining_amount');
const grandTotalElement = document.querySelector('.grand_total');

// Ensure both elements exist before trying to move them
if (alreadyPaidElement && grandTotalElement) {
// Move the 'already-paid' block after the 'grand-total' block
grandTotalElement.insertAdjacentElement('afterend', alreadyPaidElement);
}
}

updatePosition();

document.querySelectorAll('input[name="payment-method-option"]').forEach((input) => {
input.addEventListener('change', function() {
setTimeout(function() {
updatePosition();
}, 2000);
});
});
});


var buckaroo = {
modal() {
return {
Expand All @@ -103,7 +81,7 @@
initModal() {
buckaroo.start();
window.addEventListener('buckaroo-modal-show', (event) => {
if(event.detail.data) {
if (event.detail.data) {
this.showModal = true;
Object.keys(event.detail.data).forEach((key) => {
this[key] = event.detail.data[key];
Expand Down
26 changes: 26 additions & 0 deletions view/frontend/web/js/update-position.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
document.addEventListener('DOMContentLoaded', function () {

window.updatePosition = function () {
// Select the elements by their class names
const alreadyPaidElement = document.querySelector('.remaining_amount');
const grandTotalElement = document.querySelector('.grand_total');

// Ensure both elements exist before trying to move them
if (alreadyPaidElement && grandTotalElement) {
// Move the 'already-paid' block after the 'grand-total' block
grandTotalElement.insertAdjacentElement('afterend', alreadyPaidElement);
}
};

// Call updatePosition on page load
updatePosition();

// Reapply position when payment method changes
document.querySelectorAll('input[name="payment-method-option"]').forEach((input) => {
input.addEventListener('change', function () {
setTimeout(function () {
updatePosition();
}, 2000);
});
});
});

0 comments on commit 16c81a3

Please sign in to comment.