diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 62d8dd79..22a98aa5 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -23,282 +23,309 @@ <%= t :credits %> - -
-
- -
-
- <% @complete.each do |sale| %> -
-
- <%= sale.receipt_no %> - <%= sale.sale_status %> -
+ +
+
+ +
+
+ <% @complete.each do |sale| %> +
+
+ <%= sale.receipt_no %> + <%= sale.sale_status %> +
+
+ <% end %>
- <% end %>
-
- -
-
- <% @tables.each do |table| %> - <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> - <% if table.get_checkout_booking.nil? %> -
- <% else %> -
- <% end %> -
- <%= table.name %> + +
+
+ <% @tables.each do |table| %> + <% if table.status == 'occupied' %> + <% if table.get_booking.nil? %> + <% if table.get_checkout_booking.nil? %> +
+ <% else %> +
+ <% end %> +
+ <%= table.name %> - billed -
-
+ <% end %> --> + billed +
- <% else %> - <% if table.get_checkout_booking.nil? %> +
+ <% else %> + <% if table.get_checkout_booking.nil? %>
- <% else %> -
- <% end %> -
- <%= table.name %> + <% else %> +
+ <% end %> +
+ <%= table.name %> - new -
+ <% end %> --> + new
- <% end %> - <% else %> -
-
- <%= table.name %> - new -
-
- <% end %> - <% end %> +
+ <% end %> + <% else %> +
+
+ <%= table.name %> + new
+ <% end %> + <% end %> +
+
- -
-
- <% @rooms.each do |room| %> - <% if room.status == 'occupied' %> - <% if room.get_booking.nil? %> - <% if room.get_checkout_booking.nil? %> -
- <% else %> -
- <% end %> -
- <%= room.name %> + +
+
+ <% @rooms.each do |room| %> + <% if room.status == 'occupied' %> + <% if room.get_booking.nil? %> + <% if room.get_checkout_booking.nil? %> +
+ <% else %> +
+ <% end %> +
+ <%= room.name %> - billed -
+ <% end %> --> + billed
- <% else %> - <% if room.get_checkout_booking.nil? %> -
- <% else %> -
- <% end %> -
- <%= room.name %> +
+ <% else %> + <% if room.get_checkout_booking.nil? %> +
+ <% else %> +
+ <% end %> +
+ <%= room.name %> - new -
-
- <% end %> - <% else %> -
-
- <%= room.name %> - -
-
- <% end %> - <% end %> + <% end %> --> + new
+ <% end %> + <% else %> +
+
+ <%= room.name %> + +
+
+ <% end %> + <% end %> +
+
- -
-
- <% @orders.each do |order| %> -
text-white" data-id="<%= order.order_id %>"> -
- <% - order_status = "" - sale_order = order.sale_orders.first - 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 %> -
-
- <% end %> -
-
- - -
-
-
-
- -
-
- -
-
-
- - - - - - - - - -
<%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.receipt_no") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :customer %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.credit_amount") %>
-
-
-
+ +
+
+ <% @orders.each do |order| %> +
text-white" data-id="<%= order.order_id %>"> +
+ <% + order_status = "" + sale_order = order.sale_orders.first + 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 %>
- + <% end %> +
+
+ + +
+
+
+
+ +
+
+ +
- +
+ + + + + + + + + +
<%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.receipt_no") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :customer %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.credit_amount") %>
+
+
+
- -
-
-
- <% if @status_order == 'order' && @status_sale != 'sale' %> - <% if !@obj_order.nil? %> -
- <% else %> -
- <% end %> - ORDER DETAILS | Table <%= @dining.name rescue "" %> - <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %> - <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> - <% else %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <% end %> -
- <% elsif @status_sale == 'sale' %> -
- INVOICE DETAILS | Table <%= @dining.name rescue "" %> - <% if !@booking.reserved_by.nil? && %> - <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> - <% else %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <% end %> -
- <% else %> - ORDER DETAILS | Table <%= @dining.name rescue "" %> - <% end %> -
-
-
-
- <% if (!@sale_array.empty?) && (!@date.nil?) %> -
-   Receipt No: - <% if @status_sale == 'sale' %> - <%= @sale_array[0].receipt_no rescue '' %> - <% end %> - -
-
-
- Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %> -
-
- <% elsif !@date.nil? %> -
-   Order No: - <% if @status_order == 'order' %> - <%= @obj_order.order_id rescue '' %> +
+
+ +
+ - <% end %> - -
-
-
- Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %> -
-
- <% end %> -
-
-
+ +
+
+
+ <% if @status_order == 'order' && @status_sale != 'sale' %> + <% if !@obj_order.nil? %> +
+ <% else %> +
+ <% end %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> + <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %> +
+ <% elsif @status_sale == 'sale' %> +
+ INVOICE DETAILS | Table <%= @dining.name rescue "" %> + <% if !@booking.reserved_by.nil? && %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %> +
+ <% else %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> + <% end %> +
+
+
+
+ <% if (!@sale_array.empty?) && (!@date.nil?) %> +
+   Receipt No: + <% if @status_sale == 'sale' %> + <%= @sale_array[0].receipt_no rescue '' %> + <% end %> + +
+
+
+ Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %> +
+
+ <% elsif !@date.nil? %> +
+   Order No: + <% if @status_order == 'order' %> + <%= @obj_order.order_id rescue '' %> - <% if @status_sale == 'sale' %> - -   Customer : <%= @sale_array[0].customer.name rescue '' %> - <% elsif @status_order == 'order' - %> - -   Customer : <%= @customer.name rescue "" %> - <% end %> + <% end %> + +
+
+
+ Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %> +
+
+ <% end %> +
+
+
+ + <% if @status_sale == 'sale' %> + +   Customer : <%= @sale_array[0].customer.name rescue '' %> + <% elsif @status_order == 'order' + %> + +   Customer : <%= @customer.name rescue "" %> + <% end %> + +
+
+
+
"> +
+ + + - - - -
"> -
-
- + + + + + + + + <% + count = 0 + sub_total = 0 + if @status_sale == "sale" + @sale_array[0].sale_items.each do |sale_item| + + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + # unless sale_item.price == 0 + count += 1 + %> - - - - + + + + - - - <% if @status_order == 'order' && @status_sale != 'sale' + + <% + end + end + + if @status_order == 'order' && @status_sale != 'sale' puts unless @order_items.nil? || @order_items.empty? count = 0 @@ -341,47 +368,76 @@ <% - count = 0 - sub_total = 0 - if @status_sale == "sale" - @sale_array[0].sale_items.each do |sale_item| - sub_total = sub_total + sale_item.price - %> - - <% - # Can't check for discount - # unless sale_item.price == 0 + # end + end + end + end + %> + +
#ItemsQTY + Price +
#ItemsQTY - Price - <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
<%= (order_item.qty*order_item.price).to_f + set_item_prices %>
+
+
+
+ + + + + + + <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> + + <%else%> + + <%end%> + + + + <% if @status_sale == "sale" %> + + + + + + + + + + + + + <% end %> + +
Sub Total:<%= sub_total %>
Member Discount:Discount:(<%= @obj_sale.total_discount rescue 0%>)
+ <% 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 %>
+ <%if !@webview %> + + <% end %> + 		<%= @obj_sale.total_tax rescue 0%>
Rounding Adj:<%= @obj_sale.rounding_adjustment rescue 0%>
Grand Total:<%= @obj_sale.grand_total rescue 0%>
+
+ + <% + if @status_sale == 'sale' + unless @order_items.nil? || @order_items.empty? + %> + Pending New Order + + <% + count = 0 + @order_items.each do |order_item| + set_item_prices = 0 count += 1 - %> - - - - - - - - <% - end - end - - if @status_order == 'order' && @status_sale != 'sale' - puts - unless @order_items.nil? || @order_items.empty? - count = 0 - @order_items.each do |order_item| - set_item_prices = 0 - count += 1 - sub_total = sub_total + (order_item.price * order_item.qty) - - # unless order_item.price == 0 %> - - - - - - - <% + <% end %> + <% end %> - # end - end - end + <% if !order_item.set_menu_items.nil? + JSON.parse(order_item.set_menu_items).each do |item_instance| + set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f + %> +
+ <%= item_instance["item_instance_name"] %> + <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %> + <% (item_instance["options"]).each do |set_item_option| %> +
+ <%= set_item_option %> + + <% end %> + <% end %> + + <% end + sub_total += set_item_prices + end %> + + + + + <% end - %> - + %>
<%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
<%= count %> - <%= order_item.item_name %> - <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %> - <% JSON.parse(order_item.options).each do |option| %> -======= %>
<%= count %> @@ -389,399 +445,294 @@ <%= order_item.item_name %> <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %> <% JSON.parse(order_item.options).each do |option| %> ->>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
- <%= option %> - - <% end %> - <% end %> - - <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]' - JSON.parse(order_item.set_menu_items).each do |item_instance| - set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f %> -
- <%= item_instance["item_instance_name"] %> - <% if !item_instance["options"].nil? && !item_instance["options"].empty? %> - <% (item_instance["options"]).each do |set_item_option| %> -
- <%= set_item_option %> + <%= option %> - <% end %> - <% end %> - - <% end - sub_total += set_item_prices - end %> - 		<%= order_item.qty %><%= (order_item.qty*order_item.price).to_f + set_item_prices %>
<%= order_item.qty %><%= (order_item.qty*order_item.price).to_f + set_item_prices %>
-
-
-
- - - - - - - <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> - - <%else%> - - <%end%> - - - - <% if @status_sale == "sale" %> - - - - - - - - - - - - - <% end %> - -
Sub Total:<%= sub_total %>
Member Discount:Discount:(<%= @obj_sale.total_discount rescue 0%>)
- <% 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 %>
- <%if !@webview %> - - <% end %> - 		<%= @obj_sale.total_tax rescue 0%>
Rounding Adj:<%= @obj_sale.rounding_adjustment rescue 0%>
Grand Total:<%= @obj_sale.grand_total rescue 0%>
-
- - <% - if @status_sale == 'sale' - unless @order_items.nil? || @order_items.empty? - %> - Pending New Order - - <% - count = 0 - @order_items.each do |order_item| - set_item_prices = 0 - count += 1 - %> - - - - - - <% - end - %> -
<%= count %> - - <%= order_item.item_name %> - <% if !order_item.options.nil? && !order_item.options.empty? && order_item.options != "undefined" %> - <% JSON.parse(order_item.options).each do |option| %> -
- <%= option %> - - <% end %> - <% end %> - - <% if !order_item.set_menu_items.nil? - JSON.parse(order_item.set_menu_items).each do |item_instance| - set_item_prices += (item_instance["quantity"].to_f * item_instance["price"].to_f).to_f - %> -
- <%= item_instance["item_instance_name"] %> - <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %> - <% (item_instance["options"]).each do |set_item_option| %> -
- <%= set_item_option %> - - <% end %> - <% end %> - - <% end - sub_total += set_item_prices - end %> - 		<%= order_item.qty %><%= (order_item.qty*order_item.price).to_f + set_item_prices %>
- - + + <% end %> <% if @sale_array.size > 1 %> -

