diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php
index 6b529812..a5adbade 100644
--- a/app/Views/stock/bagStockDetails.php
+++ b/app/Views/stock/bagStockDetails.php
@@ -304,7 +304,7 @@
"
- class="form-control mt-2" data-provide="datepicker"
+ class="form-control mt-2"
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
@@ -682,12 +682,15 @@
>
+ foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail)
+ {
+ if($previousMonthBagStockDetail['materialCode'] == $bagMaterial['MaterialCode']){
+ echo $previousMonthBagStockDetail['balanceStock'] ;
+ break;
+ }
+
+ }
+ ?>
@@ -704,8 +707,15 @@
data-id="=$dateInMonth?> =$bagMaterial['MaterialCode']?>"
>
+ foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail)
+ {
+ if($previousMonthBagStockDetail['materialCode'] == $bagMaterial['MaterialCode']){
+ echo $previousMonthBagStockDetail['balanceStock'] ;
+ break;
+ }
+
+ }
+ ?>
diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php
index 5f0fedf1..c9df9250 100644
--- a/app/Views/stock/dieselStockDetails.php
+++ b/app/Views/stock/dieselStockDetails.php
@@ -839,10 +839,18 @@ foreach ($period as $day) {
- >= (!empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex]) )
- ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
- :" " ;
- ?>
+ >
+
+ $previousMonthDieselMachineStockDetail)
+ {
+ if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
+ echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
+ break;
+ }
+
+ }
+ ?>
- = !empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex])
- ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
- :" " ;
- ?>
+ $previousMonthDieselMachineStockDetail)
+ {
+ if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
+ echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
+ break;
+ }
+
+ }
+
+ ?>
|
>>
+
+
+
|
@@ -859,11 +862,17 @@ foreach ($period as $day) {
data-id="= $dateInMonth ?> = $powerMachine['id'] ?>">
- = (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
- ? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
- : " ";
-
+ $previousMonthPowerConsumptionStockDetail)
+ {
+ if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){
+ echo $previousMonthPowerConsumptionStockDetail['closing_units'] ;
+ break;
+ }
+
+ }
?>
+
- = (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
- ? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
- : " ";
-
+ $previousMonthPowerConsumptionStockDetail)
+ {
+ if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){
+ echo $previousMonthPowerConsumptionStockDetail['closing_units'] ;
+ break;
+ }
+
+ }
?>
+
|
>= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?> |
+ >
+
+ $previousMonthResinStockDetail)
+ {
+ if($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']){
+ echo $previousMonthResinStockDetail['balanceStock'] ;
+ break;
+ }
+
+ }
+ ?>
+
+
= ' ' ?> |
= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?> |
+ data-id="= $dateInMonth ?> = $resinMaterial['MaterialCode'] ?>">
+
+ $previousMonthResinStockDetail)
+ {
+ if($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']){
+ echo $previousMonthResinStockDetail['balanceStock'] ;
+ break;
+ }
+
+ }
+ ?>
+
+