From b5ee1b5eb11f9ccb312f4d01af0823907b3fe0a0 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 28 Mar 2025 03:11:33 +0000 Subject: [PATCH 1/3] issues fixes --- app/Config/Routes.php | 2 + app/Controllers/Employeedetails.php | 11 +- app/Controllers/Monthlypay.php | 16 +++ app/Models/Employeedetails_model.php | 12 ++ app/Models/Monthlypay_model.php | 38 +++-- app/Views/addEmployeenew.php | 6 +- app/Views/editEmployeenew.php | 56 ++++++-- app/Views/employeeLeaveApplicationForm.php | 26 ++-- app/Views/employeeListing.php | 119 +++++++++++++++- app/Views/leaveApplicationPDF.php | 154 +++++++++++++++++++++ app/Views/overTimeDetails.php | 22 +-- 11 files changed, 414 insertions(+), 48 deletions(-) create mode 100644 app/Views/leaveApplicationPDF.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index be11d5aa..c794b782 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -124,6 +124,7 @@ $routes->get('employeedetails/ViewEmployee', 'Employeedetails::ViewEmployee'); $routes->get('employeedetails/downloadEmployeeDetails', 'Employeedetails::downloadEmployeeDetails'); $routes->post('employeedetails/UpdateEmployee', 'Employeedetails::UpdateEmployee'); $routes->get('exportemployee', 'Employeedetails::exportemployee'); +$routes->post('employeeHistory', 'Employeedetails::employeeHistory'); $routes->post('employeeEmailExist', 'Employeedetails::CheckEmail'); @@ -199,6 +200,7 @@ $routes->post('monthlypay/deletePublicHoliday', 'Monthlypay::deletePublicHoliday $routes->get('leaveApplicationForm', 'Monthlypay::leaveApplicationForm'); $routes->post('fetchLeaveApplicationForm', 'Monthlypay::fetchLeaveApplicationForm'); $routes->get('deleteLeaveApplicationForm', 'Monthlypay::deleteLeaveApplicationForm'); +$routes->match(['GET', 'POST'], 'leaveApplicationPDF/(:any)', 'Monthlypay::leaveApplicationPDF/$1'); $routes->match(['GET', 'POST'], 'overTimeDetails', 'Monthlypay::overTimeDetails'); $routes->get('emppaydate/addemppaydate', 'Emppaydate::addemppaydate'); diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index ef53544e..8847a3f7 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -64,6 +64,12 @@ class Employeedetails extends BaseController $this->loadViews("employeeListing", $this->global, $data, NULL); } + function employeeHistory() + { + $Emp = $this->request->getPost('emp'); + $result = $this->employeedetails_model->employeeHistory($Emp); + return $this->response->setJSON($result); + } /* Validation for Gender status Dropdown */ @@ -757,7 +763,7 @@ class Employeedetails extends BaseController $ValidTill = $this->request->getPost('ValidTill'); $addinfo = $this->request->getPost('addinfo'); $driverlicense = $this->request->getPost('driverlicense'); - + $reason = $this->request->getPost('reason'); // dd($driverlicense); @@ -851,7 +857,8 @@ class Employeedetails extends BaseController 'is_driver' => $is_driver, 'esi_applicable' => $esi_applicable, 'pf_applicable' => $pf_applicable, - 'work_location' => $work_location + 'work_location' => $work_location, + 'reason' => $reason ); //print_r($Employee);die(); $result = $this->employeedetails_model->UpdateEmployee($Employee, $EmpId); diff --git a/app/Controllers/Monthlypay.php b/app/Controllers/Monthlypay.php index cbc05ff5..b25cd126 100755 --- a/app/Controllers/Monthlypay.php +++ b/app/Controllers/Monthlypay.php @@ -990,6 +990,22 @@ class Monthlypay extends BaseController } + public function leaveApplicationPDF($leave_application_id){ + + + $data['leave_info'] = $this->monthlypay_model->getheringleaveApplicationForm($leave_application_id); + $data['company_info'] = $this->monthlypay_model->getCompanyInformation(); + + $html = view('leaveApplicationPDF', $data); + // echo $html;die; + $mpdf = new Mpdf(); + $mpdf->WriteHTML($html); + + $fName = $data['leave_info'][0]['emp_id'].'-LeaveApplicationForm.pdf'; + return $mpdf->Output($fName, "D"); + + } + public function overTimeDetails() { $current = $this->request->getPost('monthyear') ? $this->request->getPost('monthyear') :date("m-Y"); diff --git a/app/Models/Employeedetails_model.php b/app/Models/Employeedetails_model.php index 46dac337..2ad3d0e7 100755 --- a/app/Models/Employeedetails_model.php +++ b/app/Models/Employeedetails_model.php @@ -27,6 +27,18 @@ class Employeedetails_model extends Model return $result; } + public function employeeHistory($emp) + { + $builder = $this->db->table('t_employee_history as h') + ->select('h.old_value,h.new_value,h.column_name,DATE_FORMAT(h.created_at, "%d-%m-%Y") AS indian_date, DATE_FORMAT(h.created_at, "%h:%i:%s %p") AS indian_time, CONCAT_WS(" ", ed.FirstName, ed.LastName) AS updater_name') + ->join('tbl_users as u', 'u.userId = h.updated_by', 'left') + ->join('t_employee_details as ed', 'ed on u.EmpID = ed.EmpID', 'left') + ->where('h.empcode ', $emp) + ->orderBy('h.created_at', 'asc'); + $query = $builder->get(); + $result = $query->getResult(); + return $result; + } function getUserRoles() { diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index 50f42d6c..9f93e424 100755 --- a/app/Models/Monthlypay_model.php +++ b/app/Models/Monthlypay_model.php @@ -518,19 +518,23 @@ where Month_Year = ? and att.EmpID in (select EmpID from t_attendance)"; $query = $this->db->query($sql); return $query->getResult(); } - public function getheringleaveApplicationForm(){ - $sql = "select leavetable.* ,Dep.DepartmentName as department,Emp.Designation as designation, - CONCAT_WS(' ', Emp.FirstName, Emp.LastName) AS employeeFullName , - CONCAT_WS(' ', Emp2.FirstName, Emp2.LastName) AS creatorFullName - from t_employee_leave_application_form as leavetable - left join tbl_users as user on user.userId = leavetable.created_by - left join t_employee_details as Emp2 on Emp2.EmpID = user.EmpID - left join t_employee_details as Emp on Emp.EmpID = leavetable.emp_id - left join t_departmentdetails as Dep on Emp.Departmentcode = Dep.DEPCode - where leavetable.isactive = 1"; - $query = $this->db->query($sql); + public function getheringleaveApplicationForm($leave_id = null ){ + + $builder = $this->db->table("t_employee_leave_application_form as leavetable") + ->select("leavetable.* ,Dep.DepartmentName as department,Emp.Designation as designation") + ->select("CONCAT_WS(' ', Emp.FirstName, Emp.LastName) AS employeeFullName") + ->select("CONCAT_WS(' ', Emp2.FirstName, Emp2.LastName) AS creatorFullName") + ->join("tbl_users as user", "user.userId = leavetable.created_by", "left") + ->join("t_employee_details as Emp", "Emp.EmpID = leavetable.emp_id", "left") + ->join("t_employee_details as Emp2", "Emp2.EmpID = user.EmpID", "left") + ->join("t_departmentdetails as Dep", "Emp.Departmentcode = Dep.DEPCode", "left"); + if (!empty($leave_id)) { + $builder->where('leavetable.leave_application_id', $leave_id); + } + $builder->where('leavetable.isactive', 1); + $query = $builder->get(); return $query->getResultArray(); - } + } public function getheringemployeeinformation(){ $builder = $this->db->table("t_employee_details as Emp") ->select("Emp.EmpID,Emp.Designation,Emp.Departmentcode,Dep.DEPCode,Emp.Designation,Emp.Departmentcode,Dep.DEPCode,Dep.DepartmentName as DepartmentNamee,Dep.DepartmentName as DepartmentName") @@ -542,6 +546,16 @@ where Month_Year = ? and att.EmpID in (select EmpID from t_attendance)"; $result = $query->getResult(); return $result; + } + function getCompanyInformation() + { + + $subQuery = "select CompanyName,replace(Address,'
','') as Address,GSTNO,PAN,ContactNumber,EmailAddress,AlternateContactNumber,companyWebsite,StateCode + from t_company_details "; + + $query = $this->db->query($subQuery); + return $query->getResult(); + } public function saveleaveApplicationForm($data,$id){ if ($id == 0) { diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index e2368f60..0aa07060 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -554,7 +554,7 @@ -
+
@@ -732,7 +732,7 @@
-
+
-
+

-
- - - name="isactive" value="1">   - -
@@ -402,7 +395,7 @@ if (!empty($EmpDetails)) {
-
+
+
+ + + name="isactive" value="1" onchange="handleCheckboxChange()">   + +
+ + +
-
+
@@ -167,7 +173,7 @@
-
+
@@ -175,7 +181,7 @@
-
+
@@ -183,7 +189,7 @@
-
+
@@ -200,11 +206,11 @@
-
+
- $value) { ?> @@ -213,7 +219,7 @@
-
+
diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php index 12ca5569..4c298956 100755 --- a/app/Views/employeeListing.php +++ b/app/Views/employeeListing.php @@ -142,7 +142,10 @@ - +     + + + FirstName; ?> @@ -169,6 +172,44 @@
+ + \ No newline at end of file diff --git a/app/Views/leaveApplicationPDF.php b/app/Views/leaveApplicationPDF.php new file mode 100644 index 00000000..1df89db2 --- /dev/null +++ b/app/Views/leaveApplicationPDF.php @@ -0,0 +1,154 @@ + + + + + + + + + + CompanyName)) ? $company_info[0]->CompanyName : "-"; + $CompanyAddress = (!empty($company_info) && !empty($company_info[0]->Address)) ? $company_info[0]->Address : "-"; + $address = preg_replace('/SURVEY\s*:\s*[^,]+,/', '', $CompanyAddress); + $leave_application_id = (!empty($leave_info) && !empty($leave_info[0]['leave_application_id'])) ? $leave_info[0]['leave_application_id'] : "-"; + $emp_name = (!empty($leave_info) && !empty($leave_info[0]['employeeFullName'])) ? $leave_info[0]['employeeFullName'] : "-"; + $emp_id = (!empty($leave_info) && !empty($leave_info[0]['emp_id'])) ? $leave_info[0]['emp_id'] : "-"; + $department = (!empty($leave_info) && !empty($leave_info[0]['department'])) ? $leave_info[0]['department'] : "-"; + $designation = (!empty($leave_info) && !empty($leave_info[0]['designation'])) ? $leave_info[0]['designation'] : "-"; + $start_date = (!empty($leave_info) && !empty($leave_info[0]['start_date'])) ? get_date_time_dynamical_format('Y-m-d','d-m-Y',$leave_info[0]['start_date']) : "-"; + $end_date = (!empty($leave_info) && !empty($leave_info[0]['end_date'])) ? get_date_time_dynamical_format('Y-m-d','d-m-Y',$leave_info[0]['end_date']) : "-"; + $no_of_days = (!empty($leave_info) && !empty($leave_info[0]['no_of_days'])) ? $leave_info[0]['no_of_days'] : "-"; + $reason = (!empty($leave_info) && !empty($leave_info[0]['reason'])) ? $leave_info[0]['reason'] : "-"; + $status = (!empty($leave_info) && !empty($leave_info[0]['status'])) ? $leave_info[0]['status'] : "-"; + + ?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ ' . _htmlsc($CompanyAddress) . ''; + } ?> +
Leave Application Form
+ + + + + + + + + + + +
From DateTo DateNo's Days
+
+
Employee Signatory
+ 		+
Authorized Signatory
+
+ + + +
+ + + \ No newline at end of file diff --git a/app/Views/overTimeDetails.php b/app/Views/overTimeDetails.php index 5374c0bb..75fef304 100755 --- a/app/Views/overTimeDetails.php +++ b/app/Views/overTimeDetails.php @@ -258,7 +258,7 @@ OT_Hrs_Worked; echo $OT; - $totalovertimehrs[] = $record->OT_Hrs_Worked; + $totalOThrs[] = $record->OT_Hrs_Worked; ?> @@ -275,7 +275,7 @@ // $OTSalary = ($OT_Hrs_Worked != 0) ? $OT_Hrs_Worked * $oneHoursSalary : 0; $OTSalary = $OT * $perHrSalary; echo number_format($OTSalary, 2); - $totalovertimeamounts[] = $OTSalary; + $totalOTsalary[] = $OTSalary; ?> @@ -292,15 +292,21 @@ - - Total - - + Total - + - + + + + + + + + + + From 93316bb4cebbbb74dfd36c73dcd97cfb528c4f33 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 28 Mar 2025 04:49:29 +0000 Subject: [PATCH 2/3] user --- app/Controllers/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/User.php b/app/Controllers/User.php index 170fa718..2cc02934 100755 --- a/app/Controllers/User.php +++ b/app/Controllers/User.php @@ -938,7 +938,7 @@ class User extends BaseController // { $data['EmpList'] = $this->user_model->rolesNotAllotedEmployees(); $data['roles'] = $this->user_model->getUserRoles(); - $data['Department'] = json_decode(json_encode($this->department_model->departmentListing()), true); + $data['Department'] = json_decode(json_encode($this->department_model->departmentListing(1)), true); // echo "
";
         // print_r($data['Department']);

