webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev #1

Merged
webmaster merged 19 commits from dev into main 2025-12-22 15:28:43 +00:00
Conversation 0 Commits 19 Files Changed 59 +5 -2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f197490606 - Show all commits

6
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -400,6 +400,7 @@ class PaypalController extends Controller
{ {
$m = new TeamStoreModel; $m = new TeamStoreModel;
$updated_getSubtotal = $m->getSubtotalNew($cartKey); $updated_getSubtotal = $m->getSubtotalNew($cartKey);
$original_subtotal = $m->getSubtotal($cartKey); // withoutTanle
$grouped_item = $m->selectTeamStoreGroupByCartKey($cartKey); $grouped_item = $m->selectTeamStoreGroupByCartKey($cartKey);
if (count($grouped_item) <= 0) { if (count($grouped_item) <= 0) {
@@ -414,10 +415,11 @@ class PaypalController extends Controller
$order_grandtotal = $updated_getSubtotal[0]->Subtotal; $order_grandtotal = $updated_getSubtotal[0]->Subtotal;
$order_subtotal = $original_subtotal[0]->Subtotal;
$tax = $order_subtotal * $tax_value;
$tax = $order_grandtotal * $tax_value;
return [ return [
'tax' => $tax, 'tax' => $tax,

1
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -978,6 +978,7 @@ class TeamStoreController extends Controller
'shippingFee' => number_format($shippingFee, 2), 'shippingFee' => number_format($shippingFee, 2),
'total' => number_format($finalSubTotal + $shippingFee + $tax["tax"], 2), 'total' => number_format($finalSubTotal + $shippingFee + $tax["tax"], 2),
'subtotal' => number_format($finalSubTotal, 2), 'subtotal' => number_format($finalSubTotal, 2),
'tax' => $tax["tax"],
'remaining_shippingfee' => number_format(99 - $finalSubTotal, 2) 'remaining_shippingfee' => number_format(99 - $finalSubTotal, 2)
)); ));
} else { } else {