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

08 2024

Browse source
This commit is contained in:
Kevin Adametz 2024-08-05 12:05:24 +02:00
parent 3a81b8a0f5
commit 7ec90d7e18
1183 changed files with 47973 additions and 8742 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Middleware/Checkout.php
View file

@ -8,6 +8,7 @@ use Closure;
use Auth;
use phpDocumentor\Reflection\DocBlock\Tags\Uses;
use App\Services\Util;
use Session;
use Yard;
class Checkout
@ -23,6 +24,10 @@ class Checkout
{
if($shopping_instance = ShoppingInstance::where('identifier', $request->route('identifier'))->first()){
//user shop
//set Lang
\Session::put('locale', $shopping_instance->getLocale());
\App::setLocale($shopping_instance->getLocale());
$user_shop = $shopping_instance->user_shop;
if($user_shop && $user_shop->active == 1 && $user_shop->user->isActiveShop()){
Util::setPostRoute('user/');
@ -42,15 +47,24 @@ class Checkout
\Session::put('new_session', true);
Yard::instance('shopping')->destroy();
//restore yard
Yard::instance('shopping')->restore($request->route('identifier'));
if($shopping_instance->payment !== 6){
Yard::instance('shopping')->restore($request->route('identifier'));
}else{
//dont delete shopping instance
Yard::instance('shopping')->restore($request->route('identifier'), [], false);
}
Yard::instance('shopping')->putYardExtra('user_shop_payment', $shopping_instance->payment);
Yard::instance('shopping')->putYardExtra('shopping_data', $shopping_instance->shopping_data);
$is_for = isset($shopping_instance->shopping_data['is_for']) ? $shopping_instance->shopping_data['is_for'] : 'ot';
Yard::instance('shopping')->setShippingCountryWithPrice($shopping_instance->country_id, $is_for);
$is_for = isset($shopping_instance->shopping_data['is_for']) ? $shopping_instance->shopping_data['is_for'] : 'ot-member';
Yard::instance('shopping')->setUserPriceInfos($shopping_instance->shopping_data['user_price_infos']);
ShoppingInstance::where('identifier', $request->route('identifier'))->delete();
Yard::instance('shopping')->setShippingCountryWithPrice($shopping_instance->country_id, $is_for);
if($shopping_instance->payment !== 6){
//delete shopping instance
ShoppingInstance::where('identifier', $request->route('identifier'))->delete();
}
$request->route()->forgetParameter('identifier');
return $next($request);

6
app/Http/Middleware/Localization.php
View file

@ -18,10 +18,10 @@ class Localization
public function handle($request, Closure $next)
{
if ( \Session::has('locale')) {
if (\Session::has('locale')) {
\App::setLocale(\Session::get('locale'));
Carbon::setLocale(\Session::get('locale'));
// Carbon::setLocale('\Session::get('locale')');
//Carbon::setLocale('de');
}
return $next($request);