webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from franknstayn/local_dev

Browse Source 
Local dev
This commit is contained in:
franknstayn
2019-11-14 19:45:29 +08:00
committed by GitHub
parent 9bf1a888a6 5d1248b1c7
commit 3f8c116293
16 changed files with 453 additions and 1392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

275
app/Http/Controllers/designer/DesignerController.php
View File

@@ -958,279 +958,4 @@ class DesignerController extends Controller {
return view("designer.buy_form")->with('jersey_sizes', $jersey_sizes)
->with('shorts_sizes', $shorts_sizes);
}
public function addNewRow(Request $request){
$post = $request->all();
$TeamStoreModel = new TeamStoreModel;
$newDesignerModel = new DesignerModel;
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$avalable_sizes = $post['avalable_sizes'];
$x = explode(",", $avalable_sizes );
foreach($x as $s){
$h[] = $TeamStoreModel->getSizesByBracket($s);
}
foreach($h as $d){
foreach($d as $g){
$sizes_array[] = $g;
}
}
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name" >
</td>
<td>
<select class="form-control input-sm roster-input" name="order_number[]" id="order_number">
<option value="none">none</option>
<?php
for($i = 0; $i <= 99; $i++){
echo '<option value="'.$i.'">'.$i.'</option>';
}
?>
<option value="00">00</option>
</select>
</td>
<td>
<select class="form-control input-sm order-size roster-input" name="order_jersey_size[]" id="<?php echo 'order_jersey_size_' . $trCount ?>" data-row-number="<?php echo $trCount ?>">
<option value="none">none</option>
<?php
foreach($sizes_array as $j_size){
echo '<option value="'.$j_size->Size.'">'.$j_size->Size.'</option>';
}
?>
</select>
</td>
<td style="border-right: 1px solid #ddd;">
<select class="form-control input-sm order-size roster-input" name="order_shorts_size[]" id="<?php echo 'order_shorts_size_' . $trCount ?>" data-row-number="<?php echo $trCount ?>">
<option value="none">none</option>
<?php
foreach($sizes_array as $s_size){
echo '<option value="'.$s_size->Size.'">'.$s_size->Size.'</option>';
}
?>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow btn-roster-action"removeRow data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
public function addNewRowNameAndNumber(Request $request){
$post = $request->all();
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$newDesignerModel = new DesignerModel;
$jersey_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'JERSEY');
$shorts_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'SHORTS');
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name" >
</td>
<td>
<select class="form-control input-sm roster-input" name="order_number[]" id="order_number">
<option value="none">none</option>
<?php
for($i = 0; $i <= 99; $i++){
echo '<option value="'.$i.'">'.$i.'</option>';
}
?>
<option value="00">00</option>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow-name-and-number btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow_name_and_number" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
public function addNewRowNameNumberAndSize(Request $request){
$post = $request->all();
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$newDesignerModel = new DesignerModel;
$jersey_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'JERSEY');
$shorts_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'SHORTS');
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name" >
</td>
<td>
<select class="form-control input-sm roster-input" name="order_number[]" id="order_number">
<option value="none">none</option>
<?php
for($i = 0; $i <= 99; $i++){
echo '<option value="'.$i.'">'.$i.'</option>';
}
?>
<option value="00">00</option>
</select>
</td>
<td>
<select class="form-control input-sm order-size roster-input" name="order_size[]" id="<?php echo 'order_size_' . $trCount ?>" data-row-number="<?php echo $trCount ?>">
<?php
foreach($jersey_sizes as $j_size){
echo '<option value="'.$j_size.'">'.$j_size.'</option>';
}
?>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow-name-and-number btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow_name_and_number" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
public function addRowNumber(Request $request){
$post = $request->all();
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
// $product_array = $m->selectTeamStoreProducts('ProductURL', $productURL);
$newDesignerModel = new DesignerModel;
$jersey_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'JERSEY');
$shorts_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'SHORTS');
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<select class="form-control input-sm roster-input" name="order_number[]" id="order_number">
<option value="none">none</option>
<?php
for($i = 0; $i <= 99; $i++){
echo '<option value="'.$i.'">'.$i.'</option>';
}
?>
<option value="00">00</option>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow-name-and-number btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow_number" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
public function addGamerField(Request $request){
$post = $request->all();
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$product_url = $post['product_url'];
$m = new TeamStoreModel;
$product_array = $m->selectTeamStoreProducts('ProductURL', $product_url);
$x = explode(",", $product_array[0]->AvailableSizes );
foreach($x as $s){
$h[] = $m->getSizesByBracket($s);
}
foreach($h as $d){
foreach($d as $g){
$sizes_array[] = $g;
}
}
?>
<tr class="<?php echo 'table-tr-' . $trCount ?>">
<td>
<input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Gamer Tag" >
</td>
<td>
<input type="text" name="order_names2[]" id="order_names2" class="form-control input-sm inputName roster-input" placeholder="Name">
</td>
<td>
<select class="form-control input-sm order-size roster-input" name="order_size[]" id="<?php echo 'order_size_' . $trCount ?>" data-row-number="<?php echo $trCount ?>">
<?php
foreach($sizes_array as $size){
echo '<option value="'.$size->Size.'">'.$size->Size.'</option>';
}
?>
</select>
</td>
<td id="action-column" class="text-center roster-action-column" style="padding: 4px !important; border-top: none">
<span class="tr-remove-btn">
<button type="button" class="btn btn-danger btn-sm removeRow-gamer-field btn-roster-action" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="4" ><button type="button" id="addNewRow_gamer_field" class="btn btn-link btn-sm pull-left" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
<!-- <td colspan="2" ><button type="button" class="btn btn-link btn-sm pull-right" data-toggle="tooltip" title="Add Another">Manage List</button></td> -->
<td style="padding: 4px !important; border-top: none"></td>
</tr>
<?php
}
}

