git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update crm customer

Browse Source
This commit is contained in:
Aung Myo
2017-06-26 11:10:08 +06:30
parent f426be57ab
commit 12483aba97
4 changed files with 31 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/views/crm/customers/_new_form.html.erb
View File

@@ -11,24 +11,20 @@
<% str="[\"#{msg['name']}\"]" <% str="[\"#{msg['name']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
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 -%> <% end -%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Salutation :</label><br> <label>Salutation :</label><br>
<label> <label>Mr</label>
<input type="radio" value="Mr" name="salutation" class="salutation mr" style="width: 30px">Mr <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%>
</label> <label>Miss</label>
<label> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%>
<input type="radio" value="Miss" name="salutation" class="salutation miss" style="width: 30px">Miss <label>Mrs</label>
</label> <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%>
<label> <label>Mdm</label>
<input type="radio" value="Mrs" name="salutation" class="salutation mrs" style="width: 30px">Mrs <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>
</label>
<label>
<input type="radio" value="Mdm" name="salutation" class="salutation mdm" style="width: 30px">Mdm
</label>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -37,18 +33,16 @@
<% str="[\"#{msg['name']}\"]" <% str="[\"#{msg['name']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
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 -%> <% end -%>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Gender :</label><br> <label>Gender :</label><br>
<label> <label>Male</label>
<input type="radio" value="Male" name="gender" class="gender male" style="width:30px;">Male <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
</label> <label>Female</label>
<label> <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
<input type="radio" value="Female" name="gender" class="gender female" style="width:30px;">Female
</label>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -62,7 +56,7 @@
<% str="[\"#{msg['company']}\"]" <% str="[\"#{msg['company']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
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 -%> <% end -%>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -72,7 +66,7 @@
<% str="[\"#{msg['contact_no']}\"]" <% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
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 -%> <% end -%>
</div> </div>
@@ -83,7 +77,7 @@
<% str="[\"#{msg['contact_no']}\"]" <% str="[\"#{msg['contact_no']}\"]"
str.gsub!('["', '') str.gsub!('["', '')
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 -%> <% end -%>
</div> </div>

2
app/views/crm/customers/index.html.erb
View File

@@ -130,10 +130,8 @@ $(document).on('click',".customer_tr",function(){
$('.selectpicker > option[value="'+data.membership_type+'"]').attr('selected','selected'); $('.selectpicker > option[value="'+data.membership_type+'"]').attr('selected','selected');
if (data.gender == 'Male') { if (data.gender == 'Male') {
$('.male').prop( "checked", true ) $('.male').prop( "checked", true )
$('.female').prop( "checked", false )
}else{ }else{
$('.female').prop( "checked", true ) $('.female').prop( "checked", true )
$('.male').prop( "checked", false )
} }
if(data.salutation == 'Mr') { if(data.salutation == 'Mr') {

2
app/views/crm/customers/show.html.erb
View File

@@ -55,12 +55,14 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<% if @response["status"] == true && $response["data"] != "[]"%>
<tr> <tr>
<th colspan="5">Membership Transactions</th> <th colspan="5">Membership Transactions</th>
<% if @response["status"] == true %> <% if @response["status"] == true %>
<th>Current Balance : <%= @response["data"][0]["balance"]%></th> <th>Current Balance : <%= @response["data"][0]["balance"]%></th>
<% end %> <% end %>
</tr> </tr>
<% end %>
<tr> <tr>
<th>Date</th> <th>Date</th>
<th>Redeem</th> <th>Redeem</th>

42
app/views/origami/customers/index.html.erb
View File

@@ -88,18 +88,14 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Salutation :</label><br> <label>Salutation :</label><br>
<label> <label>Mr</label>
<input type="radio" value="Mr" name="salutation" class="salutation mr" style="width: 30px">Mr <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr", :style=>"width: 30px"%>
</label> <label>Miss</label>
<label> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs", :style=>"width: 30px"%>
<input type="radio" value="Miss" name="salutation" class="salutation miss" style="width: 30px">Miss <label>Mrs</label>
</label> <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss", :style=>"width: 30px"%>
<label> <label>Mdm</label>
<input type="radio" value="Mrs" name="salutation" class="salutation mrs" style="width: 30px">Mrs <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>
</label>
<label>
<input type="radio" value="Mdm" name="salutation" class="salutation mdm" style="width: 30px">Mdm
</label>
</div> </div>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -115,12 +111,10 @@
<div class="form-group"> <div class="form-group">
<label>Gender :</label><br> <label>Gender :</label><br>
<label> <label>Male</label>
<input type="radio" value="Male" name="gender" class="gender male" style="width:30px;">Male <%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
</label> <label>Female</label>
<label> <%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
<input type="radio" value="Female" name="gender" class="gender female" style="width:30px;">Female
</label>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -327,16 +321,4 @@
}) })
</script> </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