diff --git a/app/assets/javascripts/reservation.js b/app/assets/javascripts/reservation.js new file mode 100644 index 00000000..255f3253 --- /dev/null +++ b/app/assets/javascripts/reservation.js @@ -0,0 +1,3 @@ +$(function(){ + +}); \ No newline at end of file diff --git a/app/assets/stylesheets/reservation.scss b/app/assets/stylesheets/reservation.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index b9910803..4d53cc15 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -80,6 +80,17 @@ class Origami::DashboardController < BaseOrigamiController end end end + + #reservation + reservation = Lookup.collection_of('reservation') + @reservation = 0 + if !reservation.empty? + reservation.each do |reserve| + if reserve[0] == 'Reservation' + @reservation = reserve[1] + end + end + end end def get_all_menu diff --git a/app/controllers/origami/reservation_controller.rb b/app/controllers/origami/reservation_controller.rb new file mode 100644 index 00000000..6b1e3aa5 --- /dev/null +++ b/app/controllers/origami/reservation_controller.rb @@ -0,0 +1,6 @@ +class Origami::ReservationController < BaseOrigamiController + + def index + + end +end diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 25c64303..92b34074 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -22,7 +22,7 @@
<% if @quick_service == '1' %> -
+
arrow_forward @@ -32,7 +32,7 @@
<% end %> <% if @dinein_cashier == '1' %> -
+
arrow_forward @@ -40,9 +40,19 @@
<%= t :dine_in_cashier %>
- <% end %> + <% end %> + <% if @reservation == '1' %> +
+
+
+ arrow_forward +
+
<%= t :reservation %>
+
+
+ <% end %> <% if @order_reservation == '1' %> -
+
arrow_forward @@ -240,5 +250,9 @@ $(function() { var url = $(this).attr("data-href"); window.open(url,'_blank'); }); + + $(".reservation").on("click", function(){ + window.location.href = '/origami/reservation'; + }); }); \ No newline at end of file diff --git a/app/views/origami/reservation/index.html.erb b/app/views/origami/reservation/index.html.erb new file mode 100644 index 00000000..0c7d6aae --- /dev/null +++ b/app/views/origami/reservation/index.html.erb @@ -0,0 +1,5 @@ +<%= stylesheet_link_tag 'reservation', media: 'all', 'data-turbolinks-track': 'reload' %> +<%= javascript_include_tag 'reservation', 'data-turbolinks-track': 'reload' %> +
+ +
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index d39873cd..4017e166 100755 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -42,9 +42,11 @@ <%= t("views.right_panel.detail.sales_status") %> <%= t("views.right_panel.detail.receipt_generated_at") %> <% if @sale.sale_status == "completed" %> - -