From dd7faae8131085eb45d9bd3e4ce706d3a6aed9c1 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 13 Sep 2024 16:42:16 +0530 Subject: [PATCH] CHANGE_TRACKER_ISSUE_3 --- app/Views/addEmployeenew.php | 1117 ++++++++-------- app/Views/addRawMaterial.php | 194 ++- app/Views/addSupplier.php | 484 +++---- app/Views/addUser.php | 8 +- app/Views/addasset.php | 296 ++--- app/Views/addconfig.php | 10 +- app/Views/adddepartment.php | 296 ++--- app/Views/addemppaydate.php | 11 +- app/Views/assetListing.php | 268 ++-- app/Views/attendance.php | 2 +- app/Views/capitalpurchaseorder.php | 1037 ++++++++------- app/Views/companyview.php | 800 ++++++----- app/Views/configlisting.php | 90 +- app/Views/costListing.php | 151 ++- app/Views/createPOfromRequistion.php | 57 +- app/Views/departmentListing.php | 289 ++-- app/Views/editEmployeenew.php | 1696 ++++++++++++------------ app/Views/editOld.php | 9 +- app/Views/editOldasset.php | 280 ++-- app/Views/editOldemppay.php | 302 ++--- app/Views/editRawmaterial.php | 32 +- app/Views/editRevenuepurchaseorder.php | 2 +- app/Views/editSupplier.php | 12 +- app/Views/editconfig.php | 17 +- app/Views/editdepartment.php | 314 +++-- app/Views/employeeListing.php | 9 +- app/Views/emppayListing.php | 104 +- app/Views/expense_list.php | 50 +- app/Views/importpo.php | 3 + app/Views/payslipgenerate.php | 138 +- app/Views/purchaseorder.php | 554 ++++---- app/Views/rawmaterialListing.php | 171 ++- app/Views/sales_dashboard.php | 226 ++-- app/Views/supplierListing.php | 346 +++-- app/Views/transporterListing.php | 17 +- app/Views/userListing.php | 163 ++- system/Helpers/form_helper.php | 3 +- 37 files changed, 4773 insertions(+), 4785 deletions(-) diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index f8f47c6c..227b5bfd 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -377,293 +377,291 @@
-
-
-
-

Add Employee

+
+
+
+
+

Add Employee

+ Back +
-
- Back -
-
-
-
-
-
-
- +
+
+
+
+
+ -
+
-
+
-
-
+ +
-
-
- your image
- - -
-
-
-
-
- Full Name* - -
- -
Father / Husband Name* - -
- -
Contact Number* - +
+
+ your image
+ +
-
-
Gender* - +
+ +
Father / Husband Name* + +
+ +
Contact Number* + +
+
+
+
Gender* + + ?> + +
+
Date Of Birth* + +
+
Age + +
-
Date Of Birth* - -
-
Age - -
-
-
-
Personal Email ID* - -
-
Official Email ID - -
-
+
+
Personal Email ID* + +
+
Official Email ID + +
+
- Blood group* - + + + + - + ?> + +
-
-
-
- Marital Status* - + + + + - -
-
- Current Address* - -
-
- Permanent Address* - -
- -
-
- - -
- Emergency Contact Name - -
+ ?> + +
+
+ Current Address* + +
+
+ Permanent Address* + +
-
- Emergency Contact Number -
+
-
- Current address same as permanent address + +
+ Emergency Contact Name + +
+ +
+ Emergency Contact Number + +
+ +
+ Current address same as permanent address +
-
- + - -
+ +
-
-
-
-
-
-
-
-
- Designation* - + + + + - + ?> + -
-
- Department* - + + + + - + ?> + -
-
Date Of Joining* - -
-
Previous Years of Experience +
+
Date Of Joining* + +
+
Previous Years of Experience -
- -
- -
-
+
-
-
+
+ +
+ +
+
+
-
+
Qualification*
@@ -729,118 +727,118 @@

