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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-19 11:28:19 +06:30
parent b747845cbf f8dd7d9400
commit 566cc2f3c1
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
<div class="rebate-form"> <div class="rebate-form">
<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 class="col-lg-4 col-md-4 col-sm-4">You can pay upto </label> <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_jcb %>" data-member-value=""> <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_jcb %>" data-member-value="">
</div> </div>
<hr> <hr>
@@ -68,7 +68,7 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div> <div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class=" cashier_number del_cashier_number" data-type="nett" disable>Nett</div> <div class=" cashier_number " data-type="nett" >Nett</div>
<div class=" cashier_number red left" data-type="del">Del</div> <div class=" cashier_number red left" data-type="del">Del</div>
<div class=" cashier_number green left" data-type="clr">Clr</div> <div class=" cashier_number green left" data-type="clr">Clr</div>
</div> </div>
@@ -91,7 +91,7 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button> <button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"><i class="fa fa-arrow-left fa-lg"></i> Back </button>
</div> </div>
</div> </div>
@@ -134,6 +134,9 @@ $(document).on('click', '.cashier_number', function(event){
case 'del' : case 'del' :
var cash=$('#amount').text(); var cash=$('#amount').text();
$('#amount').text(cash.substr(0,cash.length-1)); $('#amount').text(cash.substr(0,cash.length-1));
case 'nett':
var remain_amount = $('#validamount').val();
$('#amount').text(remain_amount);
break; break;
} }

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

@@ -11,7 +11,7 @@
<div class="rebate-form"> <div class="rebate-form">
<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 class="col-lg-4 col-md-4 col-sm-4">You can pay upto </label> <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_master %>" data-member-value=""> <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_master %>" data-member-value="">
</div> </div>
<hr> <hr>

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

@@ -11,7 +11,7 @@
<div class="rebate-form"> <div class="rebate-form">
<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 class="col-lg-4 col-md-4 col-sm-4">You can pay upto </label> <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_mpu %>" data-member-value=""> <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_mpu %>" data-member-value="">
</div> </div>
<hr> <hr>
@@ -68,7 +68,7 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div> <div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class=" cashier_number del_cashier_number" data-type="nett" disable>Nett</div> <div class=" cashier_number " data-type="nett" >Nett</div>
<div class=" cashier_number red left" data-type="del">Del</div> <div class=" cashier_number red left" data-type="del">Del</div>
<div class=" cashier_number green left" data-type="clr">Clr</div> <div class=" cashier_number green left" data-type="clr">Clr</div>
</div> </div>
@@ -133,6 +133,9 @@ $(document).on('click', '.cashier_number', function(event){
case 'del' : case 'del' :
var cash=$('#amount').text(); var cash=$('#amount').text();
$('#amount').text(cash.substr(0,cash.length-1)); $('#amount').text(cash.substr(0,cash.length-1));
case 'nett':
var remain_amount = $('#validamount').val();
$('#amount').text(remain_amount);
break; break;
} }

7
app/views/origami/payments/show.html.erb
View File

@@ -235,9 +235,10 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons --> <!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block"> FOC </button> <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> <i class="fa fa-arrow-left fa-lg"></i> Back </button>
<button type="button" class="btn btn-primary btn-lg btn-block"> Void </button> <button type="button" class="btn btn-primary btn-block"> FOC </button>
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button> <button type="button" class="btn btn-primary btn-block"> Void </button>
</div> </div>
</div> </div>

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

@@ -11,7 +11,7 @@
<div class="rebate-form"> <div class="rebate-form">
<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 class="col-lg-4 col-md-4 col-sm-4">You can pay upto </label> <label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label>
<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_visa %>" data-member-value=""> <input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_visa %>" data-member-value="">
</div> </div>
<hr> <hr>
@@ -68,7 +68,7 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div> <div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class=" cashier_number del_cashier_number" data-type="nett" disable>Nett</div> <div class=" cashier_number" data-type="nett" >Nett</div>
<div class=" cashier_number red left" data-type="del">Del</div> <div class=" cashier_number red left" data-type="del">Del</div>
<div class=" cashier_number green left" data-type="clr">Clr</div> <div class=" cashier_number green left" data-type="clr">Clr</div>
</div> </div>
@@ -91,7 +91,7 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button> <button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"><i class="fa fa-arrow-left fa-lg"></i> Back </button>
</div> </div>
</div> </div>
@@ -133,6 +133,9 @@ $(document).on('click', '.cashier_number', function(event){
case 'del' : case 'del' :
var cash=$('#amount').text(); var cash=$('#amount').text();
$('#amount').text(cash.substr(0,cash.length-1)); $('#amount').text(cash.substr(0,cash.length-1));
case 'nett':
var remain_amount = $('#validamount').val();
$('#amount').text(remain_amount);
break; break;
} }