diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 310a4c2b..9e2a7c9c 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -366,3 +366,8 @@ $routes->get('getInvoiceAttachments', 'Sales::getInvoiceAttachments'); $routes->get('deleteAttachment', 'Sales::deleteAttachment'); $routes->post('saveAttachment', 'Sales::saveAttachment'); $routes->get('sales_invoice', 'Sales::sales_invoice'); + +// transporter Routes +$routes->get('transporterListing', 'Supplier::transporterListing'); +$routes->post('fetchTransporterDetails', 'Supplier::fetchTransporterDetails');// for Ajax both add and edit.... +$routes->get('deleteTransporter', 'Supplier::deleteTransporter'); \ No newline at end of file diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 46a98778..f7094784 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -52,7 +52,8 @@ class Inwardgateregister extends BaseController $this->global['pageTitle'] = 'View Inward Gate Register'; $data['IGR'] = $this->inwardgateregister_model->ViewigrListing(); - $data['DEPCode'] = $this->session->get('DEPCode'); + $data['userRole'] = $this->session->get('role'); + $data['transporter'] = $this->inwardgateregister_model->transporter(); $this->loadViews("viewinwardgateregister", $this->global, $data, NULL); // $this->global['pageTitle'] = 'Inward Gate Register Details'; // $data['IGR'] = $this->inwardgateregister_model->igrListing(); @@ -66,6 +67,10 @@ class Inwardgateregister extends BaseController $this->global['pageTitle'] = 'Add Inward Gate Register'; $result = $this->inwardgateregister_model->getpurchaseorder(); + $result1 = $this->inwardgateregister_model->transporter(); + $data['transporter'] = array_filter($result1 , function($item) { + return ($item->isactive == 1); + }); // $data['PO_NO'] = array_filter($result, function($item) { // return !($item->status === 'ST027' && $item->IsOpenOrder === null); @@ -320,7 +325,7 @@ class Inwardgateregister extends BaseController $Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate'); $MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt); $VehicleNo = $this->request->getPost('VehicleNo'); - $VehicleType = $this->request->getPost('VehicleType'); + $TransporterId = $this->request->getPost('TransporterId'); $DriverName = $this->request->getPost('DriverName'); $DriverMobileNumber = $this->request->getPost('DriverMobileNumber'); $CreatedBy = $this->session->get('userId'); @@ -356,7 +361,7 @@ class Inwardgateregister extends BaseController } } #Step 3 Master Details Gathering to Save In DB - $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'VehicleType'=>$VehicleType,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); + $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'TransporterId'=>$TransporterId,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); $igr['MasterFile'] = $requestMasterFileName; #Step 4 Calling DB to Save IGR Master $IGRNO = $this->inwardgateregister_model->addigrM($igr); @@ -371,11 +376,12 @@ class Inwardgateregister extends BaseController foreach ($files['emp_file'] as $index => $file) { if ($file->isValid() && !$file->hasMoved()) { // Move the file to the desired directory + $finallyfilename = (!empty($fileNames[$index])) ? $fileNames[$index] : $file->getName(); $newName = $file->getRandomName(); $file->move($path, $newName); // Store the file information in the database $additionalFiles = array( - 'Remarks' => $fileNames[$index], + 'Remarks' => $finallyfilename, 'FilePath' => $newName, 'IGRNO' => $IGRNO, 'PONO' => $PONO @@ -383,7 +389,7 @@ class Inwardgateregister extends BaseController $lastInsertFileId = $this->inwardgateregister_model->uploadAdditionalFile($additionalFiles); if ($lastInsertFileId) { $fileupdated_count++; - $fileupdated_name[] = $fileNames[$index]; + $fileupdated_name[] = $finallyfilename; } } } @@ -478,78 +484,90 @@ class Inwardgateregister extends BaseController log_message('error', 'SaveIGR igrDetails result : ' . json_encode($igrDetails)); $igrlineno = ""; - $igrD = $this->inwardgateregister_model->addigrD($igrDetails); - $igrlineno = !empty($igrD) ? $igrD : ''; + if (strlen($QuantityAsPerInvoice) > 0 && $QuantityAsPerInvoice != '0' && ((int)$IsThisOpenOrderPO != 1)){ + $igrD = $this->inwardgateregister_model->addigrD($igrDetails); + $igrlineno = !empty($igrD) ? $igrD : ''; + }else if((int)$IsThisOpenOrderPO == 1){ + $igrD = $this->inwardgateregister_model->addigrD($igrDetails); + $igrlineno = !empty($igrD) ? $igrD : ''; + } + if($igrlineno){ + $itemvalue = ''; + $SupplierId = ''; - $itemvalue = ''; - $SupplierId = ''; - $polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO, $MaterialCode); - foreach ($polineitemvalue as $it) { - $itemvalue = $it->Rate; - $SupplierId = $it->SupplierID; - } - $historydetails = array('MaterialCode' => $MaterialCode, 'Transaction_type' => "Add", 'Ref_Type' => "IGR", 'Ref_No' => $igrlineno, 'Quantity' => $QuantityAsPerInvoice, 'CreatedBy' => $CreatedBy, 'CreatedOn' => $createddt, 'SupplierID' => $SupplierId, 'ItemValue' => $itemvalue); - $this->inwardgateregister_model->addmaterialhistory($historydetails); - if($GrossWeight){ - $igr_history = array('field' => 'GrossWeight','is_add' => 1,'new_data' => $GrossWeight,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - - } - if($TareWeight){ - $igr_history = array('field' => 'TareWeight','is_add' => 1,'new_data' => $TareWeight,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - - } - if($NetWeight){ - $igr_history = array('field' => 'NetWeight','is_add' => 1,'new_data' => $NetWeight,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - - } - if($GrossWeightDate){ - $igr_history = array('field' => 'GrossWeightDate','is_add' => 1,'new_data' => $GrossWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - - } - if($TareWeightDate){ - $igr_history = array('field' => 'TareWeightDate','is_add' => 1,'new_data' => $TareWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - } - if($QuantityAsPerInvoice){ - $igr_history = array('field' => 'QuantityAsPerInvoice','is_add' => 1,'new_data' => $QuantityAsPerInvoice,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - } - if($Remarks){ - $igr_history = array('field' => 'Remarks','is_add' => 1,'new_data' => $Remarks,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); - $history_id = $this->inwardgateregister_model->igr_history($igr_history); - log_message('error', "History updated successfully. History id: " . $history_id); - } - $get_pre_qty = $this->inwardgateregister_model->get_CurrentQty($MaterialCode); - $av_qty = 0; //$av_qty means Avaliable Quantity - if (!empty($get_pre_qty)) { - foreach ($get_pre_qty as $gt) { - $av_qty = $gt->Current_stock; + $polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO, $MaterialCode); + foreach ($polineitemvalue as $it) { + $itemvalue = $it->Rate; + $SupplierId = $it->SupplierID; + } + $historydetails = array('MaterialCode' => $MaterialCode, 'Transaction_type' => "Add", 'Ref_Type' => "IGR", 'Ref_No' => $igrlineno, 'Quantity' => $QuantityAsPerInvoice, 'CreatedBy' => $CreatedBy, 'CreatedOn' => $createddt, 'SupplierID' => $SupplierId, 'ItemValue' => $itemvalue); + $this->inwardgateregister_model->addmaterialhistory($historydetails); + if($GrossWeight){ + $igr_history = array('field' => 'GrossWeight','is_add' => 1,'new_data' => $GrossWeight,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + + } + if($TareWeight){ + $igr_history = array('field' => 'TareWeight','is_add' => 1,'new_data' => $TareWeight,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + + } + if($NetWeight){ + $igr_history = array('field' => 'NetWeight','is_add' => 1,'new_data' => $NetWeight,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + + } + if($GrossWeightDate){ + $igr_history = array('field' => 'GrossWeightDate','is_add' => 1,'new_data' => $GrossWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + + } + if($TareWeightDate){ + $igr_history = array('field' => 'TareWeightDate','is_add' => 1,'new_data' => $TareWeightDate,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + } + if($QuantityAsPerInvoice){ + $igr_history = array('field' => 'QuantityAsPerInvoice','is_add' => 1,'new_data' => $QuantityAsPerInvoice,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + } + if($Remarks){ + $igr_history = array('field' => 'Remarks','is_add' => 1,'new_data' => $Remarks,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO,'IGRItem_No'=>$igrlineno); + $history_id = $this->inwardgateregister_model->igr_history($igr_history); + log_message('error', "History updated successfully. History id: " . $history_id); + } + $get_pre_qty = $this->inwardgateregister_model->get_CurrentQty($MaterialCode); + $av_qty = 0; //$av_qty means Avaliable Quantity + if (!empty($get_pre_qty)) { + foreach ($get_pre_qty as $gt) { + $av_qty = $gt->Current_stock; + } + } + $currentav_qty = (int)$QuantityAsPerInvoice + (int)$av_qty; + $current_qty = array('Current_stock' => $currentav_qty); + $this->inwardgateregister_model->addmaterialmaster($current_qty, $MaterialCode); + $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO, $MaterialCode); + $ReceivedQuantity = 0.00; + if (count($Recqty) > 0) { + foreach ($Recqty as $key) { + $ReceivedQuantity = $key->ReceivedQuantity; + } + } + $totalReceivedqty = (int)$IsThisOpenOrderPO == 1 ? 0 : (int)$ReceivedQuantity + (int)$QuantityAsPerInvoice ; + // $totalReceivedqty = $ReceivedQuantity + $QuantityAsPerInvoice; + if(((int)$totalReceivedqty > 0) && ((int)$IsThisOpenOrderPO != 1)){ + $POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt); + $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONO, $MaterialCode); + }else if((int)$IsThisOpenOrderPO == 1){ + $POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt); + $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONO, $MaterialCode); } } - $currentav_qty = $QuantityAsPerInvoice + $av_qty; - $current_qty = array('Current_stock' => $currentav_qty); - $this->inwardgateregister_model->addmaterialmaster($current_qty, $MaterialCode); - $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO, $MaterialCode); - $ReceivedQuantity = 0.00; - if (count($Recqty) > 0) { - foreach ($Recqty as $key) { - $ReceivedQuantity = $key->ReceivedQuantity; - } - } - $totalReceivedqty = (int)$IsThisOpenOrderPO == 1 ? 0 : $ReceivedQuantity + $QuantityAsPerInvoice ; - // $totalReceivedqty = $ReceivedQuantity + $QuantityAsPerInvoice; - $POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt); - $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONO, $MaterialCode); } $this->inwardgateregister_model->UpdatePOMaster($PONO, $CreatedBy,$IGRStatus); @@ -654,10 +672,10 @@ function viewIGRDetails() function UpdateIGR() { - $IGRNo = $this->request->getPost('igr'); $PONo = $this->request->getPost('po'); + $DeliveryChellanOrInvoiceNo = $this->request->getPost('invno'); $DeliveryChellan = $this->request->getPost('invdate'); $DeliveryChellanDate = !$DeliveryChellan || $DeliveryChellan === null ? NULL : get_date_time_format($DeliveryChellan); @@ -666,7 +684,7 @@ function viewIGRDetails() $VehicleNo = $this->request->getPost('vehicle_no'); - $VehicleType = $this->request->getPost('vehicle_type'); + $TransporterId = $this->request->getPost('Transporter_Id'); $DriverName = $this->request->getPost('driver'); $DriverMobileNumber = $this->request->getPost('driver_mobile'); @@ -681,7 +699,7 @@ function viewIGRDetails() $path = ROOTPATH.'public/uploads/Igrfiles/'; if(!is_dir($path)) { mkdir($path, 0777, true); } - $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'VehicleType'=>$VehicleType,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby); + $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo); $MasterFile = $this->request->getfile('MasterFile'); @@ -710,11 +728,12 @@ function viewIGRDetails() if ($file->isValid() && !$file->hasMoved()) { // Move the file to the desired directory + $finallyfilename = (!empty($fileNames[$index])) ? $fileNames[$index] : $file->getName(); $newName = $file->getRandomName(); $file->move($path, $newName); // Store the file information in the database $additionalFiles = array( - 'Remarks' => $fileNames[$index], + 'Remarks' => $finallyfilename, 'FilePath' => $newName, 'IGRNO' => $IGRNo, 'PONO' => $PONo @@ -722,7 +741,7 @@ function viewIGRDetails() $lastInsertFileId = $this->inwardgateregister_model->uploadAdditionalFile($additionalFiles); if ($lastInsertFileId) { $fileupdated_count++; - $fileupdated_name[] = $fileNames[$index]; + $fileupdated_name[] = $finallyfilename; } } } @@ -1693,4 +1712,4 @@ function updateIGRWeight(){ } } -} +} \ No newline at end of file diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index f5eeffa3..f689d06c 100644 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -405,4 +405,63 @@ class Supplier extends BaseController exit; } + /** + * This function used to Transporter listing + */ + public function transporterListing() + { + $data['userRecords'] = $this->supplier_model->transporterListing(); + $this->global['pageTitle'] = 'Transporter List'; + $this->loadViews("transporterListing", $this->global, $data, NULL); + } + + /** + * This function is used to add/edit Transporter + */ + public function fetchTransporterDetails() { + + $id = $this->request->getPost('transporterid'); + $name = $this->request->getPost('transportername'); + $name = ($name !== null && is_string($name)) ? strtoupper(trim($name)) : null; + $userId = $this->session->get('userId'); + + $data = ['status' => false, 'message' => 'An error occurred while creating transporter details'.gettype($id)]; + + $id = trim($id); + if ((int)$id === 0) { + $addarr = ['name' => $name, + 'created_by' => $userId, + ]; + if ($this->supplier_model->saveTransporter($addarr) > 0) { + $data = ['status' => true, 'message' => 'Successfully created transporter details']; + } + }else{ + $editarr = ['name' => $name,'updated_by' => $userId]; + if ($this->supplier_model->updateTransporter($editarr, (int)$id) > 0) { + $data = ['status' => true, 'message' => 'Successfully updated transporter details']; + } + } + + + return $this->response->setJSON($data); + } + + + /** + * delete the Transporter + */ + function deleteTransporter($id = NULL) + { + + $ID = $id ?? $_GET['id']; + if(!empty($ID)){ + $updatedBy = $this->session->get('userId'); + $message = $this->supplier_model->deleteTransporter($ID, $updatedBy); + }else{ + $message = "Transporter ID Not Avalable"; + } + $this->session->setFlashdata('success', $message); + return redirect()->route('transporterListing'); + + } } \ No newline at end of file diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index a16e5246..79c5ccb1 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -6,26 +6,7 @@ use CodeIgniter\Model; class Inwardgateregister_model extends Model { - /** - * This function is used to get the user listing count - * @param string $searchText : This is optional search text - * @return number $count : This is row count - */ - - - /** - * This function is used to get the user listing count - * @param string $searchText : This is optional search text - * @param number $page : This is pagination offset - * @param number $segment : This is pagination limit - * @return array $result : This is result - */ - - - - /*--------------------------JUN 11Change ----------------------------------*/ - - + function updatefile($bill, $Picture, $oldfile) { @@ -995,5 +976,12 @@ class Inwardgateregister_model extends Model return $results; } - + public function transporter() + { + $builder = $this->db->table('t_transporter t'); + $query = $builder->select('t.*')->get(); + $result = $query->getResult(); + return $result; + } + } \ No newline at end of file diff --git a/app/Models/Supplier_model.php b/app/Models/Supplier_model.php index 45807251..a940a95f 100644 --- a/app/Models/Supplier_model.php +++ b/app/Models/Supplier_model.php @@ -167,5 +167,47 @@ class Supplier_model extends Model } /*SUPPLIER */ - /*SUPPLIER TYPE */ + /** for transporter listing */ + function transporterListing() + { + $builder = $this->db->table('t_transporter as t') + ->select('t.id,t.name,t_employee_details.FirstName as FirstName,t.created_on,t.isactive') + ->join('tbl_users', 'tbl_users.userId = t.created_by') + ->join('t_employee_details', 't_employee_details.EmpID=tbl_users.EmpID'); + $query =$builder->get(); + $result = $query->getResult(); + // echo $this->db->getLastQuery()->getQuery();die; + return $result; + } + + /** for save transporter details */ + public function saveTransporter($addarr) { + $this->db->transStart(); + $builder = $this->db->table('t_transporter'); + $builder->insert($addarr); + $aff_row = $this->db->affectedRows(); + log_message('error', 'save transporter Query: ' . $this->db->getLastQuery()->getQuery()); + $this->db->transComplete(); + return $aff_row; + } + + /** for update transporter details */ + public function updateTransporter($editarr, $id) { + $this->db->table('t_transporter') + ->where('id', $id) + ->update($editarr); + $aff_row = $this->db->affectedRows(); + return $aff_row; + } + + function deleteTransporter($id,$UpdatedBy) + { + + $this->db->table('t_transporter') + ->where('id', $id) + ->update(['isactive' => 0,'updated_by' => $UpdatedBy ]); + $aff_row = $this->db->affectedRows(); + return $aff_row; + + } } \ No newline at end of file diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 1fe98f0a..d6331f0a 100644 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -391,6 +391,7 @@
Supplier Details + Transporter Details Cost Details Asset Details Company Master diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index abcfaf57..8d4b8fa7 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -23,7 +23,7 @@ $(document).ready(function() { $("#PONO").select2(); - $("#VehicleType").select2(); + $("#TransporterId").select2(); $('#DriverName').autocomplete({ onSearchStart: function(query) { @@ -194,10 +194,15 @@
- + 'Vechicle Type',"Rented"=>'Rented',"Owned"=>'Owned'); - echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="VehicleType"' ,'class="form-control select2'); + $option = array(0 => 'Transporter Name'); + if (!empty($transporter)) { + foreach ($transporter as $opt) : + $option[$opt->id] = $opt->name; + endforeach; + } + echo form_dropdown('TransporterId', $option, set_value('TransporterId'), 'id="TransporterId"', 'class="form-control select2"'); ?>
diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php new file mode 100644 index 00000000..78e82159 --- /dev/null +++ b/app/Views/transporterListing.php @@ -0,0 +1,136 @@ + + +
+
+ +
+ + +
+
+
+
+
+
+
+
+

Transporter Details

+
+
+
+ + + + + + + + + + + + + + created_on); + $date = $createdat->format('d-m-Y'); + $time = $createdat->format('h:i A'); + ?> + + + + + + + + + + + + +
Create DateCreate TimeTransporter IDTransporter NameCreated ByActiveAction
id ?>name ?>FirstName ?>isactive == 1 ? 'ACTIVE' : 'INACTIVE'; + echo $a; + ?> + + isactive == 1) { ?> +     + +
+ +
+
+
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index c6d022da..0d805e69 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -127,7 +127,6 @@ var data = suggestion.DriverMobileNumber; } -

@@ -285,10 +284,21 @@ var data = suggestion.DriverMobileNumber; ?>
- - 'Vehicle Type',"Rented"=>'Rented',"Owned"=>'Owned'); - echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="Vehicle_Type"' ,'class="form-control select2'); + + '; + $dropdown .= ''; + + if (!empty($transporter)) { + foreach ($transporter as $opt) { + $selected = set_value('TransporterId') == $opt->id ? 'selected' : ''; + $disabled = $opt->isactive == 0 ? 'disabled' : ''; + $label = $opt->isactive == 0 ? $opt->name . ' (Inactive)' : $opt->name; + $dropdown .= ""; + } + } + $dropdown .= ''; + echo $dropdown; ?>
@@ -587,18 +597,17 @@ var data = suggestion.DriverMobileNumber; var buttonContainer = $(".buttonContainer"); var modal = $(this); // Reference to the modal itself var invoiceDateInput = modal.find('#Invoice_Date'); + var invoiceNoInput = modal.find('#Invoice_No'); var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate'); var VehicleNoInput = modal.find('#Vehicle_No'); - var VehicleTypeInput = modal.find('#Vehicle_Type'); + var TransporterIdInput = modal.find('#Transporter_Id'); var DriverInput = modal.find('#Driver_Name'); var DriverMobileNumberInput = modal.find('#DriverMobileNumber'); var MasterFileInput = modal.find('#MasterFile'); modal.find('#MasterFileLabel').hide(); - var depCode = ""; - - // depCode != "DEP27" - if(depCode == "DEP27"){ + var userRole = ""; + if(userRole != 1){ if (igrstatus == "ST074") { buttonContainer.find("#draftIGR, #generateIGR").css("display", "inline-block"); $(".a_tag_for_mrir").css("display", "block"); @@ -607,6 +616,7 @@ var data = suggestion.DriverMobileNumber; DriverMobileNumberInput.prop('readonly', false); MaterialRcvdDateInput.prop('readonly', false); invoiceDateInput.prop('readonly', false); + invoiceNoInput.prop('readonly', false); } else { buttonContainer.find("#draftIGR, #generateIGR").css("display", "none"); $(".a_tag_for_mrir").css("display", "none"); @@ -615,6 +625,7 @@ var data = suggestion.DriverMobileNumber; DriverMobileNumberInput.prop('readonly', true); MaterialRcvdDateInput.prop('readonly', true); invoiceDateInput.prop('readonly', true); + invoiceNoInput.prop('readonly', true); } }else{ $(".a_tag_for_mrir").css("display", "none"); @@ -647,7 +658,7 @@ console.log(parsedData); $('#printLink').attr('href', '#'); $('.help-block').text(''); $("#Vehicle_No").val(''); - $("#Vehicle_Type").val(''); + $("#Transporter_Id").val(''); $("#Driver_Name").val(''); $("#DriverMobileNumber").val(''); $("#IGRStatus").val(''); @@ -686,7 +697,7 @@ console.log(parsedData); $('#draftIGR').text(button_text_for_IGRDraft); $("#hiddenIsOpenOrder").val(isOpenOrder); $("#Vehicle_No").val(item.VehicleNo); - $("#Vehicle_Type").val(item.VehicleType); + $("#Transporter_Id").val(item.TransporterId); $("#Driver_Name").val(item.DriverName); $("#DriverMobileNumber").val(item.DriverMobileNumber); $("#IGRStatus").val(item.IGRStatus); @@ -700,6 +711,7 @@ console.log(parsedData); if (item.MasterFile !== null && item.MasterFile !== undefined && item.MasterFile.trim() !== "") { modal.find('#MasterFileLabel a').attr('href', '' + 'public/uploads/Igrfiles/' + item.MasterFile); modal.find('#MasterFileLabel a').attr('title', 'previously uploaded IGR Master File'); + modal.find('#MasterFileLabel a').attr('target', '_blank'); modal.find('#MasterFileLabel a span').text('previously uploaded - '); modal.find('#MasterFileLabel a small').text(item.MasterFile); modal.find('#MasterFileLabel').show(); @@ -720,7 +732,8 @@ console.log(parsedData); $("#ser").val(item.ServiceDescription); i = i + 1; - if (igrstatus === "ST074") { + // userrole is system admin also know as admin (if) + if (userRole == 1) { $("#pendingQuantityHeader").css("display", "table-cell"); trIGRHTML += '' + @@ -752,31 +765,68 @@ console.log(parsedData); $('#QuantityAsPerInvoice' + i).attr('readonly', 'true'); } - } else { - $("#pendingQuantityHeader").css("display", "none"); - trIGRHTML += '' + - '' + i + '' + - '' + item.MaterialCode + '' + - '' + item.MaterialName + '' + - '' + item.UOM + '' + - '' + item.Quantity + '' + - '' + item.QuantityAsPerInvoice + '' + - '' + item.Remarks + '' + - ' ' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - ''; + } + // userrole is security based on status we show and here (else if) + else if (userRole !== 1) { + if(igrstatus === "ST074"){ + $("#pendingQuantityHeader").css("display", "table-cell"); + + trIGRHTML += '' + + '' + i + '' + + '' + item.MaterialCode + '' + + '' + item.MaterialName + '' + + '' + item.UOM + '' + + '' + parseInt(item.Quantity) + '' + + '' + + '' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '' + + ' ' + + ' ' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + + if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) { + $('#QuantityAsPerInvoice' + i).attr('readonly', 'true'); + } + + }else{ + $("#pendingQuantityHeader").css("display", "none"); + trIGRHTML += '' + + '' + i + '' + + '' + item.MaterialCode + '' + + '' + item.MaterialName + '' + + '' + item.UOM + '' + + '' + item.Quantity + '' + + '' + item.QuantityAsPerInvoice + '' + + '' + item.Remarks + '' + + ' ' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + + } } } }); @@ -840,9 +890,10 @@ console.log(parsedData); formData.append('igr', igrno); formData.append('po', pono); formData.append('mrc', $("#MaterialRcvdDate").val()); + formData.append('invno', $("#Invoice_No").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); - formData.append('vehicle_type', $('#Vehicle_Type').val()); + formData.append('Transporter_Id', $('#Transporter_Id').val()); formData.append('driver', $('#Driver_Name').val()); formData.append('driver_mobile', $('#DriverMobileNumber').val()); formData.append('status', status); @@ -899,9 +950,10 @@ console.log(parsedData); formData.append('igr', igrno); formData.append('po', pono); formData.append('mrc', $("#MaterialRcvdDate").val()); + formData.append('invno', $("#Invoice_No").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); - formData.append('vehicle_type', $('#Vehicle_Type').val()); + formData.append('Transporter_Id', $('#Transporter_Id').val()); formData.append('driver', $('#Driver_Name').val()); formData.append('driver_mobile', $('#DriverMobileNumber').val()); formData.append('status', status); @@ -1055,7 +1107,6 @@ function constructSentence(record) { formData.append('param1', param1); formData.append('param2', param2); - $('.content').loader('show'); $.ajax({ data: formData, @@ -1158,7 +1209,6 @@ $("#Fileshow").on("shown.bs.modal", function(e) { $("#tblefile").append(trFileHTML); } - }); } }); @@ -1283,6 +1333,7 @@ function deleteBill(Billno,i){ if (fileName !== 'null' && fileName !== undefined && fileName.trim() !== "") { modal.find('#WeightFileLabel a').attr('title', 'previously uploaded IGR Weight File'); modal.find('#WeightFileLabel a').attr('href', ''+'public/uploads/Igrfiles/'+fileName); + modal.find('#WeightFileLabel a').attr('target', '_blank'); modal.find('#WeightFileLabel a span').text('previously uploaded - '); modal.find('#WeightFileLabel a small').text(fileName); modal.find('#WeightFileLabel').show(); @@ -1812,6 +1863,4 @@ function removeContact(button) { $('#day').hide() } } - - \ No newline at end of file