diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 5f24f20..6f51fc0 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -162,7 +162,7 @@ class PaypalController extends Controller // $order_subtotal = $updated_getSubtotal[0]->Subtotal; $order_grandtotal = $updated_getSubtotal[0]->Subtotal; - if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185) { + if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244) { $tax_value = 0; } else { $tax_value = 0.10; diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 71e06d5..fd9d58e 100755 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -14,6 +14,7 @@ use App\Models\user\UserModel; use Illuminate\Support\Facades\Mail; use Analytics; use App\Models\TemplatesModel; +use Illuminate\Support\Facades\Session; class TeamStoreController extends Controller { @@ -40,7 +41,7 @@ class TeamStoreController extends Controller if ($store_array[0]->Password != null) { if ($request->session()->get('teamstore_data_array') == null) { if ($store_id != $store_array[0]->Id) { - return redirect('teamstore'); + return redirect('/'); } } else { @@ -175,9 +176,16 @@ class TeamStoreController extends Controller if ($store_array) { $request->session()->put('teamstore_data_array', $store_array); - return redirect('teamstore/' . $store_array[0]->StoreUrl); + return redirect('store/' . $store_array[0]->StoreUrl); } else { - return redirect()->back()->with('errors', 'Invalid Password.'); + Session::flash('errors', 'Invalid Password'); + echo ''; + // return redirect('cart'); + + // return redirect('/'); } } diff --git a/public/assets/css/merchbay/styles.css b/public/assets/css/merchbay/styles.css index 557bdb7..e9c1902 100755 --- a/public/assets/css/merchbay/styles.css +++ b/public/assets/css/merchbay/styles.css @@ -151,10 +151,27 @@ li.footer-menu-item a:hover { } .store-logo { height: 165px; + display: inline-block; /* border: 1px solid #e2e2e2; */ position: relative; } +.store-locked{ + background-color: rgb(0 0 0 / 60%); + height: 100%; + width: 100%; + top: 0; + left: 0; + position: absolute; + padding: 67px; + text-align: center; +} + +.store-locked > i { + font-size: 2rem; + color: #ffffff; +} + .store-logo img { object-fit: contain; width: 100%; diff --git a/resources/views/teamstore-sublayouts/stores.blade.php b/resources/views/teamstore-sublayouts/stores.blade.php index 292b266..5de4ea7 100755 --- a/resources/views/teamstore-sublayouts/stores.blade.php +++ b/resources/views/teamstore-sublayouts/stores.blade.php @@ -2,16 +2,44 @@ @foreach ($stores_array as $store)
- - -
{{ $store->StoreName }}
-
+{{-- + @if($store->Password != null ) + + + +

{{ $store->StoreName }}

+ @else + + + +

{{ $store->StoreName }}

+ @endif --}} + @if($store->Password != null ) + + +
{{ $store->StoreName }}
+
+ @else + + +
{{ $store->StoreName }}
+
+ @endif
@endforeach @@ -25,7 +53,7 @@ --}} - + --}} + +{{--