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

merge with settings_backend

Browse Source
This commit is contained in:
Yan
2017-06-26 14:46:31 +06:30
parent cc67abcfc1 46ad87314a
commit 813f2ecf2d
16 changed files with 647 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/settings/accounts/index.html.erb
View File

@@ -16,9 +16,9 @@
<tr>
<th>Title</th>
<th>Account Type</th>
<th>Can get Discount</th>
<!-- <th>Can get Discount</th> -->
<th>Can get Points</th>
<th>Can get Bonus</th>
<!-- <th>Can get Bonus</th> -->
<th>Can rebate</th>
<th style="">Action</th>
@@ -30,9 +30,9 @@
<tr>
<td><%= account.title %></td>
<td><%= account.account_type %></td>
<td><%= account.discount %></td>
<!-- <td><%= account.discount %></td> -->
<td><%= account.point %></td>
<td><%= account.bonus %></td>
<!-- <td><%= account.bonus %></td> -->
<td><%= account.rebate %></td>
<td>
<%= link_to 'Edit', edit_settings_account_path(account) %> |

10
app/views/settings/accounts/show.html.erb
View File

@@ -1,4 +1,4 @@
<!-- -->
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
@@ -17,9 +17,9 @@
<tr>
<th>Title</th>
<th>Account type</th>
<th>Can get Discount</th>
<!-- <th>Can get Discount</th> -->
<th>Can get Points</th>
<th>Can get Bonus</th>
<!-- <th>Can get Bonus</th> -->
<th>Can rebate</th>
<th>Action</th>
</tr>
@@ -29,9 +29,9 @@
<tr>
<td><%= @settings_account.title %></td>
<td><%= @settings_account.account_type %></td>
<td><%= @settings_account.discount %></td>
<!-- <td><%= @settings_account.discount %></td> -->
<td><%= @settings_account.point %></td>
<td><%= @settings_account.bonus %></td>
<!-- <td><%= @settings_account.bonus %></td> -->
<td><%= @settings_account.rebate %></td>
<td><%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account) %></td>