ABN-298/fix: surcharge display — net amounts, payment method guard, sort order

Surcharge line and chips now show net (excl. tax); surcharge tax flows into
Magento's native Tax line via setTaxAmount. Total Collector skips when a
non-Two payment method is selected (clears session too). Summary sort order
set to 39 (between shipping at 30 and tax at 40).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: dgjlindsay

Model/Total/Surcharge.php

@@ -79,6 +79,13 @@ public function collect(
             return $this;
         }
 
+        $paymentMethod = $quote->getPayment()->getMethod();
+        if ($paymentMethod && $paymentMethod !== 'two_payment') {
+            $this->logRepository->addDebugLog('TotalCollector: skipped (payment method: ' . $paymentMethod . ')', []);
+            $this->clearSessionSurcharge();
+            return $this;
+        }
+
         $storeId = (int)$quote->getStoreId();
         $surchargeType = $this->configRepository->getSurchargeType($storeId);
 
@@ -142,8 +149,8 @@ public function collect(
         $total->setTaxAmount((float)$total->getTaxAmount() + $taxAmount);
         $total->setBaseTaxAmount((float)$total->getBaseTaxAmount() + $taxAmount);
 
-        // Store on total object for fetch() in the same request
-        $total->setData('two_surcharge_gross', $grossAmount);
+        // Store net on total object for fetch() — tax flows via setTaxAmount above
+        $total->setData('two_surcharge_net', $netAmount);
         $total->setData('two_surcharge_description', $result['description']);
 
         // Store in session for ComposeOrder and cross-request persistence
@@ -168,13 +175,14 @@ public function collect(
      */
     public function fetch(Quote $quote, Total $total): array
     {
-        // Prefer the total object (same request as collect), fall back to session
-        $amount = (float)$total->getData('two_surcharge_gross')
-            ?: (float)$this->checkoutSession->getTwoSurchargeGross();
+        // Prefer the total object (same request as collect), fall back to session.
+        // Returns net amount — surcharge tax is included in the Tax line via setTaxAmount.
+        $amount = (float)$total->getData('two_surcharge_net')
+            ?: (float)$this->checkoutSession->getTwoSurchargeAmount();
 
         $this->logRepository->addDebugLog('TotalCollector fetch()', [
-            'totalGross' => (float)$total->getData('two_surcharge_gross'),
-            'sessionGross' => (float)$this->checkoutSession->getTwoSurchargeGross(),
+            'totalNet' => (float)$total->getData('two_surcharge_net'),
+            'sessionNet' => (float)$this->checkoutSession->getTwoSurchargeAmount(),
             'amount' => $amount,
         ]);
 

Model/Ui/ConfigProvider.php

@@ -195,7 +195,7 @@ private function getTermSurcharges(): array
                     );
                     $net = $result['amount'];
                     $tax = round($net * ($result['tax_rate'] / 100), 2);
-                    $surcharges[$days] = $net + $tax;
+                    $surcharges[$days] = $net;
                 } catch (\Exception $e) {
                     $surcharges[$days] = 0.0;
                 }

Model/Webapi/TermSelection.php

@@ -94,7 +94,7 @@ public function selectTerm(string $cartId, int $termDays): array
     }
 
     /**
-     * Compute gross surcharges for all available terms.
+     * Compute net surcharges for all available terms.
      */
     private function computeAllTermSurcharges(float $baseAmount, $quote): array
     {
@@ -122,11 +122,9 @@ private function computeAllTermSurcharges(float $baseAmount, $quote): array
                     $currency,
                     $storeId
                 );
-                $net = $result['amount'];
-                $tax = round($net * ($result['tax_rate'] / 100), 2);
-                $surcharges[] = ['days' => $days, 'gross' => $net + $tax];
+                $surcharges[] = ['days' => $days, 'net' => (float)$result['amount']];
             } catch (\Exception $e) {
-                $surcharges[] = ['days' => $days, 'gross' => 0.0];
+                $surcharges[] = ['days' => $days, 'net' => 0.0];
             }
         }
 

view/frontend/layout/checkout_index_index.xml

@@ -69,7 +69,7 @@
                                                     <item name="children" xsi:type="array">
                                                         <item name="two-surcharge" xsi:type="array">
                                                             <item name="component" xsi:type="string">Two_Gateway/js/view/checkout/summary/surcharge</item>
-                                                            <item name="sortOrder" xsi:type="string">65</item>
+                                                            <item name="sortOrder" xsi:type="string">39</item>
                                                             <item name="config" xsi:type="array">
                                                                 <item name="title" xsi:type="string">Payment terms fee</item>
                                                             </item>

view/frontend/web/js/model/surcharge.js

@@ -97,7 +97,7 @@ define([
                 if (data && data.term_surcharges) {
                     var updated = {};
                     data.term_surcharges.forEach(function (item) {
-                        updated[item.days] = item.gross;
+                        updated[item.days] = item.net;
                     });
                     termSurcharges(updated);
                 }

view/frontend/web/js/view/checkout/summary/surcharge.js

@@ -19,7 +19,9 @@ define([
 
         isDisplayed: function () {
             var segment = totals.getSegment('two_surcharge');
-            return segment && parseFloat(segment.value) > 0;
+            var method = quote.paymentMethod();
+            return segment && parseFloat(segment.value) > 0
+                && method && method.method === 'two_payment';
         },
 
         getValue: function () {