gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Country Prices | Homeparty | Shop | Order

Browse source
This commit is contained in:
Kevin Adametz 2021-08-27 18:53:12 +02:00
parent 51d81d8ec6
commit 39d1e93416
284 changed files with 784 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Web/CheckoutController.php
View file

@ -89,6 +89,13 @@ class CheckoutController extends Controller
$shopping_user->same_as_billing = false;
}
if(!$shopping_user->billing_country){
$shopping_user->billing_country = Yard::instance('shopping')->getUserCountry();
}
if(!$shopping_user->shipping_country){
$shopping_user->shipping_country = Yard::instance('shopping')->getUserCountry();
}
if(old('selected_country') && old('selected_country') === 'change'){
\Session::forget('_old_input.selected_country');
$shopping_user->billing_state = old('billing_state');
@ -479,7 +486,7 @@ class CheckoutController extends Controller
'subtotal_ws' => 0,
'tax' => 0,
'total_shipping' => Yard::instance('shopping')->totalWithShipping(2, '.', ''),
'points' => $homeparty->order['points'],
'points' => $homeparty->order['points'] - $homeparty->order['bonus_points_diff'],
'weight' => 0,
'txaction' => 'prev',
'mode' => Util::getUserShoppingMode(),