diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 3d588ac..1e479e9 100755 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -499,6 +499,30 @@ class TeamStoreController extends Controller 'ShippingCostId' => $shipping_cost_id ); } + } elseif ($product_form == "number-size-form") { + + // $order_names = $post['order_names']; + $order_number = $post['order_number']; + $order_size = $post['order_size']; + + foreach ($order_size as $key => $val) { + $items[] = array( + 'ProductId' => $product_id, + 'StoreURL' => $store_url, + 'StoreId' => $store_id, + 'FormUsed' => $product_form, + 'CartKey' => $cartKey, + 'DesignCode' => $design_code, + 'ProductURL' => $ProductURL, + 'ProductName' => $product_name, + 'Name' => $product_name, + 'Size' => $order_size[$key], + 'Number' => $order_number[$key], + 'Price' => $ProductPrice, + 'Quantity' => 1, + 'ShippingCostId' => $shipping_cost_id + ); + } } elseif ($product_form == "number-form") { $order_number = $post['order_number']; diff --git a/composer.json b/composer.json index f3fff5b..6a2cf3a 100755 --- a/composer.json +++ b/composer.json @@ -46,6 +46,9 @@ ] }, "config": { - "preferred-install": "dist" + "preferred-install": "dist", + "allow-plugins": { + "kylekatarnls/update-helper": true + } } } diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 diff --git a/favicon.ico b/favicon.ico old mode 100644 new mode 100755 diff --git a/nginx/conf.d/app.conf b/nginx/conf.d/app.conf old mode 100644 new mode 100755 diff --git a/php/local.ini b/php/local.ini old mode 100644 new mode 100755 diff --git a/public/api/canada.json b/public/api/canada.json old mode 100644 new mode 100755 diff --git a/public/api/usa.json b/public/api/usa.json old mode 100644 new mode 100755 diff --git a/public/api/usaCities.old.json b/public/api/usaCities.old.json old mode 100644 new mode 100755 diff --git a/public/assets/css/jquery-ui.css b/public/assets/css/jquery-ui.css old mode 100644 new mode 100755 diff --git a/public/assets/files/Terms of Use.pdf b/public/assets/files/Terms of Use.pdf old mode 100644 new mode 100755 diff --git a/public/assets/js/jquery-ui.js b/public/assets/js/jquery-ui.js old mode 100644 new mode 100755 diff --git a/public/images/MERCHBAY-LOGO.png b/public/images/MERCHBAY-LOGO.png old mode 100644 new mode 100755 diff --git a/public/images/merchbay-black.png b/public/images/merchbay-black.png old mode 100644 new mode 100755 diff --git a/public/images/merchbay-white.png b/public/images/merchbay-white.png old mode 100644 new mode 100755 diff --git a/resources/views/designer/vue_designer.blade.php b/resources/views/designer/vue_designer.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/emails/contact_us.blade.php b/resources/views/emails/contact_us.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php index ea78987..25c0d88 100755 --- a/resources/views/emails/orders.blade.php +++ b/resources/views/emails/orders.blade.php @@ -540,6 +540,13 @@ Price Quantity + @elseif($item->FormUsed == 'number-size-form') + + Number + Size + Price + Quantity + @else @endif @@ -666,6 +673,17 @@ {{ $sub_item->Quantity }} + @elseif($item->FormUsed == 'number-size-form') + + {{ $sub_item->Number }} + + {{ $sub_item->Size }} + + {{ $sub_item->Price }} + + {{ $sub_item->Quantity }} + + @else @endif @endif diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php index 7d0125a..e901282 100755 --- a/resources/views/merchbay/cart.blade.php +++ b/resources/views/merchbay/cart.blade.php @@ -174,6 +174,15 @@ Quantity + @elseif($item->FormUsed == 'number-size-form') + + Number + Size + Price + Quantity + + + @else @endif @@ -296,6 +305,17 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> + @elseif($item->FormUsed == 'number-size-form') + + {{ $sub_item->Number }} + {{ $sub_item->Size }} + {{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }} + + {{ $sub_item->Quantity }} + + @else @endif @endif diff --git a/resources/views/merchbay/not_found.blade.php b/resources/views/merchbay/not_found.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/merchbay/privacy_policy.blade.php b/resources/views/merchbay/privacy_policy.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/merchbay/terms_of_use.blade.php b/resources/views/merchbay/terms_of_use.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/merchbay/track_order.blade.php b/resources/views/merchbay/track_order.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/paypal/payment_success.blade.php b/resources/views/paypal/payment_success.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/teamstore-sublayouts/forms/number-size-form.blade.php b/resources/views/teamstore-sublayouts/forms/number-size-form.blade.php new file mode 100755 index 0000000..c548c72 --- /dev/null +++ b/resources/views/teamstore-sublayouts/forms/number-size-form.blade.php @@ -0,0 +1,45 @@ + +
+ + + + + {{-- --}} + + + + + + + + {{-- --}} + + + + + +
NameNumberSize
+ + + + + + + + + +
+
+
+
+ \ No newline at end of file diff --git a/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php b/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php old mode 100644 new mode 100755 diff --git a/resources/views/user-layouts/add_item.blade.php b/resources/views/user-layouts/add_item.blade.php index f75d5c6..a13b850 100755 --- a/resources/views/user-layouts/add_item.blade.php +++ b/resources/views/user-layouts/add_item.blade.php @@ -102,6 +102,7 @@ + diff --git a/resources/views/user-layouts/buy_design.blade.php b/resources/views/user-layouts/buy_design.blade.php index 50e6a16..7667820 100755 --- a/resources/views/user-layouts/buy_design.blade.php +++ b/resources/views/user-layouts/buy_design.blade.php @@ -125,7 +125,8 @@ - + + diff --git a/resources/views/user-layouts/order-details-body.blade.php b/resources/views/user-layouts/order-details-body.blade.php index 5000aef..46983c5 100755 --- a/resources/views/user-layouts/order-details-body.blade.php +++ b/resources/views/user-layouts/order-details-body.blade.php @@ -114,6 +114,13 @@ Price Quantity + @elseif($array_item[0]->FormUsed=="number-size-form") + + Number + Size + Price + Quantity + @else @endif @@ -195,6 +202,13 @@ {{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }} {{ $array_item[0]->Quantity }} + @elseif($array_item[0]->FormUsed=="number-size-form") + + {{ $array_item[0]->Number }} + {{ $array_item[0]->Size }} + {{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }} + {{ $array_item[0]->Quantity }} + @else @endif diff --git a/resources/views/user-layouts/order_details.blade.php b/resources/views/user-layouts/order_details.blade.php index 440533a..6008e73 100755 --- a/resources/views/user-layouts/order_details.blade.php +++ b/resources/views/user-layouts/order_details.blade.php @@ -158,6 +158,14 @@ Quantity + @elseif($item->FormUsed=="number-size-form") + + Number + Size + Price + Quantity + + @else @endif @@ -219,6 +227,13 @@ {{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }} {{ $sub_item->Quantity }} + @elseif($item->FormUsed=="number-size-form") + + {{ $sub_item->Number }} + {{ $sub_item->Size }} + {{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }} + {{ $sub_item->Quantity }} + @else @endif diff --git a/resources/views/user-layouts/sell_design.blade.php b/resources/views/user-layouts/sell_design.blade.php index 2d38985..798c681 100755 --- a/resources/views/user-layouts/sell_design.blade.php +++ b/resources/views/user-layouts/sell_design.blade.php @@ -127,6 +127,7 @@ +
diff --git a/resources/views/user-layouts/view-store-item.blade.php b/resources/views/user-layouts/view-store-item.blade.php index 00050c9..5b82883 100755 --- a/resources/views/user-layouts/view-store-item.blade.php +++ b/resources/views/user-layouts/view-store-item.blade.php @@ -129,6 +129,7 @@ + diff --git a/storage/keys/crewsportswear_app.key b/storage/keys/crewsportswear_app.key old mode 100644 new mode 100755 diff --git a/storage/keys/crewsportswear_app.ppk b/storage/keys/crewsportswear_app.ppk old mode 100644 new mode 100755