diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb new file mode 100644 index 00000000..db56d882 --- /dev/null +++ b/app/controllers/origami/order_reservation_controller.rb @@ -0,0 +1,12 @@ +class Origami::OrderReservationController < BaseOrigamiController + + def index + @webview = check_mobile + @shop = Shop::ShopDetail + + end + + + + +end diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 68b09437..1b6a554e 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -34,6 +34,14 @@
<%= t :dine_in_cashier %>
+
+
+
+ arrow_forward +
+
<%= t :order_reservation %>
+
+
<% if !@current_user.nil? && @current_user.role != 'waiter' %> @@ -199,8 +207,11 @@ $(".qs_view").on('click', function() { document.getElementById('second_view').click(); - window.location.href = '/origami/quick_service'; - + window.location.href = '/origami/quick_service'; + }); + + $(".order_reservation").on('click', function() { + window.location.href = '/origami/order_reservation'; }); $("#second_view").on('click', function () { diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb new file mode 100644 index 00000000..e1e7c57e --- /dev/null +++ b/app/views/origami/order_reservation/index.html.erb @@ -0,0 +1,61 @@ +
+
+
+ +
+
+
+ <% @complete.each do |sale| %> +
+
+ <%= sale.receipt_no %> + <%= sale.sale_status %> +
+
+ <% end %> +
+
+ + +
+
+ <% @orders.each do |order| %> +
+
+ <%= order.order_id %> +
+
+ <% end %> +
+
+ +
+ +
+
+
+
+
+ + diff --git a/config/locales/en.yml b/config/locales/en.yml index 0e787751..e73771e5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -74,6 +74,7 @@ en: date_time: "DateTime" dine_in_cashier: "Dine-in Cashier" quick_service: "Quick Service" + order_reservation: "Order & Reservation" views: btn: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 406bcaf4..8a7b424a 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -69,6 +69,7 @@ mm: date_time: "ရက်စွဲအချိန်" dine_in_cashier: "Dine-in Cashier" quick_service: "Quick Service" + order_reservation: "Order & Reservation" views: btn: diff --git a/config/routes.rb b/config/routes.rb index 2c25db97..148af0ba 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -257,6 +257,8 @@ scope "(:locale)", locale: /en|mm/ do post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' } + #order and reservation + resources :order_reservation end #--------- Waiter/Ordering Station ------------#