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

app/controllers/crm/bookings_controller.rb

@@ -15,9 +15,4 @@ class Crm::BookingsController < BaseCrmController
 	    end 
     end
     
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end

app/controllers/crm/customers_controller.rb

@@ -396,12 +396,7 @@ end
     def customer_params
 
       params.require(:customer).permit(:id, :name, :company, :contact_no, :email,
-                :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type)
+                :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :image_path)
     end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+   
 end

app/controllers/crm/dining_queues_controller.rb

@@ -142,10 +142,5 @@ class Crm::DiningQueuesController < BaseCrmController
     def dining_queue_params
       params.require(:dining_queue).permit(:customer_id, :name, :contact_no, :queue_no,:status,:seater,:remark)
     end
-
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end    
+  
 end

app/controllers/crm/home_controller.rb

@@ -56,10 +56,5 @@ class Crm::HomeController < BaseCrmController
   #     end 
   # end
   
-  #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
 end