pull from master

2018-05-04 18:00:44 +06:30
parent 2f398bcfeb
commit bb4c004406
12 changed files with 185 additions and 57 deletions
--- a/app/views/origami/dashboard/index.html.erb
+++ b/app/views/origami/dashboard/index.html.erb
@@ -28,6 +28,7 @@
        </div>
      </div>
      <% end %>
+      <% if @dinein_cashier == '1' %>
      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view">
        <div class="info-box bg-green">
          <div class="icon" >
@@ -36,6 +37,7 @@
          <div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
        </div>
      </div>
+       <% end %>
      <% if @order_reservation == '1' %>
      <div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation">
        <div class="info-box bg-blue">