From d85b7058cf0eb9b160238b98efca63dfa7b713d8 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev 
Date: Fri, 28 Mar 2025 09:47:10 +0000
Subject: [PATCH 3/3] trackers issues

---
 app/Models/Monthlypay_model.php            |    4 +-
 app/Views/EditservicePurchaseorder.php     |    4 +-
 app/Views/accountsDashboard.php            |    8 +-
 app/Views/editCapitalAmendPO.php           |    4 +-
 app/Views/editCapitalPo.php                | 1052 +++++---------------
 app/Views/editEmployeenew.php              |    2 +-
 app/Views/editImportAmendPO.php            |    4 +-
 app/Views/editOldemppay.php                |   40 +-
 app/Views/editRevenueAmendPO.php           |    4 +-
 app/Views/editRevenuepurchaseorder.php     |    6 +-
 app/Views/editServiceAmendPO.php           |    4 +-
 app/Views/editSupplier.php                 |   19 +-
 app/Views/editimportpo.php                 |    4 +-
 app/Views/employeeLeaveApplicationForm.php |   56 +-
 app/Views/employeeListing.php              |    6 +-
 app/Views/viewinwardgateregister.php       |    8 +-
 16 files changed, 355 insertions(+), 870 deletions(-)

diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php
index 9f93e424..db7f7cb7 100755
--- a/app/Models/Monthlypay_model.php
+++ b/app/Models/Monthlypay_model.php
@@ -535,11 +535,13 @@ where Month_Year = ? and att.EmpID in (select EmpID  from t_attendance)";
         $query = $builder->get();
 		return $query->getResultArray();
 	}	
