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){ ?>
-