Merge pull request #40 from buckaroo-it/BP-3791-Fix-Grand-Total-Not-Updating-on-Gift-Card-Payment

BP-3791-Fix-Grand-Total-Not-Updating-on-Gift-Card-Payment

Author: vegimcarkaxhija

Magewire/Payment/Method/Giftcards.php

@@ -16,6 +16,7 @@
 use Buckaroo\Magento2\Model\Giftcard\Response\Giftcard as GiftcardResponse;
 use Buckaroo\Magento2\Model\Giftcard\Request\GiftcardInterface as GiftcardRequest;
 use Buckaroo\Magento2\Model\ConfigProvider\Method\Giftcards as MethodConfigProvider;
+use Magento\Framework\Pricing\Helper\Data as PricingHelper;
 
 class Giftcards extends Component\Form implements EvaluationInterface
 {
@@ -34,6 +35,7 @@ class Giftcards extends Component\Form implements EvaluationInterface
     protected GiftcardResponse $giftcardResponse;
 
     protected Log $logger;
+    protected $pricingHelper;
 
     public function __construct(
         UrlInterface $urlBuilder,
@@ -42,7 +44,8 @@ public function __construct(
         MethodConfigProvider $methodConfigProvider,
         GiftcardRequest $giftcardRequest,
         GiftcardResponse $giftcardResponse,
-        Log $logger
+        Log $logger,
+        PricingHelper $pricingHelper
     ) {
         $this->urlBuilder = $urlBuilder;
         $this->sessionCheckout = $sessionCheckout;
@@ -51,6 +54,7 @@ public function __construct(
         $this->giftcardRequest = $giftcardRequest;
         $this->giftcardResponse = $giftcardResponse;
         $this->logger = $logger;
+        $this->pricingHelper = $pricingHelper;
     }
 
     /**
@@ -150,7 +154,32 @@ public function applyGiftcard(
         }
     }
 
+    /**
+     * Convert and format price value for current store
+     *
+     * @param float $price
+     * @return float|string
+     */
+    public function getFormattedPrice($price)
+    {
+        return $this->pricingHelper->currency($price, true, false);
+    }
 
+    public function getRemainingAmount()
+    {
+        $quote = $this->sessionCheckout->getQuote();
+
+        $grandTotal = round(floatval($quote->getGrandTotal()), 2);
+
+        // Get the amount already paid through group transactions
+        $alreadyPaid = $this->groupTransaction->getAlreadyPaid($quote->getReservedOrderId());
+
+        // Calculate the remaining amount
+        $remainingAmount = $grandTotal - $alreadyPaid;
+
+        // Ensure the remaining amount is never negative
+        $this->emit("remainingAmount", $this->getFormattedPrice($remainingAmount));
+    }
     protected function getGiftcardResponse(Quote $quote, $response)
     {
         $this->giftcardResponse->set($response, $quote);
@@ -183,8 +212,8 @@ protected function getGiftcardResponse(Quote $quote, $response)
                 $this->giftcardResponse->getCurrency()
             );
         }
-
         return [
+            'remainder_amount_currency' => $this->getFormattedPrice($remainingAmount),
             'remainder_amount' => $remainingAmount,
             'already_paid' => $this->giftcardResponse->getAlreadyPaid($quote),
             'remaining_amount_message' => $buttonMessage,

view/frontend/templates/component/payment/after.phtml

@@ -373,24 +373,59 @@
         },
         giftcards($el) {
             return Object.assign(hyva.formValidation($el), {
-                card:'',
+                card: '',
                 pin: '',
                 cardNumber: '',
-                canSubmit:false,
+                canSubmit: false,
+
+                async update() {
+                    await this.$wire.getRemainingAmount();
+                },
+                listenToUpdate(){
+                    this.$wire.on('remainingAmount', async (response) => {
+                        this.updateGrandTotal(response);
+                    })
+                },
                 async formValid() {
-                        try {
-                            await this.validate();
-                        } catch (error) {
-                            return false;
-                        }
-                        return true;
+                    try {
+                        await this.validate();
+                    } catch (error) {
+                        return false;
+                    }
+                    return true;
                 },
+
                 async submit() {
-                    if(!await this.formValid()) {
+                    if (!await this.formValid()) {
                         return;
                     }
                     await this.$wire.applyGiftcard(this.card, this.cardNumber, this.pin);
                 },
+
+                listenToSubmit() {
+                    this.$wire.on('giftcard_response', async (response) => {
+                        if (response.error) {
+                            this.displayError(response.error);
+                        } else if (response.remainder_amount === undefined) {
+                            this.displayError(response.message);
+                        } else if (response.remainder_amount == 0) {
+                            this.canSubmit = true;
+                            await hyvaCheckout.order.place();
+                        } else if (response.remainder_amount != 0) {
+                            this.displaySuccess(response);
+                            this.updateGrandTotal(response.remainder_amount_currency);
+                        }
+                    })
+                },
+                updateGrandTotal(remainder_amount_currency) {
+                    const grandTotalElement = document.querySelector('.grand_total .value');
+                    grandTotalElement.textContent = remainder_amount_currency
+
+                    setTimeout(function () {
+                        grandTotalElement.textContent = remainder_amount_currency
+
+                    }, 2000);
+                },
                 displaySuccess(response) {
                     window.dispatchEvent(new CustomEvent('buckaroo-modal-show', {
                         detail: {
@@ -405,6 +440,7 @@
                         }
                     }));
                 },
+
                 displayError(message) {
                     window.dispatchEvent(new CustomEvent('buckaroo-modal-show', {
                         detail: {
@@ -415,30 +451,18 @@
                         }
                     }));
                 },
-                listenToSubmit() {
-                    this.$wire.on('giftcard_response', async (response) => {
-                        if (response.error) {
-                            this.displayError(response.error);
-                        } else if(response.remainder_amount === undefined) {
-                            this.displayError(response.message);
-                        } else if (response.remainder_amount == 0) {
-                            this.canSubmit = true;
-                            await hyvaCheckout.order.place();
-                        } else if (response.remainder_amount != 0) {
-                            this.displaySuccess(response);
-                        }
-                    })
-                },
+
                 register() {
                     this.listenToSubmit();
+                    this.update();
+                    this.listenToUpdate();
                     window.buckarooTask = async () => {
-                        if(!this.canSubmit) {
+                        if (!this.canSubmit) {
                             await this.submit();
                         }
                     };
                 },
-
-            })
+            });
         },
         mrCash($el) {
             return Object.assign(hyva.formValidation($el), {
@@ -566,4 +590,4 @@
         }
     }
 
-</script>
+</script>