<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
- <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
-
-
">
- <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
- <% flash.each do |name, msg| %>
- <% str="[\"#{msg['name']}\"]"
- str.gsub!('["', '')
- str.gsub!('"]', '') %>
- <%= str %>
- <% end -%>
-
-
-
+ <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
@@ -32,11 +14,12 @@
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>
-
+
">
<%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
- <% flash.each do |name, msg| %>
- <% str="[\"#{msg['name']}\"]"
+ <% flash.each do |test, msg| %>
+ <%
+ str="[\"#{msg['name']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<%= str %>
@@ -73,18 +56,18 @@
str.gsub!('["', '')
str.gsub!('"]', '') %>
<%= str %>
- <% end -%>
+ <% end %>
">
<%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
<% flash.each do |name, msg| %>
- <% str="[\"#{msg['contact_no']}\"]"
+ <% str="[\"#{msg['email']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<%= str %>
- <% end -%>
+ <% end %>
+
+
+
+
+
+
+
+ <%= f.input :tax_profiles, :collection => @taxes, :input_html => { :multiple => true }, :class => "form-control col-md-6 tax_profiles" %>
+
+
+
">
+ <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
+ <% flash.each do |name, msg| %>
+ <% str="[\"#{msg['card_no']}\"]"
+ str.gsub!('["', '')
+ str.gsub!('"]', '') %>
+ <%= str %>
+ <% end %>
+
+
+
@@ -109,8 +124,7 @@
<%end %>
-
-
+
@@ -128,16 +142,20 @@
-
\ No newline at end of file
diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder
index 5fd0410a..ffc312a2 100644
--- a/app/views/crm/customers/show.json.jbuilder
+++ b/app/views/crm/customers/show.json.jbuilder
@@ -1,4 +1,4 @@
json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth,
:membership_id, :membership_type, :membership_authentication_code,
- :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no
+ :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :tax_profiles
json.url crm_customer_url(@crm_customer, format: :json)
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb
index 3d186efe..ace0f703 100644
--- a/app/views/crm/dining_queues/index.html.erb
+++ b/app/views/crm/dining_queues/index.html.erb
@@ -1,4 +1,4 @@
-