From 263ca9c88c49e249ce93af71659fed1341db1625 Mon Sep 17 00:00:00 2001 From: franknstayn Date: Mon, 18 Nov 2019 15:26:21 +0800 Subject: [PATCH 1/3] restricted admin role in crewsportswear site --- app/Http/Controllers/CustomAuthController.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/Http/Controllers/CustomAuthController.php b/app/Http/Controllers/CustomAuthController.php index 2fc2994..0dc825c 100644 --- a/app/Http/Controllers/CustomAuthController.php +++ b/app/Http/Controllers/CustomAuthController.php @@ -19,6 +19,18 @@ class CustomAuthController extends Controller { $password = $post['password']; if (Auth::attempt(['email' => $email, 'password' => $password])){ + + if (Auth::user()->role == 'admin') { + $message = ' +
+ +

ERROR:

+ You are not allowed to enter to this site. +
'; + return response()->json(array('success' => false, 'message'=>$message)); + } + + $message = "success"; $navbar = view('layout.navbar', compact('view'))->render(); $save_design_button = ' '; From 87527f36001c63e831896fa9c11644325532ed62 Mon Sep 17 00:00:00 2001 From: franknstayn Date: Wed, 4 Dec 2019 18:38:42 +0800 Subject: [PATCH 2/3] added name size form --- .../teamstore/TeamStoreController.php | 2 +- resources/views/emails/orders.blade.php | 16 +++++++++++++++- resources/views/sublayouts/cart.blade.php | 17 ++++++++++++++++- ...-size.blade.php => name-size-form.blade.php} | 0 .../views/user-layouts/order_details.blade.php | 16 ++++++++++++++++ .../views/user-layouts/user_template.blade.php | 4 ---- 6 files changed, 48 insertions(+), 7 deletions(-) rename resources/views/teamstore-sublayouts/forms/{name-size.blade.php => name-size-form.blade.php} (100%) diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 6b02046..d41416f 100644 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -443,7 +443,7 @@ class TeamStoreController extends Controller { 'Quantity' => 1 ); } - }elseif($product_form == "name-size"){ + }elseif($product_form == "name-size-form"){ $order_names = $post['order_names']; $order_size = $post['order_size']; diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php index 5541430..18cec59 100644 --- a/resources/views/emails/orders.blade.php +++ b/resources/views/emails/orders.blade.php @@ -468,7 +468,14 @@ Price Quantity - + @elseif($item->FormUsed=="name-size-form") + + Name + Size + Price + Quantity + + @else @@ -531,6 +538,13 @@ {{ $sub_item->Price }} {{ $sub_item->Quantity }} + @elseif($item->FormUsed=="name-size-form") + + {{ $sub_item->Name }} + {{ $sub_item->Size }} + {{ $sub_item->Price }} + {{ $sub_item->Quantity }} + @else @endif diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php index 7e4c23b..69f96be 100644 --- a/resources/views/sublayouts/cart.blade.php +++ b/resources/views/sublayouts/cart.blade.php @@ -172,7 +172,14 @@ Quantity - + @elseif($item->FormUsed=="name-size-form") + + Name + Size + Price + Quantity + + @else @endif @@ -237,6 +244,14 @@ {{ $sub_item->Quantity }} + @elseif($item->FormUsed=="name-size-form") + + {{ $sub_item->Name }} + {{ $sub_item->Size }} + {{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $sub_item->Quantity }} + + @else @endif diff --git a/resources/views/teamstore-sublayouts/forms/name-size.blade.php b/resources/views/teamstore-sublayouts/forms/name-size-form.blade.php similarity index 100% rename from resources/views/teamstore-sublayouts/forms/name-size.blade.php rename to resources/views/teamstore-sublayouts/forms/name-size-form.blade.php diff --git a/resources/views/user-layouts/order_details.blade.php b/resources/views/user-layouts/order_details.blade.php index 09e802c..037d259 100644 --- a/resources/views/user-layouts/order_details.blade.php +++ b/resources/views/user-layouts/order_details.blade.php @@ -150,6 +150,14 @@ Price Quantity + @elseif($item->FormUsed=="name-size-form") + + Name + Size + Price + Quantity + + @else @endif @@ -203,6 +211,14 @@ {{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }} {{ $sub_item->Quantity }} + + @elseif($item->FormUsed=="name-size-form") + + {{ $sub_item->Name }} + {{ $sub_item->Size }} + {{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }} + {{ $sub_item->Quantity }} + @else @endif diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php index 4431a74..8c59467 100644 --- a/resources/views/user-layouts/user_template.blade.php +++ b/resources/views/user-layouts/user_template.blade.php @@ -586,8 +586,6 @@ - - @@ -615,8 +613,6 @@ - - From 9c371d17be55d8fe6549106c0f96c5356c065672 Mon Sep 17 00:00:00 2001 From: franknstayn Date: Wed, 4 Dec 2019 18:43:03 +0800 Subject: [PATCH 3/3] added name and size form in select --- resources/views/user-layouts/add_item.blade.php | 1 + resources/views/user-layouts/view-store-item.blade.php | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/views/user-layouts/add_item.blade.php b/resources/views/user-layouts/add_item.blade.php index 8bdd0e8..d5a2014 100644 --- a/resources/views/user-layouts/add_item.blade.php +++ b/resources/views/user-layouts/add_item.blade.php @@ -99,6 +99,7 @@ +
diff --git a/resources/views/user-layouts/view-store-item.blade.php b/resources/views/user-layouts/view-store-item.blade.php index f68b848..87b456c 100644 --- a/resources/views/user-layouts/view-store-item.blade.php +++ b/resources/views/user-layouts/view-store-item.blade.php @@ -126,6 +126,7 @@ +