Capital po live issue : GWM

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');

app/Controllers/Employeedetails.php

@@ -203,36 +203,7 @@ class Employeedetails extends BaseController
   function AddNewEmployee()
   {
 
-    $validation = \Config\Services::validation();
     
-
-
-
-
-    
-  //   $this->validator->setRules([
-  // 'ContactNumber'=> 'trim|required|min_length[10]|max_length[10]',
-  // 'emailid'=> 'trim|required|valid_email',
-  // 'gender'=> 'callback_Gender_validate',
-  //  'MartialStatus'=> 'callback_Martial_validate',
-  //  'bloodgroup'=>'callback_Blood_validate',
-  //  'emergencycontactnumber'=> 'trim|required|min_length[10]|max_length[10]',
-  //  'desigination'=> 'callback_Des_validate',
-  //   'departmentname'=> 'callback_Dep_validate',
-  //   'eduqualifaction'=> 'callback_select_validate',
-  //   'referrercontno'=> 'trim|min_length[10]|max_length[10]',
-  //   'aadharno'=> 'trim|min_length[14]|max_length[14]',
-  //   'panno'=> 'trim|min_length[10]|max_length[10]',
-  //   'passportno'=> 'trim|min_length[9]|max_length[9]',
-  //    'accountno'=> 'trim|min_length[10]|max_length[20]',
-  //    'pfno'=> 'trim|min_length[22]|max_length[22]',
-  //    'esino'=> 'trim|min_length[10]|max_length[10]']);
-
-    // if ($this->validator->run() == FALSE) {
-    //   $this->addemployee();
-    //   //echo 'Validate method called';
-    // } else {
-      //echo 'Validate not method called';
       $photo = $this->request->getFile('photo');
       $Picture = "";
       if ($photo->isValid() && !$photo->hasMoved()) {
@@ -371,15 +342,11 @@ class Employeedetails extends BaseController
         $Basic_Pay = $this->request->getPost('Basic_Pay');
         $HRA_Rate = $this->request->getPost('HRA_Rate');
         $HRA_Amount = $this->request->getPost('HRA_Amount');
-
-        $Allowances = $this->request->getPost('Allowances');
         $PF_Rate = $this->request->getPost('PF_Rate');
         $ESI_Rate = $this->request->getPost('ESI_Rate');
-        $Food_Allowances = $this->request->getPost('Food_Allowances');
-        $Incentives = $this->request->getPost('Incentives');
         $CreateBy =   $this->session->get('userId');
 
-        $emppay = array('EmpID' => $EmpID, 'TotalSalary' => $Total_Salary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount, 'Allowances' => $Allowances, 'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Food_Allowances' => $Food_Allowances, 'Incentives' => $Incentives, 'Created_By' => $CreateBy);
+        $emppay = array('EmpID' => $EmpID, 'TotalSalary' => $Total_Salary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount,  'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate,  'Created_By' => $CreateBy);
       
 
        $this->emppaydate_model->addNewemppay($emppay);
@@ -803,34 +770,21 @@ class Employeedetails extends BaseController
     $Basic_Pay = $this->request->getPost('Basic_Pay');
     $HRA_Rate = $this->request->getPost('HRA_Rate');
     $HRA_Amount = $this->request->getPost('HRA_Amount');
-    $Allowances = $this->request->getPost('Allowances');
     $PF_Rate = $this->request->getPost('PF_Rate');
     $ESI_Rate = $this->request->getPost('ESI_Rate');
-    $Food_Allowances = $this->request->getPost('Food_Allowances');
-    $Incentives = $this->request->getPost('Incentives');
     $CreateBy =   $this->session->get('userId');
-    $emppay = array('EmpID' => $EmpId, 'TotalSalary' => $Total_Salary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount, 'Allowances' => $Allowances, 'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Food_Allowances' => $Food_Allowances, 'Incentives' => $Incentives, 'Created_By' => $CreateBy);
+    $emppay = array('EmpID' => $EmpId, 'TotalSalary' => $Total_Salary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount,  'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Created_By' => $CreateBy);
   
 
     $empPayUpdate = $this->emppaydate_model->editemppay($emppay);
 
       if ($result + $empPayUpdate > 0) {
-
-
-        // $this->session->set_flashdata('Success', $EmpId.'Employee Updated successfully!');
         $this->session->setFlashdata('success', 'You Have Successfully updated the Employee Record!');
-        // echo "<script>alert('You Have Successfully updated the Employee Record!');</script>";
-        
       } else {
-
-        // $this->session->set_flashdata('Error', $EmpId . 'Employee details not saved');
         $this->session->setFlashdata('error', 'Record Not Updated!');
-        // echo  "<script>alert('Record Not Updated!');</script>";
-        
       }
       return redirect()->route('employeeListing');
-      // redirect('employeeListing');
-    // }
+
   }
 
   function exportemployee()

app/Controllers/Emppaydate.php

@@ -56,13 +56,9 @@ class Emppaydate extends BaseController
      */
     function emppayListing()
     {
-
-
-        
         $data['userRecords'] = $this->emppaydate_model->emppayListing();
        
-        $this->global['pageTitle'] = 'Employee Pay List';
-
+        $this->global['pageTitle'] = 'Employee Loan List';
         $this->loadViews("emppayListing", $this->global, $data, NULL);
     }
 
@@ -71,12 +67,8 @@ class Emppaydate extends BaseController
      */
     function addemppaydate()
     {
-        $q = "addemppaydate";
-        
-
-        $result['empdetails'] = $this->payroll_model->getEmpID($q);
-
       
+        $result['empdetails'] = $this->payroll_model->getEmpID();
 
         $this->global['pageTitle'] = 'Add Employee Pay';
 
@@ -88,71 +80,29 @@ class Emppaydate extends BaseController
     {
 
 
-        helper('form'); //$this->load->library('form_validation');
-        $EmpID = $this->request->getPost('EmpID');
-        // $this->validator->setRules([
-        //     'ContactNumber'=> 'trim|required|min_length[10]|max_length[10]',
-        //     'EmpID'=> 'trim|required',
-        //     'HRA_Rate'=> 'trim|required',
-        //     'HRA_Amount'=> 'trim|required',
-        //     'Basic_Pay'=> 'trim|required',
-        //     'Total_salary'=> 'trim|required',
-        //     'Allowances'=> 'trim|required',
-        //     'PF_Rate'=> 'trim|required',
-        //     'ESI_Rate'=> 'trim|required',
-        //     'Food_Allowances'=> 'trim|required',
-        //     'Incentives'=> 'trim|required']);
        
       
        
-        // if ($this->validator->run() == FALSE || $EmpID == -1) {
-        //     $this->addemppaydate();
-        // } else {
 
             $EmpID = $this->request->getPost('EmpID');
-            $Total_Salary = $this->request->getPost('Total_salary');
-            $Basic_Pay = $this->request->getPost('Basic_Pay');
-            $HRA_Rate = $this->request->getPost('HRA_Rate');
-            $HRA_Amount = $this->request->getPost('HRA_Amount');
-
-            $Allowances = $this->request->getPost('Allowances');
-            $PF_Rate = $this->request->getPost('PF_Rate');
-            $ESI_Rate = $this->request->getPost('ESI_Rate');
-            $Food_Allowances = $this->request->getPost('Food_Allowances');
-            $Incentives = $this->request->getPost('Incentives');
-
             $Loan_Amount = $this->request->getPost('Loan_Amount');
             $Load_Issued_date = $this->request->getPost('loan_issued_date');
-            if (!empty($Load_Issued_date)) {
-                $Load_Issued_date = $Load_Issued_date = format_date($Load_Issued_date);
-            } else {
-                $Load_Issued_date = null;
-            }
+            if (!empty($Load_Issued_date)) { $Load_Issued_date  = format_date($Load_Issued_date); } else { $Load_Issued_date = null; }
             $Due_Amount = $this->request->getPost('monthly_due');
             $Due_Started = $this->request->getPost('due_started');
-            if (!empty($Due_Started)) {
-                $Due_Started = $Due_Started = format_date($Due_Started);
-            } else {
-                $Due_Started = null;
-            }
-
-
+            if (!empty($Due_Started)) {$Due_Started = format_date($Due_Started);} else { $Due_Started = null; }
             $No_Of_Dues = $this->request->getPost('no_of_due');
             $Paid_due = $this->request->getPost('paid_due');
             $Remaining_Due = $this->request->getPost('remaining_due');
             $Paid_Amount = $this->request->getPost('Paid_Amount');
-
-
-
             $CreateBy =   $this->session->get('userId');
-            $chked =  $this->request->getPost('is_Active');
-            $IsActive = '1';
           
-            $emppay = array('EmpID' => $EmpID, 'TotalSalary' => $Total_Salary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount, 'Allowances' => $Allowances, 'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Food_Allowances' => $Food_Allowances, 'Incentives' => $Incentives, 'Created_By' => $CreateBy);
+
+          
             $loandetails = array('EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Created_By' => $CreateBy);
 
 
-            $result = $this->emppaydate_model->addNewemppay($emppay);
+         
             if ($Loan_Amount != 0) {
                 $result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'add');
                 if ($result2 > 0) {
@@ -161,17 +111,8 @@ class Emppaydate extends BaseController
                     echo "<script>alert('Something Went Wrong..! Loan Information Not Saved. Try later..!');</script>";
                 }
             }
-            if ($result > 0) {
-                echo "<script type='text/javascript'>alert('Employee Pay List  Created successfully!');
-                window.location = '".base_url()."emppayListings';</script>";
-            } else {
-                echo "<script type='text/javascript'>alert('Employee Pay List Not Created!');
-                window.location = '".base_url()."emppayListings';</script>";
          
-            }
 
-            //}
-        // }
     }
 
     /**
@@ -197,72 +138,26 @@ class Emppaydate extends BaseController
     {
 
 
-        helper('form'); //$this->load->library('form_validation');
-
-        $Pay_Data_ID = $this->request->getPost('Pay_Data_ID');
-
-        //'Pay_Data_ID'=>'trim|required';
-        // $this->validator->setRules([
-        // 'EmpID'=> 'trim|required',
-        //  'Total_Salary'=> 'trim|required',
-        //  'Basic_Pay'=> 'trim|required',
-        //  'HRA_Rate'=> 'trim|required',
-        //  'Allowances'=> 'trim|required',
-        //  'PF_Rate'=> 'trim|required',
-        //  'ESI_Rate'=> 'trim|required',
-        //  'Food_Allowances'=> 'trim|required',
-        //  'Incentives'=> 'trim|required']);
-
-        // if ($this->validator->run() == FALSE) {
-
-        //     $this->editOldemppay($Pay_Data_ID);
-        // } else {
-
-            $Pay_Data_ID = $this->request->getPost('Pay_Data_ID');
             $EmpID = $this->request->getPost('EmpID');
-            $TotalSalary = $this->request->getPost('Total_Salary');
-            $Basic_Pay = $this->request->getPost('Basic_Pay');
-            $HRA_Rate = $this->request->getPost('HRA_Rate');
-            $HRA_Amount = $this->request->getPost('HRA_Amount');
-
-            $Allowances = $this->request->getPost('Allowances');
-            $PF_Rate = $this->request->getPost('PF_Rate');
-            $ESI_Rate = $this->request->getPost('ESI_Rate');
             $loan_ID = $this->request->getPost('loanid');
             $Loan_Amount = $this->request->getPost('Loan_Amount');
             $Load_Issued_date = $this->request->getPost('loan_issued_date');
-            if (!empty($Load_Issued_date)) {
-                $Load_Issued_date = format_date($Load_Issued_date);
-            } else {
-                $Load_Issued_date = null;
-            }
-
-
+            if (!empty($Load_Issued_date)) {$Load_Issued_date = format_date($Load_Issued_date);} else { $Load_Issued_date = null; }
             $Due_Amount = $this->request->getPost('monthly_due');
             $Due_Started = $this->request->getPost('due_started');
-            if (!empty($Due_Started)) {
-                $Due_Started = format_date($Due_Started);
-            } else {
-                $Due_Started = null;
-            }
-
-
-            //echo $Load_Issued_date. "-" . $Due_Started;die(); 
+            if (!empty($Due_Started)) {$Due_Started = format_date($Due_Started); } else { $Due_Started = null; }
             $No_Of_Dues = $this->request->getPost('no_of_due');
             $Paid_due = $this->request->getPost('paid_due');
             $Remaining_Due = $this->request->getPost('remaining_due');
             $Paid_Amount = $this->request->getPost('Paid_Amount');
-            $is_Active = $this->request->getPost('is_Active');
             $Last_Mod_By = $this->session->get('userId');
-            $Last_Mod_Time = date('d-m-Y h:i:sa');
-            $Food_Allowances = $this->request->getPost('Food_Allowances');
-            $Incentives = $this->request->getPost('Incentives');
          
 
 
 
 
-            $emppay = array('Pay_Data_ID' => $Pay_Data_ID, 'EmpID' => $EmpID, 'TotalSalary' => $TotalSalary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount, 'Allowances' => $Allowances, 'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Food_Allowances' => $Food_Allowances, 'Incentives' => $Incentives, 'Last_Mod_By' => $Last_Mod_By);
+
+          
             $loandetails = array('Loan_ID' => $loan_ID, 'EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Last_Mod_By' => $Last_Mod_By);
 
 
@@ -284,18 +179,8 @@ class Emppaydate extends BaseController
             }
 
 
-            $result = $this->emppaydate_model->editemppay($emppay);
-            if ($result == true) {
-                echo "<script type='text/javascript'>alert('Employee Status Updated Sucessfully..!');              
-                 window.location = '".base_url()."emppayListings';</script>";
-            } else {
-                echo "<script type='text/javascript'>alert('Update Failed..!';
-                window.location = '".base_url()."emppayListings';</script>";
          
-            }
 
-            // redirect('emppaydate/emppayListing');
-        // }
     }
 
 

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');
 

app/Controllers/Payslip.php

@@ -521,15 +521,13 @@ class Payslip extends BaseController
 			$HRA_Amount = $value->HRA_Amount;
 			$Basic_Pay = $value->Basic_Pay;
 			$TotalSalary = $value->TotalSalary;
-			$Food_Allowances = $value->Food_Allowances;
 			$Days_worked = $value->Days_worked; // working day
-			$LOP_Days = $value->LOP_Days; // not working day
+			$Sunday = $value->sunday_count;  // Sunday count
+			$LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day
 			$Paid_leave = $value->Paid_leave; // leave day
 			$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
 			$Monthly_Due  = $value->Monthly_Due; // AUTO LOAN DUE
-			$Sunday = $value->sunday_count;  // Sunday count
 			$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
-			$MasterIncentives = $value->MasterIncentives; //Master values get
 			$due_start_date = $value->DueDate;
 			$paydate = $current; //From POST parm
 
@@ -561,21 +559,14 @@ class Payslip extends BaseController
 			}
 
 
-			$Allowances = $value->Allowances;
-			$HRA_Rate = $value->HRA_Rate;
+			
 			$PF_Rate = $value->PF_Rate;
 			$ESI_Rate = $value->ESI_Rate;
 
-			$MonthIncentive = $value->MonthlyIncentives; //t_monthly_pay_inputs,for change month 
-			$Incentive = 0;
-			if (empty($MonthIncentive)) {
-				$Incentive =  $MasterIncentives;
-			} else {
-				$Incentive = $MonthIncentive;
-			}
 			
 			
-            $dayFood_Allowance = $Food_Allowances * ($Days_worked + $Sunday);
+
+           
 
 			$totalDaysWorked = ($Days_worked + $Sunday) + $Paid_leave;
 
@@ -592,31 +583,36 @@ class Payslip extends BaseController
 			
 			
 			//current day basic and hra salary
+			if ($value->is_management_team == 1) 
+			{ 
+				$currentDayBasic = $dayBasic * $NoofDays;
+			    $currentDayHra = $dayHra * $NoofDays;
+			} else { 
 				$currentDayBasic = $dayBasic * $totalDaysWorked;
 				$currentDayHra = $dayHra * $totalDaysWorked;
+			}
 
 			
-			//$totalSalary = $currentDayBasic + $currentDayHra + $totSalayOT;
 
 			
-			if ($TotalSalary <= 20000) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0;}
-			$pfAmount = $currentDayBasic * $PF_Rate / 100;
+			if ($value->esi_applicable == 1) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0; }
+			if ($value->pf_applicable == 1) { $pfAmount = $currentDayBasic * $PF_Rate / 100; } else { $pfAmount = 0; }
+			
 			/** pf amount per day**/
 
 			//echo $totalothour;die;
-			$empSalaryAdd = $currentDayBasic + $currentDayHra + $totSalayOT + $dayFood_Allowance + $Allowances + $Incentive;
-			// echo $totalDaysWorked .'</br>';
-			// echo $currentDayBasic .'</br>';
-			// echo $currentDayHra .'</br>';
-			// echo $totSalayOT .'</br>';
-			// echo $dayFood_Allowance .'</br>';
-			// echo $Allowances .'</br>';
-			// echo $Incentive .'</br>';
-			// die;
+			$empSalaryAdd = $currentDayBasic + $currentDayHra + $totSalayOT;
+			
 			$empSalarySub = $esiAmount + $pfAmount + $loan;
 			
 			$salaryInCurrentday =  $empSalaryAdd -  $empSalarySub;
-
+			// echo $esiAmount .'</br>';
+			// echo $pfAmount .'</br>';
+			// echo $loan .'</br>';
+			// echo $empSalarySub .'</br>';
+			// echo $empSalaryAdd .'</br>';
+			// echo $salaryInCurrentday .'</br>';
+			// die;
 
 			$employeeSalary[] = round($salaryInCurrentday);
 			$esi[] = number_format($esiAmount,2);
@@ -628,8 +624,7 @@ class Payslip extends BaseController
 		$data['pf'] = $pf;
 		$data['over_time'] = $ot;
       
-
-		//echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die;
+//  dd($data);
 		$this->global['pageTitle'] = 'Payroll Monthly Inputs';
 		$this->loadViews("monthlypayinputs", $this->global, $data, NULL);
 	}
@@ -643,7 +638,7 @@ class Payslip extends BaseController
 		$data['month'] = $this->monthlypay_model->monthlyListing($current);
 		$data['dropdownvalue'] = $current;
 		$data['fresh'] = $this->monthlypay_model->getEmpPayDetailsforMonthInputs($current);
-	
+		//dd($data['fresh']);
 		
 		
 		$employeeSalary = [];
@@ -657,15 +652,13 @@ class Payslip extends BaseController
 			$HRA_Amount = $value->HRA_Amount;
 			$Basic_Pay = $value->Basic_Pay;
 			$TotalSalary = $value->TotalSalary;
-			$Food_Allowances = $value->Food_Allowances;
 			$Days_worked = $value->Days_worked; // working day
-			$LOP_Days = $value->LOP_Days; // not working day
+			$Sunday = $value->sunday_count;  // Sunday count
+			$LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day
 			$Paid_leave = $value->Paid_leave; // leave day
 			$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
 			$Monthly_Due  = $value->Monthly_Due; // AUTO LOAN DUE
-			$Sunday = $value->sunday_count;  // Sunday count
 			$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
-			$MasterIncentives = $value->MasterIncentives; //Master values get
 			$due_start_date = $value->DueDate;
 			$paydate = $current; //From POST parm
 
@@ -701,21 +694,13 @@ class Payslip extends BaseController
 			}
 
 
