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

change some func:

Browse Source
This commit is contained in:
phyusin
2018-05-02 16:33:04 +06:30
parent 0e87ba87f3
commit 965962e49d
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/origami/order_reservation/index.html.erb
View File

@@ -60,7 +60,7 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.created_at.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
@@ -197,7 +197,6 @@
</td>
<td width ="30%" class="align-center">
<span class="font-10 col-blue">
<%= order.delivery.to_json %>
<% if order.delivery.delivery_type == 'service' %>
DELIVERY
<% elsif order.delivery.delivery_type == 'pick_up' %>
@@ -351,7 +350,7 @@
<b id="phone"></b>
</td>
<td class="body-td align-right expected_time">
<span class="font-13">EXPECTED WAITING TIME</span><br>
<span class="font-13">EXPECTED TIME</span><br>
<b id="expected_time"></b>
</td>
</tr>