Merge branch 'adminbsb_material_ui'

app/assets/stylesheets/addorder.scss

@@ -248,3 +248,26 @@ i.logout_icon{
 .list-menu > a:hover{
   text-decoration: none;
 }
+.cashier_number{
+  width: 33%;
+  height:58px;
+  line-height:58px;
+  text-align:center;
+  background:#54A5AF;
+  // float:left;
+  // margin:2px;
+  font-size:20px;
+  color:white;
+  // cursor:pointer;
+}
+.border-top{
+  border-top:1px solid #fff;
+}
+
+.border-right{
+  border-right:1px solid #fff;
+}
+
+.border-left{
+  border-left:1px solid #fff;
+}

app/controllers/origami/home_controller.rb

@@ -132,7 +132,7 @@ class Origami::HomeController < BaseOrigamiController
 def check_emp_access_code
   pin_code = params[:code]
   employee = Employee.find_by_emp_id(pin_code)
-  if employee && employee.role == "manager"
+  if employee && (employee.role == "manager" || employee.role == "supervisor")
    result = {:status=> true, :message=>"Success" }
   else
     result = {:status=> false, :message=>"Invalid Access Code" }

app/views/origami/addorders/detail.html.erb

@@ -313,7 +313,7 @@
              <div class="col-md-3 cashier_number border-top border-left" data-value="9" data-type="num">9</div>
              <div class="col-md-3 cashier_number border-top border-left" data-value="0" data-type="num">0</div>
              <div class="col-md-3 cashier_number border-top border-left" data-value="00" data-type="num">00</div>
-              <div class="col-md-3 cashier_number border-top border-left orange" data-type="clr">Clr</div>
+              <div class="col-md-3 cashier_number border-top border-left  bg-orange" data-type="clr">Clr</div>
            </div>
          </div>
          <div class="modal-footer">

app/views/origami/home/show.html.erb

@@ -487,8 +487,13 @@
                 <% if current_login_employee.role != "waiter" %>
                   <!-- <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
                   <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button> -->
-                   <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"   data-type="edit">Edit</a> 
+                  <% if current_login_employee.role == "cashier" %>
-                  <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+                    <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"   data-type="edit">Edit</a> 
+                    <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+                  <% else %>
+                    <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+                    <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void</button>
+                  <% end %>
                 <% end %>
                 <% if current_login_employee.role != "waiter" %>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>

app/views/origami/payments/show.html.erb

@@ -350,20 +350,30 @@
     <i class="material-icons">reply</i>
      Back
   </button>
-   <!--  <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
+   <!--   -->
+  <% if current_login_employee.role == "cashier" %>
+    <a class="btn btn-block bg-deep-purple waves-effect access_modal" data-toggle="modal"  data-type="foc"> FOC</a>
+    <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+    <a class="btn btn-block bg-deep-purple waves-effect access_modal" data-toggle="modal"  data-type="waste"> Waste</a>
+    <a class="btn btn-block bg-deep-purple waves-effect access_modal" data-toggle="modal"  data-type="spoile"> Spoile</a>
+  <% else %>
+    <button type="button" class="btn bg-deep-purple btn-block" data-toggle="modal" data-target="#focModal" <%= (can? :foc, :payment)? ' ': 'disabled=' %> active="true"> FOC </button>
     <button type="button" class="btn bg-red btn-block" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
     <button type="button" class="btn btn-block bg-deep-purple waves-effect " data-status="waste" value="waste" id="btn_waste" onclick="waste_and_spoilage('waste')">Waste</button>
-<button type="button" class="btn btn-block bg-deep-purple waves-effect " data-status="spoile" value="spoile" id="btn_spoile" onclick="waste_and_spoilage('spoile')">Spoile</button> -->
+    <button type="button" class="btn btn-block bg-deep-purple waves-effect " data-status="spoile" value="spoile" id="btn_spoile" onclick="waste_and_spoilage('spoile')">Spoile</button>
-<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="foc"> FOC</a>
+  <% end %>
-<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
+
-<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="waste"> Waste</a>
-<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="spoile"> Spoile</a>
 <% if @cashier_type=="quick_service" %>
 <hr>
 
  <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
  <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
+ <% if current_login_employee.role == "cashier" %>
   <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"   data-type="edit">Edit</a>
+ <% else %>
+ <button type="button" class="btn btn-block bg-blue waves-effect" id='edit' <%= (can? :edit, :sale_edit)? ' ': 'disabled=' %> active="true">Edit</button>
+ <% end %>
+  
 <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
 <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
   <!-- Waiter Buttons -->