- Pending Payment +

+ Pending Payment <% end %> <% @sale_array.each do |sale| if @sale_array.size > 1 unless sale.receipt_no == @sale_array[0].receipt_no - %> + %> - - - - - -
Receipt No - <%= sale.receipt_no %> - -
- <% - end - end - end - end - %> -
+ + + + + +
Receipt No - <%= sale.receipt_no %> + +
+ <% + end + end + end + end + %>
+
- -
- + +
+ - - - - - <% if @dining.status != "available" %> - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - - - - <% if !@split_bill.nil? %> - <% if @split_bill == '1' %> - - <% end %> - <% end %> - - - - <% end %> - <% if @status_sale == 'sale' %> - <% if current_login_employee.role != "waiter" %> - - - <% end %> - - <% if current_login_employee.role != "waiter" %> + + + + + <% if @dining.status != "available" %> + <% if @status_order == 'order' && @status_sale != 'sale' %> + + + + + + + + <% if !@split_bill.nil? %> + <% if @split_bill == '1' %> + + <% end %> + <% end %> + + + + <% end %> + <% if @status_sale == 'sale' %> + <% if current_login_employee.role != "waiter" %> + + + <% end %> + + <% if current_login_employee.role != "waiter" %> <% if current_login_employee.role == "cashier" %> - Edit - Void + Edit + Void <% else %> - + <% if @split_bill == '1' %> + + <% end %> <% end %> - <% end %> - <% if current_login_employee.role != "waiter" %> - - - <%if @membership.discount && @obj_sale.customer.membership_id %> - - <%else%> - - <%end%> - + <% if current_login_employee.role != "waiter" %> + + + <%if @membership.discount && @obj_sale.customer.membership_id %> + + <%else%> + + <%end%> + - <% end %> - <% end %> - + <% end %>--> + <% end %> + <% end %> + - - <% else %> - <% if !@checkout_time.empty? && !@checkout_alert_time.empty? %> - - <% end %> - <% end %> - "> - - - +
-