diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 73a1a4e..89a6d30 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -140,7 +140,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) { + 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) { $tax_value = 0; } else { $tax_value = 0.10; diff --git a/resources/views/designer/design_preview.blade.php b/resources/views/designer/design_preview.blade.php index 5cdcd7a..91a8b24 100644 --- a/resources/views/designer/design_preview.blade.php +++ b/resources/views/designer/design_preview.blade.php @@ -355,7 +355,11 @@ } }else{ - gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}"; + if(port == 5953){ + gen_url = ip+":"+port+"/classic-mask/{{ $client_design_array[0]->DesignCode }}"; + }else{ + gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}"; + } } $.ajax({ //create an ajax request to load_page.php diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index e1ee3f4..6252560 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -283,6 +283,14 @@ @if($template->Type == "Hoodie" && $template->Side == "Back" && $template->TemplateFormat == "svg") @endif + + + @if($template->Type == "Hoodie" && $template->Side == "Front" && $template->TemplateFormat == "png") + + @endif + @if($template->Type == "Hoodie" && $template->Side == "Back" && $template->TemplateFormat == "png") + + @endif diff --git a/resources/views/layout/main.blade.php b/resources/views/layout/main.blade.php index cac54a4..ed26e99 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/layout/main.blade.php @@ -13,7 +13,7 @@ - + diff --git a/resources/views/paypal/get_done.blade.php b/resources/views/paypal/get_done.blade.php index da05d7c..3988105 100644 --- a/resources/views/paypal/get_done.blade.php +++ b/resources/views/paypal/get_done.blade.php @@ -12,7 +12,7 @@ - + diff --git a/resources/views/teamstore-layout/main.blade.php b/resources/views/teamstore-layout/main.blade.php index c8a3467..8c2f5d8 100644 --- a/resources/views/teamstore-layout/main.blade.php +++ b/resources/views/teamstore-layout/main.blade.php @@ -13,7 +13,7 @@ - + diff --git a/resources/views/teamstore-sublayouts/index.blade.php b/resources/views/teamstore-sublayouts/index.blade.php index 3abeac7..0f4e85f 100644 --- a/resources/views/teamstore-sublayouts/index.blade.php +++ b/resources/views/teamstore-sublayouts/index.blade.php @@ -145,14 +145,29 @@
-
-
-

Please read:

- 1. Items purchased are made on demand. Please allow 2-3 weeks for delivery.
- 2. We are currently only shipping to US locations. For international orders, please contact orders@crewsportswear.com if you'd like to place an order.
- 3. DHL, UPS & USPS shipping delays due to COVID-19. -
-
+ @if($store_array[0]->Id == 174 || $store_array[0]->Id == 175 || $store_array[0]->Id == 178 || $store_array[0]->Id == 184 || $store_array[0]->Id == 179 || $store_array[0]->Id == 177 || $store_array[0]->Id == 189 || $store_array[0]->Id == 176 || $store_array[0]->Id == 190 || $store_array[0]->Id == 191 || $store_array[0]->Id == 192 || $store_array[0]->Id == 194) +
+
+

Please read:

+ 1. All orders will be batch shipped to your school for pick up.
+ 2. Orders will be batch processed on a weekly basis, please allow 2-3 weeks for delivery.
+ 3. Masks and gaiters sold on Crew are not intended for medical use. Crew does not make any medical or health claims.
+ 4. Refunds and exchanges are not allowed due to the hygenic nature of the product.
+ @if($store_array[0]->Id == 175) + 5. $1 from every item sold will benefit the 2020-2021 Maine South Schoolwide Fundraiser. + @endif +
+
+ @else +
+
+

Please read:

+ 1. Items purchased are made on demand. Please allow 2-3 weeks for delivery.
+ 2. We are currently only shipping to US locations. For international orders, please contact orders@crewsportswear.com if you'd like to place an order.
+ 3. DHL, UPS & USPS shipping delays due to COVID-19. +
+
+ @endif @foreach($product_array as $i => $product) diff --git a/resources/views/user-layouts/add_item.blade.php b/resources/views/user-layouts/add_item.blade.php index 1f75398..47ec3ae 100644 --- a/resources/views/user-layouts/add_item.blade.php +++ b/resources/views/user-layouts/add_item.blade.php @@ -119,7 +119,9 @@ - + + +
diff --git a/resources/views/user-layouts/sell_design.blade.php b/resources/views/user-layouts/sell_design.blade.php index a16f51a..132411e 100644 --- a/resources/views/user-layouts/sell_design.blade.php +++ b/resources/views/user-layouts/sell_design.blade.php @@ -144,6 +144,7 @@ + diff --git a/resources/views/user-layouts/view-store-item.blade.php b/resources/views/user-layouts/view-store-item.blade.php index 9b9283b..18708f5 100644 --- a/resources/views/user-layouts/view-store-item.blade.php +++ b/resources/views/user-layouts/view-store-item.blade.php @@ -137,6 +137,8 @@ + +