-
- -
-
- - - -
- -
-
-
-
-
-
-
-
Bank Name* - -
-
Account Number* - -
-
IFSC Code* - -
-
Bank Address - -
-
-
- - -
-
-
-
-
-
-
-
- Total Salary - * - - - -
-
-
-
- Basic Pay - * - - -
-
-
-
- HRA Rate(%) - * - - -
-
-
-
- HRA Amount - * - - -
+ + + +
-
-
-
+
+
+
+
+
+
+
+
Bank Name* + +
+
Account Number* + +
+
IFSC Code* + +
+
Bank Address + +
+
+
+ +
-
-
- - -
+
+
+
+
+
+
+
+ Total Salary + * + + + +
+
+
+
+ Basic Pay + * + + +
+
+
+
+ HRA Rate(%) + * + + +
+
+
+
+ HRA Amount + * + + +
+
+ +
+
+ +
+
+
+
+
+
+ + +
UAN
-
- -
-
- PF Rate(%) - * - -
-
- -
-
ESI Number - -
-
-
-
- ESI Rate(%) - * - -
-
- - +
+
+ PF Rate(%) + * + - +
+
+ +
+
ESI Number + +
+
+
+
+ ESI Rate(%) + * + + +
+
+ + + + +
+
- -
-
-
-
-
-
- -
-
- ESI - Applicable - -
-
- -
-
- PF - Applicable - -
-
- +
+
-
+
+
-
- - - -
+
+
+ ESI + Applicable + +
+
+ +
+
+ PF + Applicable + +
+
+ +
+
-
-
-
-
-
-
-
Aadhar Number * - -
-
PAN Number - -
-
Passport Number - + + + +
+ +
+ +
+
+
+
+
+
Aadhar Number * + +
+
PAN Number + +
+
Passport Number + -
-
Passport Expiry Date - -
+
+
Passport Expiry Date + +
- + +
-
-
-
-
-
-
-
Voter ID - -
-
Driving License - -
+
+
+
+
+
+
Voter ID + +
+
Driving License + +
-
Driving License Expiry Date - -
+
Driving License Expiry Date + +
-
Nominee reference - -
+
Nominee reference + +
+
-
- - + + +
+ +
+
+
+
+
+
+
+ +
+ File Name + +
+
+ File + +
+
+ +
+
+ +
+
+
+ +
+ +
- -
-
-
-
-
-
-
- -
- File Name - -
-
- File - -
-
- -
-
- -
-
-
- -
- -
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1362,6 +1361,7 @@ // Validate all forms before proceeding $forms.each(function(index) { var $form = $(this); + console.log(index); if (index <= currentIndex) { // Only validate forms up to the current tab if (!$form[0].checkValidity()) { @@ -1379,16 +1379,16 @@ } }); - if (!isValid) { - console.log('Validation failed. Please fill all required fields.'); - return; // Stop the submission if validation fails - } + // if (!isValid) { + // console.log('Validation failed. Please fill all required fields.'); + // return; // Stop the submission if validation fails + // } - // Proceed to the next tab - var $nextTab = $('.nav-link.active').closest('li').next().find('.nav-link'); - if ($nextTab.length) { - $nextTab.tab('show'); - } + // // Proceed to the next tab + // var $nextTab = $('.nav-link.active').closest('li').next().find('.nav-link'); + // if ($nextTab.length) { + // $nextTab.tab('show'); + // } }); $('.submit').click(function(e) { @@ -1463,6 +1463,7 @@ var $nextTab = $activeTab.parent().next().find('a'); if ($nextTab.length) { + $nextTab.trigger('click'); } else { // If there are no more tabs, submit the form diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index dbf0423a..8693ce71 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -26,17 +26,15 @@
-
-
+
+

Add Material Details

