Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/api/sound_effect_controller.rb

@@ -22,7 +22,7 @@ class Api::SoundEffectController < Api::ApiController
         end
       ActionCable.server.broadcast "sound_effect_channel",data: {status: params[:status], message: params[:message]},shop_code: shop_code,from:from,audio:audio
     else
-      render :json => { :status => true, :message => "Something wrongs!" }
+      render :json => { :status => false, :message => "Something wrongs!" }
     end
   end
   #sound effect / alarm api for doemal side calling

app/controllers/application_controller.rb

@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   #before_action :check_installation
   protect_from_forgery with: :exception
 
-  helper_method :shop_detail
+  helper_method :shop_detail, :order_reservation, :bank_integration
   # lookup domain for db from  provision
   # before_action :set_locale
   # helper_method :current_company,:current_login_employee,:current_user

app/controllers/concerns/login_verification.rb

@@ -3,7 +3,7 @@ module LoginVerification
 
   included do
     before_action :authenticate_session_token
-    helper_method :current_company, :current_login_employee, :current_user, :get_cashier
+    helper_method :current_company, :current_login_employee, :current_user, :get_cashier, :order_reservation, :bank_integration
   end
 
   #this is base api base controller to need to inherit.
@@ -30,6 +30,38 @@ module LoginVerification
     @cashier = Employee.where("role = 'cashier' AND token_session <> ''")
   end
 
+  #check order reservation used
+  def order_reservation
+    order_reserve = Lookup.collection_of('order_reservation')
+    status = false
+    if !order_reserve.empty?
+        order_reserve.each do |order|
+            if order[0] == 'OrderReservation'
+              if order[1] == '1'
+                status = true
+              end
+            end
+        end
+    end
+    return status
+  end
+
+  #check bank integration used
+  def bank_integration
+    bank_integration = Lookup.collection_of('bank_integration')
+    status = false
+    if !bank_integration.empty?
+        bank_integration.each do |bank|
+            if bank[0] == 'Bank Integration'
+              if bank[1] == '1'
+                status = true
+              end
+            end
+        end
+    end
+    return status
+  end
+
   protected
   # Authenticate the user with token based authentication
   def authenticate   

app/views/layouts/_left_sidebar.html.erb

@@ -119,9 +119,11 @@
 						</li>
 					<% end %>
 					<% if can? :manage, OrderReservation %>
-						<li>
+						<% if order_reservation %>
-							<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
+							<li>
-						</li>
+								<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
+							</li>
+						<% end %>
 					<% end %>
 				</ul>
 			</li>
@@ -141,9 +143,11 @@
 					<li>
 						<a href="<%= reports_product_sale_index_path %>">Product Sale</a>
 					</li>
+					<% if order_reservation %>
 					<li>
-						<a href="<%= reports_order_reservation_index_path %>">Order Reservation</a>
+						<a href="<%= reports_order_reservation_index_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
 					</li>
+					<% end %>
 					<li>
 						<a href="<%= reports_receipt_no_index_path %>">Receipt</a>
 					</li>