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

add column in reports modules

Browse Source
This commit is contained in:
Frank John Begornia
2019-09-27 20:09:24 +08:00
parent 83f0624f07
commit 2680ddc5bd
8 changed files with 98 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -957,13 +957,24 @@ class DesignerController extends Controller {
public function addNewRow(Request $request){
$post = $request->all();
$TeamStoreModel = new TeamStoreModel;
$newDesignerModel = new DesignerModel;
$trCount = $post['itemCount'];
$tempCode = $post['tempCode'];
$newDesignerModel = new DesignerModel;
$jersey_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'JERSEY');
$shorts_sizes = $newDesignerModel->getAvailableSizes($tempCode, 'SHORTS');
$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 ?>">
@@ -985,8 +996,8 @@ class DesignerController extends Controller {
<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($jersey_sizes as $j_size){
echo '<option value="'.$j_size.'">'.$j_size.'</option>';
foreach($sizes_array as $j_size){
echo '<option value="'.$j_size->Size.'">'.$j_size->Size.'</option>';
}
?>
@@ -996,8 +1007,8 @@ class DesignerController extends Controller {
<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($shorts_sizes as $s_size){
echo '<option value="'.$s_size.'">'.$s_size.'</option>';
foreach($sizes_array as $s_size){
echo '<option value="'.$s_size->Size.'">'.$s_size->Size.'</option>';
}
?>
</select>
@@ -1007,6 +1018,7 @@ class DesignerController extends Controller {
<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>

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

@@ -203,8 +203,6 @@ class TeamStoreController extends Controller {
if($product_array[0]->ProductAvailableQty != null){
$soldQty = $m->getSoldQty($product_array[0]->Id);
// var_dump($soldQty);
// echo $product_array[0]->ProductAvailableQty;
$availableQty = $product_array[0]->ProductAvailableQty - $soldQty[0]->SoldQty;
}else{
// echo 'no qty';
@@ -224,13 +222,7 @@ class TeamStoreController extends Controller {
public function login(Request $request)
{
// [0]->StoreUrl != $store_array[0]->StoreUrl
// if($request->session()->get('teamstore_data_array') != null){
// return redirect('teamstore/'.$request->session()->get('teamstore_data_array')[0]->StoreUrl);
// }else{
return view('teamstore-sublayouts.login');
// }
return view('teamstore-sublayouts.login');
}
public function clearSession(Request $request)

3
app/Http/Controllers/user/UserController.php
View File

@@ -641,6 +641,7 @@ class UserController extends Controller {
$post = $request->all();
// var_dump($post['imgupload']);
$UserModel = new UserModel;
$newTeamStoreModel = new TeamStoreModel;
$getYear = date('y');
$store_id = Auth::user()->store_id;
@@ -652,7 +653,7 @@ class UserController extends Controller {
$itemDescription = $post['itemDescription'];
$itemPrice = $post['itemPrice'];
$itemForm = $post['itemForm'];
$itemUrl = $store_arrayp[0]->StoreUrl . '-' . $post['itemUrl'];
$itemUrl = $store_array[0]->StoreUrl . '-' . $post['itemUrl'];
$itemPrivacy = $post['itemPrivacy'];
$available_size = implode(",", $_POST['available_size']);