diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 4ebaaf9b..b56284fd 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -484,4 +484,9 @@ $routes->post('updateGasStockDetails', 'StockController::updateGasStockDetails') //trp sand use stock details $routes->match(['GET', 'POST'], 'trpSandUseStockDetails', 'StockController::trpSandUseStockDetails'); -$routes->post('updateTrpSandUseStockDetails', 'StockController::updateTrpSandUseStockDetails'); \ No newline at end of file +$routes->post('updateTrpSandUseStockDetails', 'StockController::updateTrpSandUseStockDetails'); + +//trp production stock details +$routes->match(['GET', 'POST'], 'trpProductionDetails', 'StockController::trpProductionDetails'); +$routes->post('updateTrpProductionDetails', 'StockController::updateTrpProductionDetails'); + diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 7d166542..4e6f72a5 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1265,6 +1265,24 @@ class StockController extends BaseController } + + public function trpProductionDetails(){} + + public function updateTrpProductionDetails(){} + + + + + + + + + + + + + + // --------------------------------------------gwm---------------------------------------------- diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index e9a109fe..a1f66c34 100755 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -454,13 +454,13 @@ class Supplier extends BaseController $addarr = [ 'name' => $name, 'created_by' => $userId, ]; if ($this->supplier_model->saveTransporter($addarr) > 0) { - $data = ['status' => true, 'message' => 'Successfully created transporter details']; + $data = ['status' => true, 'message' => "Successfully created $name transporter details"]; } }else{ $editarr = ['name' => $name,'updated_by' => $userId]; if ($this->supplier_model->updateTransporter($editarr, $id) > 0) { - $data = ['status' => true,'message' => 'Successfully updated transporter details']; + $data = ['status' => true,'message' => "Successfully updated transporter details as $name "]; } } diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php index 95647f77..85fbd1dd 100644 --- a/app/Views/CoatingMachineDetail.php +++ b/app/Views/CoatingMachineDetail.php @@ -199,10 +199,12 @@
- + --> +
+
+ +
+ @@ -841,6 +858,7 @@ + @@ -848,6 +866,80 @@ + + + + @@ -887,6 +979,8 @@ $('#machineOffTimeHrId ').select2(); $('#editMachineOnTimeHrId ').select2(); $('#editMachineOffTimeHrId ').select2(); + $('#fromDateFilter ').select2(); + $('#toDateFilter ').select2(); }); @@ -1184,4 +1278,47 @@ autoclose: true, orientation: 'bottom' }) + + + \ No newline at end of file diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index 99f23c6a..e7c24fd3 100755 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -46,13 +46,15 @@
- * + + * 'configurationname', 'value' => set_value('configurationname'), 'id' => 'configurationname', 'class' => 'form-control', 'required' => 'true', 'maxlength' => '20'); echo form_input($data); ?>
+ * 'Comments', 'value' => set_value('Comments'), 'id' => 'Comments', 'class' => 'form-control', 'required' => 'true', 'maxlength' => '20'); echo form_input($data); @@ -390,11 +392,19 @@ + + + \ No newline at end of file diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php index ffbd6771..d7e12cad 100755 --- a/app/Views/editconfig.php +++ b/app/Views/editconfig.php @@ -495,6 +495,20 @@ if (!empty($master)) { + + + + \ No newline at end of file diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index a8b73d6b..3863ee30 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -867,7 +867,9 @@ Bag Stock Details - Trp Sand Use Stock Details + TRP Sand Use Stock Details + + TRP Production Details