RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHANGE_SANJEEV_ISSUE_ISSUE_CLEAR2

Browse Source
This commit is contained in:
aadhavan valli 2024-09-26 17:27:12 +05:30
parent 6b418033b7
commit c8f7fbe528
6 changed files with 990 additions and 985 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/Purchaseorder.php
View File

@ -2944,6 +2944,9 @@ class Purchaseorder extends BaseController
$POList['POFile'] = $requestfilename; $POList['POFile'] = $requestfilename;
} }
} }
}else{
log_message('error', 'File Upload not Done' . $requestfilename);
return json_encode($this->requestr);
} }
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
@ -3033,7 +3036,7 @@ class Purchaseorder extends BaseController
$DiscountType = $this->request->getPost('DisType' . $i); $DiscountType = $this->request->getPost('DisType' . $i);
$DiscountValue = $this->request->getPost('DisVal' . $i); $DiscountValue = $this->request->getPost('DisVal' . $i);
$AfterDiscount = $this->request->getPost('AfterDisVal' . $i); $AfterDiscount = $this->request->getPost('AfterDisVal' . $i);
$TaxtotalOrderValue = $itemRate * $Quantity + $OtherAmt + $AfterCgst + $AfterSgst + $AfterIgst - $AfterDiscount; $TaxtotalOrderValue = (float)$itemRate * (float)$Quantity + (float)$OtherAmt + (float)$AfterCgst + (float)$AfterSgst + (float)$AfterIgst - (float)$AfterDiscount;
$OtherAmt = $this->request->getPost('OtherAmt' . $i); $OtherAmt = $this->request->getPost('OtherAmt' . $i);

46
app/Views/capitalpurchaseorder.php
View File

