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

Merge branch 'master' of github.com:franknstayn/crewsportswear

Browse Source 
Conflicts:
	app/Http/Controllers/paypal/PaypalController.php
This commit is contained in:
franknstayn
2020-02-28 07:02:30 -06:00
parent 587819be9a 67b52fcc1a
commit 80094cfdf0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,11 @@ class PaypalController extends Controller {
// $order_subtotal = $updated_getSubtotal[0]->Subtotal; // $order_subtotal = $updated_getSubtotal[0]->Subtotal;
$order_grandtotal = $updated_getSubtotal[0]->Subtotal; $order_grandtotal = $updated_getSubtotal[0]->Subtotal;
<<<<<<< HEAD
if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131){ if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131){
=======
if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 30){
>>>>>>> 67b52fcc1aeb55e7b1295821039a38ffeca5de18
$tax_value = 0; $tax_value = 0;
}else{ }else{
$tax_value = 0.10; $tax_value = 0.10;