Merge pull request #51 from FosterCommerce/fix/more-regression-bug-fi…

…xes-and-refactor Fix/more regression bug fixes and refactor
FosterCommerce · Nov 12, 2024 · d86b782 · d86b782
2 parents 02c15d0 + bcfa517
commit d86b782
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/templates/_components/app/summary-cart.twig b/src/templates/_components/app/summary-cart.twig
@@ -81,12 +81,13 @@
 									</button>
 								</form>
 							</dd>
-							{% if cart.storedItemTotal - voucherCurrentAmount > 0 %}
+							{% set estimatedTotal =  cart.storedItemTotal + cart.storedTotalShippingCost + cart.totalTax %}
+							{% if estimatedTotal - voucherCurrentAmount > 0 %}
 								{% set voucherAmountApplied = voucherAmountApplied + voucherCurrentAmount %}
 								{% set appliedAmount = (cart.storedItemTotal - voucherAmountApplied) <= 0 ? voucherAmountApplied - cart.storedItemTotal : voucherCurrentAmount %}
 								{% set totalVoucherAmountApplied = voucherAmountApplied %}
 							{% else %}
-								{% set appliedAmount = (totalVoucherAmountApplied - cart.storedItemTotal)|abs %}
+								{% set appliedAmount = (totalVoucherAmountApplied - estimatedTotal)|abs %}
 							{% endif %}
 							<dd class="text-right text-red-500">- {{ appliedAmount | currency }}</dd>
 						</div>

diff --git a/src/templates/checkout/order.twig b/src/templates/checkout/order.twig
@@ -83,12 +83,14 @@
 								<dd>
 									{% for voucher in order.orderAdjustments %}
 										{# Get redeemed voucher code from description #}
-										{% set voucherCode = voucher.description|split('code ')[1] %}
+										{% set voucherCode = voucher.description|split('code ')[1] is defined ? voucher.description|split('code ')[1] : false %}
 										{# Get voucher remaining amount #}
-										{% set amountRemaining = craft.giftVoucher.codes().codeKey(voucherCode).one().currentAmount %}
-										{% set appliedVoucherAmount = (order.storedItemTotal - (voucher.amount|abs)) < 0 ? order.storedItemTotal : voucher.amount|abs %}
-										{% set appliedVoucherDescription = voucher.description|split('code ')[1] ~ ' (' ~ appliedVoucherAmount|currency ~ ' applied, ' ~ amountRemaining|currency ~ ' remaining)' %}
-										<p>{{ appliedVoucherDescription }}</p>
+										{% if voucherCode %}
+											{% set amountRemaining = craft.giftVoucher.codes().codeKey(voucherCode).one().currentAmount %}
+											{% set appliedVoucherAmount = (order.storedItemTotal - (voucher.amount|abs)) < 0 ? order.storedItemTotal : voucher.amount|abs %}
+											{% set appliedVoucherDescription = voucher.description|split('code ')[1] ~ ' (' ~ appliedVoucherAmount|currency ~ ' applied, ' ~ amountRemaining|currency ~ ' remaining)' %}
+											<p>{{ appliedVoucherDescription }}</p>
+										{% endif %}
 									{% endfor %}
 								</dd>
 							</div>

diff --git a/src/templates/checkout/payment.twig b/src/templates/checkout/payment.twig
@@ -254,7 +254,8 @@
 									<div class="border-gray-400 border-b flex flex-col space-y-2 py-4 px-4 xl:px-0">
 										{% if voucherCodes|length == 1 %}
 											{% set currentAmount = craft.giftVoucher.codes().codeKey(voucherCodes[0]).one().currentAmount %}
-											{% set appliedAmount = cart.storedItemTotal < currentAmount ? cart.storedItemTotal : currentAmount %}
+											{% set estimatedTotal = cart.storedItemTotal + cart.storedTotalShippingCost + cart.totalTax %}
+											{% set appliedAmount = estimatedTotal < currentAmount ? estimatedTotal : currentAmount %}
 											<div class="flex justify-between items-center">
 												<p class="text-gray-500">{{ 'Gift cards currently applied to your order'|t('foster-checkout') }}: {{ voucherCodes[0] }} ({{ appliedAmount | currency }})</p>
 											</div>
@@ -269,12 +270,13 @@
 											<ul class="text-gray-500 m-0 list-disc">
 												{% for code in voucherCodes %}
 													{% set voucherCurrentAmount = craft.giftVoucher.codes().codeKey(code).one().currentAmount %}
-													{% if cart.storedItemTotal - voucherCurrentAmount > 0 %}
+													{% set estimatedTotal =  cart.storedItemTotal + cart.storedTotalShippingCost + cart.totalTax %}
+													{% if estimatedTotal - voucherCurrentAmount > 0 %}
 														{% set voucherAmountApplied = voucherAmountApplied + voucherCurrentAmount %}
 														{% set appliedAmount = (cart.storedItemTotal - voucherAmountApplied) <= 0 ? voucherAmountApplied - cart.storedItemTotal : voucherCurrentAmount %}
 														{% set totalVoucherAmountApplied = voucherAmountApplied %}
 													{% else %}
-														{% set appliedAmount = (totalVoucherAmountApplied - cart.storedItemTotal)|abs %}
+														{% set appliedAmount = (totalVoucherAmountApplied - estimatedTotal)|abs %}
 													{% endif %}
 													<li class="ml-5">{{ code }} ({{ appliedAmount | currency }})</li>
 												{% endfor %}