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

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

Browse Source
This commit is contained in:
Yan
2017-07-27 18:54:46 +06:30
parent bf3e30c70f 63cda9a076
commit 1dbbbcea4e
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/layouts/_header.html.erb
View File

@@ -2,7 +2,7 @@
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<a class="navbar-brand" href="#" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
<a class="navbar-brand" href="<%= root_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="navbar-nav mr-auto dropdown">
@@ -46,10 +46,16 @@
</ul>
</li>
<li class="navbar-nav mr-auto">
<a href="<%= crm_customers_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;CRM</a></li>
<a href="<%= oqs_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;OQS</a>
</li>
<li class="navbar-nav mr-auto">
<a href="<%= origami_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Origami</a>
</li>
<li class="navbar-nav mr-auto">
<a href="<%= crm_customers_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;CRM</a>
</li>
<li class="navbar-nav mr-auto">
<a href="<%= oqs_root_path %>" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;OQS</a></li>
</ul>
</div>

7
app/views/print_settings/index.html.erb
View File

@@ -29,7 +29,7 @@
<th>Precision</th>
<th>Delimiter</th>
<th>Heading_space</th>
<th colspan="3"></th>
<th>Action</th>
</tr>
</thead>
@@ -51,9 +51,8 @@
<td><%= print_setting.precision %></td>
<td><%= print_setting.delimiter %></td>
<td><%= print_setting.heading_space %></td>
<td><%= link_to 'Show', print_setting %></td>
<td><%= link_to 'Edit', edit_print_setting_path(print_setting) %></td>
<td><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td><%= link_to 'Show', print_setting %> | <%= link_to 'Edit', edit_print_setting_path(print_setting) %></td>
<!-- <td><%= link_to 'Destroy', print_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
</tr>
<% end %>
</tbody>

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

@@ -16,10 +16,10 @@
<tr>
<th>Title</th>
<th>Account Type</th>
<!-- <th>Can get Discount</th> -->
<th>Can get Points</th>
<!-- <th>Can get Bonus</th> -->
<th>Can rebate</th>
<th>Discount</th>
<th>Point</th>
<th>Bonus</th>
<th>Rebate</th>
<th style="">Action</th>
</tr>
@@ -29,10 +29,10 @@
<% @settings_accounts.each do |account| %>
<tr>
<td><%= account.title %></td>
<td><%= account.account_type %></td>
<!-- <td><%= account.discount %></td> -->
<td><%= %><%= account.account_type == 1 ? "Expense" : "Income"%></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) %> |

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

@@ -25,7 +25,13 @@
<td><%= link_to employee.name,settings_employee_path(employee) %></td>
<td><%= employee.role %></td>
<td>
<%= link_to 'Edit', edit_settings_employee_path(employee) %> | <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %></td>
<%= link_to 'Edit', edit_settings_employee_path(employee) %>
<%if employee.role != "administrator"%>
| <%= link_to 'Destroy', settings_employee_path(employee) , method: :delete, data: { confirm: 'Are you sure?' } %>
<%end%>
</td>
</tr>
<% end %>
</tbody>

14
app/views/settings/membership_settings/index.html.erb
View File

@@ -16,8 +16,8 @@
<th>Is active</th>
<th>Gateway communication type</th>
<th>Gateway url</th>
<th>Auth token</th>
<th>Merchant account</th>
<!-- <th>Auth token</th>
<th>Merchant account</th> -->
<th>Discount</th>
<th>Rebate</th>
<th>Bonus</th>
@@ -29,18 +29,18 @@
<tbody>
<% @settings_membership_settings.each do |settings_membership_setting| %>
<tr>
<td><%= link_to settings_membership_setting.membership_type, settings_membership_setting_path(settings_membership_setting) %></td>
<td><%= link_to settings_membership_setting.membership_type, edit_settings_membership_setting_path(settings_membership_setting) %></td>
<td><%= settings_membership_setting.is_active %></td>
<td><%= settings_membership_setting.gateway_communication_type %></td>
<td><%= settings_membership_setting.gateway_url %></td>
<td><%= settings_membership_setting.auth_token %></td>
<td><%= settings_membership_setting.merchant_account rescue ''%></td>
<!-- <td><%= settings_membership_setting.auth_token %></td>
<td><%= settings_membership_setting.merchant_account rescue ''%></td> -->
<td><%= settings_membership_setting.discount %></td>
<td><%= settings_membership_setting.rebate %></td>
<td><%= settings_membership_setting.bonus %></td>
<td><%= settings_membership_setting.point %></td>
<td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td>
<td><%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<!-- <td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td> -->
<!-- <td><%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td> -->
</tr>
<% end %>
</tbody>