132
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -234,84 +234,44 @@ class TeamStoreController extends Controller {
public function addNewRow(Request $request)
{
$post = $request->all();
$itemCount = $post['itemCount'];
$cssValue = $post['jersey_chk'];
$product_id = $post['product_id'];
$classname = "row" . $itemCount;
$TeamStoreModel = new TeamStoreModel;
$item = $TeamStoreModel->selectTeamStoreProductByIdHash($post['p_id']);
$x = explode(",", $item[0]->AvailableSizes);
foreach($x as $s){
$h[] = $TeamStoreModel->getSizesByBracket($s);
}
foreach($h as $d){
foreach($d as $g){
$sizes_array[] = $g;
}
}
if($item[0]->ProductAvailableQty != null){
$soldQty = $m->getSoldQty($product_array[0]->Id);
$availableQty = $item[0]->ProductAvailableQty - $soldQty[0]->SoldQty;
}else{
// echo 'no qty';
$availableQty = null;
}
$handle_form = view('teamstore-sublayouts.forms.' . $item[0]->ProductForm )
->with('sizes_array', $sizes_array)
->with('availableQty', $availableQty)
->render();
return $handle_form;
$m = new TeamStoreModel;
$teams_array = array();
$teams_array = $m->getTeams($product_id);
$sizes_array = $m->getSizes();
?>
<tr class="<?php echo $classname; ?>">
<td class="td-hide" style="<?php echo $cssValue; ?>">
<input type="text" class="form-control input-sm capitalizeText cls-uniformName" name="uniformName[]" placeholder="i.e John Doe" data-error="#err-uniformName<?php echo $itemCount ?>" required >
<span id="err-uniformName<?php echo $itemCount ?>" style="color: #dd4b39"></span>
</td>
<td>
<select class="form-control input-sm cls-uniformTeam" name="uniformTeam[]" data-error="#err-uniformTeam<?php echo $itemCount ?>" require>
<option value="">Select Team</option>
<?php
foreach($teams_array as $team){
?><option value="<?php echo $team->Team ?>"><?php echo $team->Team ?></option><?php
}
?>
<option value="others">Others</option>
</select>
<span id="err-uniformTeam<?php echo $itemCount ?>" style="color: #dd4b39"></span>
</td>
<td>
<div id="selectOptionNumber1">
<select class="form-control input-sm cls-uniformNumber" name="uniformNumber[]" data-error="#err-uniformNumber<?php echo $itemCount ?>" require >
<option value="">Select Number</option>
<?php
for($i = 0 ; $i < 100 ; $i++){
?><option value="<?php echo $i ?>"><?php echo $i ?></option><?php
}
?>
</select>
<span id="err-uniformNumber<?php echo $itemCount ?>" style="color: #dd4b39"></span>
</div>
</td>
<td>
<div id="fetchSizes">
<select class="form-control input-sm cls-uniformSize" name="uniformSize[]" data-error="#err-uniformSize<?php echo $itemCount ?>" require>
<option value="">Select Size</option>
<?php
foreach($sizes_array as $size){
?><option value="<?php echo $size->Size ?>"><?php echo $size->Size ?></option><?php
}
?>
</select>
<span id="err-uniformSize<?php echo $itemCount ?>" style="color: #dd4b39"></span>
</div>
</td>
<td class="text-center">
<span class="changeToRemoveBtn">
<button type="button" class="btn btn-danger btn-sm removeRow" data-toggle="tooltip" title="Remove"><i class="fa fa-remove" aria-hidden="true"></i></button>
</span>
</td>
</tr>
<tr id="addnew-btn-tbl-row">
<td colspan="5" ><button type="button" id="addNewRow" class="btn btn-success btn-sm pull-right" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i> Add Row</button></td>
</tr>
<?php
}
public function addToCart(Request $request)
{
$post = $request->all();
$m = new TeamStoreModel;
$product_id = $post['product_id'];
$store_url = $post['store_url'];
$store_id = $post['store_id'];
$hash_product_id = $post['p_id'];
if($request->session()->has('cartkey')){
$cartKey = $request->session()->get('cartkey');
@@ -320,13 +280,20 @@ class TeamStoreController extends Controller {
$cartKey = $cartKey = $request->session()->get('cartkey');
}
$product_array = $m->selectTeamStoreProducts('Id', $product_id);
$product_array = $m->selectTeamStoreProductByIdHash($hash_product_id);
$product_id = $product_array[0]->Id;
$TeamStoreId = $product_array[0]->TeamStoreId;
$ProductPrice = $product_array[0]->ProductPrice;
$ProductURL = $product_array[0]->ProductURL;
$product_form = $product_array[0]->ProductForm;
$design_code = $product_array[0]->DesignCode;
$product_name = $product_array[0]->ProductName;
$teamstore_array = $m->selectTeamStore('Id', $TeamStoreId);
$store_url = $teamstore_array[0]->StoreUrl;
$store_id = $teamstore_array[0]->Id;
if($product_form == "jersey-and-shorts-form"){
$order_names = $post['order_names'];
$order_number = $post['order_number'];
@@ -476,6 +443,27 @@ class TeamStoreController extends Controller {
'Quantity' => 1
);
}
}elseif($product_form == "name-size"){
$order_names = $post['order_names'];
$order_size = $post['order_size'];
foreach($order_names 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' => $order_names[$key],
'Size' => $order_size[$key],
'Price' => $ProductPrice,
'Quantity' => 1
);
}
}
$i = $m->insertToCart($items);

9
app/Http/routes.php
View File

@@ -49,12 +49,6 @@ Route::get('/designer/edit/{designCode}', 'designer\DesignerController@editDesig
//end edit routes//
// CUSTOMIZER DISPLAY
Route::post('/designer/a/add-new-row', 'designer\DesignerController@addNewRow');
Route::post('/designer/a/add-new-row-name-and-number', 'designer\DesignerController@addNewRowNameAndNumber');
Route::post('/designer/a/add-new-row-name-number-size', 'designer\DesignerController@addNewRowNameNumberAndSize');
Route::post('/designer/a/add-new-row-number', 'designer\DesignerController@addRowNumber');
Route::post('/designer/a/add-new-row-gamer-field', 'designer\DesignerController@addGamerField');
Route::post('/designer/a/save-roster', 'designer\DesignerController@saveRoster');
//END CUSTOMIZER DISPLAY
@@ -82,10 +76,11 @@ Route::get('/teamstore', 'teamstore\TeamStoreController@storelist'); // old
Route::get('/teamstore/{storename}', 'teamstore\TeamStoreController@index');
Route::get('/teamstore/{storename}/product/{producurl}', 'teamstore\TeamStoreController@productDetails');
Route::post('/teamstore/q/addnewrow', 'teamstore\TeamStoreController@addNewRow');
// Route::post('/teamstore/q/addnewrow', 'teamstore\TeamStoreController@addNewRow');
Route::post('/teamstore/q/add-to-cart', 'teamstore\TeamStoreController@addToCart');
Route::get('/teamstore/q/clearsession', 'teamstore\TeamStoreController@clearSession');
Route::post('/teamstore/q/add-voucher', 'teamstore\TeamStoreController@addVoucher');
Route::post('/teamstore/q/add-new-row', 'teamstore\TeamStoreController@addNewRow');
// });
Route::post('/teamstore/checkpassword', 'teamstore\TeamStoreController@checkTeamStorePassword');

10
app/Models/teamstore/TeamStoreModel.php
View File

@@ -22,8 +22,16 @@ class TeamStoreModel extends Model {
->orderBy('Ordering', 'ASC')->get();
return $i;
}
function selectTeamStoreProductByIdHash($id)
{
$i = DB::table('teamstore_products')
->where(DB::raw('md5(Id)') , $id)
->get();
return $i;
}
function selectTeamStore($field, $teamstoreURL) // display all data from database
function selectTeamStore($field, $teamstoreURL)
{
$i = DB::table('teamstores')
->where($field, $teamstoreURL)