-			$Allowances = $value->Allowances;
-			$HRA_Rate = $value->HRA_Rate;
 			$PF_Rate = $value->PF_Rate;
 			$ESI_Rate = $value->ESI_Rate;
 
-			$MonthIncentive = $value->MonthlyIncentives; //t_monthly_pay_inputs,for change month 
-			$Incentive = 0;
-			if (empty($MonthIncentive)) {
-				$Incentive =  $MasterIncentives;
-			} else {
-				$Incentive = $MonthIncentive;
-			}
 		
 			
-            $dayFood_Allowance = $Food_Allowances * ($Days_worked + $Sunday);
+
+      
 
 			$totalDaysWorked = ($Days_worked + $Sunday) + $Paid_leave;
 
@@ -732,31 +717,37 @@ class Payslip extends BaseController
 			
 			
 			//current day basic and hra salary
+			if ($value->is_management_team == 1) 
+			{ 
+				$currentDayBasic = $dayBasic * $NoofDays;
+			    $currentDayHra = $dayHra * $NoofDays;
+			} else { 
 				$currentDayBasic = $dayBasic * $totalDaysWorked;
 				$currentDayHra = $dayHra * $totalDaysWorked;
+			}
+
 
 			
 			//$totalSalary = $currentDayBasic + $currentDayHra + $totSalayOT;
 
 			
