-
+ <%if current_login_employee.role =="administrator" %>
+
- + + + <% end %>
-
-
+ +
+ exit_to_app + Logout
Are you sure you want to Logout ?
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index 48a768ce..434332da 100755 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -51,22 +51,24 @@
<% end %>
- <% if can? :menage, Customer %>
- widgets <%= t :crm %> - <% end %> <% if can? :menage, Inventory %>
-
+
<% end %>
@@ -372,6 +387,9 @@
%>
+ <% if !@spit_bill.nil? && @spit_bill == '1' %>
+
+ <% end %>
<% end %>
<% if @sale_array.size > 1 %>
@@ -426,14 +444,13 @@ <% end %> <% if @status_sale == 'sale' %> + +
-
Version - 1.0.1 diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 4b32c515..0fdc275e 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -239,10 +239,25 @@ $('#cash_out').on('click',function(){ window.location.href = '/origami/cash_outs/new'; }) -$('#close_cashier').on('click',function(){ - window.location.href = '/origami/shift/close'; +$('#close_cashier').on('click',function(e){ + e.preventDefault(); // Prevent the href from redirecting directly + var linkURL = '/origami/shift/close'; + warnBeforeRedirect(linkURL); }) + $('#back').on('click',function(){ window.location.href = '/origami/dashboard'; }) + +function warnBeforeRedirect(linkURL) { + swal({ + title: "Oops", + text: "Are you sure you want to Logout ?", + type: "warning", + showCancelButton: true + }, function() { + // Redirect the user + window.location.href = linkURL; + }); + } diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8120c748..d1535fcc 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -136,7 +136,22 @@ <% @orders.each do |order| %>
- <%= order.order_id %>
+ <%
+ 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 %>
@@ -426,14 +444,13 @@ <% end %> <% if @status_sale == 'sale' %> + +
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index e2b19682..a837b478 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -137,7 +137,22 @@
<% @orders.each do |order| %>
<% end %>
@@ -349,7 +364,10 @@
end
%>
-
+
+ <% if !@spit_bill.nil? && @spit_bill == '1' %>
+
+ <% end %>
<% end %>
<% if @sale_array.size > 1 %>
@@ -696,34 +714,46 @@ $('#pay').on('click',function() { }); // Bill Request $('#request_bills').click(function() { - var order_id = $('#save_order_id').attr('data-order'); - var ajax_url = "/origami/" + order_id + "/request_bills"; - $.ajax({ + var lookup_split_bill = '<%= @spit_bill %>'; + if(lookup_split_bill == '1'){ + swal({ + title: "Information!", + text: "Do you want to Split bill?", + type: "success", + showCancelButton: true, + confirmButtonColor: "#009900", + confirmButtonText: "Yes, split it!", + closeOnConfirm: false + }, function (isConfirm) { + if (isConfirm) { + var dining_id = "<%= @room.id %>"; + window.location.href = '/origami/room/' + dining_id + "/split_bills"; + }else{ + requestBillProcess(); + } + }); + }else{ + requestBillProcess(); + } +}); + +function requestBillProcess(){ + var order_id = $('#save_order_id').attr('data-order'); + var ajax_url = "/origami/" + order_id + "/request_bills"; + $.ajax({ type: "GET", - url: ajax_url, - // data: 'order_id='+ order_id, - success:function(result){ - if(!result.status){ - $.confirm({ - title: 'Information!', - content: result.error_message, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami'; - } - } - } - }); + url: ajax_url, + // data: 'order_id='+ order_id, + success: function (result) { + if (!result.status) { + swal("Information!", result.error_message); } - else { + else { location.reload(); } - } - }); -}); + } + }); +} $('#move').on('click',function(){ var dining_id = "<%= @room.id %>" @@ -736,7 +766,7 @@ $('#back').on('click',function(){ $('#add_invoice').on('click',function(){ var dining_id = "<%= @room.id %>" - var sale_id = "<%= @obj_sale.sale_id rescue "" %>" + var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %> var ajax_url = "/origami/sale/append_order"; $.ajax({ type: "POST", @@ -864,4 +894,22 @@ $('#add_invoice').on('click',function(){ var dining_id = "<%= @room.id %>" window.location.href = '/origami/addorders/' + dining_id; }); + + /* split bill in add to existing invoice*/ + $('#split_bill').on('click', function(){ + swal({ + title: "Alert", + text: "Are you sure, you want to split bill?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "Yes, split it!", + closeOnConfirm: false + }, function (isConfirm) { + if(isConfirm){ + var dining_id = "<%= @room.id %>"; + window.location.href = '/origami/table/' + dining_id + "/split_bills"; + } + }); + }); diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb new file mode 100755 index 00000000..1c396b21 --- /dev/null +++ b/app/views/origami/split_bill/index.html.erb @@ -0,0 +1,445 @@ +
- <%= order.order_id %>
+ <%
+ 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 %>
@@ -696,34 +714,46 @@ $('#pay').on('click',function() { }); // Bill Request $('#request_bills').click(function() { - var order_id = $('#save_order_id').attr('data-order'); - var ajax_url = "/origami/" + order_id + "/request_bills"; - $.ajax({ + var lookup_split_bill = '<%= @spit_bill %>'; + if(lookup_split_bill == '1'){ + swal({ + title: "Information!", + text: "Do you want to Split bill?", + type: "success", + showCancelButton: true, + confirmButtonColor: "#009900", + confirmButtonText: "Yes, split it!", + closeOnConfirm: false + }, function (isConfirm) { + if (isConfirm) { + var dining_id = "<%= @room.id %>"; + window.location.href = '/origami/room/' + dining_id + "/split_bills"; + }else{ + requestBillProcess(); + } + }); + }else{ + requestBillProcess(); + } +}); + +function requestBillProcess(){ + var order_id = $('#save_order_id').attr('data-order'); + var ajax_url = "/origami/" + order_id + "/request_bills"; + $.ajax({ type: "GET", - url: ajax_url, - // data: 'order_id='+ order_id, - success:function(result){ - if(!result.status){ - $.confirm({ - title: 'Information!', - content: result.error_message, - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - window.location.href = '/origami'; - } - } - } - }); + url: ajax_url, + // data: 'order_id='+ order_id, + success: function (result) { + if (!result.status) { + swal("Information!", result.error_message); } - else { + else { location.reload(); } - } - }); -}); + } + }); +} $('#move').on('click',function(){ var dining_id = "<%= @room.id %>" @@ -736,7 +766,7 @@ $('#back').on('click',function(){ $('#add_invoice').on('click',function(){ var dining_id = "<%= @room.id %>" - var sale_id = "<%= @obj_sale.sale_id rescue "" %>" + var sale_id = $("#sale_id").val(); //<%= @obj_sale.sale_id rescue "" %> var ajax_url = "/origami/sale/append_order"; $.ajax({ type: "POST", @@ -864,4 +894,22 @@ $('#add_invoice').on('click',function(){ var dining_id = "<%= @room.id %>" window.location.href = '/origami/addorders/' + dining_id; }); + + /* split bill in add to existing invoice*/ + $('#split_bill').on('click', function(){ + swal({ + title: "Alert", + text: "Are you sure, you want to split bill?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: "Yes, split it!", + closeOnConfirm: false + }, function (isConfirm) { + if(isConfirm){ + var dining_id = "<%= @room.id %>"; + window.location.href = '/origami/table/' + dining_id + "/split_bills"; + } + }); + }); diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb new file mode 100755 index 00000000..1c396b21 --- /dev/null +++ b/app/views/origami/split_bill/index.html.erb @@ -0,0 +1,445 @@ +
+
+
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 6a5b284e..141220a6 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -230,8 +230,10 @@ scope "(:locale)", locale: /en|mm/ do
post "bank_integration/settle_trans", to: "bank_integration#settle_trans", as:"settle_trans"
post "bank_integration/sale_trans", to: "bank_integration#sale_trans", as:"sale_trans"
-
-
+ #split bill
+ get '/table/:dining_id/split_bills' => 'split_bill#index'
+ get '/room/:dining_id/split_bills' => 'split_bill#index'
+ post '/split_bills', to: 'split_bill#create', as:"order_item_split_bills"
end
diff --git a/spec/controllers/origami/split_bill_controller_spec.rb b/spec/controllers/origami/split_bill_controller_spec.rb
new file mode 100644
index 00000000..2ab33eb0
--- /dev/null
+++ b/spec/controllers/origami/split_bill_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::SplitBillController, type: :controller do
+
+end
diff --git a/spec/helpers/origami/split_bill_helper_spec.rb b/spec/helpers/origami/split_bill_helper_spec.rb
new file mode 100644
index 00000000..db065ff0
--- /dev/null
+++ b/spec/helpers/origami/split_bill_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::SplitBillHelper. For example:
+#
+# describe Origami::SplitBillHelper do
+# describe "string concat" do
+# it "concats two strings with spaces" do
+# expect(helper.concat_strings("this","that")).to eq("this that")
+# end
+# end
+# end
+RSpec.describe Origami::SplitBillHelper, type: :helper do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%=@table.id%>
+ <%=@table.type%>
+ <% if !@order.nil? %>
+ <%= @order.customer_id %>
+ <% end %>
+
+ Order Lists
+
+
+
+ <% if !@orders.nil? %>
+
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+ <% @orders.each.with_index(0) do |order, order_index| %>
+ <% active_class = "" %>
+ <% if order_index == 0 %>
+ <% active_class = "active" %>
+ <% end %>
+
+
+
+
+
+
+ <% end %>
+
+
+ Order Items
+
+
+
+
+
+
+
+
+ | Items | +QTY | +Price | +
|---|---|---|
|
+ <%=order_item.order_id%>
+ <%=order_item.account_id%>
+
+ <%=order_item.item_name%>
+ <% if !order_item.set_menu_items.nil?
+ order_item.set_menu_items.each do |item_instance| %>
+ <%= item_instance %> + <% end + end %> + + |
+ + <%=order_item.qty%> + | ++ <%=(order_item.qty*order_item.price)%> + | +
| Sub Total: | +<%=sub_total%> | +
+
+
+
+
+
+
+
+
+
+ Receipt Lists
+
+
+
+
+ <% if !@sale_data.nil? %>
+
+
+ <% @sale_data.each do |sale_data| %>
+
+ <% end %>
+
+ | Receipt No. - <%= sale_data.receipt_no %> | +
+
+
+
+
+
+
+
+
+