bag stock changes
This commit is contained in:
vadivel J
parent
3eef21a464
commit
e007d6a299
@ -281,6 +281,22 @@ class StockController extends BaseController
|
||||
|
||||
$this->global['pageTitle']='Bag Stock Details';
|
||||
|
||||
|
||||
$previousMonth = DateTime::createFromFormat('Y-m', $month)->modify('-1 month')->format('Y-m');
|
||||
$previousMonthStartDate = "$previousMonth-01";
|
||||
$previousMonthEndDate = date("Y-m-t", strtotime($previousMonthStartDate));
|
||||
$data['previousMonthBagStockDetails'] = $this->bagStockDetails_model
|
||||
->select(['materialCode', 'date' ,'balanceStock'])
|
||||
->distinct()
|
||||
->where('date =', $previousMonthEndDate)
|
||||
->groupBy(['materialCode','date'])
|
||||
->orderBy('date','desc')
|
||||
->orderBy('materialCode','asc')
|
||||
->findAll();
|
||||
|
||||
|
||||
|
||||
|
||||
$startDate = "$month-01";
|
||||
$endDate = date("Y-m-t", strtotime($startDate));
|
||||
$data['bagStockDetails'] = $this->bagStockDetails_model
|
||||
@ -322,16 +338,16 @@ class StockController extends BaseController
|
||||
foreach($bagMaterials as $key => $bagMaterial){
|
||||
$materialCode = $bagMaterial['MaterialCode'];
|
||||
$bagMaterials[$key]['customers'] = $this->bagStockDetails_model
|
||||
->select('customer')
|
||||
->select('customer')
|
||||
->where('date >=', $startDate)
|
||||
->where('date <=', $endDate)
|
||||
->where('materialCode', $materialCode)
|
||||
->first()['customer'] ?? '';
|
||||
}
|
||||
|
||||
$bagMaterialcount = count($bagMaterials);
|
||||
|
||||
$data['bagMaterialcount'] = $bagMaterialcount;
|
||||
->where('materialCode', $materialCode)
|
||||
->first()['customer'] ?? '';
|
||||
}
|
||||
|
||||
$bagMaterialcount = count($bagMaterials);
|
||||
|
||||
$data['bagMaterialcount'] = $bagMaterialcount;
|
||||
$data['bagMaterials'] = $bagMaterials;
|
||||
|
||||
$date = DateTime::createFromFormat('Y-m', $month);
|
||||
|
||||
@ -217,9 +217,7 @@
|
||||
<tr>
|
||||
|
||||
<th class="celda_encabezado_general" colspan="1">material </th>
|
||||
|
||||
|
||||
|
||||
|
||||
<?php foreach($bagMaterials as $bagMaterial){ ?>
|
||||
<!-- this will loop till materials present -->
|
||||
<th class="celda_encabezado_general" colspan="4">
|
||||
@ -230,11 +228,12 @@
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th class="celda_encabezado_general" colspan="1">Customer </th>
|
||||
|
||||
<th class="celda_encabezado_general" colspan="1"> Customer </th>
|
||||
<?php foreach($bagMaterials as $bagMaterial){ ?>
|
||||
<!-- this will loop till materials present -->
|
||||
<th class="celda_encabezado_general" colspan="4" contenteditable="true">
|
||||
<th class="celda_encabezado_general" colspan="4"
|
||||
data-materialCode="<?=$bagMaterial['MaterialCode']?>"
|
||||
oninput="customerChange(this)" contenteditable="true">
|
||||
<?= $bagMaterial['customers']?>
|
||||
</th>
|
||||
|
||||
@ -268,11 +267,7 @@
|
||||
//dd($groupedBagStockDetails);
|
||||
foreach($groupedBagStockDetails as $groupedBagStockDetailsIndex => $bagStockDetails){
|
||||
?>
|
||||
|
||||
<tr>
|
||||
|
||||
|
||||
|
||||
<tr>
|
||||
<?php foreach($bagStockDetails as $bagStockIndex => $bagStock){ ?>
|
||||
<?php if ($bagStockIndex == 0): ?>
|
||||
<?php
|
||||
@ -291,7 +286,11 @@
|
||||
class="materialCode" ><?= $bagStock['materialCode']?>
|
||||
</td>
|
||||
|
||||
<td style="display:none"><?= $bagStock['customer']?></td>
|
||||
<td style="display:none" class="celda_normal customer"
|
||||
data-materialCode="<?=$bagStock['materialCode']?>"
|
||||
data-id="<?=$bagStock['date']?> <?=$bagStock['materialCode']?>">
|
||||
<?= $bagStock['customer']?>
|
||||
</td>
|
||||
|
||||
<td class="celda_normal openingStock"
|
||||
data-id="<?=$bagStock['date']?> <?=$bagStock['materialCode']?>"
|
||||
@ -323,88 +322,92 @@
|
||||
</td>
|
||||
|
||||
<?php } ?>
|
||||
</tr>
|
||||
</tr>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
<?php } else{?>
|
||||
<!-- this else condition work if groupedBagStockDetails is empty and creating new records
|
||||
with initial values 0 for entire month -->
|
||||
<?php } else { ?>
|
||||
|
||||
<?php
|
||||
<?php
|
||||
|
||||
$date = DateTime::createFromFormat('M-Y', $month);
|
||||
$date = DateTime::createFromFormat('M-Y', $month);
|
||||
|
||||
$startDate = $date->modify('first day of this month')->format('Y-m-d');
|
||||
$endDate = $date->modify('last day of this month')->format('Y-m-d');
|
||||
$startDate = $date->modify('first day of this month')->format('Y-m-d');
|
||||
$endDate = $date->modify('last day of this month')->format('Y-m-d');
|
||||
|
||||
$datesInMonth = [];
|
||||
$datesInMonth = [];
|
||||
|
||||
|
||||
$period = new DatePeriod(
|
||||
new DateTime($startDate),
|
||||
new DateInterval('P1D'),
|
||||
(new DateTime($endDate))->modify('+1 day')
|
||||
);
|
||||
$period = new DatePeriod(
|
||||
new DateTime($startDate),
|
||||
new DateInterval('P1D'),
|
||||
(new DateTime($endDate))->modify('+1 day')
|
||||
);
|
||||
|
||||
foreach ($period as $day) {
|
||||
$datesInMonth[] = $day->format('Y-m-d');
|
||||
}
|
||||
foreach ($period as $day) {
|
||||
$datesInMonth[] = $day->format('Y-m-d');
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
||||
<?php foreach($datesInMonth as $datesInMonthIndex => $dateInMonth){ ?>
|
||||
<tr>
|
||||
<?php
|
||||
foreach($bagMaterials as $bagMaterialIndex => $bagMaterial){ ?>
|
||||
<!-- this will loop till materials present -->
|
||||
<?php foreach($datesInMonth as $datesInMonthIndex => $dateInMonth){ ?>
|
||||
<tr>
|
||||
<?php
|
||||
foreach($bagMaterials as $bagMaterialIndex => $bagMaterial){ ?>
|
||||
<!-- this will loop till materials present -->
|
||||
|
||||
<?php if ($bagMaterialIndex == 0): ?>
|
||||
<?php
|
||||
$startDate =DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y');
|
||||
?>
|
||||
<td class="celda_normal">
|
||||
<?= $startDate ?>
|
||||
<?php if ($bagMaterialIndex == 0): ?>
|
||||
<?php
|
||||
$startDate =DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y');
|
||||
?>
|
||||
<td class="celda_normal">
|
||||
<?= $startDate ?>
|
||||
</td>
|
||||
<?php endif; ?>
|
||||
|
||||
<td class="celda_normal" style="display:none">
|
||||
<?= $dateInMonth?>
|
||||
</td>
|
||||
<?php endif; ?>
|
||||
|
||||
<td class="celda_normal" style="display:none">
|
||||
<?= $dateInMonth?>
|
||||
</td>
|
||||
|
||||
<td class="celda_normal" style="display:none"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>">
|
||||
<?= $bagMaterial['MaterialCode']?>
|
||||
</td>
|
||||
<td class="celda_normal" style="display:none"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>">
|
||||
<?= $bagMaterial['MaterialCode']?>
|
||||
</td>
|
||||
|
||||
<td class="celda_normal" style="display:none">
|
||||
<?= $bagMaterial['customers']?>
|
||||
</td>
|
||||
<td class="celda_normal customer" style="display:none"
|
||||
data-materialCode="<?=$bagMaterial['MaterialCode']?>"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>">
|
||||
<?= $bagMaterial['customers']?>
|
||||
</td>
|
||||
|
||||
<td class="celda_normal openingStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
<?php if($datesInMonthIndex == 0){ ?>
|
||||
|
||||
oninput="openingStockChange(this)"
|
||||
contenteditable="true"
|
||||
<td class="celda_normal openingStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
<?php if($datesInMonthIndex == 0){ ?>
|
||||
|
||||
oninput="openingStockChange(this)"
|
||||
contenteditable="true"
|
||||
|
||||
<?php }?>
|
||||
>0</td>
|
||||
<?php }?>
|
||||
><?= $data['previousMonthBagStockDetails'][$bagMaterialIndex]['balanceStock']??'0' ?></td>
|
||||
|
||||
<td class="celda_normal receiptStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
oninput="receiptStockChange(this)"
|
||||
contenteditable="true">0</td>
|
||||
<td class="celda_normal receiptStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
oninput="receiptStockChange(this)"
|
||||
contenteditable="true">0</td>
|
||||
|
||||
<td class="celda_normal usedStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
oninput="usedStockChange(this)"
|
||||
contenteditable="true">0</td>
|
||||
<td class="celda_normal usedStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
oninput="usedStockChange(this)"
|
||||
contenteditable="true">0</td>
|
||||
|
||||
<td class="celda_normal balanceStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
>0</td>
|
||||
<td class="celda_normal balanceStock"
|
||||
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
|
||||
>0</td>
|
||||
<?php } ?>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
<?php }?>
|
||||
|
||||
|
||||
@ -490,13 +493,15 @@
|
||||
const table = $('#bagStockDetailsTableId');
|
||||
const rows = [];
|
||||
|
||||
|
||||
//this table to json is customized for bagstock not for all
|
||||
|
||||
table.find('tbody tr').each(function() {
|
||||
const rowCells = $(this).find('td');
|
||||
const date = rowCells.eq(0).text().trim();
|
||||
|
||||
|
||||
|
||||
/** we get eight entries against a material so we loop from 1 to 7 and so on
|
||||
in a single row **/
|
||||
for (let i = 1; i < rowCells.length; i += 7) {
|
||||
const rowData = {
|
||||
date: rowCells.eq(i).text().trim(),
|
||||
@ -620,6 +625,19 @@
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function updateCustomerForMaterial(){
|
||||
return
|
||||
}
|
||||
|
||||
function customerChange(thElement){
|
||||
let materialCode = thElement.getAttribute('data-materialCode');
|
||||
let newCustomerValue = thElement.innerText;
|
||||
let matchingCustomerData = document.querySelectorAll(`td.customer[data-materialCode="${materialCode}"]`);
|
||||
matchingCustomerData.forEach((element,index)=>{
|
||||
element.innerText=newCustomerValue;
|
||||
})
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user