-			if ($TotalSalary <= 20000) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0;}
-			$pfAmount = $currentDayBasic * $PF_Rate / 100;
+			if ($value->esi_applicable == 1) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0;}
+			if ($value->pf_applicable == 1) { $pfAmount = $currentDayBasic * $PF_Rate / 100; } else { $pfAmount = 0;}
+			
 			/** pf amount per day**/
 
 			//echo $totalothour;die;
-			$empSalaryAdd = $currentDayBasic + $currentDayHra + $totSalayOT + $dayFood_Allowance + $Allowances + $Incentive;
-			// echo $totalDaysWorked .'</br>';
-			// echo $currentDayBasic .'</br>';
-			// echo $currentDayHra .'</br>';
-			// echo $totSalayOT .'</br>';
-			// echo $dayFood_Allowance .'</br>';
-			// echo $Allowances .'</br>';
-			// echo $Incentive .'</br>';
-			// die;
+			$empSalaryAdd = $currentDayBasic + $currentDayHra + $totSalayOT;
 			$empSalarySub = $esiAmount + $pfAmount + $loan;
-
 			$salaryInCurrentday =  $empSalaryAdd -  $empSalarySub;
 
+			// echo $esiAmount .'</br>';
+			// echo $pfAmount .'</br>';
+			// echo $loan .'</br>';
+			// echo $empSalarySub .'</br>';
+			// echo $empSalaryAdd .'</br>';
+			// echo $salaryInCurrentday .'</br>';
+			// die;
 
 			$employeeSalary[] = round($salaryInCurrentday);
 			$esi[] = number_format($esiAmount,2);
@@ -767,7 +758,7 @@ class Payslip extends BaseController
 		$data['esi'] = $esi;
 		$data['pf'] = $pf;
 		$data['over_time'] = $ot;
-
+	    //  dd($data);
 		//echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die;
 		$this->global['pageTitle'] = 'Payroll Monthly Inputs';
 		$this->loadViews("monthlypayinputs", $this->global, $data, NULL);
@@ -813,9 +804,9 @@ class Payslip extends BaseController
 
 				$ErrorFlag = 0;
 
-				$Emp =  $j['Employee'];
 				
-				$EmpID = substr($Emp, 0, 4);
+
+				$EmpID =  $j['Emp ID'];
 
 				//$Name =  $j['Employee Name'];
 				//echo $EmpID; die;
@@ -824,10 +815,10 @@ class Payslip extends BaseController
 				$LOP_Days = $j['LOP Days'];
 				$Paid_leave =  $j['Paid Leave'];
 				$OT_Hrs_Worked =  $j['OT Hrs'];
-				$Loan_Recovered =  $j['Manual Loan Due ₹'];
-				$Incentives =  $j['Incentives in ₹'];
+				$Loan_Recovered =  $j['Auto Loan Due ₹'];
+				// $Incentives =  $j['Incentives in ₹'];
 				$Festival_Bonus = $j['Festival Bonus in ₹'];
-				$Other_Deductions = $j['Other Deductions in ₹'];
+				$Other_Deductions = $j['TDS Deductions in ₹'];
 				$Estimate = $j['Estimate in ₹'];
 				$Created_By = $this->session->get('userId');
 
@@ -872,11 +863,11 @@ class Payslip extends BaseController
 					}
 				}
 
-				$Incentives_first = explode(".", $Incentives);
-				if (!is_numeric($Incentives) || (strlen((string)$Incentives)) > 8 || (strlen((string)$Incentives_first[0])) > 5) {
-					//echo $EmpID . "-Loan Recoverd Invalid Data!";
-					$ErrorFlag++;
-				}
+				// $Incentives_first = explode(".", $Incentives);
+				// if (!is_numeric($Incentives) || (strlen((string)$Incentives)) > 8 || (strlen((string)$Incentives_first[0])) > 5) {
+				// 	//echo $EmpID . "-Loan Recoverd Invalid Data!";
+				// 	$ErrorFlag++;
+				// }
 
 				$Festivalbonus_first = explode(".", $Festival_Bonus);
 				if (!is_numeric($Festival_Bonus) || (strlen((string)$Festival_Bonus)) > 8 || (strlen((string)$Festivalbonus_first[0])) > 5) {
@@ -910,29 +901,24 @@ class Payslip extends BaseController
 
 			foreach ($json as $index => $j) {
 
-				$Emp =  $j['Employee'];
 				
-				// $EmpID = substr($Emp, 0, 4);
-				$parts = explode("-", $Emp);
-				$EmpID = $parts[0];
-			
-				//$Name =  $j['Employee'];
 				
+				$EmpID = $j['Emp ID'];
 				$DaysWorked = $j['Days Worked'];
-				$LOP_Days = $j['LOP Days'];
-				$Paid_leave =  $j['Paid Leave'];
-				$OT_Hrs_Worked =  $j['OT Hrs'];
-				$Loan_Recovered =  isset($j['Manual Loan Due ₹']) ? $j['Manual Loan Due ₹'] : 0.00;
-				if (is_string($Loan_Recovered)) {
-					$Loan_Recovered = strtoupper($Loan_Recovered);
-				}
-				$Incentives =  isset($j['Incentives in ₹']) ? $j['Incentives in ₹'] : 0.00 ;
+				$LOP_Days =  isset($j['LOP Days']) ? $j['LOP Days'] : 0.00;
+				$Paid_leave =   isset($j['Paid Leave']) ? $j['Paid Leave'] : 0.00;
+				$OT_Hrs_Worked =   isset($j['OT Hrs']) ? $j['OT Hrs'] : 0.00;
+				$Loan_Recovered =  isset($j['Auto Loan Due ₹']) ? $j['Auto Loan Due ₹'] : 0.00;
+				// if (is_string($Loan_Recovered)) {
+				// 	$Loan_Recovered = strtoupper($Loan_Recovered);
+				// }
+				// $Incentives =  isset($j['Incentives in ₹']) ? $j['Incentives in ₹'] : 0.00 ;
 				$Festival_Bonus = isset($j['Festival Bonus in ₹']) ? $j['Festival Bonus in ₹'] : 0.00;
-				$Other_Deductions = isset($j['Other Deductions in ₹']) ? $j['Other Deductions in ₹'] : 0.00;
+				$tds_Deductions = isset($j['TDS Deductions in ₹']) ? $j['TDS Deductions in ₹'] : 0.00;
 				$Estimate = isset($j['Estimate in ₹']) ? $j['Estimate in ₹'] : 0.00;
 				$Created_By = $this->session->get('userId');
 
-				$monthlypaydata = array('Month_Year' => $month, 'EmpID' => $EmpID, 'Days_worked' => $DaysWorked, 'LOP_Days' => $LOP_Days, 'Paid_leave' => $Paid_leave, 'OT_Hrs_Worked' => $OT_Hrs_Worked, 'Loan_Recovered' => $Loan_Recovered, 'Incentives' => $Incentives, 'Festival_Bonus' => $Festival_Bonus, 'Other_Deductions' => $Other_Deductions, 'Estimate' => $Estimate, 'Created_By' => $Created_By);
+				$monthlypaydata = array('Month_Year' => $month, 'EmpID' => $EmpID, 'Days_worked' => $DaysWorked, 'LOP_Days' => $LOP_Days, 'Paid_leave' => $Paid_leave, 'OT_Hrs_Worked' => $OT_Hrs_Worked,  'Festival_Bonus' => $Festival_Bonus, 'Other_Deductions' => $tds_Deductions, 'Estimate' => $Estimate, 'Created_By' => $Created_By ,'Loan_Recovered'=>$Loan_Recovered);
 				// print_r($monthlypaydata);	die;
 				$result = $this->monthlypay_model->saveMonthlyData_model($monthlypaydata);
 				$total = $total + $result;
@@ -982,8 +968,6 @@ class Payslip extends BaseController
 
 		$Data['Payon'] = $this->payroll_model->getPayOn();
 
-
-
 		$this->global['pageTitle'] = 'Payroll Generater';
 
 		$this->loadViews("payslipgenerate", $this->global, $Data, NULL);
@@ -1004,6 +988,7 @@ class Payslip extends BaseController
 		$id = $this->request->getPost('id1');
 
 		$result = $this->payroll_model->getEmployeelist2($id);
+		
 		$HTML = "";
 
 		if (count($result) > 0) {

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');        
+
+    }
 }

app/Models/Emppaydate_model.php

@@ -15,9 +15,10 @@ class Emppaydate_model extends Model
      */
     function emppayListing()
     {
-        $builder = $this->db->table('t_emp_pay_data')
-        ->select('t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName')
-		->join('t_employee_details','t_emp_pay_data.EmpID=t_employee_details.EmpID');
+        $builder = $this->db->table('t_loan_master')
+        ->select('t_loan_master.*,t_emp_pay_data.*,t_employee_details.FirstName')
+        ->join('t_employee_details','t_loan_master.EmpID = t_employee_details.EmpID','LEFT')
+		->join('t_emp_pay_data','t_loan_master.EmpID = t_emp_pay_data.EmpID','LEFT');
         $query =$builder->get();
         $result = $query->getResult();      
         return $result;

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;
+	}
+	
+
 	
 }

