SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAYSLIP ALIGNMENT ISSUE AMEND CAPITAL ALERT FIXED

Browse Source
This commit is contained in:
velz2020 2017-09-22 12:17:22 +05:30
parent 216e4a9cc6
commit f5cc32121e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/views/editCapitalAmendPO.php
View File

@ -2,7 +2,9 @@
$insuranceStatus = array( $insuranceStatus = array(
array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1") array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
); );
$requestedBy=$requestedBy[0]->FirstName;
$requestedBy=$requestedBy[0]->FirstName;
// $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); // $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
// $CurrentDate = $dt->format('Y-m-d'); // $CurrentDate = $dt->format('Y-m-d');
$res_arr_values = array(); $res_arr_values = array();
@ -113,8 +115,10 @@ if(!empty($POMaster))
$pdt = new DateTime($Req->PODate); $pdt = new DateTime($Req->PODate);
$PODate = $pdt->format('d-m-Y'); $PODate = $pdt->format('d-m-Y');
$DeliverOption = $Req->DeliveryOption; $DeliverOption = $Req->DeliveryOption;
//echo $DeliverOption;
$DeliverSchedule = $Req->DeliverySchedule; $DeliverSchedule = $Req->DeliverySchedule;
//echo $DeliverSchedule;
// $Deliverydt=$Req->DeliveryDate; // $Deliverydt=$Req->DeliveryDate;
if(!empty($Req->DeliveryDate)) if(!empty($Req->DeliveryDate))
{ {
@ -287,7 +291,7 @@ window.onload = function()
document.getElementById('dispatchinternational').style.display = 'none'; document.getElementById('dispatchinternational').style.display = 'none';
document.getElementById('placeoforgin').style.display = 'none'; document.getElementById('placeoforgin').style.display = 'none';
document.getElementById('datedomestic').style.display = 'block'; document.getElementById('datedomestic').style.display = 'block';
document.getElementById('deliverydateby').style.display = 'none'; //document.getElementById('deliverydateby').style.display = 'none';
capitalType='Domestic'; capitalType='Domestic';
@ -531,7 +535,7 @@ document.getElementById('dispatchinternational').style.display = 'block';
<label >Schedule By </label> <label >Schedule By </label>
<input type="hidden" name="beforeSchedule" value="<?php echo $DeliverSchedule;?>"> <input type="hidden" name="beforeSchedule" value="<?php echo $DeliverSchedule;?>">
<?php <?php
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); $data = array('name' => 'Scheduleby','value' => set_value('Scheduleby',$DeliverSchedule),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
echo Form_textarea($data); echo Form_textarea($data);
?> ?>
@ -3142,12 +3146,12 @@ var capitalrange=<?php echo $CapitalRange; ?>;
var basicamt=0; var basicamt=0;
//alert(ExchangeRate+"-"+AvlBudAmt+"-"+capitalrange); //alert(ExchangeRate+"-"+AvlBudAmt+"-"+capitalrange);
if(capitalrange == 0){//international if(capitalrange == 0){//international
basicamt=($('#CapitalToatlOrder').val() * ExchangeRate); //basicamt=($('#CapitalToatlOrder').val() * ExchangeRate);
alert(basicamt); //alert(basicamt);
} }
else if(capitalrange == 1){//domestic else if(capitalrange == 1){//domestic
basicamt=$('#txtTotalBasic').val() - $('#txtTotalDiscount').val(); //basicamt=$('#txtTotalBasic').val() - $('#txtTotalDiscount').val();
alert(basicamt); //alert(basicamt);
} }
if(validate()) if(validate())
@ -3187,7 +3191,7 @@ alert(basicamt);
data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate, data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate,
type:"POST", type:"POST",
//url:"<?php echo base_url() ?>amendmentpurchaseorder/EditAmendCapitalPurchaseOrder", url:"<?php echo base_url() ?>amendmentpurchaseorder/EditAmendCapitalPurchaseOrder",
success:function(data) { success:function(data) {
if(data) if(data)

2
application/views/payslipgenerateprint.php
View File

@ -304,5 +304,5 @@ if($RecCount > 0)
<tr><td style="text-align: center;font-size:12px;" colspan="4">This is a computer generated document. This document does not require signature.</td></tr> <tr><td style="text-align: center;font-size:12px;" colspan="4">This is a computer generated document. This document does not require signature.</td></tr>
</tbody> </tbody>
</table> </table>
<p>&nbsp;</p>