diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 116ae63..189d20c 100755 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -212,6 +212,7 @@ class TeamStoreController extends Controller $thumbnails_array = $m->getThumbnails($product_array[0]->Id); $teams_array = $m->getTeams($product_array[0]->Id); + $selectRoster = $m->selectRoster($product_array[0]->Id); // $sizes_array = $m->getSizes(); if (empty($thumbnails_array)) { @@ -255,7 +256,8 @@ class TeamStoreController extends Controller ->with('teams_array', $teams_array) ->with('sizes_array', $sizes_array) ->with('available_qty', $availableQty) - ->with('store_products', $store_products); + ->with('store_products', $store_products) + ->with('roster', $selectRoster); } public function login(Request $request) @@ -295,9 +297,12 @@ class TeamStoreController extends Controller $availableQty = null; } + $selectRoster = $TeamStoreModel->selectRoster($item[0]->Id); + $handle_form = view('teamstore-sublayouts.forms.' . $item[0]->ProductForm) ->with('sizes_array', $sizes_array) ->with('availableQty', $availableQty) + ->with('roster', $selectRoster) ->render(); return $handle_form; @@ -416,7 +421,7 @@ class TeamStoreController extends Controller 'ShippingCostId' => $shipping_cost_id ); } - } elseif ($product_form == "name-number-size-form") { + } elseif ($product_form == "name-number-size-form" || $product_form == "roster-name-number-size-form") { $order_names = $post['order_names']; $order_number = $post['order_number']; diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index 4317682..3e2a137 100755 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -285,4 +285,12 @@ class TeamStoreModel extends Model $i = DB::select("SELECT * FROM teamstores WHERE IsActive = 'true' ORDER BY RAND() LIMIT 10"); return $i; } + + function selectRoster($productId){ + + $i = DB::table('roster') + ->where("ProductId", $productId) + ->get(); + return $i; + } } diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php index a2bdd48..7a01d8f 100755 --- a/resources/views/emails/orders.blade.php +++ b/resources/views/emails/orders.blade.php @@ -490,7 +490,7 @@ Price Quantity - @elseif($item->FormUsed == 'name-number-size-form') + @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == "roster-name-number-size-form") Name Number @@ -590,7 +590,7 @@ - @elseif($item->FormUsed == 'name-number-size-form') + @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == "roster-name-number-size-form") {{ $sub_item->Name }} diff --git a/resources/views/merchbay/cart.blade.php b/resources/views/merchbay/cart.blade.php index c94566a..6847f8c 100755 --- a/resources/views/merchbay/cart.blade.php +++ b/resources/views/merchbay/cart.blade.php @@ -128,7 +128,7 @@ - @elseif($item->FormUsed == 'name-number-size-form') + @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == "roster-name-number-size-form") Name Number @@ -229,7 +229,7 @@ href="{{ url('removeitem') }}/{{ $sub_item->Id }}"> - @elseif($item->FormUsed == 'name-number-size-form') + @elseif($item->FormUsed == 'name-number-size-form' || $item->FormUsed == "roster-name-number-size-form") {{ $sub_item->Name }} {{ $sub_item->Number }} diff --git a/resources/views/merchbay_main.blade.php b/resources/views/merchbay_main.blade.php index d0362d0..82aeb24 100755 --- a/resources/views/merchbay_main.blade.php +++ b/resources/views/merchbay_main.blade.php @@ -32,22 +32,30 @@ gtag('config', 'G-SB3QK6BR1N'); - + - + @@ -407,10 +415,10 @@ function submitRegisterForm() { var data = $("#frm-register").serializeArray(); - data.push({ - name: "country", - value: $("#select_country option:selected").text() - }); + data.push({ + name: "country", + value: $("#select_country option:selected").text() + }); // var data = $("#frm-register").serialize(); $.ajax({ @@ -780,6 +788,14 @@ $('.' + str).remove(); }); // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ end removing of rows @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + $(document).on('select change', '.select-name', function() { + + var selected = $(this).find('option:selected'); + var number = selected.attr('data-number'); + var name = selected.val(); + $(this).closest("tr").find("input[name='order_number[]']").val(number) + }); }); //end document ready diff --git a/resources/views/teamstore-layout/main.blade.php b/resources/views/teamstore-layout/main.blade.php index 3bd334d..dd53835 100755 --- a/resources/views/teamstore-layout/main.blade.php +++ b/resources/views/teamstore-layout/main.blade.php @@ -1,379 +1,389 @@ - - - - - - - - - - - - - - - + + + + + + + + + + - - - {{ $store_array[0]->StoreName }} Store + + {{ $store_array[0]->StoreName }} Store - - {{-- --}} - - - + + {{-- --}} + + + - - + + - - - + + + - - + - - - - - + + - gtag('config', 'UA-136108155-1'); - - + + + + + + + @include('layout.navbar') + + @yield('content') - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + return false; + + } + + // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ adding of rows @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + $(document).on('button click', '#addNewRow', function() { + var p_id = $('#p_id').val(); + $.ajax({ //create an ajax request to load_page.php + type: "POST", + url: "{{ url('/teamstore/q/add-new-row') }}", + data: { + p_id: p_id + }, + + dataType: "html", //expect html to be returned + beforeSend: function(xhr) { + var token = $('meta[name="csrf_token"]').attr('content'); + + if (token) { + return xhr.setRequestHeader('X-CSRF-TOKEN', token); + } + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + }, + + success: function(response) { + + var d = new Date(); + var n = d.getTime(); + + var parser = new DOMParser(); + var doc = parser.parseFromString(response, "text/html"); + var elem = doc.getElementById("orderTableBody"); + var currentClassName = elem.getElementsByTagName('tr')[0].className; + elem.getElementsByClassName(currentClassName)[0].classList.remove(currentClassName); // remove current Classname + elem.getElementsByTagName('tr')[0].classList.add("table-tr-" + Math.ceil(Math.random() * 999999) + n); // add random classname + $('#tableRow tbody').append(elem.innerHTML); + $('#addnew-btn-tbl-row').html('') + $('#addnew-btn-tbl-row').append(''); + $('.tr-remove-btn').html(''); + $('#orderListPanel').scrollTop($('#orderListPanel')[0].scrollHeight); + $('.inputName').keyup(function() { + this.value = this.value.toLocaleUpperCase(); + }); + } + }); + + }); + // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ end adding of rows @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ removing of rows @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + $(document).on('button click', '.removeRow', function() { + var str = $(this).closest('tr').attr('class'); + var trCount = $('#tableRow tbody').children('tr').length; + if (trCount <= 2) { + $('#addnew-btn-tbl-row').html(''); + $('.tr-remove-btn').html(''); + } + $('.' + str).remove(); + }); + // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ end removing of rows @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + + + }); //end document ready + + + + \ 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 new file mode 100644 index 0000000..8d1f50e --- /dev/null +++ b/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php @@ -0,0 +1,51 @@ +
+ + + + + + + + + + + + + + + + + + + + + +
Name / NumberSize
+ + + + + + + + +
+
+
+
\ No newline at end of file diff --git a/resources/views/user-layouts/order-details-body.blade.php b/resources/views/user-layouts/order-details-body.blade.php index 2ea9a18..5000aef 100755 --- a/resources/views/user-layouts/order-details-body.blade.php +++ b/resources/views/user-layouts/order-details-body.blade.php @@ -70,7 +70,7 @@ Price Quantity - @elseif($array_item[0]->FormUsed=="name-number-size-form") + @elseif($array_item[0]->FormUsed=="name-number-size-form" || $array_item[0]->FormUsed == "roster-name-number-size-form") Name Number @@ -150,7 +150,7 @@ {{ $array_item[0]->Quantity }} - @elseif($array_item[0]->FormUsed=="name-number-size-form") + @elseif($array_item[0]->FormUsed=="name-number-size-form" || $array_item[0]->FormUsed == "roster-name-number-size-form") {{ $array_item[0]->Name }} {{ $array_item[0]->Number }} diff --git a/resources/views/user-layouts/order_details.blade.php b/resources/views/user-layouts/order_details.blade.php index 97cebab..440533a 100755 --- a/resources/views/user-layouts/order_details.blade.php +++ b/resources/views/user-layouts/order_details.blade.php @@ -135,7 +135,7 @@ Quantity - @elseif($item->FormUsed=="name-number-size-form") + @elseif($item->FormUsed=="name-number-size-form" || $item->FormUsed == "roster-name-number-size-form") Name Number @@ -197,7 +197,7 @@ {{ $sub_item->Quantity }} - @elseif($item->FormUsed=="name-number-size-form") + @elseif($item->FormUsed=="name-number-size-form" || $item->FormUsed == "roster-name-number-size-form") {{ $sub_item->Name }} {{ $sub_item->Number }}