app/Models/Monthlypay_model.php

@@ -100,7 +100,7 @@ class Monthlypay_model extends Model
 		//echo $lastdate;
 
 		//left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and month(t_payroll.PayOn) = month(?) and year(t_payroll.PayOn) = year(?)
-		$sql = "select t_emp_pay_data.EmpID, t_emp_pay_data.Incentives as MasterIncentives,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.Designation,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Incentives as MonthlyIncentives,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
+		$sql = "select t_emp_pay_data.EmpID,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.DateofJoining,t_employee_details.Designation,t_employee_details.esi_applicable,t_employee_details.pf_applicable,t_employee_details.is_management_team,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Incentives as MonthlyIncentives,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
                 from t_emp_pay_data
 					left join t_employee_details on t_employee_details.EmpID  = t_emp_pay_data.EmpID
 					left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and t_payroll.PayOn = ?
@@ -206,7 +206,7 @@ class Monthlypay_model extends Model
 
 			$count =  $res[0]['count'];
 		}
-// print_r($data);die;
+
 
 		if ($count == 0) {
 			$builder = $this->db->table('t_monthly_pay_inputs');

app/Models/Payroll_model.php

@@ -373,14 +373,12 @@ class Payroll_model extends Model
 		$this->db->table('t_payroll')->delete(['PayOn' => $PayOn]);
 	}
 
-	function getEmpID($q = '')
+	function getEmpID()
 	{
 
 		$builder = $this->db->table('t_employee_details')
 			->select('EmpID,FirstName,LastName');
-		if ($q == "addemppaydate") {
-			$builder->where('EmpID NOT IN (SELECT EmpID from t_emp_pay_data)', NULL, FALSE);
-		}
+		
 		$query = $builder->get();
 		return $query->getResult();
 	}

app/Models/Purchaseorder_model.php

@@ -1654,18 +1654,16 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
 	{
 
 		$subQuery = 'SELECT distinct LineItem.LineItemNo,LineItem.Per,LineItem.ServiceMaterialDescription,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName,LineItem.ServiceMaterialDescription,LineItem.ServiceFrequency,
-Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,Tax.*,
+					Mat.UOM,Quantity,ReceivedQuantity,Rate,Req.Status,Tax.*,
 					ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,POMast.ExchangeRateCalculatedon,POMast.TotalOrderValue as BasicValue,POMast.CapitalRange,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,AfterCustomEdCess,ROUND((POMast.ExchangeRate*BasicPriceInMTon*Quantity),2) as BasicINRValue,Tax.TotalValue as ImportTotalValue,Tax.FreightType,Tax.NoOfTrip,Tax.FreightValue,Tax.AfterFreightValue,POMast.CurrencyType,
 					
 					Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem 
 					join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
-join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
-
- join t_import_tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
+					join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
+					left join t_import_tax Tax on Tax.LineItemNo = LineItem.LineItemNo 
 					join t_requestion_master Req on Req.ReqNo = LineItem.ReqNo 
-left join t_employee_details emp on Req.Requestedby = emp.EmpID
-
- join t_departmentdetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
+					left join t_employee_details emp on Req.Requestedby = emp.EmpID
+					left join t_departmentdetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
 		//print_r($subQuery);
 
 		$query = $this->db->query($subQuery, array($PONO));
@@ -1720,7 +1718,7 @@ left join t_employee_details emp on Req.Requestedby = emp.EmpID
          Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem 
          join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
          join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode 
-         join t_service_tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
+         left join t_service_tax ServiceTax on ServiceTax.LineItemNo = LineItem.LineItemNo
          join t_requestion_master Req on Req.ReqNo = LineItem.ReqNo 
          join t_employee_details emp on Req.Requestedby = emp.EmpID
 

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;
+
+    }
+     
 }

app/Views/addEmployee.php

