Revert "BP-3546-Use-object-as-array-in-Buckaroo-HyvaCheckout-Block-To…

…tals-Fee-getTotal-22"

This reverts commit b3f8499.

Block/Totals/Fee.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buckaroo\HyvaCheckout\Block\Totals;
+
+use Magento\Checkout\Model\Session as SessionCheckout;
+use Buckaroo\Magento2\Helper\PaymentFee;
+use Magento\Framework\View\Element\Template\Context;
+
+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;
+    }
+
+    /**
+     * Get title based on payment method config
+     *
+     * @return string
+     */
+    public function getTitle(): string
+    {
+        try {
+            $payment = $this->sessionCheckout
+                ->getQuote()
+                ->getPayment();
+            return $this->feeHelper->getBuckarooPaymentFeeLabel($payment->getMethod());
+        } catch (\Throwable $th) {
+            return __('Fee');
+        }
+        return __('Fee');
+    }
+
+    /**
+     * Get total from array of data
+     *
+     * @return float
+     */
+    public function getTotal(): float
+    {
+        $totalData = $this->getSegment();
+        $extensionAttributes = $totalData['extension_attributes'] ?? null;
+        if (
+            $extensionAttributes
+        ) {
+            return (floatval($extensionAttributes->getBuckarooFee()['buckaroo_fee'][0]));
+        }
+        return 0;
+    }
+}

view/frontend/layout/hyva_checkout_components.xml

@@ -202,13 +202,14 @@
             <block name="price-summary.total-segment.pretax_buckaroo_fee"
                 as="pretax_buckaroo_fee"
                 template="Buckaroo_HyvaCheckout::total-segments/empty.phtml"/>
-            <block name="price-summary.total-segment.buckaroo_fee_hyva"
-                as="buckaroo_fee_hyva"
+            <block name="price-summary.total-segment.buckaroo_fee"
+                class="Buckaroo\HyvaCheckout\Block\Totals\Fee"
+                as="buckaroo_fee"
                 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"/>
         </referenceBlock>
     </body>
-</page>
+</page>

view/frontend/templates/total-segments/fee.phtml

@@ -14,16 +14,14 @@ use Hyva\Checkout\ViewModel\Checkout\Formatter as FormatterViewModel;
 use Hyva\Theme\Model\ViewModelRegistry;
 
 $formatterViewModel = $viewModels->require(FormatterViewModel::class);
-$total = $block->getSegment();
-
-if ($total['value'] != 0) {
-
+$total = $block->getTotal();
+if ($total != 0) {
 ?>
     <div class="flex gap-4 justify-between md:gap-0">
         <span class="label font-bold">
-            <?= $block->escapeHtml($total['title']) ?>
+            <?= $block->escapeHtml($block->getTitle()) ?>
         </span>
-        <span class="value"><?= /* @noEscape */ $formatterViewModel->currency($total['value'] ?? 0) ?></span>
+        <span class="value"><?= /* @noEscape */ $formatterViewModel->currency($total ?? 0) ?></span>
     </div>
 <?php
 }