Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

This commit is contained in:
vadivel J 2024-09-24 17:51:51 +05:30
commit 33d827936c
19 changed files with 14426 additions and 14676 deletions

View File

@ -67,7 +67,7 @@ class Payslip extends BaseController
$PayOn = $this->request->getPost('payon');
$EmpId = $this->request->getPost('employee');
$res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn);
$result = $res[0];
@ -83,10 +83,13 @@ class Payslip extends BaseController
{
$loan_id = $result->Loan_ID;
if($result->Remaining_Due - 1 == 0){ $is_Active = 0; }else{ $is_Active = 1; }
$loan = [
'Paid_Due' => $result->Paid_Due + 1,
'Remaining_Due' => $result->Remaining_Due - 1,
'Paid_Amount' => $result->Paid_Amount + $result->Loan_Recovered,
'is_Active' => $is_Active
];
$loanHistory = [
@ -130,11 +133,16 @@ class Payslip extends BaseController
'ESINumber' => $result->ESINO,
'UANNO' => $result->PFNO,
];
// print_r($result);
// print_r($loan);
// print_r($loanHistory);
// print_r($data);
// die;
$insert = $this->payroll_model->insertPayroll($data);
if($insert){
if(count($loan)){
@ -703,7 +711,7 @@ class Payslip extends BaseController
$data['pf'] = $pf;
$data['over_time'] = $ot;
// dd($data);
$this->global['pageTitle'] = 'Payroll Monthly Inputs';
$this->loadViews("monthlypayinputs", $this->global, $data, NULL);
}

View File

@ -1215,6 +1215,7 @@ class Purchaseorder extends BaseController
//This used to Edit the Revenue Purchase Order
function EditRevenuePurchaseOrder()
{
// print_r($this->request->getPost());die;
$PONO = $this->request->getPost('txtPONO');
$POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt);

View File

@ -1201,7 +1201,7 @@ if (!empty($getlogpodtl)) {
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
<?php
} else { ?>
<td> <a data-target='#VIEWSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWSERVICE"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
<td> <a data-target='#VIEWSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWSERVICE"><i class="fa fa-eye" title="<?php echo $record->ReqNo; ?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
<?php
} ?>
</tr>
@ -1271,7 +1271,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-row">
<!--start new fields 1 sep-->
<div class="form-group col-md-12">
<div class="form-group col-md-11">
<label>Description Of Service <span class="text-danger">*</label>
<?php
@ -1283,7 +1283,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-11">
<label>Scope Of Work</label>
<?php
$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', strip_tags($ServiceDescription)), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@ -2116,9 +2116,6 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-3" style="display: none;" id="ViewotherDescription">
<label>Item Name</label>
<div>
@ -2128,10 +2125,6 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-3">
<label>UOM</label>
<div>
@ -2148,14 +2141,10 @@ if (!empty($getlogpodtl)) {
$data = array('name' => 'ViewFrequency', 'value' => set_value('ViewFrequency'), 'id' => 'ViewFrequency', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label>
<div>
@ -2175,9 +2164,9 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control');
echo form_input($data); ?>
<label>Per</label>
<?php $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3">
<label><?php echo "Basic Amount ($INRSYM)"; ?></label>
@ -2188,27 +2177,21 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6" align="right">
CGST In %
</div>
<div class="form-group col-md-3">
<div>
<?php
$data = array('name' => 'ViewCgst', 'value' => set_value('ViewCgst'), 'id' => 'ViewCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3">
<div>
<?php
$data = array('name' => 'ViewAfterCgst', 'value' => set_value('ViewAfterCgst'), 'id' => 'ViewAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data);
@ -2216,17 +2199,13 @@ if (!empty($getlogpodtl)) {
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6" align="right">
SGST In %
</div>
<div class="form-group col-md-3">
<div>
<?php
$data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'readonly' => 'true');
echo form_input($data);
@ -2236,43 +2215,33 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-3">
<div>
<?php
$data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6" align="right">
IGST In %
</div>
<div class="form-group col-md-3">
<div>
<?php
$data = array('name' => 'ViewIgst', 'value' => set_value('ViewIgst'), 'id' => 'ViewIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3">
<div>
<?php
$data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-9" align="right">
@ -2302,21 +2271,18 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Service Description<span class="text-danger">*</span></label> <?php
$data = array('name' => 'ViewtxtSpcialInstruction', 'value' => set_value('ViewtxtSpcialInstruction'), 'id' => 'ViewtxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
echo form_textarea($data);
?>
<label>Service Description<span class="text-danger">*</span></label>
<?php $data = array('name' => 'ViewtxtSpcialInstruction', 'value' => set_value('ViewtxtSpcialInstruction'), 'id' => 'ViewtxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40', 'readonly' => 'true');
echo form_textarea($data); ?>
</div>
</div><br />
</div><br>
<div class="modal-footer">
<div class="form-row">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</div>
</div>
</form>
</div>
</div>
</div><!-- /.modal -->
@ -3293,13 +3259,21 @@ if (!empty($getlogpodtl)) {
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#EditMaterialCode").append($('<option></option>')
.val($('#materialCode' + userid).val())
.html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())
.prop('selected', true)
);
// Make the select element read-only (disable it)
$("#EditMaterialCode").prop('disabled', true);
// $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
// For Binding Material list center for the selected Requistion Number
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
@ -3336,6 +3310,11 @@ if (!empty($getlogpodtl)) {
}
});
$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');

File diff suppressed because it is too large Load Diff

View File

@ -1448,7 +1448,7 @@
</div>
<br>
</div>
@ -1628,24 +1628,14 @@
<div class="form-row">
<div class="form-group col-md-3">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => '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 "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
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 "'); ?>
</div>
<div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
<label>NO Of Trips</label>
@ -1948,24 +1938,15 @@
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="AmendTripsValue" style="display:none;">
<span>NO Of Trips</span>
@ -3996,15 +3977,19 @@
$('#drpamendFreight').change(function() {
//alert();
var FreightType = $('#drpamendFreight').val();
if (FreightType == "PER TRIP") {
$('#AmendTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#AmendNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#AmendtxtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#AmendtxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#AmendTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#AmendNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#AmendtxtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#AmendtxtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
});
@ -4414,15 +4399,21 @@
$('#drpFreighteditloc').change(function() {
var FreightType = $("#drpFreighteditloc").val();
if (FreightType == '<?php echo PERTRIP; ?>') {
$('#TripsValuelocedit').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#NOOfTripslocedit').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtFreightlocedit').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtAfterFreightlocedit').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#TripsValuelocedit').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#NOOfTripslocedit').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtFreightlocedit').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtAfterFreightlocedit').parent().removeClass('col-md-2').addClass('col-md-3');
}
if ($('#EditCPRate').val() != '' && $('#EditMaterialCode').val() != "0") {
selValue = $("#drpFreighteditloc").val();

File diff suppressed because it is too large Load Diff

View File

@ -409,7 +409,7 @@ if (!empty($RequistionDetails)) {
<!-- <label>Delivery Date</label>
<?php
$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt', 'class' => 'form-control', 'required' => 'true');
$data = array('type' => 'date', 'name' => 'Deliverydt', 'value' => set_value('Deliverydt', $CurrentDate), 'id' => 'Deliverydt', 'class' => 'form-control', 'required' => 'true');
echo form_input($data);
?> -->
@ -806,10 +806,10 @@ if (!empty($RequistionDetails)) {
<p id="labelEditBasicPriceUs"><b><?php echo "Basic Value in $Currencycode ($Value)" ?></b></p>
<?php
$data = array('name' => 'EditimBasicPrice', 'value' => set_value('EditimBasicPrice'), 'id' => 'EditimBasicPrice', 'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
<?php
$data = array('name' => 'EditimBasicPrice', 'value' => set_value('EditimBasicPrice'), 'id' => 'EditimBasicPrice', 'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
@ -1040,61 +1040,46 @@ if (!empty($RequistionDetails)) {
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpamendFreight', $options, set_value('drpamendFreight'), 'id="drpamendFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="AmendTripsValue" style="display:block;">
<span>NO Of Trips</span>
<div>
<?php
$data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'AmendNOOfTrips', 'value' => set_value('AmendNOOfTrips'), 'id' => 'AmendNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<span>Freight Rate </span>
<div>
<?php
$data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'AmendtxtFreight', 'value' => set_value('AmendtxtFreight'), 'id' => 'AmendtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt In <?php echo $INR; ?></span>
<div>
<?php
$data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'AmendtxtAfterFreight', 'value' => set_value('AmendtxtAfterFreight'), 'id' => 'AmendtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<!--End of Adding of freight in edit model -->
<center> <label>Cost of the product Per UOM</label></center>
<hr/>
<center> <label>Cost of the product Per UOM</label></center>
<hr />
<div class="form-row">
<div class="form-group col-md-4">
Duty Impact
@ -1250,7 +1235,7 @@ if (!empty($RequistionDetails)) {
<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
<!-- <input type="hidden" name="<?php //echo 'AvlBudAmt'.$index
?>" id="<?php //echo 'AvlBudAmt'.$index
?>" value="<?php //echo $AvlBudAmt;
?>" value="<?php //echo $AvlBudAmt;
?>" /> -->
<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
@ -2433,151 +2418,152 @@ if (!empty($RequistionDetails)) {
$(document).ready(function() {
$('#editimportpomodel').on("shown.bs.modal", function(e) {
$('#editimportpomodel').on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
// alert('test'+userid);
userid = $(e.relatedTarget).data('userid');
// alert('test'+userid);
var tr = document.getElementById(userid);
var tr = document.getElementById(userid);
var cellval = tr.cells;
var cellval = tr.cells;
var id = $('#Reqnumber' + userid).val();
var id = $('#Reqnumber' + userid).val();
$('#EditReqNo').val($('#Reqnumber' + userid).val());
$('#EditReqNo').val($('#Reqnumber' + userid).val());
$('#EditdeptName').val($('#departmentName' + userid).val());
$("#EditCostCenter").val($('#costCode' + userid).val());
$('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
$('#EditdeptName').val($('#departmentName' + userid).val());
$("#EditCostCenter").val($('#costCode' + userid).val());
$('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
$('#EditItemName').val($('#materialName' + userid).val());
$('#EditUOM').val($('#uom' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
//RequistQuantity = $('#quantity'+userid).val();
$('#EditRate').val($('#itemRate' + userid).val());
$('#EditItemName').val($('#materialName' + userid).val());
$('#EditUOM').val($('#uom' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
//RequistQuantity = $('#quantity'+userid).val();
$('#EditRate').val($('#itemRate' + userid).val());
var q = parseFloat($('#quantity' + userid).val());
// console.log(q);
var q = parseFloat($('#quantity' + userid).val());
// console.log(q);
var r = parseFloat($('#itemRate' + userid).val());
//console.log(r);
var r = parseFloat($('#itemRate' + userid).val());
//console.log(r);
var as = q * r;
var as = q * r;
$('#EdittxtBasicValue').val(parseFloat(as).toFixed(2));
$('#EdittxtBasicValue').val(parseFloat(as).toFixed(2));
$('#EditimBasicPrice').val(parseFloat(as).toFixed(2));
$('#EditimBasicPrice').val(parseFloat(as).toFixed(2));
// $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val());
// $('#EdittxtBasicValue').val($('#ProductPrice'+userid).val());
// $('#EditimBasicPrice').val($("#ProductPrice"+userid).val());
var a = parseFloat($('#EdittxtBasicValue').val())
var b = parseFloat($('#ExchangeRate').val());
var c = a * b;
//console.log(c);
// $('#EditimBasicPrice').val($("#ProductPrice"+userid).val());
var a = parseFloat($('#EdittxtBasicValue').val())
var b = parseFloat($('#ExchangeRate').val());
var c = a * b;
//console.log(c);
$('#EditINRBasicvalue').val(parseFloat(c).toFixed(2));
$('#EditAfterBasicPriceTax').val(parseFloat(c).toFixed(2));
$('#EditLandingCharge').val($("#LandingCharge" + userid).val());
$('#EditAfterLandingCharge').val($("#AfterLandingCharge" + userid).val());
$('#EditINRBasicvalue').val(parseFloat(c).toFixed(2));
$('#EditAfterBasicPriceTax').val(parseFloat(c).toFixed(2));
$('#EditLandingCharge').val($("#LandingCharge" + userid).val());
$('#EditAfterLandingCharge').val($("#AfterLandingCharge" + userid).val());
$('#EditCustomduty').val($("#CustomDuty" + userid).val());
$('#EditAfterCustomduty').val($("#AfterCustomDuty" + userid).val());
$('#EditCustomduty').val($("#CustomDuty" + userid).val());
$('#EditAfterCustomduty').val($("#AfterCustomDuty" + userid).val());
$('#EditCustomEDcess').val($("#CustomEdCess1" + userid).val());
$('#EditAfterCustomEDcess').val($("#AfterCustomEdCess1" + userid).val());
$('#EditCustomSHcess').val($("#CustomSHCess" + userid).val());
$('#EditAfterCustomSHcess').val($("#AfterCustomSHCess" + userid).val());
$('#EditCustomEDcess').val($("#CustomEdCess1" + userid).val());
$('#EditAfterCustomEDcess').val($("#AfterCustomEdCess1" + userid).val());
$('#EditCustomSHcess').val($("#CustomSHCess" + userid).val());
$('#EditAfterCustomSHcess').val($("#AfterCustomSHCess" + userid).val());
$('#EditGrossdutypayable').val($("#Grossdutypayable1" + userid).val());
$('#EditGrossdutypayable').val($("#Grossdutypayable1" + userid).val());
$('#EditPurQuantity').val($("#QuantityKG" + userid).val());
$('#EditPurQuantity').val($("#QuantityKG" + userid).val());
$('#EditCustomDutyExpenses').val($("#CustomDutyExpensesPerKG" + userid).val());
$('#EditCustomDutyExpenses').val($("#CustomDutyExpensesPerKG" + userid).val());
//$('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val());
//$('#EditAfterBasicPriceTax').val($("#BasicINRValue"+userid).val());
$('#EditTotalExp').val($("#TotalValue" + userid).val());
//$('#EditINRBasicvalue').val($("#BasicINRValue"+userid).val());
$('#EditTotalExp').val($("#TotalValue" + userid).val());
//$('#EditINRBasicvalue').val($("#BasicINRValue"+userid).val());
$('#EditAfterAssessable').val($("#AssessableValue" + userid).val());
$('#EditSubtotal').val($("#SubTotal" + userid).val());
$('#EditIgst').val($("#IGST" + userid).val());
$('#EditAfterIgst').val($("#AfterIGST" + userid).val());
$('#EditDutyImpact').val($("#DutyImpact" + userid).val());
$('#EditNett').val($("#NetValue" + userid).val());
$('#EditClearingCharges').val($("#ClearingCharge" + userid).val());
$('#EditAfterAssessable').val($("#AssessableValue" + userid).val());
$('#EditSubtotal').val($("#SubTotal" + userid).val());
$('#EditIgst').val($("#IGST" + userid).val());
$('#EditAfterIgst').val($("#AfterIGST" + userid).val());
$('#EditDutyImpact').val($("#DutyImpact" + userid).val());
$('#EditNett').val($("#NetValue" + userid).val());
$('#EditClearingCharges').val($("#ClearingCharge" + userid).val());
$('#drpamendFreight').val($("#FreightType" + userid).val());
$('#AmendNOOfTrips').val($("#NoOfTrip" + userid).val());
$('#AmendtxtFreight').val($("#FreightValue" + userid).val());
$('#AmendtxtAfterFreight').val($("#AfterFreightValue" + userid).val());
$('#drpamendFreight').val($("#FreightType" + userid).val());
$('#AmendNOOfTrips').val($("#NoOfTrip" + userid).val());
$('#AmendtxtFreight').val($("#FreightValue" + userid).val());
$('#AmendtxtAfterFreight').val($("#AfterFreightValue" + userid).val());
$('#EditAmendPer').val($("#Per" + userid).val());
$('#EditAmendPer').val($("#Per" + userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction' + userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction' + userid).val());
var FreightType = $('#drpamendFreight').val();
var FreightType = $('#drpamendFreight').val();
if (FreightType == "PER TRIP") {
if (FreightType == "PER TRIP") {
$('#AmendTripsValue').show();
} else {
$('#AmendTripsValue').hide();
}
$('#AmendTripsValue').show();
} else {
$('#AmendTripsValue').hide();
}
$('#EditTotalOrderValue').val(cellval[6].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
$('#EditTotalOrderValue').val(cellval[6].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
if (obj.ReqNo === id) {
if (obj.ReqNo === id) {
$.each(SelectedMaterialList.Mat, function(idx1, el) {
if (id == el.ReqNo) {
$.each(SelectedMaterialList.Mat, function(idx1, el) {
if (id == el.ReqNo) {
if (el.materialCode == obj.MaterialCode) {
isAdded = "1";
return false;
} else {
isAdded = "0";
}
if (el.materialCode == obj.MaterialCode) {
isAdded = "1";
return false;
} else {
isAdded = "0";
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
});
}
});
}
});});
});
});
$('.EditImport').click(function() {
@ -3010,16 +2996,21 @@ if (!empty($RequistionDetails)) {
//alert();
var FreightType = $('#drpamendFreight').val();
if (FreightType == "PER TRIP") {
$('#AmendTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#AmendNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#AmendtxtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#AmendtxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#AmendTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#AmendNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#AmendtxtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#AmendtxtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
selValue = $("#drpamendFreight").val();
$('#AmendtxtFreight').val('');

View File

@ -246,17 +246,30 @@ if (!empty($emppay)) {
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Paid Amount</span>
<input type="text" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" readonly>
<input type="text" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" readonly>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="">Paid Due</span>
<input type="text" class="form-control requried num" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>" readonly>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="">Remaining Due</span>
<input type="text" class="form-control requried num" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>" readonly>
</div>
</div>
</div>
<input type="hidden" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>">
<input type="hidden" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>">
<!-- <input type="hidden" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>">
<input type="hidden" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>"> -->
</div>
</div>
<div class="col-md-12 text-right">
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:red ;color: white; margin-right: 15px;width: 80px;border:none;" />
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:#ee4d4d;color:white;margin-right:15px;width:80px;border:none;" />
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
</div>
</div>
@ -308,27 +321,7 @@ if (!empty($emppay)) {
</div> <!-- content -->
<script>
function calculateBasic()
{
var Totalsalary = document.getElementById('Total_Salary').value;;
var HRA = document.getElementById('HRA_Rate').value;
if (HRA == '') {
alert("Please Enter HRA RATE..");
document.getElementById('HRA_Rate').focus();
} else if (Totalsalary == '') {
alert("Please Enter Total Salary..");
document.getElementById('Total_Salary').focus();
} else {
var temp = (Totalsalary * (HRA / 100));
var basic = Totalsalary - temp;
document.getElementById('Basic_Pay').value = basic;
document.getElementById('HRA_Amount').value = temp;
}
//alert(basic);
}
@ -351,14 +344,13 @@ if (!empty($emppay)) {
} else {
document.getElementById('no_of_due').value = Math.ceil(totaldue);
var noofdues = document.getElementById('no_of_due').value;
$('#remaining_due').val(noofdues);
$('#Paid_Amount').val("0.00");
$('#paid_due').val(0);
$('#remaining_due').val(noofdues - $('#paid_due').val());
// $('#Paid_Amount').val("0.00");
// $('#paid_due').val(0);
}
}
} //else if(loan == "" || loan == 0)
//alert(totaldue);
}
dateCalulation();
@ -366,7 +358,7 @@ if (!empty($emppay)) {
}
function dateCalulation() {
//alert('j');
var loanamount = document.getElementById('Loan_Amount').value;
if (loanamount == 0.00 || loanamount == "") {
$('#loan_issued_date').val("");
@ -377,17 +369,12 @@ if (!empty($emppay)) {
$('#Loan_Amount').val("0.00");
$('#paid_due').val(0);
$('#Paid_Amount').val("0.00");
}
}
function finalCheck() {
//alert("final check");
var loanamount = document.getElementById('Loan_Amount').value;
if (loanamount != "" && loanamount != 0.00) {
var idate = document.getElementById('loan_issued_date').value;
@ -413,9 +400,10 @@ if (!empty($emppay)) {
echo $emppay[0]->Loan_ID;
} ?>";
var i = confirm("Do You want to delete " + loanid + " from Loan Master?");
// alert(i);s
if (i) {
// $('#content').loader('show');
$('#loader').show();
$.ajax({
data: {
id: loanid
@ -426,7 +414,7 @@ if (!empty($emppay)) {
if (result) {
alert(result);
// $('#content').loader('hide');
$('#loader').hide();
window.location.href = "<?php echo base_url(); ?>emppayListings";
}

View File

@ -320,13 +320,19 @@ if (!empty($INRSYMBOL)) {
$('#drpEditFreight').change(function() {
var FreightType = $("#drpEditFreight").val();
// alert(FreightType);
if (FreightType == "PER TRIP") {
$('#EditTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#EditNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtEditFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtEditAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#EditTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#EditNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtEditFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtEditAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
selValue = $("#drpEditFreight").val();
$('#txtEditFreight').val('');
@ -919,8 +925,8 @@ if (!empty($INRSYMBOL)) {
<div class="row">
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4><?= "Amendment Revenue Purchase Order - $PONO "; ?></h4>
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
<h4><?= "Amendment Revenue Purchase Order - $PONO "; ?></h4>
<a href="<?php echo base_url() ?>amendmentpurchaseorder" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>
@ -1716,51 +1722,36 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-4"></div>
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div>
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight();');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight();');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label>
<div>
<?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight();', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Amt <?php echo "($INRSYM)" ?></label>
<div>
<?php
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div>
<div class="form-row" style="text-align:left;">

View File

@ -1,3 +1,35 @@
<script>
$(document).ready(function() {
// When the second modal is about to be shown
$('#freightcalmodel').on('show.bs.modal', function() {
// Set a higher z-index for the second modal to appear on top
$('#freightcalmodel').css('z-index', 1060); // Set the z-index for the second modal
// Ensure the second modal backdrop appears above the first one
setTimeout(function() {
$('.modal-backdrop').last().css('z-index', 1055);
}, 0);
});
// Reset z-index when the second modal is hidden (optional)
$('#freightcalmodel').on('hidden.bs.modal', function() {
$('#freightcalmodel').css('z-index', ''); // Reset to default
});
$('#packagingcalmodel').on('show.bs.modal', function() {
// Set a higher z-index for the second modal to appear on top
$('#packagingcalmodel').css('z-index', 1060); // Set the z-index for the second modal
// Ensure the second modal backdrop appears above the first one
setTimeout(function() {
$('.modal-backdrop').last().css('z-index', 1055);
}, 0);
});
// Reset z-index when the second modal is hidden (optional)
$('#packagingcalmodel').on('hidden.bs.modal', function() {
$('#packagingcalmodel').css('z-index', ''); // Reset to default
});
});
</script>
<?php $ReqType = '';
$CompanyAddress = '';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
@ -139,6 +171,10 @@ if (!empty($getlogpodtl)) {
}
?>
<style>
.modal {
overflow: auto !important;
}
/* #packagingcalmodel {
margin-top: 200px;
z-index: 1080 !important;
@ -516,7 +552,7 @@ if (!empty($getlogpodtl)) {
$('#txtAfterPackaging').val('');
selValue = $("#PackagingType").val();
if (selValue == PercentageType) {
$('#REVENUE').modal('hide');
// $('#REVENUE').modal('hide');
edit = 'PackingCalculationOn';
var PackagingCalculation = '';
$('#packagingcalmodel').modal('show');
@ -547,7 +583,7 @@ if (!empty($getlogpodtl)) {
$('#txtEditAfterPackaging').val('');
selValue = $("#EditPackagingType").val();
if (selValue == PercentageType) {
$('#EDITREVENUE').modal('hide');
// $('#EDITREVENUE').modal('hide');
var PackagingCalculation = '';
edit = 'EditPackingCalculationOn';
$('#packagingcalmodel').modal('show');
@ -606,18 +642,18 @@ if (!empty($getlogpodtl)) {
var FreightType = $("#drpFreight").val();
if (FreightType == "PER TRIP") {
$('#TripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else {
$('#TripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
}
selValue = $("#drpFreight").val();
$('#txtFreight').val('');
$('#txtAfterFreight').val('');
if (selValue == PercentageType) {
$('#REVENUE').modal('hide');
// $('#REVENUE').modal('hide');
freight = 'FreightCalculationOn';
var FreightCalculation = '';
$('#freightcalmodel').modal('show');
@ -660,11 +696,11 @@ if (!empty($getlogpodtl)) {
var FreightType = $("#drpEditFreight").val();
if (FreightType == "PER TRIP") {
$('#EditTripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else {
$('#EditTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
}
selValue = $("#drpEditFreight").val();
@ -688,16 +724,15 @@ if (!empty($getlogpodtl)) {
calculateFreight(1);
});
$('#drpViewFreight').change(function() {
var FreightType = $("#drpViewFreight").val();
if (FreightType == "PER TRIP") {
$('#ViewTripsValue').show();
$(this).parent().removeClass('col-md-4').addClass('col-md-2');
} else {
$('#ViewTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-4');
}
selValue = $("#drpViewFreight").val();
@ -2259,11 +2294,11 @@ if (!empty($getlogpodtl)) {
if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
<td> <a data-target='#EDITREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITREVENUE"><i class="ri-pencil-fill"></i></a>
&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
<?php
} else { ?>
<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
<td> <a data-target='#VIEWREVENUE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWREVENUE"><i class="fa fa-eye" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
<?php
} ?>
@ -2509,63 +2544,63 @@ if (!empty($getlogpodtl)) {
<?php if (!empty($update)) { ?>
<div class="form-row" id="editpodiv">
<!-- <div class="form-row"> -->
<label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;">
<tr>
<th>Sno</th>
<th>PONO</th>
<label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;">
<tr>
<th>Sno</th>
<th>PONO</th>
<th>LineItemNo</th>
<th>Entity</th>
<th>OldValue</th>
<th>NewValue</th>
<th>UpdatedBy</th>
<th>UpdateOn</th>
<th>LineItemNo</th>
<th>Entity</th>
<th>OldValue</th>
<th>NewValue</th>
<th>UpdatedBy</th>
<th>UpdateOn</th>
</tr>
</thead>
<tbody>
<?php
if (!empty($getlogpodtl)) {
</tr>
</thead>
<tbody>
<?php
if (!empty($getlogpodtl)) {
$inde = 0;
foreach ($getlogpodtl as $oldpo) {
$inde = $inde + 1;
?>
<tr id="<?php echo $inde; ?>">
$inde = 0;
foreach ($getlogpodtl as $oldpo) {
$inde = $inde + 1;
?>
<tr id="<?php echo $inde; ?>">
<td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td>
<td><?php echo $inde; ?></td>
<td><?php echo $oldpo->PONO ?></td>
<td><?php echo $oldpo->LineItemNos; ?></td>
<td><?php echo $oldpo->entity ?></td>
<?php if ($oldpo->entity == 'PO DateChanged') {
$oldValue = date('d-m-Y', strtotime($oldpo->oldValue));
} else {
$oldValue = $oldpo->oldValue;
} ?>
<td><?php echo $oldValue . '-' . $oldpo->SupplierName; ?></td>
<?php if ($oldpo->entity == 'PO DateChanged') {
$newValue = date('d-m-Y', strtotime($oldpo->newValue));
} else {
$newValue = $oldpo->newValue;
} ?>
<td><?php echo $newValue ?></td>
<td><?php echo $oldpo->FirstName ?></td>
<td><?php echo $oldpo->LineItemNos; ?></td>
<td><?php echo $oldpo->entity ?></td>
<?php if ($oldpo->entity == 'PO DateChanged') {
$oldValue = date('d-m-Y', strtotime($oldpo->oldValue));
} else {
$oldValue = $oldpo->oldValue;
} ?>
<td><?php echo $oldValue . '-' . $oldpo->SupplierName; ?></td>
<?php if ($oldpo->entity == 'PO DateChanged') {
$newValue = date('d-m-Y', strtotime($oldpo->newValue));
} else {
$newValue = $oldpo->newValue;
} ?>
<td><?php echo $newValue ?></td>
<td><?php echo $oldpo->FirstName ?></td>
<td><?php $date = new DateTime($oldpo->UpdatedOn);
echo $date->format('d-m-Y'); ?></td>
<td><?php $date = new DateTime($oldpo->UpdatedOn);
echo $date->format('d-m-Y'); ?></td>
</tr>
<?php
}
</tr>
<?php
}
?>
</tbody>
</table>
}
?>
</tbody>
</table>
<!-- </div> -->
</div>
<?php } else {
@ -2582,7 +2617,9 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if(isset($index)){ echo $index; } ?>">
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
echo $index;
} ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
@ -2837,18 +2874,16 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-4"></div>
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-2" id="TripsValue" style="display:none;">
<label>NO Of Trips</label>
@ -3191,22 +3226,13 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-4"></div>
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"');
?>
</div>
<?php $options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control"'); ?>
</div>
<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label>
@ -3500,7 +3526,6 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-4">
<label>Packaging Type </label>
<div>
<?php
$data = array('name' => 'ViewPackagingType', 'value' => set_value('ViewPackagingType'), 'id' => 'ViewPackagingType', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
@ -3540,35 +3565,29 @@ if (!empty($getlogpodtl)) {
endforeach;
}
echo form_dropdown('drpViewFreight', $options, set_value('drpViewFreight'), 'id="drpViewFreight" class="form-control"');
echo form_dropdown('drpViewFreight', $options, set_value('drpViewFreight'), 'id="drpViewFreight" class="form-control" disabled');
?>
</div>
<div class="form-group col-md-2" id="ViewTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label>
<div class="form-group">
<?php
$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'onchange' => 'calculateFreight(2);');
$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'style' => 'text-align:right;', 'onchange' => 'calculateFreight(2);', 'readonly' => 'readonly');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-2">
<label><?php echo "Freight Amt ($INRSYM)"; ?> </label>
<div class="form-group">
<?php
$data = array('name' => 'txtViewAfterFreight', 'value' => set_value('txtViewAfterFreight'), 'id' => 'txtViewAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row">
@ -3668,7 +3687,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<div class="modal-footer">
<a class="btn btn-success ViewRevenue" ID="ViewRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
</div>
</form>
</div>
@ -3962,7 +3981,9 @@ if (!empty($getlogpodtl)) {
</div>
</script>
<script>
var index = <?php if(isset($index)){ echo $index; } ?>;
var index = <?php if (isset($index)) {
echo $index;
} ?>;
var userid = '';
var taxcheck = 0;
$("#BudgetType").change(function() {
@ -4830,7 +4851,7 @@ if (!empty($getlogpodtl)) {
var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
var txtEditAfterPackaging = $('#txtEditAfterPackaging').val() == '' ? '0.00' : $('#txtEditAfterPackaging').val();
var totvalue = parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) ;
var totvalue = parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst);
var tot = parseFloat(totvalue).toFixed(2);
// alert('tot:'+tot);
@ -5002,7 +5023,7 @@ if (!empty($getlogpodtl)) {
AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
userid = $(e.relatedTarget).data('userid');
$('#isEdit').val(1);
//alert(userid);
// alert(userid);
var tr = document.getElementById(userid);
var cellval = tr.cells;
var id = $('#Reqnumber' + userid).val();

View File

@ -644,6 +644,12 @@ foreach ($PaymentTerms as $TER) {
});
</script>
<style>
#mceu_5{
border-width: 0px 0px 0px !important;
}
#mceu_4{
padding: 1px !important;
}
/* .modal {
padding-right: 25% ! important;
} */
@ -1486,8 +1492,7 @@ foreach ($PaymentTerms as $TER) {
</div>
<div class="form-row px-3">
<div class="form-group col-md-6">
<div class="form-group col-md-6" align="right">
CGST In %
</div>
@ -1514,7 +1519,7 @@ foreach ($PaymentTerms as $TER) {
</div>
<div class="form-row px-3">
<div class="form-group col-md-6">
<div class="form-group col-md-6" align="right">
SGST In %
</div>
@ -1543,7 +1548,7 @@ foreach ($PaymentTerms as $TER) {
</div>
<div class="form-row px-3">
<div class="form-group col-md-6">
<div class="form-group col-md-6" align="right">
IGST In %
</div>
@ -1571,11 +1576,8 @@ foreach ($PaymentTerms as $TER) {
</div>
<div class="form-row px-3">
<div class="form-group col-md-3">
<div class="form-group col-md-6" align="right">
<label>Other Allowances <?php echo $INRSYM ?></label>
</div>
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<div class="form-group">
@ -1588,11 +1590,8 @@ foreach ($PaymentTerms as $TER) {
</div>
<div class="form-row px-3">
<div class="form-group col-md-3 ">
<div class="form-group col-md-6" align="right">
<label><?php echo "Total Order Value ($INRSYM)"; ?></label>
</div>
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<div class="form-group">
@ -1604,11 +1603,8 @@ foreach ($PaymentTerms as $TER) {
</div>
</div>
<div class="form-row pl-3">
<div class="form-group col-md-2">
<div class="form-group col-md-11">
<label>Service Description </label>
</div>
<div class="form-group col-md-3">
<?php $data = array(
'name' => 'EdittxtSpcialInstruction',
'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription),
@ -1630,7 +1626,7 @@ foreach ($PaymentTerms as $TER) {
<div class="modal-footer" align="right">
<div class="form-group col-md-12">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>

View File

@ -529,7 +529,7 @@ if (!empty($getlogpodtl)) {
<label>Exchange Rate On</label>
<div>
<?php
$data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateCalculatedon), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('type' => 'text', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateCalculatedon), 'id' => 'Exchangerateon', 'class' => 'form-control num form-date-search', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?>
</div>
@ -565,7 +565,7 @@ if (!empty($getlogpodtl)) {
<label>Purchase Order Date</label>
<div>
<?php
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control form-date-search', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
</div>
@ -1697,52 +1697,37 @@ if (!empty($getlogpodtl)) {
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpaddFreight', $options, set_value('drpaddFreight'), 'id="drpaddFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpaddFreight', $options, set_value('drpaddFreight'), 'id="drpaddFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-4" id="AddTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div>
<?php
$data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'addNOOfTrips', 'value' => set_value('addNOOfTrips'), 'id' => 'addNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-4">
<label>Freight Rate </label>
<div>
<?php
$data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'addtxtFreight', 'value' => set_value('addtxtFreight'), 'id' => 'addtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-4" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR; ?></label>
<div>
<?php
$data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'addtxtAfterFreight', 'value' => set_value('addtxtAfterFreight'), 'id' => 'addtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
@ -1861,7 +1846,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12">
<label>Import Description :</label>
<?php
$data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
$data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40', 'disabled' => 'disabled');
echo form_textarea($data);
?>
</div>
@ -2304,52 +2289,37 @@ if (!empty($getlogpodtl)) {
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="EditTripsValue" style="display:block;">
<span>NO Of Trips</span>
<div>
<?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<span>Freight Rate </span>
<div>
<?php
$data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'edittxtFreight', 'value' => set_value('edittxtFreight'), 'id' => 'edittxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt <?php echo $INR; ?></span>
<div>
<?php
$data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
@ -2486,18 +2456,15 @@ if (!empty($getlogpodtl)) {
</div>
<form>
<div class="modal-body p-4">
<div class="form-row">
<div class="form-row" style="margin-bottom: 10px;">
<div class="form-group col-md-3">
<label>Req No<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
<div>
<?php
$data = array('name' => 'ViewReqNo', 'value' => set_value('ViewReqNo'), 'id' => 'ViewReqNo', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-3">
<label>Department Name</label>
<div>
@ -2510,123 +2477,88 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-3">
<label>Cost Center Code</label>
<div>
<?php
$options = array("0" => 'Select Cost Center');
<?php $options = array("0" => 'Select Cost Center');
//echo form_dropdown('EditCostCenter', $options,set_value('EditCostCenter'),'id="EditCostCenter"' ,'class="form-control"');
$data = array('name' => 'ViewCostCenter', 'value' => set_value('ViewCostCenter'), 'id' => 'ViewCostCenter', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-3" style="padding-right: 0px;">
<label>Available Budget Amount (<?php echo $INR ?>)</label>
<div>
<?php
$data = array('name' => 'ViewAvlBudAmt', 'value' => set_value('ViewAvlBudAmt'), 'id' => 'ViewAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewAvlBudAmt', 'value' => set_value('ViewAvlBudAmt'), 'id' => 'ViewAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-row" style="margin-bottom: 10px;">
<div class="form-group col-md-2">
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
<!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
<div>
<?php
// $options = array("0"=>'Item Code');
//if(!empty($MaterialList))
//{
// foreach ($MaterialList as $SID):
// $options[$SID->MaterialCode] = $SID->MaterialCode.' '.' - '.' '.$SID->MaterialName;
//endforeach;
//}
//echo form_dropdown('ImportMaterialCode', $options,set_value('ImportMaterialCode'),'id="ImportMaterialCode"' ,'class="form-control"');
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('ViewMaterialCode', $options, set_value('ViewMaterialCode'), 'id="ViewMaterialCode" class="form-control"');
?>
echo form_dropdown('ViewMaterialCode', $options, set_value('ViewMaterialCode'), 'id="ViewMaterialCode" class="form-control"'); ?>
</div>
</div>
<div class="form-group col-md-2">
<label>Item Name</label>
<div>
<?php
$data = array('name' => 'ViewItemName', 'value' => set_value('ViewItemName'), 'id' => 'ViewItemName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewItemName', 'value' => set_value('ViewItemName'), 'id' => 'ViewItemName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-1">
<label>UOM</label>
<div>
<?php
$data = array('name' => 'ViewUOM', 'value' => set_value('ViewUOM'), 'id' => 'ViewUOM', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewUOM', 'value' => set_value('ViewUOM'), 'id' => 'ViewUOM', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-2">
<label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
<div>
<?php
$data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewQuantity', 'value' => set_value('ViewQuantity'), 'id' => 'ViewQuantity', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange(),ExceedEditQuantityCheck()');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-2">
<label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
<div>
<?php
$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditRatechange()');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-1">
<label>Per</label> <?php
$data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'readonly' => true, 'class' => 'form-control');
echo form_input($data); ?>
<label>Per</label>
<?php $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'readonly' => true, 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-2" style="padding: 0px;">
<!-- <label><?php echo "Basic Value In"; ?></label>-->
<!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
<!-- <p id=label3> -->
<label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
<div>
<?php
//$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'ViewtxtBasicValue', 'value' => set_value('ViewtxtBasicValue'), 'id' => 'ViewtxtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
echo form_input($data); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-row" style="margin-bottom: 10px;">
<div class="form-group col-md-3">
<!-- Basic Price in US $ per Ton : -->
<p id=labelEditBasicPriceUs><b><?php echo "Basic Price in $Currencycode ($Value)" ?></p>
<label id=labelEditBasicPriceUs><b><?php echo "Basic Price in $Currencycode ($Value)" ?></b></label>
<div>
<?php
$data = array('name' => 'ViewimBasicPrice', 'value' => set_value('ViewimBasicPrice'), 'id' => 'ViewimBasicPrice', 'class' => 'form-control num', 'placeholder ' => 'basic price', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2634,27 +2566,17 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-3">
<!-- Exchange Rate : -->
<label id=labelviewexc><?php echo "Exchange Rate ($Currencycode ($Value))" ?></label>
<div>
<?php
$data = array('name' => 'ViewExchangeRt', 'value' => set_value('ViewExchangeRt', $ExchangeRate), 'id' => 'ViewExchangeRt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewExchangeRt', 'value' => set_value('ViewExchangeRt', $ExchangeRate), 'id' => 'ViewExchangeRt', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-3">
<!-- Basic value in INR : -->
<p id=labelEditBasicINR><label><?php echo "Basic value in ($INR) :"; ?></label></p>
<label id=labelEditBasicINR><?php echo "Basic value in ($INR) :"; ?></label>
<div>
<?php
$data = array('name' => 'ViewINRBasicvalue', 'value' => set_value('ViewINRBasicvalue'), 'id' => 'ViewINRBasicvalue', 'class' => 'form-control num', 'readonly' => 'true');
@ -2666,9 +2588,9 @@ if (!empty($getlogpodtl)) {
<a href="http://www.xe.com/" target="_blank"><u>Click nere to check Today's Foreign Exchange value</u></a>
</div>-->
</div>
<div class="form-row" style="padding:0px;">
<br />
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-row" style="border: 1px solid;padding:0px;margin: 10px 0px;">
<br>
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<div class="form-group col-md-4">
Basic Price (<?php echo $INR ?>)
@ -2697,21 +2619,14 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewLandingCharge', 'value' => set_value('ViewLandingCharge'), 'id' => 'ViewLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateloadingcharge()');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'readonly' => true, 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
@ -2759,9 +2674,6 @@ if (!empty($getlogpodtl)) {
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom ED_cess : (e) -->
@ -2769,18 +2681,14 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewCustomEDcess', 'value' => set_value('ViewCustomEDcess'), 'id' => 'ViewCustomEDcess', 'readonly' => true, 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCustomEdcess()');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewAfterCustomEDcess', 'value' => set_value('ViewAfterCustomEDcess'), 'id' => 'ViewAfterCustomEDcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
@ -2799,15 +2707,13 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewAfterCustomSHcess', 'value' => set_value('ViewAfterCustomSHcess'), 'id' => 'ViewAfterCustomSHcess', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
</div>
<div class="form-group col-md-6" style="padding:0px;">
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -2815,25 +2721,17 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-4">
<div style="display: none;">
<?php
$data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditCalculateaddlExciseDuty(),EditCalculateAvlModvat(),EditCalculateGrossExpense()');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewSubtotal', 'value' => set_value('ViewSubtotal'), 'id' => 'ViewSubtotal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Additional Excise duty : (g) -->
@ -2841,28 +2739,17 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewIgst ', 'value' => set_value('ViewIgst', 0), 'id' => 'ViewIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true', 'onchange' => 'EditCalculateIgst()');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst', 0), 'id' => 'ViewAfterIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-8">
<!-- Gross duty payable -->
@ -2870,105 +2757,65 @@ if (!empty($getlogpodtl)) {
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable', 'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewGrossdutypayable ', 'value' => set_value('ViewGrossdutypayable'), 'id' => 'ViewGrossdutypayable', 'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data); ?>
</div>
</div>
</div>
<!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<span>Freight Type </span>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpviewFreight', $options, set_value('drpviewFreight'), 'id="drpviewFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpviewFreight', $options, set_value('drpviewFreight'), 'id="drpviewFreight" class="form-control " disabled'); ?>
</div>
<div class="form-group col-md-3" id="ViewTripsValue" style="display:block;">
<span>NO Of Trips</span>
<div>
<?php
$data = array('name' => 'viewNOOfTrips', 'value' => set_value('viewNOOfTrips'), 'id' => 'viewNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
echo form_input($data);
?>
</div>
<?php $data = array('name' => 'viewNOOfTrips', 'value' => set_value('viewNOOfTrips'), 'id' => 'viewNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(2);', 'disabled' => 'disabled');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3">
<span>Freight Rate </span>
<div>
<?php
$data = array('name' => 'viewtxtFreight', 'value' => set_value('viewtxtFreight'), 'id' => 'viewtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);');
echo form_input($data);
?>
</div>
<?php $data = array('name' => 'viewtxtFreight', 'value' => set_value('viewtxtFreight'), 'id' => 'viewtxtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);', 'readonly' => 'true');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<span>Freight Amt In <?php echo $INR; ?></span>
<div>
<?php
$data = array('name' => 'viewtxtAfterFreight', 'value' => set_value('viewtxtAfterFreight'), 'id' => 'viewtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<?php $data = array('name' => 'viewtxtAfterFreight', 'value' => set_value('viewtxtAfterFreight'), 'id' => 'viewtxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
<!--End of Adding of freight in edit model -->
<div class="form-row">
<center> <label>Cost of the product Per KG</label></center>
<hr />
</div>
<div class="form-row">
<div class="form-group col-md-4">
Duty Impact
</div>
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<label>Duty Impact</label>
<div>
<?php
$data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewDutyImpact', 'value' => set_value('ViewDutyImpact'), 'id' => 'ViewDutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.8%">
<span>Quantity</span>
<div class="form-group col-md-6">
<label>Quantity</label>
<div>
<?php
$data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'readonly' => true, 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditCalculateCtable()');
echo form_input($data); ?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<!-- Custom Duty Expenses -->
<div class="form-group col-md-6">
<label><?php echo "Custom Duty($INR) /UOM" ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2976,14 +2823,11 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges ($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2991,15 +2835,9 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -3007,51 +2845,32 @@ if (!empty($getlogpodtl)) {
?>
</div>
</div>
<div class="form-group col-md-4" style="display:none;">
<!-- Total Amount: -->
<label id=labelViewTotalAmount>Total Amount</label>
</div>
<div class="form-group col-md-4">
<div style="display:none;">
<?php
$data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data);
?>
<?php $data = array('name' => 'ViewTotalExp', 'value' => set_value('ViewTotalExp'), 'id' => 'ViewTotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); ?>
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-row" style="margin-bottom: 10px;">
<div class="form-group col-md-12">
<label>Import Description :</label>
<?php
$data = array('name' => 'viewtxtInstruction', 'value' => set_value('viewtxtInstruction'), 'id' => 'viewtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data);
?>
<?php $data = array('name' => 'viewtxtInstruction', 'value' => set_value('viewtxtInstruction'), 'id' => 'viewtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data); ?>
</div>
</div>
</div>
<div class="modal-footer">
<!-- <a class="btn btn-success font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
<!--<a class="btn btn-success font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font UpdateImport" ID="UpdateImport"> &nbsp;&nbsp;<span class="bold">Update</span></a>
<!-- <a class="btn btn-success font UpdateImport" ID="UpdateImport"> &nbsp;&nbsp;<span class="bold">Update</span></a> -->
</div>
</form>
</div>
@ -5601,12 +5420,19 @@ if (!empty($getlogpodtl)) {
$('#drpviewFreight').change(function() {
var FreightType = $('#drpviewFreight').val();
if (FreightType == "PER TRIP") {
$('#ViewTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#viewNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#viewtxtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#viewtxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#ViewTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#viewNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#viewtxtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#viewtxtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
$('#viewNOOfTrips').val('');
@ -5636,16 +5462,20 @@ if (!empty($getlogpodtl)) {
$('#drpeditFreight').change(function() {
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP") {
$('#EditTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#editNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#edittxtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#edittxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#EditTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#editNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#edittxtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#edittxtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
$('#editNOOfTrips').val('');
$('#edittxtFreight').val('');
$('#edittxtAfterFreight').val('');
@ -5678,16 +5508,22 @@ if (!empty($getlogpodtl)) {
$('#drpaddFreight').change(function() {
//alert();
var FreightType = $('#drpaddFreight').val();
if (FreightType == "PER TRIP") {
$('#AddTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#addNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#addtxtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#addtxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#AddTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#addNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#addtxtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#addtxtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
selValue = $("#drpaddFreight").val();
$('#txtFreight').val('');

View File

@ -747,8 +747,18 @@ td {
if ($("#drpMaterial option:selected").val() == '-1') {
alert('Please Select the MaterialCode ');
}
var drpMaterial = document.getElementById('drpMaterial').value;
if (drpMaterial == 0) {
$('#drpMaterial').focus();
$('#drpMaterial').select2('open');
alert('Please Select the Material');
return false;
}
var qty = parseInt(document.getElementById('Quantity').value);
if (isNaN(qty) || qty < 1) {
$('#Quantity').focus();
$('#Quantity').click();
alert('Please Enter the Vaild Quantity');
return false;
}
@ -773,13 +783,13 @@ td {
index = parseInt(index) + 1;
var rowHtml = `<tr id="${temp}">
<td align="left">${temp}</td>
<td align="left">${materialCode}</td>
<td align="left">${materialName}</td>
<td align="left">${uom}</td>
<td align="left">${quantity}</td>
<td align="left">0.00</td>
<td align="left">NEW</td>
<td align="center">${temp}</td>
<td align="center">${materialCode}</td>
<td align="center">${materialName}</td>
<td align="center">${uom}</td>
<td align="center">${quantity}</td>
<td align="center">0.00</td>
<td align="center">NEW</td>
<td>
<a data-id="${temp}" data-userid="${temp}" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal">
<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${materialCode} Material details"></i>

View File

@ -538,7 +538,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<label>Exchange Rate On</label>
<div>
<?php
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $CurrentDate), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
$data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $CurrentDate), 'id' => 'Exchangerateon', 'class' => 'form-control num date_range form-date-search', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data);
?>
</div>
@ -899,7 +899,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()">
<input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()" style="margin-right: 15px;">
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">
<span class="bold">Submit</span>
@ -1339,52 +1339,37 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="TripsValue" style="display:none;">
<label>NO Of Trips</label>
<div>
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-4">
<label>Freight Rate </label>
<div>
<?php
$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-4" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR; ?></label>
<div>
<?php
$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtAfterFreight', 'value' => set_value('txtAfterFreight'), 'id' => 'txtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
@ -1397,11 +1382,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<label>Duty Impact</label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'DutyImpact', 'value' => set_value('DutyImpact', 0), 'id' => 'DutyImpact', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1409,7 +1391,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
?>
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.8%">
<div class="form-group col-md-6">
<label>Quantity</label>
<div>
<?php
@ -1423,11 +1406,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-row">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- Custom Duty Expenses -->
<label><?php echo "Custom Duty($INR)/UOM"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'CustomDutyExpenses ', 'value' => set_value('CustomDutyExpenses', 0), 'id' => 'CustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1439,11 +1420,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
<div class="form-row mt-2">
<div class="form-group col-md-4">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Clearing Charges($INR)"; ?></label>
</div>
<div class="form-group col-md-4">
<div>
<?php
$data = array('name' => 'ClearingCharges', 'value' => set_value('ClearingCharges', 0), 'id' => 'ClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'CalculateCtable()');
@ -1452,8 +1431,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-group col-md-4" style="margin-top: -4.8%">
<div class="form-group col-md-6">
<!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label>
<div>
@ -1464,16 +1442,16 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
</div>
<div class="form-group col-md-12">
</div>
<div class="form-group col-md-4" style="display:none;">
<div class="form-group col-md-6" style="display: none;">
<!-- Total Amount: -->
<label id=labelTotalAmount>Total Amount</label>
</div>
<div class="form-group col-md-4" style="display: none;">
<div class="form-group col-md-6" style="display: none;">
<div>
<?php
$data = array('name' => 'TotalExp', 'value' => set_value('TotalExp', 0), 'id' => 'TotalExp', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1491,7 +1469,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
<div class="form-group col-md-4" style="margin-top:10px;">
<div class="form-group col-md-11" style="margin-top:10px;">
<label>Import Description </label>
<?php
$data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
@ -1924,53 +1902,38 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-row" style="padding:0px;">
<div class="form-group col-md-3">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpeditFreight', $options, set_value('drpeditFreight'), 'id="drpeditFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-3" id="editTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div>
<?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'editNOOfTrips', 'value' => set_value('editNOOfTrips'), 'id' => 'editNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>Freight Rate </label>
<div>
<?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding-left: 0px;">
<label>Freight Amt In <?php echo $INR; ?></label>
<div>
<?php
$data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'edittxtAfterFreight', 'value' => set_value('edittxtAfterFreight'), 'id' => 'edittxtAfterFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
@ -2108,6 +2071,10 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
// for delivey date and scheduled
//alert();
$(document).ready(function() {
setTimeout(() => {
$('#Exchangerateon').addClass('date_range form-date-search');
}, 1000);
$('#Date').click(function() {
//for Date range selection
$('#Schedulediv').hide();
@ -4203,27 +4170,39 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
});
$('#drpFreight').change(function() {
var FreightType = $('#drpFreight').val();
if (FreightType == "PER TRIP") {
$('#TripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#NOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#TripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#NOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
});
$('#drpeditFreight').change(function() {
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP") {
$('#editTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#editNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtEditFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#edittxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#editTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#editNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtEditFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#edittxtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
selValue = $("#drpEditFreight").val();
$('#txtEditFreight').val('');

View File

@ -341,78 +341,134 @@
overflow: hidden;
text-overflow: ellipsis;
}
.text-truncate:hover {
white-space: normal;
overflow: visible;
word-wrap: break-word;
max-width: none;
}
.text-truncate.expanded {
white-space: normal;
max-width: none;
}
/* This CSS is for Table Cell Expend*/
</style>
<!-- loader css code start -->
<div id="loader" style="display:none;"><div class="lds-hourglass"></div></div>
<!-- loader css code start -->
<div id="loader" style="display:none;">
<div class="lds-hourglass"></div>
</div>
<style>
#loader {
display: flex;
justify-content: center;
align-items: center;
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: #00000014;
z-index: 9999;
}
#loader {
display: flex;
justify-content: center;
align-items: center;
position: fixed;
top: 0;
left: 0;
width: 100vw;
height: 100vh;
background: #00000014;
z-index: 9999;
}
.lds-hourglass {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-hourglass {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-hourglass:after {
content: " ";
display: block;
border-radius: 50%;
width: 0;
height: 0;
margin: 6px;
box-sizing: border-box;
border: 26px solid #333;
border-color: #d86935 transparent #616bac transparent;
animation: lds-hourglass 1.2s infinite;
}
.lds-hourglass:after {
content: " ";
display: block;
border-radius: 50%;
width: 0;
height: 0;
margin: 6px;
box-sizing: border-box;
border: 26px solid #333;
border-color: #d86935 transparent #616bac transparent;
animation: lds-hourglass 1.2s infinite;
}
@keyframes lds-hourglass {
0% {
transform: rotate(0);
animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
}
50% {
transform: rotate(900deg);
animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
}
100% {
transform: rotate(1800deg);
}
}
@keyframes lds-hourglass {
0% {
transform: rotate(0);
animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
}
50% {
transform: rotate(900deg);
animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
}
100% {
transform: rotate(1800deg);
}
}
/* Style for loader background */
.loader-mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.8);
/* Semi-transparent background */
z-index: 9999;
/* Ensure it stays on top */
display: flex;
justify-content: center;
/* Center horizontally */
align-items: center;
/* Center vertically */
visibility: visible;
/* Loader will be shown initially */
}
/* Loader image styles */
.loader {
display: flex;
justify-content: center;
align-items: center;
}
/* Hide the loader by default after the page loads */
body.loaded .loader-mask {
visibility: hidden;
opacity: 0;
transition: visibility 0s 0.3s, opacity 0.3s ease;
}
</style>
<!-- loader css code end -->
<!-- loader css code end -->
<script>
// window.addEventListener('load', function() {
// document.body.classList.add('loaded');
// });
$(window).on('load', function() {
setTimeout(function() {
$('.loader').fadeOut();
$('.loader-mask').fadeOut('slow');
}, 1000);
});
// $('.loader').fadeIn();
// $('.loader-mask').fadeIn();
// $('.loader').fadeOut();
// $('.loader-mask').delay(350).fadeOut('slow');
</script>
</head>
<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
<!-- Begin page -->
<div id="wrapper">
@ -679,4 +735,4 @@
<!-- ============================================================== -->
<!-- Start Page Content here -->
<!-- ============================================================== -->
<!-- ============================================================== -->

View File

@ -241,7 +241,7 @@
<?php echo $record->Designation; ?>
</td>
<td style="max-width:80px"><?php echo $record->NoofDays; ?></td>
<td style="max-width:80px;text-align:center;"><?php echo $record->NoofDays; ?></td>
<td id="dayWork<?php echo $index ?>"
<?php if (empty($record->Key)) {
@ -262,8 +262,8 @@
echo "contenteditable='false';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>>
style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->LOP_Days)) {
echo $record->LOP_Days;
} else {
@ -276,8 +276,8 @@
echo "contenteditable='false';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>>
style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->Paid_leave)) {
echo number_format($record->Paid_leave, 2, '.', '');
} else {
@ -290,8 +290,8 @@
echo "contenteditable='false';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>>
style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->OT_Hrs_Worked)) {
echo $record->OT_Hrs_Worked;
} else {
@ -299,45 +299,45 @@
} ?>
</td>
<td style="max-width:80px"><?php echo $record->TotalSalary; ?></td>
<td style="max-width:80px;text-align:right;"><?php echo $record->TotalSalary; ?></td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $perDaySalary = $record->TotalSalary / $record->NoofDays;
echo number_format($perDaySalary, 2, '.', ''); ?>
</td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $workedSalary = $perDaySalary * ($record->Days_worked + $record->sunday_count);
echo number_format($workedSalary, 2, '.', ''); ?>
</td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $perHrSalary = $perDaySalary / 8;
echo number_format($perHrSalary, 2); ?>
</td>
<td style="max-width:80px"><?php echo number_format($workedSalary, 2, '.', ''); ?></td>
<td style="max-width:80px;text-align:right;"><?php echo number_format($workedSalary, 2, '.', ''); ?></td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $basicWorked = $workedSalary * 70 / 100;
echo number_format($basicWorked, 2, '.', ''); ?>
</td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $hraWorked = $workedSalary * 30 / 100;
echo number_format($hraWorked, 2, '.', ''); ?>
</td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); ?>
</td>
<td id="esiAmt<?php echo $index ?>" style="max-width:80px"> <?php echo $esi[$i]; ?> </td>
<td id="esiAmt<?php echo $index ?>" style="max-width:80px;text-align:right;"> <?php echo $esi[$i]; ?> </td>
<td id="pfAmt<?php echo $index ?>" style="max-width:80px"> <?php echo $pf[$i]; ?> </td>
<td style="max-width:80px"> <?php echo $over_time[$i]; ?> </td>
<td id="pfAmt<?php echo $index ?>" style="max-width:80px;text-align:right;"> <?php echo $pf[$i]; ?> </td>
<td style="max-width:80px;text-align:right;"> <?php echo $over_time[$i]; ?> </td>
<td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) { echo "contenteditable='true';"; } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
@ -394,7 +394,7 @@
echo "contenteditable='false';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" <?php } ?>>
style="text-align:right;color:blue;" <?php }else{ ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Estimate)) {
echo $record->Estimate;
$estTotal[] = $record->Estimate;
@ -462,20 +462,19 @@
<tfoot>
<tr>
<th colspan="20"></th>
<th>Total</th>
<th id="monthloan">
<th id="monthloan" style="text-align:right;">
<?php echo isset($totalmonthloan) ? array_sum($totalmonthloan) : ''; ?>
</th>
<th id="other">
<?php echo isset($totalotherDet) ? array_sum($totalotherDet) : ''; ?></th>
<th id="fest">
<?php echo isset($totalfestival) ? array_sum($totalfestival) : ''; ?></th>
<th id="estsal"><?php echo isset($estTotal) ? array_sum($estTotal) : ''; ?></th>
<th id="other" style="text-align:right;">
<?php echo isset($totalotherDet) ? array_sum($totalotherDet) : ''; ?>
</th>
<th id="fest" style="text-align:right;">
<?php echo isset($totalfestival) ? array_sum($totalfestival) : ''; ?>
</th>
<th id="estsal" style="text-align:right;">
<?php echo isset($estTotal) ? array_sum($estTotal) : ''; ?>
</th>
</tr>
</tfoot>
</table>

View File

@ -1,3 +1,35 @@
<script>
$(document).ready(function() {
// When the second modal is about to be shown
$('#freightcalmodel').on('show.bs.modal', function() {
// Set a higher z-index for the second modal to appear on top
$('#freightcalmodel').css('z-index', 1060); // Set the z-index for the second modal
// Ensure the second modal backdrop appears above the first one
setTimeout(function() {
$('.modal-backdrop').last().css('z-index', 1055);
}, 0);
});
// Reset z-index when the second modal is hidden (optional)
$('#freightcalmodel').on('hidden.bs.modal', function() {
$('#freightcalmodel').css('z-index', ''); // Reset to default
});
$('#packagingcalmodel').on('show.bs.modal', function() {
// Set a higher z-index for the second modal to appear on top
$('#packagingcalmodel').css('z-index', 1060); // Set the z-index for the second modal
// Ensure the second modal backdrop appears above the first one
setTimeout(function() {
$('.modal-backdrop').last().css('z-index', 1055);
}, 0);
});
// Reset z-index when the second modal is hidden (optional)
$('#packagingcalmodel').on('hidden.bs.modal', function() {
$('#packagingcalmodel').css('z-index', ''); // Reset to default
});
});
</script>
<?php $ReqType = '';
$CompanyAddress = '';
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
@ -469,7 +501,7 @@ if (!empty($INRSYMBOL)) {
selValue = $("#PackagingType").val();
if (selValue == PercentageType) {
var PackagingCalculation = '';
$('#REVENUE').modal('hide');
// $('#REVENUE').modal('hide');
edit = 'PackingCalculationOn';
$('#packagingcalmodel').modal('show');
$('#txtPackaging').removeAttr('readonly', 'true');
@ -507,7 +539,7 @@ if (!empty($INRSYMBOL)) {
selValue = $("#EditPackagingType").val();
if (selValue == PercentageType) {
var PackagingCalculation = '';
$('#EDITREVENUE').modal('hide');
// $('#EDITREVENUE').modal('hide');
edit = 'EditPackingCalculationOn';
$('#packagingcalmodel').modal('show');
$('#txtEditPackaging').removeAttr('readonly', 'true');
@ -621,10 +653,19 @@ if (!empty($INRSYMBOL)) {
var freight = '';
$('#drpFreight').change(function() {
var FreightType = $("#drpFreight").val();
if (FreightType == "PER TRIP") {
$('#TripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#NOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#edittxtAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#TripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#NOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
if ($('#Rate').val() != '' && $('#MaterialCode').val() != "0") {
selValue = $("#drpFreight").val();
@ -632,7 +673,7 @@ if (!empty($INRSYMBOL)) {
$('#txtAfterFreight').val('');
if (selValue == PercentageType) {
var freightCalculation = '';
$('#REVENUE').modal('hide');
// $('#REVENUE').modal('hide');
freight = 'FreightCalculationOn';
$('#freightcalmodel').modal('show');
//$('#freightcalmodel').modal('blur');
@ -665,10 +706,19 @@ if (!empty($INRSYMBOL)) {
$('#drpEditFreight').change(function() {
var FreightType = $("#drpEditFreight").val();
if (FreightType == "PER TRIP") {
$('#EditTripsValue').show();
$(this).parent().removeClass('col-md-3').addClass('col-md-2');
$('#EditNOOfTrips').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtEditFreight').parent().removeClass('col-md-3').addClass('col-md-2');
$('#txtEditAfterFreight').parent().removeClass('col-md-3').addClass('col-md-2');
} else {
$('#EditTripsValue').hide();
$(this).parent().removeClass('col-md-2').addClass('col-md-3');
$('#EditNOOfTrips').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtEditFreight').parent().removeClass('col-md-2').addClass('col-md-3');
$('#txtEditAfterFreight').parent().removeClass('col-md-2').addClass('col-md-3');
}
if ($('#EditRate').val() != '' && $('#EditMaterialCode').val() != "0") {
selValue = $("#drpEditFreight").val();
@ -678,7 +728,7 @@ if (!empty($INRSYMBOL)) {
var FreightCalculation = '';
// $('#freight').modal('show');
freight = 'EditFreightCalculationOn';
$('#EDITREVENUE').modal('hide');
// $('#EDITREVENUE').modal('hide');
$('#freightcalmodel').modal('show');
$('#txtEditFreight').removeAttr('readonly', 'true');
//Editchange();
@ -2568,42 +2618,29 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-4"></div>
<div class="form-group col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpFreight', $options, set_value('drpFreight'), 'id="drpFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-2" id="TripsValue" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'NOOfTrips', 'value' => set_value('NOOfTrips'), 'id' => 'NOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(0);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label>
<div class="form-group">
<?php
$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtFreight', 'value' => set_value('txtFreight'), 'id' => 'txtFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Amt <?php echo "($INRSYM)" ?></label>
@ -2922,51 +2959,36 @@ if (!empty($INRSYMBOL)) {
<div class="col-md-4"></div>
<div class="col-md-4">
<label>Freight Type </label>
<div>
<?php
$options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
?>
</div>
<?php
$options = array("0" => 'Select Freight Type');
if (!empty($FreightType)) {
foreach ($FreightType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('drpEditFreight', $options, set_value('drpEditFreight'), 'id="drpEditFreight" class="form-control "');
?>
</div>
<div class="form-group col-md-2" id="EditTripsValue" style="display:none;">
<label>NO Of Trips</label>
<div class="form-group">
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'EditNOOfTrips', 'value' => set_value('EditNOOfTrips'), 'id' => 'EditNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(1);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Rate </label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtEditFreight', 'value' => set_value('txtEditFreight'), 'id' => 'txtEditFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
<div class="form-group col-md-2">
<label>Freight Amt <?php echo "($INRSYM)" ?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
<?php
$data = array('name' => 'txtEditAfterFreight', 'value' => set_value('txtEditAfterFreight'), 'id' => 'txtEditAfterFreight', 'class' => 'form-control num', 'readonly' => 'true', 'style' => 'text-align:right;');
echo form_input($data);
?>
</div>
</div>
<div class="form-row">

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB