git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validate required for reference no: in other payment amount

Browse Source
This commit is contained in:
San Wai Lwin
2018-02-22 16:43:53 +06:30
parent c3af21d71c
commit ce644e304c
5 changed files with 257 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/origami/jcb/index.html.erb
View File

@@ -51,7 +51,8 @@
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label>Reference Number</label> <label>Reference Number</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value=""> <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
<br><span id="reference_no_Err" style="color:red;"></span>
</div> </div>
<hr> <hr>
</div> </div>
@@ -194,9 +195,12 @@ $(document).on('click', '.cashier_number', function(event){
$('#jcb_pay').on('click',function(){ $('#jcb_pay').on('click',function(){
var amount = $('#amount').text(); var amount = $('#amount').text();
var reference_no = $('#reference_no').val();
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var receipt_no = "<%= @receipt_no %>"; var receipt_no = "<%= @receipt_no %>";
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";
$("#reference_no_Err").html("");
if(reference_no.length > 0){
if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click"); $(this).off("click");
//start member discount 5% by pay card //start member discount 5% by pay card
@@ -214,6 +218,7 @@ $('#jcb_pay').on('click',function(){
// } // }
//end member discount //end member discount
if(bank_integration == '1'){ if(bank_integration == '1'){
$("#reference_no").val("");
pay_withBank("SALE", "jcb", amount, sale_id, receipt_no); pay_withBank("SALE", "jcb", amount, sale_id, receipt_no);
}else{ }else{
$.ajax({type: "POST", $.ajax({type: "POST",
@@ -242,5 +247,8 @@ $('#jcb_pay').on('click',function(){
swal ( "Oops" , "Enter Amount!" , "error" ); swal ( "Oops" , "Enter Amount!" , "error" );
} }
} }
}else{
$("#reference_no_Err").html("can't be blank");
}
}) })
</script> </script>

10
app/views/origami/master/index.html.erb
View File

@@ -52,7 +52,8 @@
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label>Reference Number</label> <label>Reference Number</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value=""> <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
<br><span id="reference_no_Err" style="color:red;"></span>
</div> </div>
<hr> <hr>
</div> </div>
@@ -192,9 +193,12 @@
}); });
$('#master_pay').on('click',function(){ $('#master_pay').on('click',function(){
var amount = $('#amount').text(); var amount = $('#amount').text();
var reference_no = $('#reference_no').val();
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var receipt_no = "<%= @receipt_no %>"; var receipt_no = "<%= @receipt_no %>";
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";
$("#reference_no_Err").html("");
if(reference_no.length > 0){
if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click"); $(this).off("click");
//start member discount 5% by pay card //start member discount 5% by pay card
@@ -212,6 +216,7 @@
// } // }
//end member discount //end member discount
if(bank_integration == '1'){ if(bank_integration == '1'){
$("#reference_no").val("");
pay_withBank("SALE", "master", amount, sale_id, receipt_no); pay_withBank("SALE", "master", amount, sale_id, receipt_no);
}else{ }else{
$.ajax({type: "POST", $.ajax({type: "POST",
@@ -240,5 +245,8 @@
swal ( "Oops" , "Enter Amount!" , "error" ); swal ( "Oops" , "Enter Amount!" , "error" );
} }
} }
}else{
$("#reference_no_Err").html("can't be blank");
}
}) })
</script> </script>

11
app/views/origami/mpu/index.html.erb
View File

@@ -52,7 +52,8 @@
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label>Reference Number</label> <label>Reference Number</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value=""> <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
<br><span id="reference_no_Err" style="color:red;"></span>
</div> </div>
<hr> <hr>
</div> </div>
@@ -196,10 +197,13 @@
$('#mpu_pay').on('click',function(){ $('#mpu_pay').on('click',function(){
var amount = $('#amount').text(); var amount = $('#amount').text();
var reference_no = $('#reference_no').val();
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var receipt_no = "<%= @receipt_no %>"; var receipt_no = "<%= @receipt_no %>";
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";
var cashier_type = "<%= @cashier_type %>"; var cashier_type = "<%= @cashier_type %>";
$("#reference_no_Err").html("");
if(reference_no.length > 0){
if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click"); $(this).off("click");
//start member discount 5% by pay card //start member discount 5% by pay card
@@ -217,6 +221,7 @@
// } // }
//end member discount //end member discount
if(bank_integration == '1'){ if(bank_integration == '1'){
$("#reference_no").val("");
pay_withBank("SALE", "mpu", amount, sale_id, receipt_no); pay_withBank("SALE", "mpu", amount, sale_id, receipt_no);
}else{ }else{
$.ajax({type: "POST", $.ajax({type: "POST",
@@ -238,7 +243,6 @@
} }
}); });
} }
}else{ }else{
if (amount>0) { if (amount>0) {
swal ( "Oops" , "Paid Amount is over!" , "error" ); swal ( "Oops" , "Paid Amount is over!" , "error" );
@@ -246,6 +250,9 @@
swal ( "Oops" , "Enter Amount!" , "error" ); swal ( "Oops" , "Enter Amount!" , "error" );
} }
} }
}else{
$("#reference_no_Err").html("can't be blank");
}
}) })
</script> </script>

10
app/views/origami/unionpay/index.html.erb
View File

@@ -52,7 +52,8 @@
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label>Reference Number</label> <label>Reference Number</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value=""> <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
<br><span id="reference_no_Err" style="color:red;"></span>
</div> </div>
<hr> <hr>
</div> </div>
@@ -196,8 +197,11 @@
}); });
$('#unionpay_pay').on('click',function(){ $('#unionpay_pay').on('click',function(){
var amount = $('#amount').text(); var amount = $('#amount').text();
var reference_no = $('#reference_no').val();
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var receipt_no = "<%= @receipt_no %>"; var receipt_no = "<%= @receipt_no %>";
$("#reference_no_Err").html("");
if(reference_no.length > 0){
if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click"); $(this).off("click");
//start member discount 5% by pay card //start member discount 5% by pay card
@@ -216,6 +220,7 @@
//end member discount //end member discount
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";
if(bank_integration == '1'){ if(bank_integration == '1'){
$("#reference_no").val("");
pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no); pay_withBank("SALE", "unionpay", amount, sale_id, receipt_no);
} }
else{ else{
@@ -245,5 +250,8 @@
swal ( "Oops" , "Enter Amount!" , "error" ); swal ( "Oops" , "Enter Amount!" , "error" );
} }
} }
}else{
$("#reference_no_Err").html("can't be blank");
}
}) })
</script> </script>

10
app/views/origami/visa/index.html.erb
View File

@@ -52,7 +52,8 @@
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label>Reference Number</label> <label>Reference Number</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value=""> <input type="text" name="reference_no" id="reference_no" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
<br><span id="reference_no_Err" style="color:red;"></span>
</div> </div>
<hr> <hr>
</div> </div>
@@ -195,10 +196,13 @@
}); });
$('#visa_pay').on('click',function(){ $('#visa_pay').on('click',function(){
var amount = $('#amount').text(); var amount = $('#amount').text();
var reference_no = $('#reference_no').val();
var sale_id = "<%= @sale_id %>"; var sale_id = "<%= @sale_id %>";
var receipt_no = "<%= @receipt_no %>"; var receipt_no = "<%= @receipt_no %>";
console.log(amount); console.log(amount);
console.log($("#validamount").attr("value")); console.log($("#validamount").attr("value"));
$("#reference_no_Err").html("");
if(reference_no.length > 0){
if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
$(this).off("click"); $(this).off("click");
//start member discount 5% by pay card //start member discount 5% by pay card
@@ -217,6 +221,7 @@
//end member discount //end member discount
var bank_integration = "<%= @bank_integration %>"; var bank_integration = "<%= @bank_integration %>";
if(bank_integration == '1'){ if(bank_integration == '1'){
$("#reference_no").val("");
pay_withBank("SALE", "visa", amount, sale_id, receipt_no); pay_withBank("SALE", "visa", amount, sale_id, receipt_no);
} }
else{ else{
@@ -246,5 +251,8 @@
swal ( "Oops" , "Enter Amount!" , "error" ); swal ( "Oops" , "Enter Amount!" , "error" );
} }
} }
}else{
$("#reference_no_Err").html("can't be blank");
}
}) })
</script> </script>