From 9ed251820e5e8e86be638f744cda048cf94cfbb6 Mon Sep 17 00:00:00 2001 From: Kevin Adametz Date: Sun, 14 Jun 2020 13:48:11 +0200 Subject: [PATCH] Produkte SysAdmin --- .idea/workspace.xml | 123 ++---------------- .../Api/ShoppingUserController.php | 22 +++- app/Models/Product.php | 2 +- resources/views/admin/product/form.blade.php | 13 +- 4 files changed, 36 insertions(+), 124 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e3e6e97..49f8ee3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,119 +2,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -650,18 +545,18 @@ - + - + - + - + diff --git a/app/Http/Controllers/Api/ShoppingUserController.php b/app/Http/Controllers/Api/ShoppingUserController.php index 89810cd..64ce2a6 100755 --- a/app/Http/Controllers/Api/ShoppingUserController.php +++ b/app/Http/Controllers/Api/ShoppingUserController.php @@ -40,7 +40,12 @@ class ShoppingUserController extends Controller 'wp_order_numbers' => 'required', ]); - $wp_order_numbers = json_decode($request->wp_order_numbers); + if(!is_array($request->wp_order_numbers)){ + $wp_order_numbers = json_decode($request->wp_order_numbers); + + }else{ + $wp_order_numbers = $request->wp_order_numbers; + } if(!$wp_order_numbers || !is_array($wp_order_numbers)){ @@ -80,7 +85,12 @@ class ShoppingUserController extends Controller 'wp_order_numbers' => 'required', ]); - $wp_order_numbers = json_decode($request->wp_order_numbers); + if(!is_array($request->wp_order_numbers)){ + $wp_order_numbers = json_decode($request->wp_order_numbers); + + }else{ + $wp_order_numbers = $request->wp_order_numbers; + } if(!$wp_order_numbers || !is_array($wp_order_numbers)){ return response()->json([ @@ -232,8 +242,12 @@ class ShoppingUserController extends Controller 'time' => Carbon::now()->toDateTimeString() ], 400); } + if(!is_array($request->wp_order)){ + $wp_order = json_decode($request->wp_order); - $wp_order = json_decode($request->wp_order); + }else{ + $wp_order = $request->wp_order; + } $wp_order = $this->prepareOrder($wp_order, $shopping_user); if ($wp_order){ $user = $this->prepareForShow($shopping_user); @@ -433,6 +447,8 @@ class ShoppingUserController extends Controller if(is_array($wp_shopping_order)){ foreach ($wp_shopping_order as $order) { + //$object = json_decode(json_encode($order), FALSE); + $order = (object) $order; $error = []; if (!isset($order->article) || !isset($order->qty) || !isset($order->price)) { $error[] = "article parameter is missing"; diff --git a/app/Models/Product.php b/app/Models/Product.php index a264ee1..26ba2a9 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -162,7 +162,7 @@ class Product extends Model public $identifiers_types = [ '' => '-', - 'show_upgrade' => 'Kann gepdatet werden', + 'show_upgrade' => 'Kann geupdatet werden', 'show_order' => 'Wird immer als Option angezeigt', 'upgrade' => 'Produktupgrade zur Produkt ID', 'upgrade_member' => 'Beraterupgrade zur Karriere ID', diff --git a/resources/views/admin/product/form.blade.php b/resources/views/admin/product/form.blade.php index fc63a16..c0d124f 100755 --- a/resources/views/admin/product/form.blade.php +++ b/resources/views/admin/product/form.blade.php @@ -245,9 +245,10 @@ +@if(Auth::user()->isSySAdmin())
- {{ __('Admin Einstellungen') }} + {{ __('SySAdmin Einstellungen') }}
@@ -256,20 +257,20 @@ {{ Form::select('action[]', $product->actions, $product->action, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'action', 'multiple') ) }}
- + {{ Form::select('identifier', $product->identifiers_types, $product->identifier, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'identifier') ) }}
- - {{ Form::text('upgrade_to_id', $product->upgrade_to_id, array('placeholder'=>__('Product ID when need an upgrade'), 'class'=>'form-control', 'id'=>'upgrade_to_id')) }} + + {{ Form::text('upgrade_to_id', $product->upgrade_to_id, array('placeholder'=>__('Produkt-ID auf das geupdatet werden soll'), 'class'=>'form-control', 'id'=>'upgrade_to_id')) }}
- + {{ Form::text('wp_number', $product->wp_number, array('placeholder'=>__('WP Number'), 'class'=>'form-control', 'id'=>'wp_number')) }}
- +@endif \ No newline at end of file