diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 51ddc9eb..f917538e 100755 --- a/app/controllers/crm/customers_controller.rb +++ b/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 diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 58f70faa..d84dac92 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/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"} diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 2682f203..d05af387 100755 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -52,6 +52,7 @@ <%= t("views.right_panel.detail.sr_no") %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.card_no") %> + <%= t("views.right_panel.detail.membership_type") %> <%= t("views.right_panel.detail.contact_no") %> <%= t("views.right_panel.detail.email") %> <%= t("views.right_panel.detail.action") %> @@ -75,6 +76,15 @@ <%= crm_customer.name %> <%= crm_customer.card_no rescue '-' %> + + <% if !@membership_types.nil? %> + <% @membership_types.each do |member_type| %> + <% if member_type[1] == crm_customer.membership_type %> + <%= member_type[0] %> + <% end %> + <% end %> + <% end %> + <%= crm_customer.contact_no %> <%= crm_customer.email %> <%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %> diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 03c73fea..80f90a2d 100755 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -54,6 +54,7 @@ <%= t("views.right_panel.detail.sr_no") %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.card_no") %> + <%= t("views.right_panel.detail.membership_type") %> <%= t("views.right_panel.detail.contact_no") %> <%= t("views.right_panel.detail.email") %> @@ -76,7 +77,16 @@ <% end %> <%= crm_customer.name %> - <%= crm_customer.company rescue '-' %> + <%= crm_customer.card_no rescue '-' %> + + <% if !@membership_types.nil? %> + <% @membership_types.each do |member_type| %> + <% if member_type[1] == crm_customer.membership_type %> + <%= member_type[0] %> + <% end %> + <% end %> + <% end %> + <%= crm_customer.contact_no %> <%= crm_customer.email %>