UI for credit payment
This commit is contained in:
@@ -64,9 +64,7 @@ $(document).on('turbolinks:load', function() {
|
|||||||
'</div>\n',
|
'</div>\n',
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
$(document).on('turbolinks:load', function() {
|
|
||||||
$('.datetimepicker').bootstrapMaterialDatePicker({
|
$('.datetimepicker').bootstrapMaterialDatePicker({
|
||||||
format: 'DD-MM-YYYY - HH:mm',
|
format: 'DD-MM-YYYY - HH:mm',
|
||||||
clearButton: true,
|
clearButton: true,
|
||||||
@@ -228,6 +226,11 @@ $(document).on('turbolinks:load', function() {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).on("click", ".credit_detail",function(){
|
||||||
|
var sale_payment_id = $(this).attr("data-id");
|
||||||
|
window.location.href = "/origami/cashier/credit_sales/"+sale_payment_id;
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/* start check first bill or not funs: */
|
/* start check first bill or not funs: */
|
||||||
@@ -481,3 +484,89 @@ function getAllMenu(){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* String format */
|
||||||
|
if (!String.prototype.formatUnicorn) {
|
||||||
|
String.prototype.formatUnicorn=function(){
|
||||||
|
var e=this.toString();
|
||||||
|
if(!arguments.length){
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
var t=typeof arguments[0],n="string"==t||"number"==t?Array.prototype.slice.call(arguments):arguments[0];
|
||||||
|
for(var i in n){
|
||||||
|
e=e.replace(new RegExp("\\{"+i+"\\}","gi"),n[i]==null?'':n[i]);
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
/* String format */
|
||||||
|
|
||||||
|
//credit sales lists
|
||||||
|
function timeFormat(date){
|
||||||
|
var isPM = date.getHours() >= 12;
|
||||||
|
var isMidday = date.getHours() == 12;
|
||||||
|
var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0),
|
||||||
|
(date.getMinutes()>10? date.getMinutes() : '0'+date.getMinutes()) || '00'].join(':') +
|
||||||
|
(isPM ? ' PM' : ' AM');
|
||||||
|
return time;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getCreditData(){
|
||||||
|
var filter = $("#filter").val();
|
||||||
|
var customer = $("#sel_customer").val();
|
||||||
|
|
||||||
|
var receipt_no = "";
|
||||||
|
var customer_id = "";
|
||||||
|
if((filter!=undefined) && (filter!=null) && (filter!="")){
|
||||||
|
receipt_no = filter;
|
||||||
|
}
|
||||||
|
if((customer!=undefined) && (customer!=null) && (customer!="")){
|
||||||
|
customer_id = customer;
|
||||||
|
}
|
||||||
|
getCreditSales(receipt_no, customer_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getCreditSales(filter, customer){
|
||||||
|
$(".tbd_credit_lists").empty();
|
||||||
|
var html_credit_items = $("#html_credit_items").html();
|
||||||
|
var receipt_no = "";
|
||||||
|
var customer_id = "";
|
||||||
|
if((filter!=undefined) && (filter!=null) && (filter!="")){
|
||||||
|
receipt_no = filter;
|
||||||
|
}
|
||||||
|
if((customer!=undefined) && (customer!=null) && (customer!="")){
|
||||||
|
customer_id = customer;
|
||||||
|
}
|
||||||
|
$.ajax({
|
||||||
|
type: "POST",
|
||||||
|
data: {receipt_no: receipt_no, customer_id: customer_id},
|
||||||
|
dataType: 'json',
|
||||||
|
url: "/origami/cashier/credit_sales",
|
||||||
|
success: function(data){
|
||||||
|
// console.log(data);
|
||||||
|
if(data.status){
|
||||||
|
var credit_sales = data.data;
|
||||||
|
// console.log(credit_sales);
|
||||||
|
if(credit_sales.length > 0){
|
||||||
|
for (var i = 0; i < credit_sales.length ; i++) {
|
||||||
|
var sale_date = new Date(credit_sales[i].sale_date);
|
||||||
|
var receipt_date = sale_date.getFullYear() +'-'+ (sale_date.getMonth() > 10 ? sale_date.getMonth() : '0' + sale_date.getMonth()) +'-'+ (sale_date.getDate() > 10 ? sale_date.getDate() : '0' + sale_date.getDate());
|
||||||
|
$('.tbd_credit_lists').append(html_credit_items.formatUnicorn({
|
||||||
|
'key':i,
|
||||||
|
'sale_payment_id':credit_sales[i].sale_payment_id,
|
||||||
|
'receipt_date':receipt_date +" "+timeFormat(sale_date),
|
||||||
|
'receipt_no':credit_sales[i].receipt_no,
|
||||||
|
'cashier_name':credit_sales[i].cashier_name,
|
||||||
|
'customer_name':credit_sales[i].customer_name,
|
||||||
|
'credit_amount':credit_sales[i].payment_amount
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
$(".credit_items").empty();
|
||||||
|
$(".tbd_credit_lists").html(data.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
//End of credit sales function
|
||||||
25
app/controllers/origami/credit_sales_controller.rb
Normal file
25
app/controllers/origami/credit_sales_controller.rb
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
class Origami::CreditSalesController < BaseOrigamiController
|
||||||
|
def show
|
||||||
|
@webview = false
|
||||||
|
if check_mobile
|
||||||
|
@webview = true
|
||||||
|
end
|
||||||
|
|
||||||
|
@tables = Table.unscoped.all.active.order('status desc')
|
||||||
|
@rooms = Room.unscoped.all.active.order('status desc')
|
||||||
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
|
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
||||||
|
@customers = Customer.pluck("customer_id, name")
|
||||||
|
|
||||||
|
sale_payment = SalePayment.find_by_sale_payment_id(params[:sale_payment_id])
|
||||||
|
@sale = Sale.find_by_sale_id(sale_payment.sale_id)
|
||||||
|
@sale_taxes = []
|
||||||
|
sale_taxes = SaleTax.where("sale_id = ?", @sale.sale_id)
|
||||||
|
if !sale_taxes.empty?
|
||||||
|
sale_taxes.each do |sale_tax|
|
||||||
|
@sale_taxes.push(sale_tax)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@@ -91,4 +91,15 @@ def get_all_menu
|
|||||||
@menus = Menu.all
|
@menus = Menu.all
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get_credit_sales
|
||||||
|
credit_sales = Sale.get_credit_sales(params)
|
||||||
|
if !credit_sales.nil?
|
||||||
|
result = {:status=> true, :data=> credit_sales }
|
||||||
|
else
|
||||||
|
result = {:status=> false, :message=>"There is no record." }
|
||||||
|
end
|
||||||
|
|
||||||
|
render :json => result.to_json
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class Origami::HomeController < BaseOrigamiController
|
|||||||
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
||||||
@shop = Shop.first
|
@shop = Shop.first
|
||||||
|
@customers = Customer.pluck("customer_id, name")
|
||||||
# @shift = ShiftSale.current_open_shift(current_user.id)
|
# @shift = ShiftSale.current_open_shift(current_user.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -21,6 +21,7 @@ class Origami::HomeController < BaseOrigamiController
|
|||||||
@rooms = Room.unscoped.all.active.order('status desc')
|
@rooms = Room.unscoped.all.active.order('status desc')
|
||||||
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
||||||
|
@customers = Customer.pluck("customer_id, name")
|
||||||
|
|
||||||
@status_order = ""
|
@status_order = ""
|
||||||
@status_sale = ""
|
@status_sale = ""
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ class Origami::OrdersController < BaseOrigamiController
|
|||||||
@webview = true
|
@webview = true
|
||||||
end
|
end
|
||||||
|
|
||||||
@tables = Table.all.active.order('status desc')
|
@tables = Table.unscoped.all.active.order('status desc')
|
||||||
@rooms = Room.all.active.order('status desc')
|
@rooms = Room.unscoped.all.active.order('status desc')
|
||||||
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
||||||
@order = Order.find(params[:order_id])
|
@order = Order.find(params[:order_id])
|
||||||
booking = Booking.select('bookings.booking_id, bookings.dining_facility_id')
|
booking = Booking.select('bookings.booking_id, bookings.dining_facility_id')
|
||||||
.joins(" JOIN booking_orders as bo on bo.booking_id = bookings.booking_id")
|
.joins(" JOIN booking_orders as bo on bo.booking_id = bookings.booking_id")
|
||||||
@@ -24,7 +24,7 @@ class Origami::OrdersController < BaseOrigamiController
|
|||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@customers = Customer.pluck("customer_id, name")
|
||||||
#for split bill
|
#for split bill
|
||||||
lookup_spit_bill = Lookup.collection_of('split_bill')
|
lookup_spit_bill = Lookup.collection_of('split_bill')
|
||||||
@split_bill = 0
|
@split_bill = 0
|
||||||
@@ -53,37 +53,37 @@ class Origami::OrdersController < BaseOrigamiController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
bookings = Booking.all
|
# bookings = Booking.all
|
||||||
if !bookings.today.nil?
|
# if !bookings.today.nil?
|
||||||
@order_items_count = Hash.new
|
# @order_items_count = Hash.new
|
||||||
bookings.each do |booking|
|
# bookings.each do |booking|
|
||||||
if booking.sale_id.nil? && booking.booking_status != 'moved'
|
# if booking.sale_id.nil? && booking.booking_status != 'moved'
|
||||||
if !booking.booking_orders.empty?
|
# if !booking.booking_orders.empty?
|
||||||
booking.booking_orders.each do |booking_order|
|
# booking.booking_orders.each do |booking_order|
|
||||||
order = Order.find(booking_order.order_id)
|
# order = Order.find(booking_order.order_id)
|
||||||
if !order.order_items.empty?
|
# if !order.order_items.empty?
|
||||||
if !@order_items_count.key?(booking.dining_facility_id)
|
# if !@order_items_count.key?(booking.dining_facility_id)
|
||||||
@order_items_count.store(booking.dining_facility_id, order.order_items.count)
|
# @order_items_count.store(booking.dining_facility_id, order.order_items.count)
|
||||||
else
|
# else
|
||||||
@order_items_count[booking.dining_facility_id] += order.order_items.count
|
# @order_items_count[booking.dining_facility_id] += order.order_items.count
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
else
|
# else
|
||||||
if !booking.sale_id.nil?
|
# if !booking.sale_id.nil?
|
||||||
sale = Sale.find(booking.sale_id)
|
# sale = Sale.find(booking.sale_id)
|
||||||
if sale.sale_status !='completed'
|
# if sale.sale_status !='completed'
|
||||||
if !@order_items_count.key?(booking.dining_facility_id)
|
# if !@order_items_count.key?(booking.dining_facility_id)
|
||||||
@order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
|
# @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
|
||||||
else
|
# else
|
||||||
@order_items_count[booking.dining_facility_id] = sale.sale_items.count
|
# @order_items_count[booking.dining_facility_id] = sale.sale_items.count
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
# end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ class Origami::RoomsController < BaseOrigamiController
|
|||||||
@rooms = Room.unscoped.all.active.order('status desc')
|
@rooms = Room.unscoped.all.active.order('status desc')
|
||||||
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
||||||
|
@customers = Customer.pluck("customer_id, name")
|
||||||
@room = DiningFacility.find(params[:room_id])
|
@room = DiningFacility.find(params[:room_id])
|
||||||
|
|
||||||
@status_order = ""
|
@status_order = ""
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
class Origami::SalesController < BaseOrigamiController
|
class Origami::SalesController < BaseOrigamiController
|
||||||
def show
|
def show
|
||||||
@tables = Table.all.active.order('status desc')
|
@webview = false
|
||||||
@rooms = Room.all.active.order('status desc')
|
if check_mobile
|
||||||
|
@webview = true
|
||||||
|
end
|
||||||
|
|
||||||
|
@tables = Table.unscoped.all.active.order('status desc')
|
||||||
|
@rooms = Room.unscoped.all.active.order('status desc')
|
||||||
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
@complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
|
||||||
@orders = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
@orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
|
||||||
|
@customers = Customer.pluck("customer_id, name")
|
||||||
@sale = Sale.find(params[:sale_id])
|
@sale = Sale.find(params[:sale_id])
|
||||||
@order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
|
@order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
|
||||||
@booking = BookingOrder.find_by_order_id(@order).booking_id
|
@booking = BookingOrder.find_by_order_id(@order).booking_id
|
||||||
|
|||||||
@@ -2566,7 +2566,29 @@ def self.all_receipt_details
|
|||||||
return query
|
return query
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
def self.get_credit_sales(params)
|
||||||
|
receipt_no = ""
|
||||||
|
customer = ""
|
||||||
|
if !params["receipt_no"].blank?
|
||||||
|
receipt_no = " and s.receipt_no LIKE '%#{params["receipt_no"]}%'"
|
||||||
|
end
|
||||||
|
|
||||||
|
if !params["customer_id"].blank?
|
||||||
|
customer = " and s.customer_id = '#{params["customer_id"]}'"
|
||||||
|
end
|
||||||
|
|
||||||
|
query = SalePayment.select("s.receipt_no, sale_payments.sale_payment_id, sale_payments.payment_method, sale_payments.payment_amount,s.receipt_date as sale_date,
|
||||||
|
s.cashier_name as cashier_name, c.name as customer_name")
|
||||||
|
.joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
|
||||||
|
.joins("INNER JOIN customers c ON c.customer_id = s.customer_id")
|
||||||
|
|
||||||
|
query = query.where("payment_method='creditnote' and s.sale_status = 'completed' #{receipt_no} #{customer}")
|
||||||
|
.order("s.receipt_date ASC, s.receipt_no ASC")
|
||||||
|
|
||||||
|
return query
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
def generate_custom_id
|
def generate_custom_id
|
||||||
self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL")
|
self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL")
|
||||||
|
|||||||
360
app/views/origami/credit_sales/show.html.erb
Executable file
360
app/views/origami/credit_sales/show.html.erb
Executable file
@@ -0,0 +1,360 @@
|
|||||||
|
|
||||||
|
<div class="container-fluid"><div class="row">
|
||||||
|
<!-- Column One -->
|
||||||
|
<div class="col-lg-6 col-md-6 col-sm-6">
|
||||||
|
|
||||||
|
<!-- Nav tabs -->
|
||||||
|
<ul class="nav nav-tabs tab-col-teal" role="tablist" id="mytab">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link " data-toggle="tab" href="#completed" role="tab">Completed</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link " data-toggle="tab" href="#tables" role="tab">Tables</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Rooms</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item credit_items">
|
||||||
|
<a class="nav-link active" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<!-- Nav tabs - End -->
|
||||||
|
<div id="custom-slimscroll">
|
||||||
|
<div class="tab-content">
|
||||||
|
<!--- Panel 0 - Completed Orders -->
|
||||||
|
<div class="tab-pane " id="completed" role="tabpanel" style="">
|
||||||
|
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
|
<% @complete.each do |sale| %>
|
||||||
|
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!--- Panel 1 - Table Orders -->
|
||||||
|
<div class="tab-pane " id="tables" role="tabpanel" style="">
|
||||||
|
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
|
<% @tables.each do |table| %>
|
||||||
|
<% if table.status == 'occupied' %>
|
||||||
|
<% if table.get_booking.nil? %>
|
||||||
|
<% if table.get_checkout_booking.nil? %>
|
||||||
|
<div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
||||||
|
<% else %>
|
||||||
|
<div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
||||||
|
<% end %>
|
||||||
|
<div class="card-block">
|
||||||
|
<%= table.name %>
|
||||||
|
<% if !@order_items_count.nil? %>
|
||||||
|
<% if @order_items_count.key?(table.id) %>
|
||||||
|
(Orders : <%= @order_items_count[table.id] %>)
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
|
||||||
|
<div style="font-size:12px;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% else %>
|
||||||
|
<% if table.get_checkout_booking.nil? %>
|
||||||
|
<div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
||||||
|
<% else %>
|
||||||
|
<div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
||||||
|
<% end %>
|
||||||
|
<div class="card-block">
|
||||||
|
<%= table.name %>
|
||||||
|
<% if !@order_items_count.nil? %>
|
||||||
|
<% if @order_items_count.key?(table.id) %>
|
||||||
|
(Orders : <%= @order_items_count[table.id] %>)
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<span class="float-right font-12 new_text_<%= table.id %>"> new</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<div class="card tables green text-white table_<%= table.id %>" data-id="<%= table.id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= table.name %>
|
||||||
|
<span class="float-right font-12 new_text_<%= table.id %> hide"> new</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!--- Panel 2 - Room Orders -->
|
||||||
|
<div class="tab-pane" id="rooms" role="tabpanel" style="">
|
||||||
|
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
|
<% @rooms.each do |room| %>
|
||||||
|
<% if room.status == 'occupied' %>
|
||||||
|
<% if room.get_booking.nil? %>
|
||||||
|
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= room.name %>
|
||||||
|
<% if !@order_items_count.nil? %>
|
||||||
|
<% if @order_items_count.key?(room.id) %>
|
||||||
|
(Orders : <%= @order_items_count[room.id] %>)
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% else %>
|
||||||
|
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= room.name %>
|
||||||
|
<% if !@order_items_count.nil? %>
|
||||||
|
<% if @order_items_count.key?(room.id) %>
|
||||||
|
(Orders : <%= @order_items_count[room.id] %>)
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<span class="float-right font-12 new_text_<%= room.id %>"> new</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<div class="card rooms green text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%= room.name %>
|
||||||
|
<span class="float-right font-12 new_text_<%= room.id %> hide">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!--- Panel 3 - Orders -->
|
||||||
|
<div class="tab-pane" id="orders" role="tabpanel" style="">
|
||||||
|
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
|
||||||
|
<% @orders.each do |order| %>
|
||||||
|
<div class="card orders <%=(order.status=="new") ? 'blue' : 'red'%> text-white" data-id = "<%= order.order_id %>">
|
||||||
|
<div class="card-block">
|
||||||
|
<%
|
||||||
|
order_status = ""
|
||||||
|
sale_order = SaleOrder.find_by_order_id(order)
|
||||||
|
if sale_order
|
||||||
|
unless sale_order.sale_id.nil?
|
||||||
|
sale = Sale.find(sale_order.sale_id)
|
||||||
|
order_status = sale.sale_status
|
||||||
|
if order_status == 'new'
|
||||||
|
order_status = order.status
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
order_status = order.status
|
||||||
|
end
|
||||||
|
%>
|
||||||
|
<%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Credit Items -->
|
||||||
|
<div class="tab-pane dining active" id="credits" role="tabpanel">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row m-t-10 m-l-10 clearfix">
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<input type="text" name="filter" id="filter" onchange="getCreditData();" style="height: 32px;" placeholder="Receipt No." class="form-control">
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData();">
|
||||||
|
<option value="">-- Select Customer --</option>
|
||||||
|
<% if !@customers.empty? %>
|
||||||
|
<% @customers.each do |cus| %>
|
||||||
|
<option value="<%= cus[0] %>"><%= cus[1] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row clearfix m-t-20 m-l-10">
|
||||||
|
<table class="table table-responsive tbl_credit_lists">
|
||||||
|
<thead>
|
||||||
|
<th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
|
||||||
|
<th><%= t("views.right_panel.detail.receipt_no") %></th>
|
||||||
|
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
|
||||||
|
</thead>
|
||||||
|
<tbody class="tbd_credit_lists"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- tabs - End -->
|
||||||
|
</div>
|
||||||
|
<!-- Column One -->
|
||||||
|
<!-- Column Two -->
|
||||||
|
<div class="col-lg-5 col-md-5 col-sm-5">
|
||||||
|
<div class="card" >
|
||||||
|
<div class="card-header">
|
||||||
|
<div><strong id="order-title">SALE DETAILS </strong></div>
|
||||||
|
</div>
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="card-title row p-l-10 p-r-10">
|
||||||
|
<div class="col-lg-6 col-md-6 col-sm-6">
|
||||||
|
Receipt No: <span id="receipt_no"> <%= @sale.receipt_no %>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-6 col-md-6 col-sm-6 text-right">
|
||||||
|
Date: <span id="receipt_date"><%= @sale.receipt_date.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-title row customer_detail hide">
|
||||||
|
<div class="col-lg-6 col-md-6 col-sm-6">
|
||||||
|
Customer : <span id="customer_name"></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div id="order-detail-slimscroll" data-height="200">
|
||||||
|
<div class="card-text" style="">
|
||||||
|
<table class="table table-striped" id="order-items-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th class="item-name">Items</th>
|
||||||
|
<th class="item-attr">QTY</th>
|
||||||
|
<th class="item-attr">Price</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<%
|
||||||
|
sub_total = 0
|
||||||
|
@sale.sale_items.each do |sale_item|
|
||||||
|
sub_total = sub_total + sale_item.price
|
||||||
|
%>
|
||||||
|
<% unless sale_item.price <= 0 %>
|
||||||
|
<tr>
|
||||||
|
<td class='item-name'><%= sale_item.product_name %></td>
|
||||||
|
<td class='item-attr'><%= sale_item.qty %></td>
|
||||||
|
<td class='item-attr'><%= sale_item.price %></td>
|
||||||
|
</tr>
|
||||||
|
<%
|
||||||
|
end
|
||||||
|
end
|
||||||
|
%>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card-footer">
|
||||||
|
<table class="table" id="order-charges-table" border="0">
|
||||||
|
<tr>
|
||||||
|
<td class="charges-name"><strong>Sub Total:</strong></td>
|
||||||
|
<td class="item-attr"><strong id="sub-total"><%= sub_total %></strong></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<%if @sale != nil && @sale.discount_type == 'member_discount'%>
|
||||||
|
<td class="charges-name"><strong>Member Discount:</strong></td>
|
||||||
|
<%else%>
|
||||||
|
<td class="charges-name"><strong>Discount:</strong></td>
|
||||||
|
<%end%>
|
||||||
|
|
||||||
|
<td class="item-attr"><strong id="order-discount">(<%= @sale.total_discount rescue 0%>)</strong></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="charges-name"><strong>
|
||||||
|
<% if !@sale_taxes.empty? %>
|
||||||
|
Tax:
|
||||||
|
(<% @i = 0
|
||||||
|
@sale_taxes.each do |ct| %>
|
||||||
|
<%=ct.tax_name%>
|
||||||
|
<% if @sale_taxes.count != @i+1%>
|
||||||
|
+ <% @i =+1 %>
|
||||||
|
<%end%>
|
||||||
|
<%end %>)
|
||||||
|
<% else %>
|
||||||
|
No Tax
|
||||||
|
<% end %></strong>
|
||||||
|
</td>
|
||||||
|
<td class="item-attr"><strong id="order-Tax"><%= @sale.total_tax rescue 0%></strong></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="charges-name"><strong>Rounding Adj:</strong></td>
|
||||||
|
<td class="item-attr"><strong id="order-round-adj"><%= @sale.rounding_adjustment rescue 0%></strong></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="charges-name"><strong>Grand Total:</strong></td>
|
||||||
|
<td class="item-attr"><strong id="order-grand-total"><%= @sale.grand_total rescue 0%></strong></td>
|
||||||
|
</tr>
|
||||||
|
<tr class="rebate_amount"></tr>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Column Three -->
|
||||||
|
<div class="col-lg-1 col-md-1 col-sm-1">
|
||||||
|
<button type="button" class="btn bg-default btn-block waves-effect" id='back'><i class="material-icons">reply</i>Back</button>
|
||||||
|
<button type="button" class="btn bg-blue btn-block waves-effect" id='pay'>Pay</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
<script type="text/html" id="html_credit_items">
|
||||||
|
<tr class="row_{key} credit_detail" data-id="{sale_payment_id}">
|
||||||
|
<td>{receipt_date}</td>
|
||||||
|
<td>{receipt_no}</td>
|
||||||
|
<td>{cashier_name}</td>
|
||||||
|
<td>{customer_name}</td>
|
||||||
|
<td>{credit_amount}</td>
|
||||||
|
</tr>
|
||||||
|
</script>
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(document).ready(function(){
|
||||||
|
/* check webview loaded*/
|
||||||
|
var webview = <%= @webview %>;
|
||||||
|
showHideNavbar(webview);
|
||||||
|
|
||||||
|
getCreditSales(); //credit sales script data binding
|
||||||
|
|
||||||
|
$(".tables").on('click', function(){
|
||||||
|
var dining_id = $(this).attr("data-id");
|
||||||
|
window.location.href = '/origami/table/' + dining_id;
|
||||||
|
})
|
||||||
|
$(".sales").on('click',function(){
|
||||||
|
var sale_id = $(this).attr("data-id");
|
||||||
|
window.location.href = '/origami/sale/' + sale_id;
|
||||||
|
})
|
||||||
|
$(".rooms").on('click', function(){
|
||||||
|
var dining_id = $(this).attr("data-id");
|
||||||
|
window.location.href = '/origami/room/' + dining_id;
|
||||||
|
})
|
||||||
|
$(".orders").on('click',function(){
|
||||||
|
var order_id = $(this).attr("data-id");
|
||||||
|
window.location.href = '/origami/order/' + order_id;
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#pay').on('click',function() {
|
||||||
|
// var sale_id = $('#sale_id').val();
|
||||||
|
// var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;
|
||||||
|
// $.ajax({
|
||||||
|
// type: "POST",
|
||||||
|
// url: '/origami/sale/'+ sale_id + "/rounding_adj",
|
||||||
|
// success:function(result){
|
||||||
|
// window.location.href = '/origami/sale/'+ sale_id + "/payment";
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#back').on('click',function(){
|
||||||
|
window.location.href = '/origami';
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div id="loading_wrapper" style="display:none;">
|
<div id="loading_wrapper" style="display:none;">
|
||||||
<div id="loading"></div>
|
<div id="loading"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- Column One -->
|
<!-- Column One -->
|
||||||
<div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10' %>">
|
<div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10' %>">
|
||||||
|
|
||||||
@@ -20,6 +20,9 @@
|
|||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
|
<a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item credit_items">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- Nav tabs - End -->
|
<!-- Nav tabs - End -->
|
||||||
|
|
||||||
@@ -131,16 +134,48 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Credit Items -->
|
||||||
|
<div class="tab-pane dining" id="credits" role="tabpanel">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row m-t-10 m-l-10 clearfix">
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<input type="text" name="filter" id="filter" onchange="getCreditData();" style="height: 32px;" placeholder="Receipt No." class="form-control">
|
||||||
</div>
|
</div>
|
||||||
<!-- tabs - End -->
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData();">
|
||||||
|
<option value="">-- Select Customer --</option>
|
||||||
|
<% if !@customers.empty? %>
|
||||||
|
<% @customers.each do |cus| %>
|
||||||
|
<option value="<%= cus[0] %>"><%= cus[1] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
|
</div>
|
||||||
|
<div class="row clearfix m-t-20 m-l-10">
|
||||||
|
<table class="table table-responsive tbl_credit_lists">
|
||||||
|
<thead>
|
||||||
|
<th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
|
||||||
|
<th><%= t("views.right_panel.detail.receipt_no") %></th>
|
||||||
|
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
|
||||||
|
</thead>
|
||||||
|
<tbody class="tbd_credit_lists"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- tabs - End -->
|
||||||
|
</div>
|
||||||
|
<div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
|
||||||
<!-- <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button> -->
|
<!-- <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button> -->
|
||||||
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
|
<button type="button" class="btn btn-block btn-default waves-effect" id='back'>
|
||||||
<i class="material-icons">reply</i>
|
<i class="material-icons">reply</i>
|
||||||
<%= t("views.btn.back") %>
|
<%= t("views.btn.back") %>
|
||||||
</button>
|
</button>
|
||||||
<%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
|
<%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
|
||||||
<!-- <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
|
<!-- <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
|
||||||
</button> -->
|
</button> -->
|
||||||
<%end%>
|
<%end%>
|
||||||
@@ -152,11 +187,23 @@
|
|||||||
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
|
<button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
|
||||||
<%end%>
|
<%end%>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- Column One -->
|
<!-- Column One -->
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
<script type="text/html" id="html_credit_items">
|
||||||
|
<tr class="row_{key} credit_detail" data-id="{sale_payment_id}">
|
||||||
|
<td>{receipt_date}</td>
|
||||||
|
<td>{receipt_no}</td>
|
||||||
|
<td>{cashier_name}</td>
|
||||||
|
<td>{customer_name}</td>
|
||||||
|
<td>{credit_amount}</td>
|
||||||
|
</tr>
|
||||||
|
</script>
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
localStorage.removeItem("tax_type");
|
localStorage.removeItem("tax_type");
|
||||||
|
|
||||||
var webview = <%= @webview %>;
|
var webview = <%= @webview %>;
|
||||||
@@ -167,6 +214,8 @@ $(document).ready(function(){
|
|||||||
getAllMenu();
|
getAllMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getCreditSales(); //credit sales script data binding
|
||||||
|
|
||||||
$(".tables").on('click', function(){
|
$(".tables").on('click', function(){
|
||||||
var dining_id = $(this).attr("data-id");
|
var dining_id = $(this).attr("data-id");
|
||||||
window.location.href = '/origami/table/' + dining_id;
|
window.location.href = '/origami/table/' + dining_id;
|
||||||
@@ -190,7 +239,7 @@ $(document).ready(function(){
|
|||||||
$('#sale_summary').on('click',function(){
|
$('#sale_summary').on('click',function(){
|
||||||
window.location.href = '/origami/shift/sale_summary';
|
window.location.href = '/origami/shift/sale_summary';
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
// $(function() {
|
// $(function() {
|
||||||
// var timer;
|
// var timer;
|
||||||
@@ -271,7 +320,7 @@ $('#close_cashier').on('click',function(e){
|
|||||||
e.preventDefault(); // Prevent the href from redirecting directly
|
e.preventDefault(); // Prevent the href from redirecting directly
|
||||||
var linkURL = '/origami/shift/cashier/close';
|
var linkURL = '/origami/shift/cashier/close';
|
||||||
warnBeforeRedirect(linkURL);
|
warnBeforeRedirect(linkURL);
|
||||||
})
|
})
|
||||||
|
|
||||||
$('#back').on('click',function(){
|
$('#back').on('click',function(){
|
||||||
window.location.href = '/origami/dashboard';
|
window.location.href = '/origami/dashboard';
|
||||||
@@ -287,5 +336,5 @@ function warnBeforeRedirect(linkURL) {
|
|||||||
// Redirect the user
|
// Redirect the user
|
||||||
window.location.href = linkURL;
|
window.location.href = linkURL;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -19,6 +19,9 @@
|
|||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
|
<a class="nav-link" data-toggle="tab" href="#orders" role="tab"><%= t :orders %></a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item credit_items">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- Nav tabs - End -->
|
<!-- Nav tabs - End -->
|
||||||
<div id="custom-slimscroll">
|
<div id="custom-slimscroll">
|
||||||
@@ -165,6 +168,39 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Credit Item Lists-->
|
||||||
|
<div class="tab-pane dining" id="credits" role="tabpanel">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row m-t-10 m-l-10 clearfix">
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<input type="text" name="filter" id="filter" style="height: 32px;" placeholder="Receipt No." class="form-control" onchange="getCreditData();">
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData();" >
|
||||||
|
<option value="">-- Select Customer --</option>
|
||||||
|
<% if !@customers.empty? %>
|
||||||
|
<% @customers.each do |cus| %>
|
||||||
|
<option value="<%= cus[0] %>"><%= cus[1] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row clearfix m-t-20 m-l-10">
|
||||||
|
<table class="table table-responsive tbl_credit_lists">
|
||||||
|
<thead>
|
||||||
|
<th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
|
||||||
|
<th><%= t("views.right_panel.detail.receipt_no") %></th>
|
||||||
|
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
|
||||||
|
</thead>
|
||||||
|
<tbody class="tbd_credit_lists"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- tabs - End -->
|
<!-- tabs - End -->
|
||||||
@@ -583,9 +619,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
|
<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
|
||||||
<div class="modal-dialog" role="document">
|
<div class="modal-dialog" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
@@ -607,9 +643,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal fade" id="AccessCodeModal" tabindex="-1" role="dialog">
|
<div class="modal fade" id="AccessCodeModal" tabindex="-1" role="dialog">
|
||||||
<div class="modal-dialog modal-sm" role="document">
|
<div class="modal-dialog modal-sm" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
@@ -640,10 +676,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- change tax modal -->
|
<!-- change tax modal -->
|
||||||
<div class="modal fade" id="change_taxModal" tabindex="-1" role="dialog">
|
<div class="modal fade" id="change_taxModal" tabindex="-1" role="dialog">
|
||||||
<div class="modal-dialog modal-md" role="document">
|
<div class="modal-dialog modal-md" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
@@ -695,7 +731,19 @@
|
|||||||
<div class="modal-footer"></div>
|
<div class="modal-footer"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
<script type="text/html" id="html_credit_items">
|
||||||
|
<tr class="row_{key} credit_detail" data-id="{sale_payment_id}">
|
||||||
|
<td>{receipt_date}</td>
|
||||||
|
<td>{receipt_no}</td>
|
||||||
|
<td>{cashier_name}</td>
|
||||||
|
<td>{customer_name}</td>
|
||||||
|
<td>{credit_amount}</td>
|
||||||
|
</tr>
|
||||||
|
</script>
|
||||||
|
<!-- script data for credit lists -->
|
||||||
<script>
|
<script>
|
||||||
var cashier_type = "cashier";
|
var cashier_type = "cashier";
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
@@ -709,6 +757,8 @@
|
|||||||
receipt_no = ($("#receipt_no").html()).trim();
|
receipt_no = ($("#receipt_no").html()).trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getCreditSales(); //credit sales script data binding
|
||||||
|
|
||||||
discount="<%= @membership.discount%>"
|
discount="<%= @membership.discount%>"
|
||||||
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
|
if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
|
||||||
if (discount) {
|
if (discount) {
|
||||||
@@ -936,12 +986,12 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#pay').on('click', function () {
|
$('#pay').on('click', function () {
|
||||||
var sale_id = $('#sale_id').val();
|
var sale_id = $('#sale_id').val();
|
||||||
window.location.href = '/origami/sale/' + sale_id + "/cashier/payment";
|
window.location.href = '/origami/sale/' + sale_id + "/cashier/payment";
|
||||||
});
|
});
|
||||||
|
|
||||||
// Bill Request
|
// Bill Request
|
||||||
$('#request_bills').click(function () {
|
$('#request_bills').click(function () {
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link active" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
<a class="nav-link active" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item credit_items">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- Nav tabs - End -->
|
<!-- Nav tabs - End -->
|
||||||
<div id="custom-slimscroll">
|
<div id="custom-slimscroll">
|
||||||
@@ -47,11 +50,6 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<%= table.name %>
|
<%= table.name %>
|
||||||
<% if !@order_items_count.nil? %>
|
|
||||||
<% if @order_items_count.key?(table.id) %>
|
|
||||||
(Orders : <%= @order_items_count[table.id] %>)
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
<span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
|
<span class="float-right font-12 new_text_<%= table.id %>"> billed</span>
|
||||||
<div style="font-size:12px;"></div>
|
<div style="font-size:12px;"></div>
|
||||||
</div>
|
</div>
|
||||||
@@ -64,11 +62,6 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<%= table.name %>
|
<%= table.name %>
|
||||||
<% if !@order_items_count.nil? %>
|
|
||||||
<% if @order_items_count.key?(table.id) %>
|
|
||||||
(Orders : <%= @order_items_count[table.id] %>)
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
<span class="float-right font-12 new_text_<%= table.id %>"> new</span>
|
<span class="float-right font-12 new_text_<%= table.id %>"> new</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -94,11 +87,6 @@
|
|||||||
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
<div class="card rooms red text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<%= room.name %>
|
<%= room.name %>
|
||||||
<% if !@order_items_count.nil? %>
|
|
||||||
<% if @order_items_count.key?(room.id) %>
|
|
||||||
(Orders : <%= @order_items_count[room.id] %>)
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
<span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
|
<span class="float-right font-12 new_text_<%= room.id %>"> billed</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -106,11 +94,6 @@
|
|||||||
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
<div class="card rooms blue text-white table_<%= room.id %>" data-id="<%= room.id %>">
|
||||||
<div class="card-block">
|
<div class="card-block">
|
||||||
<%= room.name %>
|
<%= room.name %>
|
||||||
<% if !@order_items_count.nil? %>
|
|
||||||
<% if @order_items_count.key?(room.id) %>
|
|
||||||
(Orders : <%= @order_items_count[room.id] %>)
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
|
||||||
<span class="float-right font-12 new_text_<%= room.id %>"> new</span>
|
<span class="float-right font-12 new_text_<%= room.id %>"> new</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -155,6 +138,39 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Credit Item Lists-->
|
||||||
|
<div class="tab-pane dining" id="credits" role="tabpanel">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row m-t-10 m-l-10 clearfix">
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<input type="text" name="filter" id="filter" style="height: 32px;" placeholder="Receipt No." class="form-control" onchange="getCreditData();">
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData();" >
|
||||||
|
<option value="">-- Select Customer --</option>
|
||||||
|
<% if !@customers.empty? %>
|
||||||
|
<% @customers.each do |cus| %>
|
||||||
|
<option value="<%= cus[0] %>"><%= cus[1] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row clearfix m-t-20 m-l-10">
|
||||||
|
<table class="table table-responsive tbl_credit_lists">
|
||||||
|
<thead>
|
||||||
|
<th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
|
||||||
|
<th><%= t("views.right_panel.detail.receipt_no") %></th>
|
||||||
|
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
|
||||||
|
</thead>
|
||||||
|
<tbody class="tbd_credit_lists"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- tabs - End -->
|
<!-- tabs - End -->
|
||||||
@@ -251,12 +267,25 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
<script type="text/html" id="html_credit_items">
|
||||||
|
<tr class="row_{key} credit_detail" data-id="{sale_payment_id}">
|
||||||
|
<td>{receipt_date}</td>
|
||||||
|
<td>{receipt_no}</td>
|
||||||
|
<td>{cashier_name}</td>
|
||||||
|
<td>{customer_name}</td>
|
||||||
|
<td>{credit_amount}</td>
|
||||||
|
</tr>
|
||||||
|
</script>
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
/* check webview loaded*/
|
/* check webview loaded*/
|
||||||
var webview = <%= @webview %>;
|
var webview = <%= @webview %>;
|
||||||
showHideNavbar(webview);
|
showHideNavbar(webview);
|
||||||
|
getCreditSales(); //credit sales script data binding
|
||||||
$(".tables").on('click', function(){
|
$(".tables").on('click', function(){
|
||||||
var dining_id = $(this).attr("data-id");
|
var dining_id = $(this).attr("data-id");
|
||||||
window.location.href = '/origami/table/' + dining_id;
|
window.location.href = '/origami/table/' + dining_id;
|
||||||
|
|||||||
@@ -20,6 +20,9 @@
|
|||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
<a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item credit_items">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<!-- Nav tabs - End -->
|
<!-- Nav tabs - End -->
|
||||||
<div id="custom-slimscroll">
|
<div id="custom-slimscroll">
|
||||||
@@ -166,6 +169,39 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Credit Item Lists-->
|
||||||
|
<div class="tab-pane dining" id="credits" role="tabpanel">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row m-t-10 m-l-10 clearfix">
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<input type="text" name="filter" id="filter" style="height: 32px;" placeholder="Receipt No." class="form-control" onchange="getCreditData();">
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData();" >
|
||||||
|
<option value="">-- Select Customer --</option>
|
||||||
|
<% if !@customers.empty? %>
|
||||||
|
<% @customers.each do |cus| %>
|
||||||
|
<option value="<%= cus[0] %>"><%= cus[1] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row clearfix m-t-20 m-l-10">
|
||||||
|
<table class="table table-responsive tbl_credit_lists">
|
||||||
|
<thead>
|
||||||
|
<th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
|
||||||
|
<th><%= t("views.right_panel.detail.receipt_no") %></th>
|
||||||
|
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
|
||||||
|
</thead>
|
||||||
|
<tbody class="tbd_credit_lists"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- tabs - End -->
|
<!-- tabs - End -->
|
||||||
@@ -691,6 +727,18 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
<script type="text/html" id="html_credit_items">
|
||||||
|
<tr class="row_{key} credit_detail" data-id="{sale_payment_id}">
|
||||||
|
<td>{receipt_date}</td>
|
||||||
|
<td>{receipt_no}</td>
|
||||||
|
<td>{cashier_name}</td>
|
||||||
|
<td>{customer_name}</td>
|
||||||
|
<td>{credit_amount}</td>
|
||||||
|
</tr>
|
||||||
|
</script>
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var cashier_type = "cashier";
|
var cashier_type = "cashier";
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
@@ -698,6 +746,8 @@ $(document).ready(function(){
|
|||||||
/* check webview loaded*/
|
/* check webview loaded*/
|
||||||
var webview = <%= @webview %>;
|
var webview = <%= @webview %>;
|
||||||
showHideNavbar(webview);
|
showHideNavbar(webview);
|
||||||
|
|
||||||
|
getCreditSales(); //credit sales script data binding
|
||||||
// $(".tables").on('click', function(){
|
// $(".tables").on('click', function(){
|
||||||
// var customer_id=$(".customer-id").text();
|
// var customer_id=$(".customer-id").text();
|
||||||
// show_customer_details(customer_id);
|
// show_customer_details(customer_id);
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
<a class="nav-link" data-toggle="tab" href="#orders" role="tab">Orders</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item credit_items">
|
||||||
|
<a class="nav-link" data-toggle="tab" href="#credits" role="tab"><%= t :credit %></a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
|
<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
|
||||||
<!-- Nav tabs - End -->
|
<!-- Nav tabs - End -->
|
||||||
@@ -156,6 +159,39 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Credit Item Lists-->
|
||||||
|
<div class="tab-pane dining" id="credits" role="tabpanel">
|
||||||
|
<div class="card-block">
|
||||||
|
<div class="row m-t-10 m-l-10 clearfix">
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<input type="text" name="filter" id="filter" style="height: 32px;" placeholder="Receipt No." class="form-control" onchange="getCreditData();">
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12">
|
||||||
|
<select class="form-control" id="sel_customer" name="sel_customer" placeholder="Select Customer" onchange="getCreditData();" >
|
||||||
|
<option value="">-- Select Customer --</option>
|
||||||
|
<% if !@customers.empty? %>
|
||||||
|
<% @customers.each do |cus| %>
|
||||||
|
<option value="<%= cus[0] %>"><%= cus[1] %></option>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row clearfix m-t-20 m-l-10">
|
||||||
|
<table class="table table-responsive tbl_credit_lists">
|
||||||
|
<thead>
|
||||||
|
<th><%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %></th>
|
||||||
|
<th><%= t("views.right_panel.detail.receipt_no") %></th>
|
||||||
|
<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t :customer %> <%= t("views.right_panel.detail.name") %></th>
|
||||||
|
<th> <%= t("views.right_panel.detail.credit_amount") %> </th>
|
||||||
|
</thead>
|
||||||
|
<tbody class="tbd_credit_lists"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- tabs - End -->
|
<!-- tabs - End -->
|
||||||
@@ -353,8 +389,25 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- script data for credit lists -->
|
||||||
|
<script type="text/html" id="html_credit_items">
|
||||||
|
<tr class="row_{key} credit_detail" data-id="{sale_payment_id}">
|
||||||
|
<td>{receipt_date}</td>
|
||||||
|
<td>{receipt_no}</td>
|
||||||
|
<td>{cashier_name}</td>
|
||||||
|
<td>{customer_name}</td>
|
||||||
|
<td>{credit_amount}</td>
|
||||||
|
</tr>
|
||||||
|
</script>
|
||||||
|
<!-- script data for credit lists -->
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
|
/* check webview loaded*/
|
||||||
|
var webview = <%= @webview %>;
|
||||||
|
showHideNavbar(webview);
|
||||||
|
getCreditSales(); //credit sales script data binding
|
||||||
|
|
||||||
$(".tables").on('click', function(){
|
$(".tables").on('click', function(){
|
||||||
var dining_id = $(this).attr("data-id");
|
var dining_id = $(this).attr("data-id");
|
||||||
window.location.href = '/origami/table/' + dining_id;
|
window.location.href = '/origami/table/' + dining_id;
|
||||||
|
|||||||
@@ -287,8 +287,9 @@ scope "(:locale)", locale: /en|mm/ do
|
|||||||
post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
|
post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
|
||||||
post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
|
post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
|
||||||
|
|
||||||
|
#credit sales
|
||||||
|
post '/:type/credit_sales' => "dashboard#get_credit_sales", :as => "get_credit_sales", :defaults => { :format => 'json' }
|
||||||
|
get '/:type/credit_sales/:sale_payment_id' => "credit_sales#show"
|
||||||
end
|
end
|
||||||
|
|
||||||
#--------- Waiter/Ordering Station ------------#
|
#--------- Waiter/Ordering Station ------------#
|
||||||
|
|||||||
Reference in New Issue
Block a user