diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 310a4c2b..3df64b43 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -49,7 +49,10 @@ $routes->post('supplierExist','Supplier::checksupplier'); $routes->get('exportsupplier','Supplier::exportsupplier'); // export supplier details $routes->post('deletesupplier','Supplier::deletesupplier'); - +// transporter Routes +$routes->get('transporterListing', 'Supplier::transporterListing'); +$routes->post('fetchTransporterDetails', 'Supplier::fetchTransporterDetails');// for Ajax both add and edit.... +$routes->get('deleteTransporter', 'Supplier::deleteTransporter'); // Material Master Routes $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addRawmaterial', 'Rawmaterialdetails::addRawMaterial'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 7857c282..ad795479 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -49,10 +49,13 @@ class Inwardgateregister extends BaseController function viewIGR() { + // echo $this->roleText; + // echo $this->role;die; $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 +69,11 @@ 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); + }); + // print_r($data['transporter']);die; // $data['PO_NO'] = array_filter($result, function($item) { // return !($item->status === 'ST027' && $item->IsOpenOrder === null); @@ -320,7 +328,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 +364,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); @@ -667,10 +675,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); @@ -679,7 +687,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'); @@ -694,7 +702,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'); diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index f5eeffa3..fedd58f5 100644 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -405,4 +405,64 @@ class Supplier extends BaseController exit; } + // transporter functionality + /** + * 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..1bb45941 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -995,5 +995,14 @@ 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..ea9399b7 100644 --- a/app/Models/Supplier_model.php +++ b/app/Models/Supplier_model.php @@ -168,4 +168,49 @@ 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/header.php b/app/Views/includes/header.php index 45372e2a..4e7240ba 100644 --- a/app/Views/includes/header.php +++ b/app/Views/includes/header.php @@ -782,9 +782,7 @@ -

HR

- - +

HR

  • @@ -843,6 +841,7 @@
    • + @@ -1285,6 +1284,13 @@ + +
  • + + Transporter Details + +
    • +
  • @@ -1410,6 +1416,11 @@ Supplier Details
    • +
  • + + Transporter Details + +
    • 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..d17bbba5 --- /dev/null +++ b/app/Views/transporterListing.php @@ -0,0 +1,289 @@ + +
    +
    +
    +
    +
    +

    Transporter Details

    +
    +
    +
    +
    +
    +
    + + + + + + + + + +
    +
    +
    +
    +
    + Add New Transporter +
    +
    +
    +
    + + + + + + + + + + + + + + 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 f85eb9e8..44738910 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); @@ -721,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 += '' + @@ -753,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 + '' + + ' ' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + ''; + + } } } }); @@ -841,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); @@ -900,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); @@ -1056,7 +1107,6 @@ function constructSentence(record) { formData.append('param1', param1); formData.append('param2', param2); - $('.content').loader('show'); $.ajax({ data: formData, @@ -1159,7 +1209,6 @@ $("#Fileshow").on("shown.bs.modal", function(e) { $("#tblefile").append(trFileHTML); } - }); } });