@@ -394,7 +394,7 @@ function onlyAlphabets(evt) {
 
 
 function validatePF() {
-    var regpf = /^([a-zA-Z]){5}([0-9]){17}$/;
+    var regpf = /^\d{12}$/;
 
 
     var PF = $('#pfno').val();
@@ -906,44 +906,7 @@ legend {
 
 
 
-                                            <div class="col-md-12">
-                                                <div class="col-md-3">
-                                                    <div class="form-group">
-                                                        <span for="Allowances">Allowances</span>
-                                                        <input type="text" name="Allowances"
-                                                            value="<?php echo set_value('Allowances'); ?>"
-                                                            class="form-control num" style="text-transform:uppercase;"
-                                                            pattern="([0-9]{1,5}([.][0-9]{1,2})?)"
-                                                            title="Enter the Valid Allowances, Minimum 1 digit, Maximum 5 digits" />
-                                                    </div>
-                                                </div>
 
-                                                <div class="col-md-3">
-                                                    <div class="form-group">
-                                                        <span for="Food_Allowances">Food Allowances(Per Day)</span>
-                                                        <input type="text" name="Food_Allowances"
-                                                            value="<?php echo set_value('Food_Allowances'); ?>"
-                                                            class="form-control num"
-                                                            pattern="([0-9]{1,3}([.][0-9]{1,2})?)"
-                                                            onfocusout="validateFood();"
-                                                            title="Enter the Valid Food Allowances, Minimum 1 Digit, Maximum 3 Digits" />
-
-                                                    </div>
-                                                </div>
-
-                                                <div class="col-md-3">
-                                                    <div class="form-group">
-                                                        <span for="Incentives">Incentives</span>
-                                                        <input type="text" name="Incentives"
-                                                            value="<?php echo set_value('Incentives'); ?>"
-                                                            class="form-control num" style="text-transform:uppercase;"
-                                                            pattern="([0-9]{1,5}([.][0-9]{1,2})?)"
-                                                            title="Enter the Valid Allowances, Minimum 1 digit, Maximum 5 digits" />
-
-                                                    </div>
-                                                </div>
-                                                <div class="col-md-3"></div>
-                                            </div>
 
                                             <div class="col-md-12">
                                                 <div class="col-md-3">
@@ -1005,8 +968,8 @@ legend {
                                                         <input type="text" id="pfno" name="pfno" maxlength="22"
                                                             onchange="validatePF();" class="form-control"
                                                             style="text-transform:uppercase"
-                                                            pattern="([a-zA-Z]){5}([0-9]){17}"
-                                                            title=" 5 Character and 17 Digit number (ex:ABCDE12345678901234567)"
+                                                            pattern="\d{12}"
+                                                            title="12 Digit number"
                                                             onkeypress="return alpha(event);">
                                                     </div>
                                                 </div>

app/Views/addemppaydate.php

@@ -1,25 +1,30 @@
 <script>
-$(document).ready(function(){
+$(document).ready(function() {
 
 
-$("#loan_issued_date").datepicker({
-                minDate : 'now',
+    $("#loan_issued_date").datepicker({
+        minDate: 'now',
         // maxDate : 'now',
-                dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
+        dateFormat: 'dd-mm-yy',
+        changeMonth: true,
+        changeYear: true,
+        yearRange: '-100:+0'
     });
 
-$("#due_started").datepicker({
-                minDate :'now',
+    $("#due_started").datepicker({
+        minDate: 'now',
         //maxDate : 'now',
-                dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1'
+        dateFormat: 'dd-mm-yy',
+        changeMonth: true,
+        changeYear: true,
+        yearRange: '-100:+1'
     });
 });
-
 </script>
 
 <style type="text/css">
-  .num {
-  text-align:right;
+.num {
+    text-align: right;
 }
 </style>
 
@@ -27,12 +32,14 @@ $("#due_started").datepicker({
 <div class="content-wrapper">
     <!-- Content Header (Page header) -->
     <section class="content-header">
-    <center><b><h3 class="box-title">Add Employee Pay</h3></b></center>
+        <center><b>
+                <h3 class="box-title">Add Employee Pay</h3>
+            </b></center>
     </section>
 
     <section class="content">
         <div style="text-align:right;">
-    <a href="<?php echo base_url() ?>emppayListings" class="btn btn-success" value="Back"/>Back</a>
+            <a href="<?php echo base_url() ?>emppayListings" class="btn btn-success" value="Back" />Back</a>
         </div>
         <br>
         <div class="row">
@@ -44,197 +51,15 @@ $("#due_started").datepicker({
 
                     <!-- form start -->
 
-                     <form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform" > 
+                    <form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay"
+                        method="post" name="addform">
 
 
                         <div class="box-body">
-						<div class="col-md-12">
-		                    <legend>Pay Details</legend>
-                           </div>
-                            <div class="row"> 
-
-                             <!--<div class="col-md-4">
-                                    <div class="form-group">
-                                        <label for="Pay_Data_ID">Pay Data ID:</label><font color="Red">*</font>
-                                         
-                                        <div class="form-group">
-                                                <?php
-                                         $data = array('name' => 'Pay_Data_ID','value' => set_value('Pay_Data_ID'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>-->
                            
 
 
 
-                                <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="EmpID">Employee ID</span><font color="Red">*</font>
-                                        <div class="form-group">
-                            
-                                          <?php
-                                               $Employee = array("-1"=>'Select Employee');
-
-                                                if(!empty($empdetails)){
-                                            
-                                                  foreach($empdetails as $emp){
-                                                     $EmpID=$emp->EmpID;
-                                                     $Employee+= array($EmpID => $emp->EmpID . "-" . $emp->FirstName . "-" . $emp->LastName);
-                                                     // $Employee = array_merge($Employee,$Employee1);
-                                                    }
-                                                }
-											//$data=array('name'=>'EmpID','value'=>$Employee,'id'=>'EmpID','class' => 'form-control');
-											$js = array('id'=> 'emp');
-											  echo form_dropdown('EmpID', $Employee,set_value('EmpID'),'class="form-control"',$js);
-											  //echo form_dropdown($data);
-
-                                            ?>                          
-                                       </div>
-                                    </div>
-                                </div>
-
-                                <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="Basic_Pay">Total Salary</span><font color="Red">*</font>
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                       $data = array('name' => 'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '([0-9]{1,8}([.][0-9]{1,2})?)', 'class' => 'form-control num', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="Basic_Pay">Basic Pay</span><font color="Red">*</font>
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                       $data = array('name' => 'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control num', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number','readonly'=>'readonly');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-                                  <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="HRA_Rate">HRA Rate(%)</span><font color="Red">*</font>
-                                         
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                         $data = array('name' => 'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control num','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();','onchange'=>'calculalteHRA();');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-                               
-
-                              </div><!--row completed div-->
-
-                                  <div class="row">
-								  
-								 
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="HRA_Rate">HRA Amount</span><font color="Red">*</font>
-                                         
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                         $data = array('name' => 'HRA_Amount','id'=>'HRA_Amount','value' => set_value('HRA_Amount'), 'class' => 'form-control num','style'=>'text-transform:uppercase;','readonly'=>'readonly');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-								
-                                
-                                 <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="Allowances">Allowances</span><font color="Red">*</font>
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                         $data = array('name' => 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 5 digit ');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-                                
-                            <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="PF_Rate">PF Rate(%)</span><font color="Red">*</font>
-                                         
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                         $data = array('name' => 'PF_Rate','value' => set_value('PF_Rate'),'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the valid PF Rate,Minimum 1 digit,Maximum 2 digit');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-								
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="ESI_Rate">ESI Rate(%)</span><font color="Red">*</font>
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                          $data = array('name' => 'ESI_Rate','value' => set_value('ESI_Rate'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)','title'=>'Enter the Valid ESI Rate,Minimum 1 digit,Maximum 2 digit');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-
-                                 </div><!--row completed div-->
-                            
-                           <div class="row">
-						   
-						  
-                                
-                                <!--for food allowances-->
-                                 <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="Food_Allowances">Food Allowances(Per Day)</span><font color="Red">*</font>
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                         $data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control num','pattern'=>'([0-9]{1,3}([.][0-9]{1,2})?)','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 3 Digit');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-                         
-                          <div class="col-md-3">
-                                    <div class="form-group">
-                                        <span for="Incentives">Incentives</span><font color="Red">*</font>
-                                        <div class="form-group">
-                                                <?php
-                                         
-                                         $data = array('name' => 'Incentives','value' => set_value('Incentives'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 5 digit ');
-                                        echo form_input($data);
-                                        ?>   
-                                    </div>
-                                    </div>
-                                </div>
-                                </div>
-                          
-                          
-                          
-                          
-                          
-                          
-                          
-                          <!--row completed div-->
 
 
                             <div class="col-md-12">
@@ -243,13 +68,41 @@ $("#due_started").datepicker({
 
                             <div class="row">
 
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <span for="EmpID">Employee ID</span>
+                                        <font color="Red">*</font>
+                                        <div class="form-group">
+
+                                            <?php
+                                               $Employee = array("-1"=>'Select Employee');
+
+                                                if(!empty($empdetails)){
+                                                  foreach($empdetails as $emp){
+                                                     $EmpID=$emp->EmpID;
+                                                     $Employee+= array($EmpID => $emp->EmpID . "-" . $emp->FirstName);
+                                                    
+                                                    }
+                                                }
+										
+											$js = array('id'=> 'emp');
+											echo form_dropdown('EmpID', $Employee,set_value('EmpID'),'class="form-control"',$js);
+											
+                                            ?>
+                                        </div>
+                                    </div>
+                                </div>
+
+
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
 
 
                                             <span for="Pay_Data_ID">Loan Amount</span>
-                                        <input type="text"  class="form-control num"  id="Loan_Amount" name="Loan_Amount" value="0.00" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
+                                            <input type="text" class="form-control num" id="Loan_Amount"
+                                                name="Loan_Amount" value="0.00" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
+                                                title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
                                         </div>
                                     </div>
                                 </div>
@@ -261,7 +114,8 @@ $("#due_started").datepicker({
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="EmpID">Loan Issue(d) Date</span>
-                                        <input type="text" class="form-control num" id="loan_issued_date" name="loan_issued_date" value="" onchange="dateCalulation();">
+                                            <input type="text" class="form-control num" id="loan_issued_date"
+                                                name="loan_issued_date" value="" onchange="dateCalulation();">
                                         </div>
                                     </div>
                                 </div>
@@ -271,7 +125,9 @@ $("#due_started").datepicker({
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Basic_Pay">Monthly Due</span>
-                                        <input type="text" value="0.00" class="form-control num" id="monthly_due" name="monthly_due" value="" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 6 Digit" onchange="duecalculation();">
+                                            <input type="text" value="0.00" class="form-control num" id="monthly_due"
+                                                name="monthly_due" value="" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
+                                                title="Minimum 1 digit,Maximum 6 Digit" onchange="duecalculation();">
                                         </div>
                                     </div>
                                 </div>
@@ -279,7 +135,8 @@ $("#due_started").datepicker({
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Basic_Pay">Due Started</span>
-                                        <input type="text" class="form-control requried num" id="due_started" name="due_started" value="" onchange="dateCalulation();">
+                                            <input type="text" class="form-control requried num" id="due_started"
+                                                name="due_started" value="" onchange="dateCalulation();">
                                         </div>
                                     </div>
                                 </div>
@@ -287,7 +144,9 @@ $("#due_started").datepicker({
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Basic_Pay">No Of Due(s)</span>
-                                        <input type="text" value="0" class="form-control requried num" id="no_of_due" name="no_of_due" value="" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly>
+                                            <input type="text" value="0" class="form-control requried num"
+                                                id="no_of_due" name="no_of_due" value="" pattern="[0-9]{1,2}"
+                                                title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                         </div>
                                     </div>
                                 </div>
@@ -295,7 +154,10 @@ $("#due_started").datepicker({
                                     <div class="form-group">
                                         <div class="form-group">
                                             <span for="Basic_Pay">Paid Amount</span>
-                                        <input type="text" value="0.00" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="0" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" readonly>
+                                            <input type="text" value="0.00" class="form-control requried num"
+                                                id="Paid_Amount" name="Paid_Amount" value="0"
+                                                pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
+                                                title="Minimum 1 digit,Maximum 2 Digit" readonly>
                                         </div>
                                     </div>
                                 </div>
@@ -303,7 +165,8 @@ $("#due_started").datepicker({
                                 <input type="hidden" id="paid_due" name="paid_due" value="0">
                             </div>
                             <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-success" value="Submit"  onmouseover="finalCheck();"/>
+                                <input type="submit" class="btn btn-success" value="Submit"
+                                    onmouseover="finalCheck();" />
                                 <input type="reset" class="btn btn-success" value="Reset" />
                             </div>
 
@@ -341,72 +204,65 @@ $("#due_started").datepicker({
 
                 <div class="row">
                     <div class="col-md-12">
-                        <?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>                    </div>
+                        <?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
+                    </div>
                 </div>
             </div>
         </div> <!-- first row closed-->
     </section>
 
-</div><!--content-wrapper closed-->
+</div>
+<!--content-wrapper closed-->
 <script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
 <script>
-function calculalteHRA()
-{
+function calculalteHRA() {
     //var empid=document.getElementById('emp').value;
     //alert(empid);
     var Totalsalary = document.getElementById('Total_salary').value;
-	var HRA=document.getElementById('HRA_Rate').value;
+    var HRA = document.getElementById('HRA_Rate').value;
     //if(EmpID == -1){alert("Select Employee ID..!");}
-	if(HRA==''){
+    if (HRA == '') {
         alert("Please Enter HRA RATE..");
         document.getElementById('HRA_Rate').focus();
-	}else if(Totalsalary==''){
+    } else if (Totalsalary == '') {
         alert("Please Enter Total Salary..");
         document.getElementById('total_salary').focus();
-	}
-	else{
-	var temp=(Totalsalary*(HRA/100));
-	var basic=Totalsalary-temp;
-	document.getElementById('Basic_Pay').value=basic;
-	document.getElementById('HRA_Amount').value=temp;
+    } else {
+        var temp = (Totalsalary * (HRA / 100));
+        var basic = Totalsalary - temp;
+        document.getElementById('Basic_Pay').value = basic;
+        document.getElementById('HRA_Amount').value = temp;
     }
 }
 
 
 
-function duecalculation()
-{
-	var totaldue=0;
-	var loan=document.getElementById('Loan_Amount').value;
-	var due=document.getElementById('monthly_due').value;
+function duecalculation() {
+    var totaldue = 0;
+    var loan = document.getElementById('Loan_Amount').value;
+    var due = document.getElementById('monthly_due').value;
 
 
 
-	if(loan != 0)
-	{
-		if(due == 0)
-		{
+    if (loan != 0) {
+        if (due == 0) {
             alert("Enter Monthly Due Amount....!");
             $('#monthly_due').focus();
-		}
-		else
-		{
+        } else {
 
-			totaldue=loan/due;
+            totaldue = loan / due;
 
-				if(totaldue < 1)
-					{
+            if (totaldue < 1) {
                 alert("Please Enter Correct Due Amount..!");
                 $('#monthly_due').focus();
-					}
-					else{
-						document.getElementById('no_of_due').value=Math.ceil(totaldue);
-						var noofdues=document.getElementById('no_of_due').value;
+            } else {
+                document.getElementById('no_of_due').value = Math.ceil(totaldue);
+                var noofdues = document.getElementById('no_of_due').value;
                 $('#remaining_due').val(noofdues);
             }
 
         }
-	}//else if(loan == "" || loan == 0)
+    } //else if(loan == "" || loan == 0)
     //alert(totaldue);
 
     dateCalulation();
@@ -414,12 +270,10 @@ function duecalculation()
 
 }
 
-function dateCalulation()
-{
+function dateCalulation() {
     //alert('j');
-	var loanamount=document.getElementById('Loan_Amount').value;
-	if(loanamount == 0.00 || loanamount == "")
-	{
+    var loanamount = document.getElementById('Loan_Amount').value;
+    if (loanamount == 0.00 || loanamount == "") {
         $('#loan_issued_date').val("");
         $('#due_started').val("");
         $('#monthly_due').val("0.00");
@@ -435,22 +289,15 @@ function dateCalulation()
 
 }
 
-function finalCheck()
-{
-	var loanamount=document.getElementById('Loan_Amount').value;
-	if(loanamount != "" && loanamount != 0.00)
-	{
-	var idate=document.getElementById('loan_issued_date').value;
-	var due=document.getElementById('monthly_due').value;
-	var dsdate=document.getElementById('due_started').value;	
-		if(idate == "" || due == "" || due == 0.00 || dsdate == ""){
+function finalCheck() {
+    var loanamount = document.getElementById('Loan_Amount').value;
+    if (loanamount != "" && loanamount != 0.00) {
+        var idate = document.getElementById('loan_issued_date').value;
+        var due = document.getElementById('monthly_due').value;
+        var dsdate = document.getElementById('due_started').value;
+        if (idate == "" || due == "" || due == 0.00 || dsdate == "") {
             alert("Enter All Loan Information Correctly...!");
         }
     }
 }
-
 </script>
-
-
-
-

app/Views/editCapitalPo.php

@@ -2935,7 +2935,7 @@
                                   </div>
                                 </div>
 
-                                <div class="col-md-3" style=padding-left: -2px;">
+                                <div class="col-md-3" style=padding-left:-2px;">
                                   <label>Freight Amt <?php echo "($INR)"; ?></label>
                                   <div class="form-group">
                                     <?php
@@ -3480,7 +3480,7 @@
               <label>Total Discount Amount <?php echo "($INR)" ?> </label>
 
               <?php
-              $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($ExitDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+              $data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', isset($ExitDiscountedAmt) ? number_format($ExitDiscountedAmt, 2, '.', '') : 0 ), 'id' => 'txtTotalDiscount',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
               echo form_input($data);
               ?>
 
@@ -3623,7 +3623,7 @@
               <label>Total Freight Amount <?php echo "($INR)" ?></label>
 
               <?php
-              $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', number_format($TotalFreightAmt, 2, '.', '')), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+              $data = array('name' => 'txtTotalFreight', 'value' => set_value('txtTotalFreight', isset($TotalFreightAmt) ? number_format($TotalFreightAmt, 2, '.', '') : 0 ), 'id' => 'txtTotalFreight',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
               echo form_input($data);
               ?>
 
@@ -3638,7 +3638,7 @@
               <label id="lbl_international">Total Order Value <?php echo "($INR)" ?> </label>
 
               <?php
-              $data = array('name' => 'CapitalToatlOrder', 'value' => set_value('CapitalToatlOrder', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'CapitalToatlOrder',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
+              $data = array('name' => 'CapitalToatlOrder', 'value' => set_value('CapitalToatlOrder', isset($totalCapitalOrder) ? number_format($totalCapitalOrder, 2, '.', '') : 0), 'id' => 'CapitalToatlOrder',  'class' => 'form-control', 'readonly' => 'true', 'style' => 'text-align:right;');
               echo form_input($data);
               ?>
             </div>
@@ -3828,7 +3828,7 @@
       var SelectedMaterialList = {
         Mat: []
       };
-      var index = <?php echo $index; ?> + 1;
+      var index = <?php isset($index) ? $index : 0; ?> + 1;
 
       var myArray = <?php echo json_encode($res_arr_values); ?>;
       $.each(myArray, function(idx, obj) {

app/Views/editEmployee.php

@@ -494,7 +494,7 @@ function validateESI() {
 }
 
 function validatePF() {
-    var regpf = /^([a-zA-Z]){5}([0-9]){17}?$/;
+    var regpf = /^\d{12}$/;
 
     var PF = $('#pfno').val();
 
@@ -1198,47 +1198,6 @@ legend {
 
 
 
-                                                <div class="col-md-12">
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-                                                            <span for="Allowances">Allowances</span>
-                                                            <input type="text" name="Allowances"
-                                                                value="<?php echo $empPay->Allowances; ?>"
-                                                                class="form-control num"
-                                                                style="text-transform:uppercase;"
-                                                                pattern="([0-9]{1,5}([.][0-9]{1,2})?)"
-                                                                title="Enter the Valid Allowances, Minimum 1 digit, Maximum 5 digits" />
-                                                        </div>
-                                                    </div>
-
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-                                                            <span for="Food_Allowances">Food Allowances(Per Day)</span>
-                                                            <input type="text" name="Food_Allowances"
-                                                                value="<?php echo $empPay->Food_Allowances; ?>"
-                                                                class="form-control num"
-                                                                pattern="([0-9]{1,3}([.][0-9]{1,2})?)"
-                                                                onfocusout="validateFood();"
-                                                                title="Enter the Valid Food Allowances, Minimum 1 Digit, Maximum 3 Digits" />
-
-                                                        </div>
-                                                    </div>
-
-                                                    <div class="col-md-3">
-                                                        <div class="form-group">
-                                                            <span for="Incentives">Incentives</span>
-                                                            <input type="text" name="Incentives"
-                                                                value="<?php echo $empPay->Incentives; ?>"
-                                                                class="form-control num"
-                                                                style="text-transform:uppercase;"
-                                                                pattern="([0-9]{1,5}([.][0-9]{1,2})?)"
-                                                                title="Enter the Valid Allowances, Minimum 1 digit, Maximum 5 digits" />
-
-                                                        </div>
-                                                    </div>
-                                                    <div class="col-md-3"></div>
-                                                </div>
-
                                                 <div class="col-md-12">
                                                     <div class="col-md-3">
                                                         <div class="form-group">
@@ -1307,8 +1266,8 @@ legend {
                                                                value="<?php echo $pfno; ?>"
                                                                 onchange="validatePF();" class="form-control"
                                                                 style="text-transform:uppercase"
-                                                                pattern="([a-zA-Z]){5}([0-9]){17}"
-                                                                title=" 5 Character and 17 Digit number (ex:ABCDE12345678901234567)"
+                                                                pattern="\d{12}"
+                                                                title="12 Digit number"
                                                                 onkeypress="return alpha(event);">
                                                         </div>
                                                     </div>

app/Views/editOldemppay.php

@@ -145,7 +145,7 @@ if(!empty($emppay))
     <section class="content-header">
       <h1>
         <!--title-->
-        <center>Edit Salary Payment Details</center>
+        <center>Edit Loan Details</center>
         
       </h1>
     </section>
@@ -165,14 +165,14 @@ if(!empty($emppay))
                     
                     <form role="form" id="edit" action="<?php echo base_url() ?>emppaydate/editemppay" method="post">
                         <div class="box-body">
+
+								 
 							<div class="col-md-12">
-		                    <legend>Pay Details</legend>
+		                    <legend>Loan Details</legend>
                            </div>
+                                   
 						    <div class="row">  
 
-                               
-
-                      
                             <input type="hidden"  readonly id="Pay_Data_ID" name="Pay_Data_ID" value="<?php echo $Pay_Data_ID; ?>">
                                 <div class="col-md-3">
                                     <div class="form-group">
@@ -184,117 +184,6 @@ if(!empty($emppay))
                                 </div>
 
                                 <div class="col-md-3">
-                                <div class="form-group">
-                                    <div class="form-group">
-                                        <span for ="Employee">Employee Name</span>
-                                         <input type="text" class="form-control" id="Empname" name="Empname" value="<?php echo $Empname; ?>" readonly>  
-                                        </div>
-                                    </div>
-                                </div>
-								
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                        <span for="Basic_Pay">Total Salary</span><font color="Red">*</font>
-                                        <input type="text" class="form-control requried num" id="Total_Salary" name="Total_Salary" value="<?php echo number_format($TotalSalary,0,'',''); ?>" pattern="([0-9]{1,8}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="calculateBasic();">
-                                    </div>
-                                    </div>
-                                </div>
-                                 <div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                        <span for="Basic_Pay">Basic Pay</span><font color="Red">*</font>
-                                        <input type="text" class="form-control requried num" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>"  readonly>
-                                    </div>
-                                    </div>
-                                </div>
-                         </div>
-
-
-                             <div class="row">  
-							   <div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                            <span for="HRA_Rate">HRA_Rate(%)</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required num" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" onchange="calculateBasic();">
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                            <span for="HRA_Rate">HRA_Amount</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required num" id="HRA_Amount" name="HRA_Amount" value="<?php echo number_format($HRA_Amount,0,'',''); ?>"  readonly>
-                                        </div>
-                                    </div>
-                                </div>
-                                
-                             
-                             <div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                            <span for="Allowances">Allowances</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required num" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>" pattern="([0-9]{1,5}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 4 Digit">
-                                        </div>
-                                    </div>
-                                </div>
-								<div class="col-md-3">
-                                    <div class="form-group">
-                                         <div class="form-group">
-                                           <span for="PF_Rate">PF_Rate(%)</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required num" id="PF_Rate" name="PF_Rate" value="<?php echo $PF_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
-                                        </div>
-                                    </div>
-                                </div>
-								
-                                
-                            </div> 
-
-
-
-
-                             <div class="row">
-							 
-							 
-								
-							
-								
-                                  <div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                            <span for="ESI_Rate">ESI_Rate(%)</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required num" id="ESI_Rate" name="ESI_Rate" value="<?php echo $ESI_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
-                                        </div>
-                                    </div>
-                                </div>
-                            
-                                <div class="col-md-3">
-                                <div class="form-group">
-                                    <div class="form-group">
-                                        <span for ="Food_Allowances">Food Allowances(Per Day)</span><font color="Red">*</font>
-                                         <input type="text" class="form-control required num" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>" pattern="([0-9]{1,3}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 3 Digit">  
-                                        </div>
-                                    </div>
-                                </div>
-
-
-                                 <div class="col-md-3">
-                                    <div class="form-group">
-                                        <div class="form-group">
-                                            <span for="Incentives">Incentives</span><font color="Red">*</font>
-                                           <input type="text" class="form-control required num" id="Incentives" name="Incentives" value="<?php echo ($Incentives)  ?>" pattern="([0-9]{1,5}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 5 Digit">
-                                        </div>
-                                    </div>
-                                </div>
-								</div>
-								 
-							<div class="col-md-12">
-		                    <legend>Loan Details</legend>
-                           </div>
-                                   
-						    <div class="row">  
-
-                                <div class="col-md-3">
                                     <div class="form-group">
                                         <div class="form-group">
 											

app/Views/emppayListing.php

@@ -4,14 +4,14 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-           <center>Employee Salary Details</center>       
+           <center>Employee Loan Details</center>       
       </h1>
     </section>
     <section class="content">
         <div class="row">
             <div class="col-xs-12 text-right">
                 <div class="form-group">
-                    <a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Add New Employee Pay List</a>
+                    <a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Create New Loan</a>
                 </div>
             </div>
         </div>
@@ -25,49 +25,39 @@
                  <table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;text-align: right;" >
 				         <thead style="background-color: #ddd;">
                     <tr >
-                         <th width="7%">Emp ID</th>
-  					            <th width="8%">Emp Name</th>
-  					           <th width="8%"> Total Sal in ₹</th>
-                        <th width="8%">Basic Pay in ₹</th>
-                        <th width="8%">HRA Rate in %</th>
-  					           <th width="8%">HRA Amt in  ₹</th>
-                        
-                        <th width="9%">Allowances in  ₹</th>
-                        <th width="8%">PF Ratein %</th>
-                        <th width="8%">ESI Rate in %</th>
-                        <th width="8%">Food Allow in  ₹</th>                      
+                        <th width="15%">Employee</th>
+  					            <th width="7%"> Total Sal in ₹</th>
+                        <th width="7%"> Loan Amt in ₹</th>
+                        <th width="7%"> Loan Issued Date</th>
+                        <th width="7%"> Monthly Due Amt in ₹</th>
+                        <th width="7%"> No Of Dues</th>
+                        <th width="7%"> Paid Dues</th>
+                        <th width="7%"> Remaining Dues</th>
+                        <th width="7%"> Paid Amt in ₹</th>
                         <th width="7%">Action</th>                   
                     </tr>
                     </thead>
 
 
                     <?php
-                    if(!empty($userRecords))
-                    {
-						//print_r($userRecords);
-                        foreach($userRecords as $record)
-                        {
-                    ?>
+                    if(!empty($userRecords)) { foreach($userRecords as $record) { ?>
                       <tr>
-                      <td style="text-align: left;"><?php echo $record->EmpID ?></td>
-					            <td style="text-align: left;"><?php echo $record->FirstName ."   ". $record->LastName?></td>
+                        <td style="text-align: left;"><?php echo $record->EmpID ?>-<?php echo $record->FirstName;?></td>
                         <td><?php echo $record->TotalSalary; ?></td>
-                      <td><?php echo $record->Basic_Pay ?></td>
-                      <td><?php echo $record->HRA_Rate ?></td>
-				          	  <td><?php echo $record->HRA_Amount; ?></td>
+                        <td><?php echo $record->Loan_Amount; ?></td>
+                        <td><?php echo $record->Loan_Issued_Date; ?></td>
+                        <td><?php echo $record->Monthly_Due; ?></td>
+                        <td><?php echo $record->No_of_Dues; ?></td>
+                        <td><?php echo $record->Paid_Due; ?></td>
+                        <td><?php echo $record->Remaining_Due; ?></td>
+                        <td><?php echo $record->Paid_Amount; ?></td>
                       
-                      <td><?php echo $record->Allowances ?></td>
-                      <td><?php echo $record->PF_Rate ?></td>
-                      <td><?php echo $record->ESI_Rate ?></td>
-                      <td><?php echo $record->Food_Allowances ?></td>  
                         <td>                       
                         <a href="<?php echo base_url().'emppaydate/editOldemppay/'.$record->Pay_Data_ID; ?>"><i class="btn btn-success">EDIT</i></a>
                         </td>
                       </tr>
-                    <?php
-                        }
-                    }
-                    ?>
+
+                    <?php  }  }?>
                   </table>
                   
                 </div><!-- /.box-body -->

app/Views/includes/header.php

@@ -342,7 +342,7 @@
 			</li><!--Dashboard active treeview -->
 			<li class="treeview">
 					<!-- <a id="salesDashboardLin" href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" target="_blank"> -->
-					<a id="salesDashboardLin" href="<?php echo base_url(); ?>sales_dashboard">
+					<a id="salesDashboardLin" href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333">
 						<i class="fa fa-dashboard"></i><span>Sales Dashboard</span>
 					</a>
 			</li><!--Dashboard active treeview -->
@@ -783,8 +783,6 @@
 
 		<?php if($DEPCode == ADMIN || $DEPCode == HR) { ?>
 			<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> HR</p>	
-		<?php }  ?>
-
 		<li >
 		       <a href="<?php echo base_url(); ?>employeeListing" >
 					<i class="fa fa-user-circle"></i>
@@ -843,6 +841,7 @@
 
 			</ul>
 		</li>
+		<?php }  ?>
 		
 
 
@@ -1285,6 +1284,13 @@
 							</a>
 		 				 </li>
 						 <?php } ?>
+						 <?php if ($DEPCode == ADMIN) { ?>
+						 <li><a href="<?php echo base_url(); ?>transporterListing" >
+							<i class="fa fa-user-secret"></i>
+							<span class="nav-label">Transporter Details</span>
+							</a>
+		 				 </li>
+						 <?php } ?>
 
 						<?php if ($DEPCode == ADMIN && $DEPCode != SECURITY) { ?>
 						<li><a href="<?php echo base_url(); ?>companyview" >
@@ -1410,6 +1416,11 @@
 									<span class="nav-label">Supplier Details</span>
 								</a>
 							   </li>
+							   	<li><a href="<?php echo base_url(); ?>transporterListing" >
+									<i class="fa fa-user-secret"></i>
+									<span class="nav-label">Transporter Details</span>
+									</a>
+								</li>
 							 </ul>
 					         <?php
                     } ?>

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 @@
 							<!-- <span pattern="" required="true"></span> -->
 						</div>
 						<div class="col-md-3">
-							<label>Vechicle Type</label>
+							<label>Transporter Name</label>
 							<?php
-							   $opt = array(""=>'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"');
 						   ?>
 						</div>
 						<div class="col-md-3">

app/Views/transporterListing.php

@@ -0,0 +1,289 @@
+<style>
+  
+  .Date-filter-form {
+      display: flex;
+      align-items: center;
+      gap: 10px; /* Adjust the gap as needed */
+  }
+  .Date-filter-form input, .Date-filter-form button {
+      padding: 5px;
+      font-size: 14px;
+  }
+  .Date-filter-form button {
+      background-color: #007bff;
+      color: white;
+      border: none;
+      cursor: pointer;
+  }
+  .Date-filter-form button:hover {
+      background-color: #0056b3;
+  }
+  .icon-button {
+      background: none;
+      border: none;
+      cursor: pointer;
+      color: #007bff;
+      font-size: 18px;
+  }
+  .icon-button:hover {
+      color: #0056b3;
+  }
+</style> 
+<div class="content-wrapper">
+   <section class="content">
+     <div class="box">
+       <div class="box-header">
+         <CENTER>
+           <h3 class="box-title"> Transporter Details</h3>
+         </CENTER>
+       </div>
+       <div class="container-fluid">
+         <div class="row">
+         <div class="col-xs-12 col-md-6">
+                      <form class="Date-filter-form" id="DateRangeFilter" >
+                                              <input type="hidden"  name="table" value="requisition">
+                                              <label for="fromDate">From:</label>
+                                              <input type="text" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
+
+                                              <label for="toDate">To:</label>
+                                              <input type="text" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
+
+                                              <button type="submit">Search</button>
+                                              <i class="fa fa-repeat" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
+                                              <div class="error" id="error"></div>
+                      </form>
+                    </div>
+                    <div class="col-xs-12 col-md-6 text-right">
+                        <div class="form-group">
+                        <a data-toggle="modal" href="#transporterwizard" data-id="0" data-name="" class="btn btn-success">Add New Transporter</a>
+              </div>
+         </div>
+         <div class="row">
+           <div class="col-xs-12">
+             <table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
+               <thead style="background-color: #ddd;">
+                 <tr>
+                   <th>Create Date</th>
+                   <th>Create Time</th>
+                   <th>Transporter ID</th>
+                   <th>Transporter Name</th>
+                   <th>Created By</th>
+                   <th>Active</th>
+                   <th>Action</th>
+                 </tr>
+               </thead>
+               <tbody>
+                 <?php
+                  if (!empty($userRecords)) {
+                    foreach ($userRecords as $record) {                    
+                      $createdat = new DateTime($record->created_on);
+                      $date = $createdat->format('d-m-Y');
+                      $time = $createdat->format('h:i A');
+                  ?>
+                     <tr>
+                        <td align="right"><?php echo $date; ?></td>  
+                        <td align="right"><?php echo $time; ?></td>
+                       <td><?php echo $record->id ?></td>
+                       <td><?php echo $record->name ?></td>
+                       <td><?php echo $record->FirstName ?></td>
+                       <td><?php
+                            $a = '';
+                            $a = $record->isactive == 1 ?  'ACTIVE' : 'INACTIVE';
+                            echo $a;
+                            ?></td>
+                       <td>
+                           <a data-toggle="modal" href="#transporterwizard" data-id="<?php echo $record->id; ?>" data-name="<?php echo $record->name; ?>" ><i class="fa fa-pencil"></i></a>
+                           <?php if($record->isactive == 1){ ?>
+                           <a href="<?php echo base_url() . 'deleteTransporter?id=' . $record->id; ?>"><i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;</a>
+                           <?php } ?>
+                       </td>
+                     </tr>
+                 <?php
+                    }
+                  }
+                  ?>
+               </tbody>
+             </table>
+
+
+           </div>
+         </div>
+       </div>
+       <!-- for Add and edit Modal -->
+      <div class="modal fade" id="transporterwizard" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+          <div class="modal-dialog">
+              <div class="modal-content">
+                  <!-- Modal Header -->
+                  <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal">
+                          <span aria-hidden="true">&times;</span>
+                          <span class="sr-only">Close</span>
+                      </button>
+                     <center><h4 class="modal-title" id="myModalLabel"></h4></center>
+                  </div>
+
+                  <!-- Modal Body -->
+                  <div class="modal-body">
+                      <form id="transporterForm" class="form-horizontal" role="form">
+                          <div class="form-group">
+                              <div class="row">
+                                  <div class="col-md-3 col-md-offset-2">
+                                    Transporter Name:
+                                  </div>
+                                  <div class="col-md-5">
+                                      <input type="text" name="transportername" id="transportername" class="form-control">
+                                      <input type="hidden" name="transporterid" id="transporterid" class="form-control">
+                                  </div>
+                              </div>
+                          </div>
+                      </form>
+                  </div>
+
+                  <!-- Modal Footer -->
+                  <div class="modal-footer">
+                      <a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
+                      <a class="btn btn-success font tempClick" id="tempClick">
+                          <span class="bold">Submit</span>
+                      </a>
+                  </div>
+              </div>
+          </div>
+      </div>
+
+											
+
+											
+
+   </section>
+ </div>
+ <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
+ <script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+ 
+ <script>
+    $(document).ready(function() {
+        $("#transporterwizard").on("shown.bs.modal", function(e) {
+            var id = $(e.relatedTarget).data('id');
+            var name = $(e.relatedTarget).data('name');
+            $('#transportername').val('');
+            $('#transporterid').val(id);
+            if (id == 0) {
+                $('.modal-title').html("Add Transporter");
+            } else {
+                $('.modal-title').html("Edit Transporter");
+                $('#transportername').val(name);
+            }
+        });
+
+        $('#tempClick').click(function() {
+            if ($('#transportername').val() === '') {
+                alert('Please Enter the Transporter Name');
+                return;
+            }
+
+            var formData = {
+                transporterid: $('#transporterid').val(),
+                transportername: $('#transportername').val()
+            };
+
+            $.ajax({
+                type: 'POST',
+                url: "<?php echo base_url();?>fetchTransporterDetails",
+                data: formData,
+                dataType: 'json',
+                success: function(response) {
+                    if (response.status) {
+                        alert(response.message);
+                        $('#transporterwizard').modal('hide');
+                        location.reload();
+                    } else {
+                        alert(response.message);
+                    }
+                },
+                error: function(xhr, status, error) {
+                    alert('An error occurred: ' + error);
+                }
+            });
+        });
+    });
+</script>
+<script>
+$(document).ready(function() {
+  $.fn.dataTable.ext.type.order['date-eu-pre'] = function (date) {
+    var dateSplit = date.split('-');
+    return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
+};
+    // Initialize the DataTable
+    var table = $('#datatable').DataTable({
+        "paging": true,
+        "lengthChange": true,
+        "searching": true,
+        "ordering": true,
+        "columnDefs": [{
+            "targets": 0,
+            "type": "date-eu"
+        }],
+        "aaSorting": [
+            [0, "desc"]
+        ],
+        "info": true,
+        "autoWidth": true,
+        "pageLength": 10,
+        "lengthMenu": [10, 25, 50, 100],
+       
+    });
+
+    // Initialize the datepickers
+    $("#fromDate").datepicker({
+        dateFormat: 'dd-mm-yy',
+        onSelect: function(selectedDate) {
+            var minDate = $(this).datepicker("getDate");
+            $("#toDate").datepicker("option", "minDate", minDate);
+        }
+    });
+
+    $("#toDate").datepicker({
+        dateFormat: 'dd-mm-yy',
+        onSelect: function(selectedDate) {
+            var maxDate = $(this).datepicker("getDate");
+            $("#fromDate").datepicker("option", "maxDate", maxDate);
+        }
+    });
+
+    // Reset button functionality
+    $("#resetButton").click(function() {
+        $("#fromDate").datepicker("setDate", null);
+        $("#toDate").datepicker("setDate", null);
+        $("#toDate").datepicker("option", "minDate", null); 
+        $("#fromDate").datepicker("option", "maxDate", null);
+        table.draw();
+    });
+
+    // Date range filter
+    $.fn.dataTable.ext.search.push(
+       
+        function(settings, data, dataIndex) {
+            var fromDate = $("#fromDate").datepicker("getDate");
+            var toDate = $("#toDate").datepicker("getDate");
+           
+            var dateStr = data[0]; // Assuming the date is in the first column
+           
+            // Convert dateStr to Date object
+            var dateParts = dateStr.split("-");
+            var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
+
+            if (!fromDate || !toDate) {
+                return true; // No filter if dates are not selected
+            }
+
+            return date >= fromDate && date <= toDate;
+        }
+    );
+
+    // Handle form submission
+    $("#DateRangeFilter").submit(function(e) {
+        e.preventDefault();
+        table.draw();
+    });
+});
+</script>
+ <!-- <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script> -->

app/Views/viewinwardgateregister.php

@@ -127,7 +127,6 @@ var data = suggestion.DriverMobileNumber;
     }
 </style>
 <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/Autocomplete/jquery.autocomplete.js"></script>
-
   <div class="content-wrapper">
     <section class="content"><br/>  
 			<div class="box"> 
@@ -285,10 +284,21 @@ var data = suggestion.DriverMobileNumber;
 												?> 
 									</div>
 									<div class="col-md-3">
-										<label>Vehicle Type</label>
+									<label>Transporter Name</label>
 									<?php
-										$opt = array(""=>'Vehicle Type',"Rented"=>'Rented',"Owned"=>'Owned');
-										echo form_dropdown('VehicleType', $opt,set_value('VehicleType'),'id="Vehicle_Type"' ,'class="form-control select2');
+																$dropdown = '<select name="TransporterId" id="Transporter_Id" class="form-control select2">';
+																$dropdown .= '<option value=0>Transporter Name</option>';
+
+																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 .= "<option value='{$opt->id}' $selected $disabled>{$label}</option>";
+																	}
+																}
+																$dropdown .= '</select>';
+																echo $dropdown;
 									?>
 									</div>
 									<div class="col-md-3">
@@ -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 = "<?php echo $DEPCode; ?>";
-
-		// depCode != "DEP27"
-        if(depCode == "DEP27"){
+		var userRole = "<?php echo (int)$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 += '<tr>' +
@@ -753,7 +765,42 @@ console.log(parsedData);
 								$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
 							}
 
-						} else {
+						} 
+						 // 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 += '<tr>' +
+										'<td style="width: 50px;" align="right">' + i + '</td>' +
+										'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
+										'<td style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
+										'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
+										'<td style="width: 100px;" align="right" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
+										'<td style="width: 100px;" align="right" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ','+isOpenOrder+')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '"  value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
+										'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
+										'<td style="width: 150px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
+										'<td style="width: 50px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="'+i+'" data-material="'+item.MaterialName+'" data-igrstatus = "'+igrstatus+'"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
+										'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
+										'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
+										'<input type="hidden" id="txtQuantityAsPerInvoice' + i + '" name="txtQuantityAsPerInvoice' + i + '" value="' + item.QuantityAsPerInvoice + '">' +
+										'<input type="hidden" id="txtOrderedQuantity' + i + '" name="txtOrderedQuantity' + i + '" value="' + item.Quantity + '">' +
+										'<input type="hidden" id="txtGrossWeight' + i + '" name="txtGrossWeight' + i + '" value="' + item.GrossWeight + '">' +
+										'<input type="hidden" id="txtGrossWeightDate' + i + '" name="txtGrossWeightDate' + i + '" value="' + item.GrossWeightDate + '">' +
+										'<input type="hidden" id="txtTareWeight' + i + '" name="txtTareWeight' + i + '" value="' + item.TareWeight + '">' +
+										'<input type="hidden" id="txtTareWeightDate' + i + '" name="txtTareWeightDate' + i + '" value="' + item.TareWeightDate + '">' +
+										'<input type="hidden" id="txtNetWeight' + i + '" name="txtNetWeight' + i + '"value="' + item.NetWeight + '">' +
+										'<input type="hidden" id="txtRemarks' + i + '" name="txtRemarks' + i + '"value="' + item.Remarks + '">' +
+										'<input type="hidden" id="txtIGRLineItem' + i + '" name="txtIGRLineItem' + i + '"value="' + item.IGRItemNo + '">' +
+										'<input type="file"   id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '" style="display:none;">' +
+										'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' +
+									'</tr>';
+
+									if ((item.Quantity - item.QuantityAsPerInvoice) == 0.00) {
+										$('#QuantityAsPerInvoice' + i).attr('readonly', 'true');
+									}
+
+                            }else{
 										$("#pendingQuantityHeader").css("display", "none");
 										trIGRHTML += '<tr>' +
 										'<td style="width: 50px;" align="right">' + i + '</td>' +
@@ -778,6 +825,8 @@ console.log(parsedData);
 										'<input type="file"   id="txtWeightFile' + i + '" name="txtWeightFile' + i + '"value="' + item.WeightFile + '">' +
 										'<input type="hidden" id="txtWeightFileName' + i + '" name="txtWeightFileName' + i + '"value="' + item.WeightFile + '">' +
 									'</tr>';
+
+							} 
 						}
 					}
 				});
@@ -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);
 
 			}
-
 		});
 	}
 });