From 15d09e5c7b7b266618d66ae61b0f1633bb10c806 Mon Sep 17 00:00:00 2001 From: Smart Date: Fri, 25 Oct 2024 09:09:01 +0530 Subject: [PATCH] Code merge : GWM --- app/Models/Ipinvoice_model.php | 6 +- app/Views/drierMachineDetails.php | 21 + app/Views/editstorerequisition.php | 1700 ++++++++++++++-------------- app/Views/includes/new_header.php | 4 + 4 files changed, 860 insertions(+), 871 deletions(-) diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php index 52b50afe..d7ddacad 100755 --- a/app/Models/Ipinvoice_model.php +++ b/app/Models/Ipinvoice_model.php @@ -237,7 +237,7 @@ class Ipinvoice_model extends Model ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left') ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left') ->where('a.invoice_date_created', date('Y-m-d')) - ->where('a.invoice_status_id', 2); + ->whereIn('a.invoice_status_id', [2,5]); $query = $builder->get(); return $query->getRow(); // Assuming you want a single row of aggregated results @@ -270,7 +270,7 @@ class Ipinvoice_model extends Model ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left') ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left') ->where('a.invoice_date_created >=', $fiscalMonthStart) - ->where('a.invoice_status_id', 2); + ->whereIn('a.invoice_status_id', [2,5]); // Execute the query $query = $builder->get(); @@ -308,7 +308,7 @@ class Ipinvoice_model extends Model ->join('ip_invoice_items b', 'a.invoice_id = b.invoice_id', 'left') ->join('ip_invoice_item_amounts c', 'b.item_id = c.item_id', 'left') ->where('a.invoice_date_created >=', $fiscalYearStart) - ->where('a.invoice_status_id', 2); + ->whereIn('a.invoice_status_id', [2,5]); // Execute the query $query = $builder->get(); diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index 5af417c1..254cc2a0 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -164,6 +164,27 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); .modal { padding-right: 30% ! important; } + + + + + + + +/* #drierTable th:nth-child(1), +#drierTable th:nth-child(2), +#drierTable td:nth-child(1), +#drierTable td:nth-child(2) { + position: sticky; + left: 0; + background-color: white; + z-index: 2; + border-right: 1px solid #ddd; +} +#drierTable th:nth-child(1), +#drierTable td:nth-child(1) { + z-index: 3; +} */
diff --git a/app/Views/editstorerequisition.php b/app/Views/editstorerequisition.php index ea2b20d3..91a4a624 100755 --- a/app/Views/editstorerequisition.php +++ b/app/Views/editstorerequisition.php @@ -26,44 +26,47 @@ foreach ($Status as $key ) { ?> - - -
-
- -
-

-
Edit Store Requisition -
- -

-
-
-
- + +
+
+ +
+

+
Edit Store Requisition -
+ +

+
+
+
+ 'form-label-left requistion ','name' => 'requistion','id' => 'requistion'); echo form_open(base_url().'storerequisitionlist @@ -71,44 +74,44 @@ $(function() { ?> - - -
- - - -
- - --> +
+ + + +
+ + 'RequestedBy','value' => set_value('RequestedBy',$name), 'id'=>'RequestedBy','class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true'); echo form_input($data); ?> -
-
- - +
+ + 'DepartmentName','value' => set_value('DepartmentName',$DEPCode . "-".$DepName), 'id'=>'DepartmentName','class' => 'form-control num' ,'required' => 'true' ,'readonly' => 'true'); echo form_input($data); ?> -
- - - -
- - + + + +
+ + 'Date','value' => set_value('Date',$CurrentDate), 'id' =>"Date", 'class' => 'form-control num' ,'required' => 'true'); echo form_input($data); ?> - - -
-
- - +
+ + + + -
- - -
+
-
-
+
+
-
- -
-
+
+
+
+
- + - Add Line Item + Add Line Item - + - - + +
+   Edit + cancel +
+
+ +
+ - + - -
-
+
-
- - - - - - - - - - - - +
+ + cancel +
+ - + + + + +
SNOItem CodeDescriptionUOMQuantityIssued QuantityRemarksAction
+
+ +
+ + + + + + + + + + + + + + - - - - - - - - - - - - - - + + - UOM ?> + + + + + + + + + + {?> - - - - - - + + - - +     + + + + + + - - - - -
SNOItem CodeDescriptionUOMQuantityIssued QuantityRemarksAction
MaterialCode ?>MaterialName ?>UOM ?>QuantityRequired ?>QuantityIssued ?>Remarks ?>MaterialCode ?>MaterialName ?>QuantityRequired ?>QuantityIssued ?>Remarks ?> -     -     - +     + +
-
+ + + +
-
-
- - - - - - +
+ + + + + + -   Save -   Submit - - -   Save +   Submit + + + - -   Update - -   Update + + -   OK - - - -
- -
-
-
+   OK + - - - <%=IssuedQty%> + - - - - - - - - - - - - - +$('#MaterialCode').change(function() { - + //alert(obj.MaterialName); + $("#UOM").val(obj.UOM); + $("#Description").val(obj.MaterialName) + } + }); +}); - - + + - diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 275abede..95c43630 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -76,6 +76,10 @@