-	public function getheringemployeeinformation(){
+	public function getheringemployeeinformation(){ //active employee only no driver also.
 		$builder = $this->db->table("t_employee_details as Emp")
             ->select("Emp.EmpID,Emp.Designation,Emp.Departmentcode,Dep.DEPCode,Emp.Designation,Emp.Departmentcode,Dep.DEPCode,Dep.DepartmentName as DepartmentNamee,Dep.DepartmentName as DepartmentName")
 			->select("CONCAT_WS(' ', Emp.FirstName, Emp.LastName) AS FullName")
             ->join("t_departmentdetails as Dep", "Emp.Departmentcode = Dep.DEPCode", "left")
+			->where('Emp.is_driver != ', 1)
+			->where('Emp.IsActive', 1)
             ->orderBy("Emp.EmpID", "asc");
 
         $query = $builder->get();
diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php
index dd1eb121..713769ef 100755
--- a/app/Views/EditservicePurchaseorder.php
+++ b/app/Views/EditservicePurchaseorder.php
@@ -1622,8 +1622,8 @@ if (!empty($getlogpodtl)) {
 											
 											

 												

-												
+												
 												    
 												
 												

diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php
index ca9777a7..534550c1 100644
--- a/app/Views/accountsDashboard.php
+++ b/app/Views/accountsDashboard.php
@@ -767,9 +767,9 @@
 							if (typeof item.MasterFile == 'string') {
 								if (item.MasterFile !== null && item.MasterFile !== undefined && item.MasterFile.trim() !== "") {
 									modal.find('#MasterFileLabel a').attr('href', '' + 'public/uploads/Igrfiles/' + item.MasterFile);
-									modal.find('#MasterFileLabel a').attr('title', 'previously uploaded IGR Master File');
+									modal.find('#MasterFileLabel a').attr('title', 'Previous Upload IGR Master File');
 									modal.find('#MasterFileLabel a').attr('target', '_blank');
-									modal.find('#MasterFileLabel a span').text('previously uploaded - ');
+									modal.find('#MasterFileLabel a span').text('Previous Upload - ');
 									modal.find('#MasterFileLabel a small').text(item.MasterFile);
 									modal.find('#MasterFileLabel').show();
 								}
@@ -1294,10 +1294,10 @@
 			modal.find('#WeightFileLabel').hide();
 			console.log(typeof fileName);
 			if (fileName !== 'null' && fileName !== undefined && fileName.trim() !== "") {
-				modal.find('#WeightFileLabel a').attr('title', 'previously uploaded IGR Weight File');
+				modal.find('#WeightFileLabel a').attr('title', 'Previous Upload IGR Weight File');
 				modal.find('#WeightFileLabel a').attr('href', '' + 'public/uploads/Igrfiles/' + fileName);
 				modal.find('#WeightFileLabel a').attr('target', '_blank');
-				modal.find('#WeightFileLabel a span').text('previously uploaded - ');
+				modal.find('#WeightFileLabel a span').text('Previous Upload - ');
 				modal.find('#WeightFileLabel a small').text(fileName);
 				modal.find('#WeightFileLabel').show();
 			}
diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php
index 86f8dcf1..dd753064 100755
--- a/app/Views/editCapitalAmendPO.php
+++ b/app/Views/editCapitalAmendPO.php
@@ -1679,9 +1679,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
 										

 											

 
-											
 											    
 											
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php
index e1520dd8..5dd4d777 100755
--- a/app/Views/editCapitalPo.php
+++ b/app/Views/editCapitalPo.php
@@ -1568,8 +1568,8 @@ if (!empty($getlogpodtl)) {
               

                 

                   
-                    
+                    
                         
                     
                   
@@ -2679,6 +2679,7 @@ if (!empty($getlogpodtl)) {
 
             

           

+
           

             

               
@@ -2731,6 +2732,7 @@ if (!empty($getlogpodtl)) {
             

 
           

+
           

             

               
@@ -2756,8 +2758,10 @@ if (!empty($getlogpodtl)) {
               

             

           

+
           

-          

             

             

@@ -3077,17 +3081,16 @@ if (!empty($getlogpodtl)) {
         

       
     

-  

+
- - + +
- 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter', 'class' => 'form-control', 'readonly' => 'true'); echo form_input($data); ?>
-
+
- 'ViewCapitalbudAmt', 'value' => set_value('ViewCapitalbudAmt'), 'id' => 'ViewCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?>
-
-
+
+ +
+
- +
+
@@ -3150,7 +3156,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
@@ -3159,7 +3165,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
@@ -3168,41 +3174,49 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
- 'ViewCPQuantity', 'value' => set_value('ViewCPQuantity'), 'id' => 'ViewCPQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); ?>
-
- + + +
+
- * + *
'ViewCPRate', 'value' => set_value('ViewCPRate'), 'id' => 'ViewCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); ?>
-
+
+
- + 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control', 'readonly' => 'true'); echo form_input($data); ?> -
+ +
- 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
- +
+ 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ + + +
@@ -3214,7 +3228,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
- +
@@ -3223,17 +3237,18 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
- 'txtViewAfterDiscount', 'value' => set_value('txtViewAfterDiscount'), 'id' => 'txtViewAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); echo form_input($data); ?>
-
-
+ +
+
- -
+ +
'txtFreightlocview', 'value' => set_value('txtFreightlocview'), 'id' => 'txtFreightlocview', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightlocviewper();', 'disabled' => 'disabled'); echo form_input($data); ?> -
+
'txtAfterFreightlocview', 'value' => set_value('txtAfterFreightlocview'), 'id' => 'txtAfterFreightlocview', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
+ +
+ +
-
+
- 'ViewAfterCgst', 'value' => set_value('ViewAfterCgst'), 'id' => 'ViewAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); - echo form_input($data); - ?> -
- +
+ 'ViewAfterCgst', 'value' => set_value('ViewAfterCgst'), 'id' => 'ViewAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ + + +
+
-
+
@@ -3299,8 +3320,13 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true'); echo form_input($data); ?> +
+ + + +
@@ -3311,12 +3337,14 @@ if (!empty($getlogpodtl)) { ?>
- - + + +
-
+
+
@@ -3326,7 +3354,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -3336,9 +3364,10 @@ if (!empty($getlogpodtl)) { ?>
-
+ + + -
@@ -3361,145 +3390,151 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'ViewTotalAmountlocal', 'value' => set_value('ViewTotalAmountlocal'), 'id' => 'ViewTotalAmountlocal', 'class' => 'form-control num', 'placeholder' => 'Total Amount', 'readonly' => 'true'); echo form_input($data); ?> -
- -
-
+ +
+ +

-
-
- Basic Price -
-
- -
-
- Landing charge -
-
-
- +
+
+
+
+
+ Landing charge +
+
+
+ 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> -
-
-
-
- +
+
+
+
+ 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> + ?> -
-
-
-
-
- Assessable Value (A) -
-
- +
+
+
+
+ Assessable Value (A) +
+
+ -
-
-
- +
+
+
+
+ 'ViewAfterAssessable', 'value' => set_value('ViewAfterAssessable'), 'id' => 'ViewAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); - ?> -
-
-
-
-
- Custom duty (B) -
-
-
- +
+
+
+
+
+ Custom duty (B) +
+
+
+ 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); ?> - -
-
-
-
- 'viewAfterCustomduty', 'value' => set_value('viewAfterCustomduty'), 'id' => 'viewAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); ?> -
-
-
-
-
- Custom ED_cess (C) -
-
-
- + +
+
+
+
+ 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Custom ED_cess (C) +
+
+
+ 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> -
-
-
-
- +
+
+
+
+ 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); - ?> -
-
-
-
-
- Custom S & H cess (D) -
-
-
- +
+
+
+
+
+ Custom S & H cess (D) +
+
+
+ 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> -
-
-
-
- +
+
+
+
+ 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); - ?> -
-
-
-
+ ?> +
+
+
+
@@ -3519,7 +3554,6 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?> -
@@ -3558,7 +3592,7 @@ if (!empty($getlogpodtl)) { - +
Freight Type @@ -3572,7 +3606,7 @@ if (!empty($getlogpodtl)) { echo form_dropdown('drpViewFreight', $options, set_value('drpViewFreight'), 'id="drpViewFreight"', 'class="form-control "'); ?>
- - +

Cost Of The Product Per UOM


-
- - + Duty Impact +
+
+
+ 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> - + ?> +
-
- - + Quantity +
+ 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> + ?> +
+
-
- - + Custom Duty Expenses +
+
+
+ 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> + ?> +
- -
- - + Clearing Charges +
+
+
+ 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); echo form_input($data); - ?> + ?> +
-
- - + + +
+ 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); - echo form_input($data); - ?> -
+ echo form_input($data); + ?> +
+
+
+ +
+ + +
@@ -3655,9 +3715,10 @@ if (!empty($getlogpodtl)) {
- - -
+ + + +
@@ -3665,604 +3726,19 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?>
-
- + +
- Cancel + Cancel - -
- - - - - - - - + diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index d0620151..267149cc 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -247,7 +247,7 @@ if (!empty($EmpDetails)) { ProfilePic){ ?>
-