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

payment keypad

Browse Source
This commit is contained in:
Nweni
2017-06-11 15:51:22 +06:30
parent 596c16d274
commit b7bd68a461
6 changed files with 148 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/assets/javascripts/origami.js
View File

@@ -18,17 +18,17 @@
$(document).ready(function(){ $(document).ready(function(){
$(".orders").on('click', function(){ $(".orders").on('click', function(){
var zone_name=$(this).find(".orders-table").text(); var zone_name=$(this).find(".orders-table").text();
var receipt_no=$(this).find(".orders-receipt-no").text(); var receipt_no=$(this).find(".orders-receipt-no").text();
var unique_id=$(this).find(".orders-id").text(); var unique_id=$(this).find(".orders-id").text();
var order_status=$(this).find(".orders-order-status").text().trim(); var order_status=$(this).find(".orders-order-status").text().trim();
// Enable/Disable Button // Enable/Disable Button
control_button(order_status); control_button(order_status);
//for customer button //for customer button
if(unique_id.charAt(0) == 'S'){ if(unique_id.charAt(0) == 'S'){
$("#customer").removeAttr('disabled'); $("#customer").removeAttr('disabled');
}else{ }else{
$("#customer").attr('disabled','disabled'); $("#customer").attr('disabled','disabled');
} }
@@ -49,7 +49,7 @@ $(document).ready(function(){
type: "GET", type: "GET",
url: "origami/" + unique_id, url: "origami/" + unique_id,
data: { 'id' : unique_id }, data: { 'id' : unique_id },
success:function(result){ success:function(result){
for (i = 0; i < result.length; i++) { for (i = 0; i < result.length; i++) {
var data = JSON.stringify(result[i]); var data = JSON.stringify(result[i]);
var parse_data = JSON.parse(data); var parse_data = JSON.parse(data);
@@ -78,7 +78,7 @@ $(document).ready(function(){
$("#order-grand-total").text(grand_total_amount); $("#order-grand-total").text(grand_total_amount);
// Ordered Items // Ordered Items
var order_items_rows = "<tr>" + var order_items_rows = "<tr>" +
"<td class='item-name'>" + parse_data.item_name + "</td>" + "<td class='item-name'>" + parse_data.item_name + "</td>" +
"<td class='item-attr'>" + parse_data.qty + "</td>" + "<td class='item-attr'>" + parse_data.qty + "</td>" +
"<td class='item-attr'>" + parse_data.qty*parse_data.price + "</td>" + "<td class='item-attr'>" + parse_data.qty*parse_data.price + "</td>" +
@@ -94,9 +94,9 @@ $(document).ready(function(){
$(this).addClass('selected-item'); $(this).addClass('selected-item');
}); });
// Bill Request // Bill Request
$('#request_bills').click(function() { $('#request_bills').click(function() {
var order_id=$(".selected-item").find(".orders-id").text(); var order_id=$(".selected-item").find(".orders-id").text();
if(order_id!=""){ if(order_id!=""){
window.location.href = '/origami/request_bills/'+ order_id window.location.href = '/origami/request_bills/'+ order_id
} }
@@ -106,16 +106,16 @@ $(document).ready(function(){
return false; return false;
}); });
// Discount for Payment // Discount for Payment
$('#discount').click(function() { $('#discount').click(function() {
var order_id=$(".selected-item").find(".orders-id").text(); var order_id=$(".selected-item").find(".orders-id").text();
if(order_id!=""){ if(order_id!=""){
window.location.href = '/origami/discount/'+ order_id window.location.href = '/origami/discount/'+ order_id
} }
else { else {
alert("Please select an order!"); alert("Please select an order!");
} }
return false; return false;
}); });
@@ -125,11 +125,11 @@ $(document).ready(function(){
var sub_total = $('#order-sub-total').text(); var sub_total = $('#order-sub-total').text();
var grand_total = $('#order-grand-total').text(); var grand_total = $('#order-grand-total').text();
var discount_type = $('#discount-type').val(); var discount_type = $('#discount-type').val();
var discount_value = $('#discount-amount').val(); var discount_value = $('#discount-amount').val();
var discount_amount = discount_value; var discount_amount = discount_value;
// For Percentage Discount // For Percentage Discount
if(discount_type == 1){ if(discount_type == 1){
discount_amount=(sub_total*discount_value)/100; discount_amount=(sub_total*discount_value)/100;
} }
@@ -150,8 +150,8 @@ $(document).ready(function(){
} }
else { else {
alert("Please select an order!"); alert("Please select an order!");
} }
return false; return false;
}); });
@@ -168,7 +168,7 @@ $(document).ready(function(){
original_value = $('#discount-amount').val(); original_value = $('#discount-amount').val();
var input_type = $(this).attr("data-type"); var input_type = $(this).attr("data-type");
switch (input_type) { switch (input_type) {
case 'num': case 'num':
var input_value = $(this).attr("data-value"); var input_value = $(this).attr("data-value");
@@ -179,7 +179,7 @@ $(document).ready(function(){
else{ else{
$('#discount-amount').val(original_value + '' + input_value); $('#discount-amount').val(original_value + '' + input_value);
update_balance(); update_balance();
} }
break; break;
case 'add': case 'add':
@@ -210,16 +210,16 @@ $(document).ready(function(){
}); });
/* Button Control by Status */ /* Button Control by Status */
function control_button(order_status){ function control_button(order_status){
if(order_status=="billed"){ if(order_status=="billed"){
$("#request_bills").prop('disabled', true); $("#request_bills").prop('disabled', true);
$("#discount").prop('disabled', false); $("#discount").prop('disabled', false);
$("#pay").prop('disabled', false); $("#pay-bill").prop('disabled', false);
} }
else if(order_status=="new") { else if(order_status=="new") {
$("#request_bills").prop('disabled', false); $("#request_bills").prop('disabled', false);
$("#discount").prop('disabled', true); $("#discount").prop('disabled', true);
$("#pay").prop('disabled', true); $("#pay-bill").prop('disabled', true);
} }
} }
@@ -236,9 +236,6 @@ function update_balance(){
} }
var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount;
$('#order-discount').text(discount_amount); $('#order-discount').text(discount_amount);
$('#order-grand-total').text(total); $('#order-grand-total').text(total);
} }

43
app/assets/stylesheets/origami.scss
View File

@@ -7,17 +7,36 @@
// min-height: 75rem; // min-height: 75rem;
// padding-top: 4.5rem; // padding-top: 4.5rem;
// } // }
.others-payment{
line-height:100px;
text-align:center;
color:white;
width:300px;
height:100px;
font-size:18px;
}
.cashier_number{ .cashier_number{
height:76px; width: 30%;
line-height:80px; height:71px;
line-height:71px;
text-align:center; text-align:center;
background:#54A5AF; background:#54A5AF;
float:left; // float:left;
margin:2px; // margin:2px;
font-size:20px;
color:white;
// cursor:pointer;
}
.pay{
width: 98%;
height:210px;
line-height:210px;
text-align:center;
font-size:20px; font-size:20px;
color:white; color:white;
cursor:pointer;
} }
.cashier_number:hover{ .cashier_number:hover{
@@ -25,7 +44,7 @@
} }
.long{ .long{
width:100% width:49%
} }
.sold { .sold {
@@ -42,17 +61,17 @@
} }
.charges-name { .charges-name {
width: 80%; width: 80%;
text-align: left; text-align: left;
} }
.item-name { .item-name {
width: 60%; width: 60%;
text-align: left; text-align: left;
} }
.item-attr { .item-attr {
width: 20%; width: 20%;
text-align: right; text-align: right;
} }
@@ -70,7 +89,13 @@
background-color: #009900 background-color: #009900
} }
.left{
margin-left:1px;
}
.bottom{
margin-bottom: 1px;
}
/*----- Reset -----*/ /*----- Reset -----*/
select.form-control { select.form-control {

8
app/views/origami/home/index.html.erb
View File

@@ -215,13 +215,13 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button> <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button> <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled id="customer">Customer</button> <button type="button" class="btn btn-primary btn-lg btn-block" disabled id="customer" disabled>Customer</button>
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button> <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button>
<!-- Cashier Buttons --> <!-- Cashier Buttons -->
<button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button> <button type="button" id="discount" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> --> <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
<button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" >Pay</button> <button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button> <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div> </div>
</div> </div>

4
app/views/origami/others_payments/index.html.erb
View File

@@ -1,10 +1,10 @@
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<div class="card"> <div >
<% @payment_method_setting.each do |payment_method|%> <% @payment_method_setting.each do |payment_method|%>
<div class="col-md-5"> <div class="col-md-5">
<div class="col-md-12 long purple " id="<%= payment_method.payment_method%>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div> <div class="purple others-payment" id="<%= payment_method.payment_method%>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
</div> </div>
<% end %> <% end %>
</div> </div>

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

@@ -1,25 +1,35 @@
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-6 col-md-6 col-sm-3">
<div class="card" > <div class="card" >
<div class="card-header"> <div class="card-header">
<div id="order-title"> <div id="order-title">
<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span> <table>
<span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span> <tr>
<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span> <td style="width:60%;"><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></td>
<span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span> <td style="width:40%;"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></td>
</tr>
<tr>
<td><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></td>
<td><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></td>
</tr>
<tr>
<td><strong>Customer :</strong> Default Customer</td>
<td><strong>Points :</strong> 1234 </td>
</tr>
</table>
</div> </div>
</div> </div>
<div class="card-block"> <div class="card-block">
<div class="card-title"> <div class="card-title">
<table class="table"> <table >
<thead> <!-- <thead> -->
<tr> <tr>
<th style="width:60%; text-align:left">Items</th> <th style="width:80%;">Items</th>
<th style="width:20%; text-align:right">QTY</td> <th style="width:20%;">QTY</td>
<th style="width:20%; text-align:right">Price</td> <th style="width:20%;">Price</td>
</tr> </tr>
</thead> <!-- </thead> -->
</table> </table>
</div> </div>
<div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll"> <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
@@ -71,95 +81,80 @@
</div> </div>
</div> </div>
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<div class="row"> <div class="row" style="margin-top:10px;">
<div class="col-md-8"><strong>AMOUNT DUE</strong></div> <div class="col-md-8"><strong style="font-size:18px;">Amount Due</strong></div>
<div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div> <div class="col-md-4"><strong><span id="amount_due" style="font-size:18px;"><%= @sale_data.grand_total %></span></strong></div>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-md-8">CASH</div> <div class="col-md-8">Cash</div>
<div class="col-md-4" id="cash" ><%= @cash %></div> <div class="col-md-4" id="cash" ><%= @cash %></div>
</div> </div>
<hr> <hr>
<div class="row" id="credit_payment"> <div class="row" id="credit_payment">
<div class="col-md-8">CREDIT</div> <div class="col-md-8">Credit</div>
<div class="col-md-4">0.0</div> <div class="col-md-4">0.0</div>
</div> </div>
<hr> <hr>
<div class="row" id="card_payment"> <div class="row" id="card_payment">
<div class="col-md-8">OTHERS PAYMENT</div> <div class="col-md-8">Others Payment</div>
<div class="col-md-4">0.0</div> <div class="col-md-4">0.0</div>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-md-8">BALANCE</div> <div class="col-md-8">Balance</div>
<div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div> <div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
</div> </div>
<hr> <hr>
<div class="row">
<div class="col-md-12"> <div class="row">
<div class="row"> <div class="col-lg-6 col-md-1 col-sm-1">
<div class="col-md-7"> <div class="row bottom">
<div class="row"> <div class=" cashier_number " data-value="1" data-type="num">1</div>
<div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div> <div class=" cashier_number left" data-value="2" data-type="num">2</div>
<div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div> <div class=" cashier_number left" data-value="3" data-type="num">3</div>
<div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div> </div>
</div> <div class="row bottom">
</div> <div class=" cashier_number " data-value="4" data-type="num">4</div>
<div class="col-md-5"> <div class=" cashier_number left" data-value="5" data-type="num">5</div>
<div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div> <div class=" cashier_number left" data-value="6" data-type="num">6</div>
</div>
<div class="row bottom">
<div class=" cashier_number " data-value="7" data-type="num">7</div>
<div class=" cashier_number left" data-value="8" data-type="num">8</div>
<div class=" cashier_number left" data-value="9" data-type="num">9</div>
</div>
<div class="row bottom">
<div class=" cashier_number " data-value="0" data-type="num">0</div>
<div class=" cashier_number left" data-value="." data-type="num">.</div>
<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 red left" data-type="del">Del</div>
<div class=" cashier_number green left" data-type="clr">Clr</div>
</div> </div>
</div> </div>
<div class="row"> <div class="col-lg-6 col-md-1 col-sm-1">
<div class="col-md-7"> <div class="row bottom">
<div class="row"> <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
<div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</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>
</div> </div>
<div class="col-md-5"> <div class="row bottom">
<div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div> <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
<div class="pay purple" id="pay">Pay</div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-7">
<div class="row">
<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>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="row">
<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>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div>
</div>
</div>
<div class="row">
<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>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long purple " id="pay">PAY</div>
</div>
</div>
</div> </div>
</div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button>
<button type="button" class="btn btn-primary btn-lg btn-block"> Void </button>
</div> </div>
</div> </div>

16
lib/tasks/clear_data.rake Normal file
View File

@@ -0,0 +1,16 @@
namespace :clear do
desc "Clear Data"
task :data => :environment do
BookingOrder.delete_all
Booking.delete_all
OrderItem.delete_all
AssignedOrderItem.delete_all
Order.delete_all
SaleOrder.delete_all
SaleItem.delete_all
Sale.delete_all
SaleAudit.delete_all
SalePayment.delete_all
puts "Clear Data Done."
end
end