+ Back
-
- Back -
-
- +
+
@@ -44,17 +42,17 @@
-
-
- -
-
-
- + +
+ +
+
+
+
-
- +
+ +
-
- +
+
-
- +
+ +
-
-
-
- +
+
+
+ -
-
- - -
-
- - 'Date', 'value' => set_value('Date'), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;'); - echo form_input($data); - ?>
-
- +
+ + +
+
+ + 'Date', 'value' => set_value('Date'), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;'); + echo form_input($data); + ?> +
+
+
-
-
-
- +
+
+
+
-
+
-
+
- +
-
-
-
- - -
-
+
+
+
+ + +
+
- getFlashdata('listErrors'); - if($listErrors) - { - ?> -
-
-
- - getFlashdata('listErrors'); ?> -
-
-
- - + getFlashdata('listErrors'); + if ($listErrors) { + ?> +
+
+
+ + getFlashdata('listErrors'); ?> +
+
+
+ +
- getFlashdata('error'); - if($error) - { - ?> -
- - getFlashdata('error'); ?> -
- - - getFlashdata('success'); - if($success) - { - ?> -
- - getFlashdata('success'); ?> -
- + getFlashdata('error'); + if ($error) { + ?> +
+ + getFlashdata('error'); ?> +
+ + + getFlashdata('success'); + if ($success) { + ?> +
+ + getFlashdata('success'); ?> +
+
- +
@@ -236,13 +231,15 @@ $('#MaterialName').change(function() { var materialname = $('#MaterialName').val(); - + //material = material.replace(/\s*$/,""); var material = materialname.replace(/ /g, ''); //alert(m.length+" "+m+" "+s+" "+s.length); $('#content').loader('show'); $.ajax({ - data: { id: material }, + data: { + id: material + }, type: "POST", url: "materialExist", success: function(data) { @@ -252,7 +249,7 @@ if (count > 2) { $('#content').loader('hide'); alert('Material name already existed ! '); - + var related_name = ""; $.each(data, function(i, obj) { @@ -267,10 +264,11 @@ // alert("empty data"); } - },error: function() { - $('#content').loader('hide'); - alert("Error Occur"); - } + }, + error: function() { + $('#content').loader('hide'); + alert("Error Occur"); + } }); }); diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index df221c50..3feb1215 100755 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -3,217 +3,215 @@
-
- getFlashdata('error'); - if ($error) { - ?> -
- - getFlashdata('error'); ?> -
- - getFlashdata('success'); - if ($success) { - ?> -
- - getFlashdata('success'); ?> -
- - -
-
- -
-
    - +
    + getFlashdata('error'); + if ($error) { + ?> +
    + + getFlashdata('error'); ?> +
    + + getFlashdata('success'); + if ($success) { + ?> +
    + + getFlashdata('success'); ?> +
    + + +
    +
    + +
    +
      +
      • - -
    -
    - - + +
- -
-
-
-

Add Supplier Details

+ + +
+ +
+
+
+

Add Supplier Details

+ Back +
+
+
+ +
+
+
+
+
+
+
+
+ + Supplier Information +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +   +
+
+ SERVICE   +
+
+ RAW MATERIALS   +
+
+ MAINTENANCE   +
+
+
+
+ + + Address Details +
+
+
+ + +
+
+
+ + + Tax Related Data + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+
+ + + Bank Details + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+ +
+
+ + +
+
+
+
+ + Payment Details + + + +
+
+ Payable Terms + + + +
+
+
+ +
-
- Back -
-
- -
-
-
-
-
-
- -
- - Supplier Information -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- -   -
-
- SERVICE   -
-
- RAW MATERIALS   -
-
- MAINTENANCE   -
-
-
-
- - - Address Details -
-
-
- - -
-
-
- - - Tax Related Data - -
-
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
-
- - - Bank Details - -
-
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
- -
-
- - -
-
-
-
- - Payment Details - - - -
-
- Payable Terms - - - -
-
-
- - -
-
- -
-
- -
-
-
+ +
- -
-
+ +
+
+
+
+ +
+
@@ -230,7 +228,7 @@ $("#paymentid").val(termid); $("#paymentname").val(termname); } - + function Validate() { if ($("#supplierName").val().length < 1) { alert('Please Enter Supplier Name'); @@ -258,38 +256,40 @@ } } - + $('#supplierName').change(function() { var suppliername = $('#supplierName').val(); var supplier = suppliername.replace(/ /g, ''); $('#content').loader('show'); $.ajax({ - type: "POST", - url: "", - data: { id: supplier }, - success: function(data) { - var count = data.length; - if (count > 2) { - $('#content').loader('hide'); - alert('supplier already existed ! '); - var related_supplier = ""; - $.each(data, function(i, obj) { - related_supplier += obj.SupplierID + " - " + obj.SupplierName + " - " + obj.Address + "\n"; - }); - alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier); - $("#supplierName").focus(); - } else { - $('#content').loader('hide'); - // alert('This is New Supplier! '); - } - console.log(data); - }, - error: function() { - $('#content').loader('hide'); - // alert("Error Occur"); - } - }); -}); + type: "POST", + url: "", + data: { + id: supplier + }, + success: function(data) { + var count = data.length; + if (count > 2) { + $('#content').loader('hide'); + alert('supplier already existed ! '); + var related_supplier = ""; + $.each(data, function(i, obj) { + related_supplier += obj.SupplierID + " - " + obj.SupplierName + " - " + obj.Address + "\n"; + }); + alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier); + $("#supplierName").focus(); + } else { + $('#content').loader('hide'); + // alert('This is New Supplier! '); + } + console.log(data); + }, + error: function() { + $('#content').loader('hide'); + // alert("Error Occur"); + } + }); + }); //Email Validate function validateEmail() { @@ -315,7 +315,7 @@ function blockKeyPress(evt) { var charCode = (evt.which) ? evt.which : evt.keyCode; alert(charCode); - if (charCode == 8 || charCode == 46){ + if (charCode == 8 || charCode == 46) { return false; } else { return false; @@ -355,7 +355,7 @@ function validateGST() { // var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/; - var reg = /^([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}$/; + var reg = /^([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}$/; var GST = $('#GSTNo').val(); var PAN = $('#panno').val(); (PAN != '') ?? $('#panno').val(""); @@ -367,10 +367,10 @@ var panPattern = /[A-Z]{5}[0-9]{4}[A-Z]{1}/; var panMatch = GST.match(panPattern); if (panMatch) { - var extractedPAN = panMatch[0].toUpperCase(); - if (panPattern.test(extractedPAN) == true) { - $('#panno').val(extractedPAN);//.prop('readonly', true); - } + var extractedPAN = panMatch[0].toUpperCase(); + if (panPattern.test(extractedPAN) == true) { + $('#panno').val(extractedPAN); //.prop('readonly', true); + } } return true; } @@ -465,9 +465,9 @@ } } - + $(document).ready(function() { //$("#Payment").select2(); }); - + \ No newline at end of file diff --git a/app/Views/addUser.php b/app/Views/addUser.php index cee4f0d6..726b4d63 100755 --- a/app/Views/addUser.php +++ b/app/Views/addUser.php @@ -3,15 +3,13 @@
-
-
+
+

Add User Details

+ Back
-
- Back -
diff --git a/app/Views/addasset.php b/app/Views/addasset.php index f6b0a6f8..04fe0eed 100755 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -3,15 +3,13 @@
-
-
+
+
-

Add Asset Details

+

Add Asset Details

+ Back
-
- Back -
@@ -19,151 +17,151 @@
-
-
-
- -
-
-
- - -
- -
- - -
-
- - -
-
- - -
+
+ +
+ +
+
+
+ +
-
-
- - -
- - - - - - -
- - -
-
- - -
-
- - -
+
+ +
-
-
- - -
+
+ +
-
-
- - - -
-
- - -
-
- - - -
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- > -
+
+ +
-
- - +
+
+ + +
+ + + + + + +
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+
+
+ + + +
+
+ + +
+
+ + + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ > +
- +
+ + +
+
+
getFlashdata('listErrors'); @@ -235,7 +233,7 @@ data: 'PONO=' + PONO, dataType: 'json', success: function(data) { - console.log(data); + console.log(data); var line = ''; $('#MaterialCode').empty(); @@ -264,12 +262,12 @@ var selectedText = $('#MaterialCode option:selected').text(); - var lineItemNo = selectedText.split('-')[0]; + var lineItemNo = selectedText.split('-')[0]; - var id = lineItemNo + var id = lineItemNo var line = id; - + //line +='' if (line) { $.ajax({ @@ -278,13 +276,13 @@ data: 'line=' + line, success: function(data) { - + $.each(JSON.parse(data), function(i, item) { if (id == item.LineItemNo) { alert(item.LineItemNo); - // alert(item.MaterialCode); + // alert(item.MaterialCode); $('#DateOfPurchase').val(item.PODate); if (item.DeliveryDate != null) { diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index 92fae60c..40312a0a 100755 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -11,15 +11,13 @@
-
-
+
+
-

Add Config Details

+

Add Config Details

+ Back
-
- Back -
- .pad{ - padding-bottom:1%; - } - .badge - { - color:red; background-color:#fff; - } + .pad { + padding-bottom: 1%; + } + + .badge { + color: red; + background-color: #fff; + } -
-
- -
- -
-
-
-

Add Department Details

-
-
-
- Back -
-
- -
-
-
-
-
-
-
-
- -
- Department Information -
-
- - -
-
- - -
-
- -    Is Active -
-
-
-
- - -
-
-
-
- getFlashdata('error'); - if($error) - { - ?> -
- - getFlashdata('error'); ?> -
- - getFlashdata('success'); - if($success) - { - ?> -
- - getFlashdata('success'); ?> -
- - -
-
- listErrors('
', '
'); ?>
-
-
-
-
- -
-
-
-
- -
-
-
+
+
+ +
+ +
+
+
+

Add Department Details

+ Back +
+
+
+ +
+
+
+
+
+
+
+
+ +
+ Department Information +
+
+ + +
+
+ + - - + + + + - - + + - - -
- + + +
+
- + - - - - - - - - - - - - - - - - - - - + - CreatedDt)) == "30-11--0001") { - $cdate = '00-00-0000'; - } else { - $cdate = date('d-m-Y', strtotime($record->CreatedDt)); - } ?> - - - - - - - - - - + + + + + + + + + + + + - - -
Created DateAsset CodeAsset NameAsset DescriptionDepartment NameLocationAsset UserSupplier NameReceived DateAsset ValueAsset Status
AssetCode, 5) ?> - AssetName ?>Description ?>DepartmentName ?>Location ?>UserName ?>SupplierName ?>DateOfPurchase); - $DOPurchase = $dtpurchase->format('d-m-Y'); - echo $DOPurchase ?>AssetValue, 2); ?>AssetStatus ?>Created DateAsset CodeAsset NameAsset DescriptionDepartment NameLocationAsset UserSupplier NameReceived DateAsset ValueAsset Status
+ + + + + CreatedDt)) == "30-11--0001") { + $cdate = '00-00-0000'; + } else { + $cdate = date('d-m-Y', strtotime($record->CreatedDt)); + } ?> + + AssetCode, 5) ?> + AssetName ?> + Description ?> + DepartmentName ?> + Location ?> + UserName ?> + SupplierName ?> + DateOfPurchase); + $DOPurchase = $dtpurchase->format('d-m-Y'); + echo $DOPurchase ?> + AssetValue, 2); ?> + AssetStatus ?> + + + + +
@@ -154,78 +153,81 @@ \ No newline at end of file diff --git a/app/Views/attendance.php b/app/Views/attendance.php index 46b797b0..b267f23d 100755 --- a/app/Views/attendance.php +++ b/app/Views/attendance.php @@ -210,7 +210,7 @@ $currentday = date('d');
+ title='click here for load attendance for specified month' style="margin-top:0px;">
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index db1c3195..79342bf1 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -150,8 +150,8 @@ // yearRange: '0:+10' // }); $("#Exchangerateon").datepicker({ - format: 'dd-mm-yyyy', - startDate: new Date(), + format: 'dd-mm-yyyy', + startDate: new Date(), autoclose: true, todayHighlight: true, clearBtn: true @@ -827,17 +827,17 @@
-
+
-
+
-
- Cancel -   Ok +
+ Cancel +   Ok
@@ -855,17 +855,17 @@
-
+
-
+
-
- Cancel -   Ok +
+ Cancel +   Ok
@@ -884,7 +884,7 @@
-
+
@@ -901,7 +901,7 @@ ?>
-
+
-
+
-
+
'CapitalbudAmt', 'value' => set_value('CapitalbudAmt'), 'id' => 'CapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?>
-
-
-
+
'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true'); @@ -1000,6 +998,8 @@
+
+
@@ -1041,6 +1041,8 @@
+
+
@@ -1174,7 +1176,7 @@

-
+
Basic Price @@ -1279,7 +1281,7 @@
-
+
Subtotal (E) @@ -1332,6 +1334,7 @@
+
Freight Type
@@ -1390,7 +1393,7 @@ echo form_input($data); ?>
-
+
Quantity 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); @@ -1399,10 +1402,11 @@
-
Custom Duty
+
+
'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); @@ -1412,19 +1416,25 @@
+
Clearing Charges
+
+
'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); echo form_input($data); ?>
+
+
+
'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); @@ -1478,7 +1488,7 @@
-
+
@@ -1520,7 +1530,7 @@ ?>
-
+
'EditCapitalbudAmt', 'value' => set_value('EditCapitalbudAmt'), 'id' => 'EditCapitalbudAmt', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?>
@@ -1600,53 +1610,428 @@
-
-
-
-
- -
- 'Select Discount Type'); - //print_r( $options); +
+
+
+ +
+ 'Select Discount Type'); + //print_r( $options); - if (!empty($TaxType)) { - foreach ($TaxType as $SID) : + if (!empty($TaxType)) { + foreach ($TaxType as $SID) : - $options[$SID->ConfigValue] = $SID->ConfigValue; + $options[$SID->ConfigValue] = $SID->ConfigValue; - endforeach; - } + endforeach; + } - echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"'); + echo form_dropdown('EditDiscountType', $options, set_value('EditDiscountType'), 'id="EditDiscountType" class="form-control"'); - ?> -
+ ?>
-
- +
+
+ +
+ 'txtEditDiscount', 'value' => set_value('txtEditDiscount'), 'id' => 'txtEditDiscount', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateDiscount(1);', 'style' => 'text-align:right;'); + echo form_input($data); + ?> +
+
+
+ +
+ 'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); + echo form_input($data); + ?> +
+
+
+
+
+
+ +
+ 'Select Freight Type'); + //print_r( $options); + + if (!empty($FreightType)) { + foreach ($FreightType as $SID) : + + + $options[$SID->ConfigValue] = $SID->ConfigValue; + + endforeach; + } + + echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "'); + + ?> +
+
+ +
+ +
+ 'txtFreightlocedit', 'value' => set_value('txtFreightlocedit'), 'id' => 'txtFreightlocedit', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreightloceditper();'); + echo form_input($data); + ?> +
+
+ +
+ +
+ 'txtAfterFreightlocedit', 'value' => set_value('txtAfterFreightlocedit'), 'id' => 'txtAfterFreightlocedit', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+ +
+
+
+ + CGST In % +
+ +
+
+ + 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+
+
+ + SGST In % +
+ +
+
+ + 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+
+
+ + IGST In % +
+ +
+
+ + 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
+ +
+
+
+ + 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); + echo form_input($data); + ?> +
+ +
+ +
+
+
+ +
+
+
+ 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+ +
+
+
+ 'EdittxtTotalOrderValue', 'value' => set_value('EdittxtTotalOrderValue'), 'id' => 'EdittxtTotalOrderValue', 'class' => 'form-control num', 'placeholder' => 'Total Order Amount', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+
+
+
+
+
+
+ Basic Price +
+ -
- +
'txtEditAfterDiscount', 'value' => set_value('txtEditAfterDiscount'), 'id' => 'txtEditAfterDiscount', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;'); + $data = array('name' => 'EditAfterBasicPriceTax', 'value' => set_value('EditAfterBasicPriceTax'), 'id' => 'EditAfterBasicPriceTax', 'class' => 'form-control num', 'readonly' => 'true'); echo form_input($data); ?>
+
+ Landing charge +
+
+
+ 'EditLandingCharge', 'value' => set_value('EditLandingCharge'), 'id' => 'EditLandingCharge', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterLandingCharge', 'value' => set_value('EditAfterLandingCharge'), 'id' => 'EditAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Assessable Value (A) +
+
+ +
+
+
+ 'EditAfterAssessable', 'value' => set_value('EditAfterAssessable'), 'id' => 'EditAfterAssessable', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Custom duty (B) +
+
+
+ 'EditCustomduty', 'value' => set_value('EditCustomduty'), 'id' => 'EditCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + +
+
+ Custom ED_cess (C) +
+
+
+ 'EditCustomEDcess', 'value' => set_value('EditCustomEDcess'), 'id' => 'EditCustomEDcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterCustomEDcess', 'value' => set_value('EditAfterCustomEDcess'), 'id' => 'EditAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ Custom S & H cess (D) +
+
+
+ 'EditCustomSHcess', 'value' => set_value('EditCustomSHcess'), 'id' => 'EditCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterCustomSHcess', 'value' => set_value('EditAfterCustomSHcess'), 'id' => 'EditAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+ Subtotal (E) +
+
+ +
+
+
+ 'EditSubtotal', 'value' => set_value('EditSubtotal'), 'id' => 'EditSubtotal', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + + +
+
+ + + + IGST on (E): (F) +
+
+
+ 'EditIgstInt ', 'value' => set_value('EditIgstInt', 0), 'id' => 'EditIgstInt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateIgst()'); + echo form_input($data); + ?> +
+
+
+
+ 'EditAfterIgstInt', 'value' => set_value('EditAfterIgstInt', 0), 'id' => 'EditAfterIgstInt', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + + + + + + + +
+
+ Total Duty (G) +
+
+
+ 'EditGrossdutypayable ', 'value' => set_value('EditGrossdutypayable'), 'id' => 'EditGrossdutypayable', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + +
- +
+
+ Freight Type
'Select Freight Type'); @@ -1661,35 +2046,65 @@ endforeach; } - echo form_dropdown('drpFreighteditloc', $options, set_value('drpFreighteditloc'), 'id="drpFreighteditloc" class="form-control "'); + echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"'); ?>
-