diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 78b9e3e9..e4e5fdcb 100755 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -208,7 +208,9 @@ class Emergencypurchaseorder extends BaseController $newPONO = generate_po_number($lastPONO); // PO Master $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); - $file = $this->request->getFile('POFile'); + $file = null; + if($POType == "SERVICE"){ $file = $this->request->getFile('ServiceFile');} + if($POType == "REVENUE"){ $file = $this->request->getFile('RevenueFile');} if($file !== null){ $requestfilename = $file->getName(); if (!empty($requestfilename)) { diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 92c925fb..a680ad47 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -1442,6 +1442,8 @@ function updateIGRWeight(){ if ($value1 != $value && $key1 == $key) { $value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value; $value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1; + $value = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value) : $value; + $value1 = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value1) : $value1; // Store each changed field in an array $history_entries[] = [ 'field' => $key1, diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 74ab8b73..57eba79c 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -1361,5 +1361,16 @@ $builder = $this->db->table('t_igr_history') return $StatusName; } + public function get_TransporterId($value){ + $builder = $this->db->table('t_transporter') + ->select('id,name') + ->where('id', $value); + + $query = $builder->get()->getRow(); + + $transportername = $query ? $query->name : null; + return $transportername; + } + } \ No newline at end of file diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 78b28659..dd1eb121 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1619,31 +1619,17 @@ if (!empty($getlogpodtl)) {
- - - - -
-
-
- - -      - - -
+ + - - - - - + +
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 90d8379b..01011b4b 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -3049,7 +3049,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -3155,7 +3155,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -5208,6 +5208,7 @@ if (!empty($INRSYMBOL)) { + - - + - - + + + - - - - - - - - - - - + @@ -2044,111 +2022,110 @@ if (!empty($POItem) && $CapitalRange == '1') { - - -
+
-
- - -
+
+ + +
-
+
- 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> + 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', '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); + ?> + +
+ + +
+ + +
+
+ + '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); + ?> + +
+ +
+
+ + +
-
+
- 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); - echo form_input($data); - ?> + '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); + ?> + +
+ +
+
+ +
- -
- - -
-
- - '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); - ?> - +
+ 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); + echo form_input($data); + ?> +
-
-
-
- - +
+
+ +
+ +
+ 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
- -
- - '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', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);'); - echo form_input($data); - ?> -
-
-
-
- -
- -
- 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
- +
+
@@ -2568,18 +2542,7 @@ if (!empty($POItem) && $CapitalRange == '1') { var capital = ; if (capital == 0) { $('#CAPdiv').hide(); - $('#ADDCAPdiv').hide(); - $('#ADDCAPdiv1').hide(); - $('#ADDCAPdiv2').hide(); - $('#ADDCAPdiv3').hide(); $('#EDITCAPdiv').hide(); - // $('#EDITCAPdiv1').hide(); - // $('#EDITCAPdiv2').hide(); - // $('#EDITCAPdiv3').hide(); - // $('#VIEWCAPdiv').hide(); - // $('#VIEWCAPdiv1').hide(); - // $('#VIEWCAPdiv2').hide(); - // $('#VIEWCAPdiv3').hide(); //$('#DOMdiv').hide(); } diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index b7c46863..e1520dd8 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -1569,8 +1569,7 @@ if (!empty($getlogpodtl)) {
+ href="">previously uploaded purchase order file-      @@ -1680,7 +1679,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel   Ok @@ -1712,7 +1711,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel   Ok
@@ -1742,7 +1741,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel   Ok @@ -2421,7 +2420,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel   Add Capital
@@ -2758,7 +2757,7 @@ if (!empty($getlogpodtl)) {
-

@@ -3072,7 +3071,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel   Update Capital
@@ -3669,7 +3668,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel @@ -4254,7 +4253,7 @@ if (!empty($getlogpodtl)) {
- Cancel + Cancel @@ -4548,7 +4547,7 @@ if (!empty($getlogpodtl)) { $("#CPRate").val(obj.material_rate); RequistQuantity = obj.Quantity; - var CPUOMDisplay = obj.UOM; + var CPUOMDisplay = obj.UOM ? obj.UOM : ''; $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); @@ -4608,7 +4607,7 @@ if (!empty($getlogpodtl)) { $("#EditUOM").val(obj.UOM); $("#EditQuantity").val(obj.Quantity); RequistQuantity = obj.Quantity; - var CPUOMDisplay = obj.UOM; + var CPUOMDisplay = obj.UOM ? obj.UOM : ''; $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); @@ -6508,7 +6507,8 @@ if (!empty($getlogpodtl)) { if (obj.MaterialCode === id) { $("#EditCapitalItemName").val(obj.MaterialName); $("#EditCPUOM").val(obj.UOM); - var EDITUOMDisplay = obj.UOM; + var EDITUOMDisplay = obj.UOM ? obj.UOM : ''; + $("#EditCPQuantity").val(obj.Quantity); RequistQuantity = obj.Quantity; $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EDITUOMDisplay + ')'); diff --git a/app/Views/editOldemppay.php b/app/Views/editOldemppay.php index d2b0d818..f6c765cb 100755 --- a/app/Views/editOldemppay.php +++ b/app/Views/editOldemppay.php @@ -48,6 +48,7 @@ $Remaining_Due = ''; $Paid_Due = ''; $Paid_Amount = 0; $loanid = ''; +$pending_due_amount = 0; if (!empty($emppay)) { @@ -115,6 +116,7 @@ if (!empty($emppay)) { $loanid = $ep->Loan_ID; $request_letter = $ep->request_letter; $payment_statement = $ep->payment_statement; + $pending_due_amount = $Remaining_Due * $Monthly_due; } } @@ -236,6 +238,12 @@ if (!empty($emppay)) {
+
+
+ + +
+
@@ -434,12 +442,14 @@ if (!empty($emppay)) { Paid_Amount = document.getElementById('Paid_Amount').value; loan = loan - Paid_Amount totalDueAmt = loan / no_of_due; + balanceDueAmount = no_of_due * totalDueAmt; document.getElementById('monthly_due').value = Math.ceil(totalDueAmt); document.getElementById('remaining_due').value = Math.ceil(no_of_due); + document.getElementById('balance_due_amount').value = Math.ceil(balanceDueAmount); }