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

update commission and seed for font

Browse Source
This commit is contained in:
Aung Myo
2017-11-07 10:31:10 +06:30
parent 3aacc63b82
commit b48625e25e
21 changed files with 312 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/settings/commissions/_form.html.erb
View File

@@ -6,8 +6,9 @@
<%= f.error_notification %>
<div class="form-inputs">
<%= f.label :product_code, 'Product' %>
<%= f.collection_select :product_code, MenuItem.all.order('name asc'), :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>
<!--<%= f.label :product_code, 'Product' %>
<%= f.collection_select :product_code, MenuItem.all.order('name asc'), :id, :name, {prompt: 'Select a Product'}, {class: 'form-control'} %><br/>-->
<%= f.input :name %>
<%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
<%= f.input :amount %>
<%= f.input :is_active,:class => "filled-in" ,:id => "" %>

6
app/views/settings/commissions/index.html.erb
View File

@@ -28,12 +28,14 @@
<tbody>
<% @commissions.each do |commission| %>
<tr>
<td><%= commission.menu_item.name rescue '-' %></td>
<td><%= commission.name rescue '-' %></td>
<td><%= commission.commission_type rescue '-' %></td>
<td><%= commission.amount rescue '-' %></td>
<td><%= commission.is_active rescue '-' %></td>
<td><%= link_to t("views.btn.show"), settings_commission_path(commission), :class => "btn btn-info btn-sm waves-effect" %>
<%= link_to t("views.btn.edit"), edit_settings_commission_path(commission), :class => "btn btn-info btn-sm waves-effect" %></td>
<%= link_to t("views.btn.edit"), edit_settings_commission_path(commission), :class => "btn btn-info btn-sm waves-effect" %>
<%= link_to 'Assign Product', new_settings_commission_assign_product_path(commission),:class => 'btn btn-success btn-sm waves-effect' %>
</td>
</tr>
<% end %>
</tbody>

2
app/views/settings/commissions/show.html.erb
View File

@@ -18,7 +18,7 @@
<tbody>
<tr>
<th style="width:20%"><%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name_txt2") %></th>
<td><%= @commission.menu_item.name rescue '-' %></td>
<td><%= @commission.name rescue '-' %></td>
</tr>
<tr>
<th style="width:20%"><%= t("views.right_panel.detail.amount") %></th>