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

Update

Browse Source
This commit is contained in:
Nweni
2017-06-12 13:26:09 +06:30
parent b6bba9ecd4
commit ee208a5dcd
7 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/views/origami/discounts/index.html.erb
View File

@@ -4,7 +4,7 @@
<!-- Order Details -->
<div class="card" >
<!-- <div class="card-header">
<!-- <div class="card-header">
<div><strong id="order-title">ORDER DETAILS</strong></div>
</div> -->
<div class="card-block">
@@ -13,10 +13,10 @@
<p id="sale-id" class="hidden"><%=@sale_data.sale_id %></p>
<p>Receipt No: <span id="receipt_no"><%=@sale_data.receipt_no rescue ' '%></span></p>
<!-- <p>Cashier: <span id="cashier"><%=@sale_data.cashier_name rescue ' '%></span></p> -->
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
</div>
</div>
</div>
<div class="card-text">
<table class="table table-default" id="order-items-table">
@@ -75,7 +75,7 @@
</table>
</div>
</div>
</div>
</div>
</div>
<!-- Column One -->
@@ -88,7 +88,7 @@
</div>
<div class="card-block">
<div class="card-title">
<div class="form-horizontal">
<div class="form-horizontal">
<div class="form-group">
<div class="col-md-3">
<select name="discount_type" id="discount-type" class="form-control">
@@ -97,27 +97,27 @@
</select>
</div>
<div class="col-md-9">
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
</div>
</div>
<input type="text" id="discount-amount" name="discount-amount" value="<%= @sale_data.total_discount rescue 0 %>" class="form-control" />
</div>
</div>
<button id="pay-discount" class="btn btn-primary long">Discount</button>
</div>
</div>
</div>
<hr />
<div class="col-md-12">
<div class="col-md-12">
<div class="row">
<div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="5" data-type="add">5%</div>
</div>
<div class="col-md-7">
<div class="row">
<div class="row bottom">
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div>
<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div>
</div>
</div>
</div>
</div>
<div class="row">
@@ -125,12 +125,12 @@
<div class="col-md-12 cashier_number long" data-value="10" data-type="add">10%</div>
</div>
<div class="col-md-7">
<div class="row">
<div class="row bottom">
<div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div>
<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div>
</div>
</div>
</div>
</div>
<div class="row">
@@ -138,12 +138,12 @@
<div class="col-md-12 cashier_number long" data-value="20" data-type="add">20%</div>
</div>
<div class="col-md-7">
<div class="row">
<div class="row bottom">
<div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div>
<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div>
</div>
</div>
</div>
</div>
<div class="row">
@@ -151,12 +151,12 @@
<div class="col-md-12 cashier_number long" data-value="30" data-type="add">30%</div>
</div>
<div class="col-md-7">
<div class="row">
<div class="row bottom">
<div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-3 cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div>
<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div>
</div>
</div>
</div>
</div>
<div class="row">
@@ -166,13 +166,13 @@
<div class="col-md-7">
<div class="row">
<div class="col-md-3 cashier_number"></div>
<div class="col-md-3 cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
<div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

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

@@ -130,7 +130,7 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div>
<div class="row bottom">
<div class=" cashier_number"></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 green left" data-type="clr">Clr</div>
</div>
@@ -195,6 +195,10 @@ $(document).on('click', '.cashier_number', function(event){
$('#cash').text("0.0");
update_balance();
break;
case 'nett':
$('#cash').text($('#amount_due').text());
update_balance();
break;
}
event.handled = true;
} else {
@@ -216,7 +220,6 @@ $( document ).ready(function() {
});
$('#pay').click(function() {
if($('#balance').text() > 0){
alert(" Insufficient Amount!")
}else{
@@ -230,7 +233,7 @@ $( document ).ready(function() {
data: "cash="+ cash + "&sale_id=" + sale_id,
success:function(result){
alert("Thank you")
window.location.href = '/origami';
// window.location.href = '/origami';
}
});
}