diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-07-11 15:21:10 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-07-11 15:21:10 +0700 |
| commit | 44895db5a27a87e6f6f91d4d3fda33ff444f82f0 (patch) | |
| tree | 25a7b9f51623790dd7fa684e3cd7c653103634e8 | |
| parent | 2d4f116eff62474a7b4b3af18a6053e031c03ff1 (diff) | |
<iman> marge conflik
| -rw-r--r-- | src/lib/checkout/components/Checkout.jsx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/checkout/components/Checkout.jsx b/src/lib/checkout/components/Checkout.jsx index 4355c7bd..3c2b8a09 100644 --- a/src/lib/checkout/components/Checkout.jsx +++ b/src/lib/checkout/components/Checkout.jsx @@ -1391,13 +1391,10 @@ const Checkout = () => { <div className='flex gap-x-2 justify-between mb-4'> <div>Grand Total</div> <div className='font-semibold text-gray_r-12'> -<<<<<<< HEAD {currencyFormat(grandTotal)} -======= {currencyFormat( cartCheckout?.grandTotal + finalShippingAmt )} ->>>>>>> dev/voucher-shipment </div> </div> )} |