@@ -230,7 +239,7 @@ if(!empty($PaymentMultiple))
@@ -368,7 +377,7 @@ if(!empty($PaymentMultiple))
if($dd->type == 'PAYMENT'){
$dropdowncode = $dd->code;
$dropdownname = $dd->name;
-
+
if(trim($dropdowncode) != trim($paydtl->Account_code))
{
if ($_POST['$paydtl->Account_code'] == $dropdowncode)
@@ -461,7 +470,7 @@ if(!empty($PaymentMultiple))
@@ -491,25 +500,8 @@ $(document).ready(function(){
$('#myradio2').attr('checked','true');
$('#towhom').text('Paid To:');
}
- // var isChecked = $('#RECEIPT').prop('checked');
- // //alert(isChecked);
- // if(isChecked)
- // {
- // $('#towhom').text('Received From:');
- // }
-
-// //var isChecked2 = $('#PAYMENT').prop('checked');
-// //if(isChecked2)
- // else
-// {
- // $('#towhom').text('Paid To:');
- // }
-
-
});
-// var pay_ddvalue = [];
-// var dbpay_ddvalue = [];
$(function() {
@@ -524,7 +516,7 @@ $(function() {
}
});
- $('#accode option[value=""]').prop('selected', true);
+ $('#accode option[value=""]').attr("selected", "selected");
if('' != '999'){
@@ -534,7 +526,7 @@ $(function() {
$("#Paymentaccode1").append( $('
').val(item.code).html(item.name));
}
});
- $('#Paymentaccode1 option[value=""]').prop('selected', true);
+ $('#Paymentaccode1 option[value=""]').attr("selected", "selected");
$('#subdescription1').val("");
$('#Paymentamount1').val();
}
@@ -544,44 +536,21 @@ $(function() {
if(item.type == 'PAYMENT')
{
$("#Paymentaccode1").append( $('
').val(item.code).html(item.name));
- //var ddvalues = item.code;
- //pay_ddvalue[i] = ddvalues;
- //pay_ddvalue.push(pay_ddvalues);
}
});
}
- //dbarray = ;//this part is db dropdown value
- //$.each(dbarray,function(db,obj){
- // dbacccode = obj.Account_code;
- // dbpay_ddvalue[db] = dbacccode;
- //});
-
- // $.each(pay_ddvalue,function(i,obj){
-
- // //console.log("pay"+obj);
-
- // $.each(dbpay_ddvalue,function(j,ob){
- // //console.log("db"+ob);
-
- // if(ob == obj){
-
- // $("#Paymentaccode1 option[value="+obj+"]").prop('disabled',true);}
-
-
- // });
- // });
$('#gst').click(function(){
$('#gstarea').toggle();
});
-// $('#towhom').text('Received From:');
+
$("#Date").datepicker({
- //minDate : new Date(year-SIAStartYear,1,1),
+
maxDate :'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,
});
@@ -590,6 +559,16 @@ $("#PaymentDate").datepicker({
maxDate :'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,
});
+var value = "";
+var type = "";
+if(type == "RECEIPT")
+{
+ if(value != ''){
+ // $('#gstarea').attr('checked', true);
+ $('#gstarea').toggle();
+
+ }
+}
});
@@ -736,8 +715,26 @@ function validate()
function GSTvalue(id)
{
var sgst = $('#SGST').val();
+ if(sgst == ''){
+ sgst = "0.00" ;
+
+ }else{
+ sgst = sgst;
+ }
var cgst = $('#CGST').val();
+ if(cgst == ''){
+ cgst = "0.00" ;
+
+ }else{
+ cgst = cgst;
+ }
var igst = $('#IGST').val();
+ if(igst == ''){
+ igst = "0.00" ;
+
+ }else{
+ igst = igst;
+ }
var beforegst = $('#valuebeforegST').val();
$('#valuebeforegST').val((parseFloat(beforegst).toFixed(2)));
@@ -748,7 +745,13 @@ function GSTvalue(id)
$('#IGST').val('0.00');
calculateTotal();
}
-
+ if(id == 'CGST')
+ {
+ $('#CGST').val(parseFloat(cgst).toFixed(2));
+ $('#SGST').val(parseFloat(cgst).toFixed(2));
+ $('#IGST').val('0.00');
+ calculateTotal();
+ }
if(id == 'IGST')
{
$('#CGST').val('0.00');
@@ -835,23 +838,50 @@ function PaymentGSTvalue(id)
{
var sgst = $('#PaymentSGST').val();
+ if(sgst == ''){
+ sgst = '0.00' ;
+ //alert('qwe'+sgst);
+ }else{
+ sgst = sgst;
+ }
var cgst = $('#PaymentCGST').val();
+ if(cgst == ''){
+ cgst = '0.00' ;
+ //alert('qwe'+sgst);
+ }else{
+ cgst = cgst;
+ }
var igst = $('#PaymentIGST').val();
+ if(igst == ''){
+ igst = '0.00' ;
+ //alert('qwe'+sgst);
+ }else{
+ igst = igst;
+ }
if(id == 'PaymentSGST')
{
$('#PaymentCGST').val(parseFloat(sgst).toFixed(2));
$('#PaymentSGST').val(parseFloat(sgst).toFixed(2));
$('#PaymentIGST').val('0.00');
- //paymenttotalamount();
+ paymenttotalamount();
}
+ if(id == 'PaymentCGST')
+ {
+ $('#PaymentCGST').val(parseFloat(cgst).toFixed(2));
+ $('#PaymentSGST').val(parseFloat(cgst).toFixed(2));
+ $('#PaymentIGST').val('0.00');
+ paymenttotalamount();
+ }
+
+
if(id == 'PaymentIGST')
{
$('#PaymentCGST').val('0.00');
$('#PaymentSGST').val('0.00');
$('#PaymentIGST').val(parseFloat(igst).toFixed(2));
- //paymenttotalamount();
+ paymenttotalamount();
}
}
@@ -865,28 +895,28 @@ if(paydtl == ''){ var counterConstant = 1; }
function add_more()
{
-if($("option:selected", $("#Paymentaccode1")).val() == '-1')
-{
- alert('Select/Choose account name');
- $('#Paymentaccode1').focus();
- return false;
-}
-else if($('#subdescription1').val() == '')
-{
- alert("Provide Account description..!");
- $('#subdescription1').focus();
- return false;
-
-}
-else if($('#Paymentamount1').val() == '')
-{
- alert("Provide Amount data..!");
- $('#Paymentamount1').focus();
- return false;
-}
-else
-{
-// var paydtl = $('#hidepaydtl').val();
+ if($("option:selected", $("#Paymentaccode1")).val() == '-1')
+ {
+ alert('Select/Choose account name');
+ $('#Paymentaccode1').focus();
+ return false;
+ }
+ else if($('#subdescription1').val() == '')
+ {
+ alert("Provide Account description..!");
+ $('#subdescription1').focus();
+ return false;
+
+ }
+ else if($('#Paymentamount1').val() == '')
+ {
+ alert("Provide Amount data..!");
+ $('#Paymentamount1').focus();
+ return false;
+
+ }
+ else
+ {// var paydtl = $('#hidepaydtl').val();
// alert(paydtl);
counter++;
@@ -960,12 +990,14 @@ $('#Paymentaccode'+counterConstant).append(option);
function removeRow(input) {
var number = input.replace(/[^0-9]+/ig,"");
- var subtracttotal = $("#Paymentamount"+number).val();
+ var lineitemamount = $("#Paymentamount"+number).val();
var total = $('#Paymenttotalamount').val();
- subtracttotal = total - subtracttotal;
-
-var accode = $('#Paymentaccode'+number).val();
-
+ var subtracttotal = total - lineitemamount;
+ var valueb4gst = $('#PaymentvaluebeforegST').val();
+ var valueb4 = valueb4gst - lineitemamount;
+ //alert(subtracttotal);
+ var accode = $('#Paymentaccode'+number).val();
+//alert('remove');
//temparray = jQuery.grep(temparray, function(value) {
// return value != accode;});
//alert(temparray);
@@ -993,6 +1025,7 @@ var accode = $('#Paymentaccode'+number).val();
}
$('#Paymenttotalamount').val(parseFloat(subtracttotal).toFixed(2));
+ $('#PaymentvaluebeforegST').val(parseFloat(valueb4).toFixed(2));
//parseFloat(subtracttotal).toFixed(2)
}
@@ -1046,13 +1079,12 @@ function paymenttotalamount(){
function valid(){
-
+//alert("now entered");
if($('#PaymentDate').val() == '')
{
alert("Please Provide Date..!");
$('#PaymentDate').focus();
return false;
-
}
else if($('#PaymentPaidto').val() == '')
{
@@ -1065,39 +1097,36 @@ function valid(){
alert("Please Provide voucher code data..!");
$('#Paymentvouchercode').focus();
return false;
-
}
-// else if($('#PaymentSGST').val() == '')
-// {
-// alert("Please Provide Sgst data..!");
-// $('#PaymentSGST').focus();
-// return false;
-// }
else if($('#hidecounter').val() == 1){
-
- if($("option:selected", $("#Paymentaccode1")).val() == '-1')
- {
- alert("Please Select Account Code..!");
- $('#Paymentaccode1').focus();
- return false;
- }
- else if($('#subdescription1').val() == '')
- {
- alert("Please Provide Account description..!");
- $('#subdescription1').focus();
- return false;
- }
- else if($('#Paymentamount1').val() == '')
- {
- alert("Please Provide Amount data..!");
- $('#Paymentamount1').focus();
- return false;
- }
+// alert('true');
+ if($("option:selected", $("#Paymentaccode1")).val() == '-1')
+ {
+ alert('Select/Choose account name');
+ $('#Paymentaccode1').focus();
+ return false;
+ }
+ else if($('#subdescription1').val() == '')
+ {
+ alert("Provide Account description..!");
+ $('#subdescription1').focus();
+ return false;
+ }
+ else if($('#Paymentamount1').val() == '')
+ {
+ alert("Provide Amount data..!");
+ $('#Paymentamount1').focus();
+ return false;
+ }
+ else{
+ $('#updatePayment').submit();
+ }
+
}
else{
$('#updatePayment').submit();
}
-
+
}
\ No newline at end of file
diff --git a/application/views/viewIndIncomeExpense.php b/application/views/viewIndIncomeExpense.php
index e7278111..afe26570 100755
--- a/application/views/viewIndIncomeExpense.php
+++ b/application/views/viewIndIncomeExpense.php
@@ -69,7 +69,7 @@ if(!empty($data))
Merchant GST No : | | merchant_gst)){echo $data[0]->merchant_gst;}?> |
-
Invoice No : | | invoice_no)){echo $data[0]->invoice_no;}?> |
+
Voucher No : | | invoice_no)){echo $data[0]->invoice_no;}?> |
HSN/SAC No : | | HSN)){echo $data[0]->HSN;}?> |
Value Before GST : | | value_before_gst)){echo $data[0]->value_before_gst;}?> |
@@ -118,7 +118,7 @@ if(!empty($data))
Date : | | date)){echo date_format(date_create($data[0]->date),'d-m-Y');}?> |
| | towhom)){echo $data[0]->towhom;}?> |
-
Invoice No : | | invoice_no)){echo $data[0]->invoice_no;}?> |
+
: | | invoice_no)){echo $data[0]->invoice_no;}?> |
Merchant Name : | | merchant)){echo $data[0]->merchant;}?> |
Merchant GST No : | | merchant_gst)){echo $data[0]->merchant_gst;}?> |
HSN/SAC No : | | HSN)){echo $data[0]->HSN;}?> |