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

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

Browse Source
This commit is contained in:
Yan
2017-11-22 10:40:34 +06:30
parent 749e271879 b75d8cc176
commit 77ce2f32ff
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,15 +5,20 @@
<div class="form-group"> <div class="form-group">
<label> <%= t("views.right_panel.detail.salutation") %> :</label><br> <label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
<label class="font-13"><%= t("views.right_panel.detail.mr") %></label> <label class="font-13"><%= t("views.right_panel.detail.mr") %>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.miss") %></label> </label>&nbsp;
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%> <label class="font-13 m-l--15"><%= t("views.right_panel.detail.miss") %>
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.mrs") %></label> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
</label>&nbsp;
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.mrs") %>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
<label class="font-13 m-l--15"><%= t("views.right_panel.detail.mdm") %></label> </label>&nbsp;
<label class="font-13 m-l--15">
<%= t("views.right_panel.detail.mdm") %>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
</div> </label>
</div>
<div class="form-group <%= (flash["errors"]) ? "error" : "" %>"> <div class="form-group <%= (flash["errors"]) ? "error" : "" %>">
<%= f.input :name, :class => "form-control col-md-6 name", :required => true %> <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>

2
db/seeds.rb
View File

@@ -65,7 +65,7 @@ menu_item_attribute_type = Lookup.create([{lookup_type:'menu_item_attribute_type
#Employee Roles #Employee Roles
employee_roles = Lookup.create([{lookup_type:'employee_roles', name: 'Cashier', value: 'cashier'}, employee_roles = Lookup.create([{lookup_type:'employee_roles', name: 'Cashier', value: 'cashier'},
{lookup_type:'employee_roles', name: 'Waiter', value: 'waiter'}, {lookup_type:'employee_roles', name: 'Waiter', value: 'waiter'},
{lookup_type:'employee_roles', name: 'Supervisour', value: 'supervisour'}, {lookup_type:'employee_roles', name: 'Supervisor', value: 'supervisor'},
{lookup_type:'employee_roles', name: 'Manager', value: 'manager'}, {lookup_type:'employee_roles', name: 'Manager', value: 'manager'},
{lookup_type:'employee_roles', name: 'Accountant', value: 'account'}, {lookup_type:'employee_roles', name: 'Accountant', value: 'account'},
{lookup_type:'employee_roles', name: 'Administrator', value: 'administrator'}]) {lookup_type:'employee_roles', name: 'Administrator', value: 'administrator'}])