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-24 10:41:40 +06:30
parent 7c977e8423 8277473185
commit 80734b3642
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,11 +115,11 @@
<label><%= t("views.right_panel.detail.salutation") %> :</label><br> <label><%= t("views.right_panel.detail.salutation") %> :</label><br>
<label class="font-15"><%= t("views.right_panel.detail.mr") %> <label class="font-15"><%= t("views.right_panel.detail.mr") %>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%></label> <%= f.radio_button :salutation,"Mr", :class => "salutation mr", :value=>"Mr"%></label>
<label class="font-15 m-l-20"><%= t("views.right_panel.detail.miss") %> <label class="font-15 m-l-5"><%= t("views.right_panel.detail.miss") %>
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%></label> <%= f.radio_button :salutation,"Mrs", :class => "salutation mrs", :value=>"Mrs"%></label>
<label class="font-15 m-l-20"><%= t("views.right_panel.detail.mrs") %> <label class="font-15 m-l-5"><%= t("views.right_panel.detail.mrs") %>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%></label> <%= f.radio_button :salutation,"Miss", :class => "salutation miss", :value=>"Miss"%></label>
<label class="font-15 m-l-20"><%= t("views.right_panel.detail.mdm") %> <label class="font-15 m-l-5"><%= t("views.right_panel.detail.mdm") %>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%></label> <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm"%></label>
</div> </div>

10
app/views/origami/sale_edit/edit.html.erb
View File

@@ -30,13 +30,13 @@
<thead> <thead>
<tr> <tr>
<th width="4%">#</th> <th width="4%">#</th>
<th class="" width="30%">Items</th> <th class="" width="20%">Items</th>
<th style="" width="13%">QTY <th style="" width="13%">QTY
</td> </td>
<th class="" width="13%">Price <th class="" width="13%">Price
</td> </td>
<!-- <th class='' width="17%"> Total </th> --> <!-- <th class='' width="17%"> Total </th> -->
<th class='' width="17%"> Action</th> <th class='' width="20%"> Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -54,7 +54,7 @@
%> %>
<tr> <tr>
<td width="4%"><%= count %></td> <td width="4%"><%= count %></td>
<td class='' width="30%"> <td class='' width="20%">
<%= sale_item.product_name %> <%= sale_item.product_name %>
</td> </td>
<% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %> <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %>
@@ -108,8 +108,8 @@
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>
<td class="charges-name"><strong>Sub Total:</strong></td> <td width="50%"><strong>Sub Total:</strong></td>
<td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td> <td><strong id="order-sub-total"><%= sub_total %></strong></td>
</tr> </tr>
<tr class="rebate_amount"></tr> <tr class="rebate_amount"></tr>
</table> </table>