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

app/controllers/crm/customers_controller.rb

@@ -37,6 +37,8 @@ class Crm::CustomersController < BaseCrmController
     @crm_customer   = Customer.new
     @count_customer = Customer.count_customer
 
+    @membership_types = Lookup.collection_of("member_group_type")
+
     @taxes = TaxProfile.all.order("order_by asc")
 
     @filter = filter

app/controllers/origami/customers_controller.rb

@@ -75,7 +75,8 @@ class Origami::CustomersController < BaseOrigamiController
     # if flash["errors"]
     #   @crm_customer.valid?
     # end
-  
+    @membership_types = Lookup.collection_of("member_group_type")
+
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }
       format.html { render action: "index"}