@ -93,9 +93,11 @@ if (!empty($INRSYMBOL)) {
#mceu_1 { #mceu_1 {
border-width: 0px 0px 0px !important; border-width: 0px 0px 0px !important;
} }
#mceu_0 { #mceu_0 {
padding: 1px !important; padding: 1px !important;
} }
.modal { .modal {
overflow: auto !important; overflow: auto !important;
} }
@ -1197,10 +1199,10 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
</span>
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="padding:1%;"></div>
<div class="form-row" id="ModalImportTaxHide"> <div class="form-row" id="ModalImportTaxHide" style="border:1px solid #000;padding:0px;">
<br /> <br />
<div class="form-group col-md-6" style="padding:10px;"> <div class="form-group col-md-6" style="padding:10px;">
<div class="form-row"> <div class="form-row">
@ -1402,17 +1404,15 @@ if (!empty($INRSYMBOL)) {
<hr /> <hr />
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-6">
Duty Impact <label>Duty Impact</label>
</div>
<div class="form-group col-md-4">
<?php <?php
$data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); $data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact'), 'id' => 'DutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4" style="margin-top: -3.1%"> <div class="form-group col-md-6">
<span>Quantity</span> <label>Quantity</label>
<?php <?php
$data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); $data = array('name' => 'PurQuantity', 'value' => set_value('PurQuantity'), 'id' => 'PurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
echo form_input($data); echo form_input($data);
@ -1420,12 +1420,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-6">
Custom Duty<?php echo " ($INR)/UOM" ?> <label> Custom Duty<?php echo " ($INR)/UOM" ?></label>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<?php <?php
$data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true'); $data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses'), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1435,25 +1431,17 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-6">
Clearing Charges <?php echo "($INR)" ?> <label> Clearing Charges <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<?php <?php
$data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();'); $data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges'), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
</div>
<div class="form-group col-md-4">
<?php <?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1822,7 +1810,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="padding:1%;"></div>
<div class="form-row" style="padding:0px;" id="EditModalImportTaxHide"> <div class="form-row" style="padding:0px;border:1px solid" id="EditModalImportTaxHide">
<br /> <br />
<div class="form-group col-md-6" style="padding:10px;text-align:left;"> <div class="form-group col-md-6" style="padding:10px;text-align:left;">
<div class="form-row"> <div class="form-row">
@ -2190,13 +2178,13 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-check form-check-inline"> <div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="optcapital" id="optcapitalYes" value="0"> <input class="form-check-input" type="radio" name="optcapital" id="optcapital" checked="checked" value="0">
<label class="form-check-label" for="optcapitalYes">YES</label> <label class="form-check-label" for="optcapitalYes">YES</label>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-check form-check-inline"> <div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="optcapital" id="optcapitalNo" value="1" checked> <input class="form-check-input" type="radio" name="optcapital" id="optcapital" value="1" checked>
<label class="form-check-label" for="optcapitalNo">NO</label> <label class="form-check-label" for="optcapitalNo">NO</label>
</div> </div>
</div> </div>
@ -5065,6 +5053,8 @@ if (!empty($INRSYMBOL)) {
capitalType1 = $("input:radio[name='optcapital']:checked").val(); capitalType1 = $("input:radio[name='optcapital']:checked").val();
console.log(capitalType1);
console.log(capitalType1 == 0);
if (capitalType1 == 0) { if (capitalType1 == 0) {
capitalType = 'International'; capitalType = 'International';

22
app/Views/editCapitalPo.php
View File

@ -224,9 +224,11 @@ if (!empty($getlogpodtl)) {
#mceu_1 { #mceu_1 {
border-width: 0px 0px 0px !important; border-width: 0px 0px 0px !important;
} }
#mceu_0 { #mceu_0 {
padding: 1px !important; padding: 1px !important;
} }
.modal { .modal {
overflow: auto !important; overflow: auto !important;
} }
@ -639,7 +641,7 @@ if (!empty($getlogpodtl)) {
<label>Exchange Rate On</label> <label>Exchange Rate On</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num date-picker-common', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1733,12 +1735,8 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:2px">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>
<?php <?php
@ -1774,10 +1772,6 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="form-row" style="padding:2px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
CGST In % CGST In %
</div> </div>
@ -2410,8 +2404,6 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:0px">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2447,8 +2439,6 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="form-row" style="padding:0px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
CGST In % CGST In %
</div> </div>
@ -5809,6 +5799,12 @@ if (!empty($getlogpodtl)) {
formData.append('txtRowCount', $('#txtRowCount').val()); formData.append('txtRowCount', $('#txtRowCount').val());
formData.append('txtPONO', $('#txtPONO').val()); formData.append('txtPONO', $('#txtPONO').val());
formData.append('capitalType', $('#capitalType').val()); formData.append('capitalType', $('#capitalType').val());
const fileInput = document.getElementById('POFile');
if (fileInput.files.length > 0) {
formData.append('POFile', fileInput.files[0]);
} else {
console.error('No file selected.');
}
$('input, select, textarea').each(function() { $('input, select, textarea').each(function() {
var input = $(this); var input = $(this);
var inputID = input.attr('id'); // Get the ID of the input field var inputID = input.attr('id'); // Get the ID of the input field

42
app/Views/editRevenuepurchaseorder.php
View File

@ -3283,6 +3283,27 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row">
<div class="form-group col-md-8"></div>
<div class="form-group col-md-2">
<label>CGST In %</label>
<div class="form-group">
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-2">
<label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row" id="SGSTEditModel"> <div class="form-row" id="SGSTEditModel">
<div class="form-group col-md-8"></div> <div class="form-group col-md-8"></div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
@ -3325,27 +3346,6 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-row">
<div class="form-group col-md-8"></div>
<div class="form-group col-md-2">
<label>CGST In %</label>
<div class="form-group">
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();RevenueChangeEditSgst();');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-2">
<label>CGST Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"></div> <div class="form-group col-md-8"></div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">

6
app/Views/includes/new_footer.php
View File

@ -60,6 +60,12 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('select').addClass('form-control'); $('select').addClass('form-control');
$(".date-picker-common")
.datepicker({
autoclose: true,
orientation: 'bottom',
format: 'dd-mm-yyyy',
todayHighlight: true });
form = $(".form-date-search") form = $(".form-date-search")
.datepicker({ .datepicker({
autoclose: true, autoclose: true,

12
app/Views/includes/new_header.php
View File

@ -71,7 +71,17 @@
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" /> <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
<style> <style>
.modal { overflow: auto !important; } .mce-edit-area.mce-container.mce-panel.mce-first.mce-last.mce-stack-layout-item {
border-width: 0px 0px 0px !important;
}
.mce-tinymce.mce-container.mce-panel {
padding: 1px !important;
}
.modal {
overflow: auto !important;
}
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 5px; width: 5px;