From 12483aba9777fa6a693a054510b4b000a0e25163 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 26 Jun 2017 11:10:08 +0630
Subject: [PATCH] update crm customer

---
 app/views/crm/customers/_new_form.html.erb | 40 +++++++++------------
 app/views/crm/customers/index.html.erb     |  2 --
 app/views/crm/customers/show.html.erb      |  2 ++
 app/views/origami/customers/index.html.erb | 42 +++++++---------------
 4 files changed, 31 insertions(+), 55 deletions(-)

diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index eb121c14..d52c0456 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -11,24 +11,20 @@
          <% str="[\"#{msg['name']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-10px"><%= str %></span>
+         <span class="help-block" style="margin-top:-6px"><%= str %></span>
       <% end -%>
     </div>
 
     <div class="form-group">
       <label>Salutation :</label><br>
-       <label>
-        <input type="radio" value="Mr" name="salutation" class="salutation mr" style="width: 30px">Mr
-      </label>
-      <label>
-        <input type="radio" value="Miss" name="salutation" class="salutation miss" style="width: 30px">Miss
-      </label>
-      <label>
-        <input type="radio" value="Mrs" name="salutation" class="salutation mrs" style="width: 30px">Mrs
-      </label>
-      <label>
-        <input type="radio" value="Mdm" name="salutation" class="salutation mdm" style="width: 30px">Mdm
-      </label>
+       <label>Mr</label>
+        <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%>
+        <label>Miss</label>
+        <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%>
+        <label>Mrs</label>
+        <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%>
+        <label>Mdm</label>
+        <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>    
    </div>
     
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -37,18 +33,16 @@
          <% str="[\"#{msg['name']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-10px"><%= str %></span>
+         <span class="help-block" style="margin-top:-6px"><%= str %></span>
       <% end -%>
     </div>
 
     <div class="form-group">
       <label>Gender :</label><br>
-       <label>
-         <input type="radio" value="Male" name="gender" class="gender male" style="width:30px;">Male
-      </label>
-      <label>
-        <input type="radio" value="Female" name="gender" class="gender female" style="width:30px;">Female
-      </label>
+      <label>Male</label>
+      <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
+        <label>Female</label>
+        <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
    </div>
     
     <div class="form-group">
@@ -62,7 +56,7 @@
         <% str="[\"#{msg['company']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-        <span class="help-block" style="margin-top:-10px"><%= str %></span>
+        <span class="help-block" style="margin-top:-6px"><%= str %></span>
       <% end -%>
     </div>
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -72,7 +66,7 @@
         <% str="[\"#{msg['contact_no']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
-        <span class="help-block" style="margin-top:-10px"><%= str %></span>
+        <span class="help-block" style="margin-top:-6px"><%= str %></span>
       <% end -%>
     </div>
 
@@ -83,7 +77,7 @@
          <% str="[\"#{msg['contact_no']}\"]"
             str.gsub!('["', '')
             str.gsub!('"]', '') %>
-         <span class="help-block" style="margin-top:-10px"><%= str %></span>
+         <span class="help-block" style="margin-top:-6px"><%= str %></span>
       <% end -%>
     </div>
 
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 3270262e..a5ce8550 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -130,10 +130,8 @@ $(document).on('click',".customer_tr",function(){
                       $('.selectpicker > option[value="'+data.membership_type+'"]').attr('selected','selected');
                     if (data.gender == 'Male') {
                       $('.male').prop( "checked", true )
-                      $('.female').prop( "checked", false )
                     }else{
                       $('.female').prop( "checked", true )
-                      $('.male').prop( "checked", false )
                     }
 
                     if(data.salutation == 'Mr') {
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index 0dead477..c6ec25c2 100644
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -55,12 +55,14 @@
         <div class="table-responsive">
           <table class="table table-striped">
             <thead>
+            <% if @response["status"] == true && $response["data"] != "[]"%>
                <tr>
                 <th colspan="5">Membership Transactions</th>
                 <% if @response["status"] == true %>
                  <th>Current Balance : <%= @response["data"][0]["balance"]%></th>
                  <% end %>
               </tr>
+               <% end %>
               <tr>
                 <th>Date</th>
                 <th>Redeem</th>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 2557e787..d1886423 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -88,18 +88,14 @@
     </div>
     <div class="form-group">
       <label>Salutation :</label><br>
-       <label>
-        <input type="radio" value="Mr" name="salutation" class="salutation mr" style="width: 30px">Mr
-      </label>
-      <label>
-        <input type="radio" value="Miss" name="salutation" class="salutation miss" style="width: 30px">Miss
-      </label>
-      <label>
-        <input type="radio" value="Mrs" name="salutation" class="salutation mrs" style="width: 30px">Mrs
-      </label>
-      <label>
-        <input type="radio" value="Mdm" name="salutation" class="salutation mdm" style="width: 30px">Mdm
-      </label>
+       <label>Mr</label>
+        <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%>
+        <label>Miss</label>
+        <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%>
+        <label>Mrs</label>
+        <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%>
+        <label>Mdm</label>
+        <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>    
    </div>
     
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -115,12 +111,10 @@
 
      <div class="form-group">
       <label>Gender :</label><br>
-       <label>
-         <input type="radio" value="Male" name="gender" class="gender male" style="width:30px;">Male
-      </label>
-      <label>
-        <input type="radio" value="Female" name="gender" class="gender female" style="width:30px;">Female
-      </label>
+      <label>Male</label>
+      <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
+        <label>Female</label>
+        <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
    </div>
     
     <div class="form-group">
@@ -327,16 +321,4 @@
   })
 
 </script>
-class CreateDiningQueues < ActiveRecord::Migration[5.1]
-  def change
-    create_table :dining_queues do |t|
-      t.string :name
-      t.string :contact_no
-      t.string :queue_no
-      t.string :status
-      t.references :dining_facility, foreign_key: true
 
-      t.timestamps
-    end
-  end
-end