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

req bill bugs fixing

Browse Source
This commit is contained in:
Yan
2017-06-06 16:37:42 +06:30
parent d28449a9c9 b847cde62c
commit c482318b1a
8 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
<% if @booking_orders %>
<% @booking_orders.each do |booking_order| %>
<% if !booking_order.order_status = 'new'%>
<% if booking_order.order_status != "new" %>
<div style="background-color: red;color: white;" class="card" id="table-order-<%=booking_order.sale_id%>" onclick="callOrderDetails('sale_<%=booking_order.sale_id%>')">
<div class="card-block">
<h4 class="card-title">
@@ -204,14 +204,17 @@
var old_order_id = 0
var old_table_name = ""
var table_or_order_id = 0
var pay_sale_id = 0
function callOrderDetails(sale_order_id){
var order_id = 0
var sale_id = 0
var data_val = ""
sale_order = sale_order_id.split("_")[0]
if (sale_order == 'sale') {
order_id = sale_order_id.split("_")[1]
sale_id = sale_order_id.split("_")[1]
url = "origami/"+sale_order_id.split("_")[1]
data_val = { sale_id: sale_order_id.split("_")[1]}
@@ -221,7 +224,9 @@ function callOrderDetails(sale_order_id){
data_val = { order_id: sale_order_id.split("_")[1]}
}
table_or_order_id = order_id
pay_sale_id = sale_id
var tbody = ""
$("#append-table").html("")
if (old_order_id != order_id){
@@ -305,6 +310,7 @@ function callOrderDetails(sale_order_id){
$( document ).ready(function() {
$('#request_bills').click(function() {
console.log(table_or_order_id);
window.location.href = '/origami/request_bills/'+ table_or_order_id
return false;
});
@@ -312,7 +318,7 @@ $( document ).ready(function() {
$( document ).ready(function() {
$('#pay').click(function() {
window.location.href = '/origami/sale/'+ 10 + "/payment"
window.location.href = '/origami/sale/'+ pay_sale_id + "/payment"
return false;
});
});