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

order reservation action times

Browse Source
This commit is contained in:
phyusin
2018-09-11 11:56:18 +06:30
parent b60584c6d7
commit d7de89632f
4 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/order_reservation/get_order.json.jbuilder
View File

@@ -4,7 +4,7 @@ if @order
:requested_time,:pickup_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
:payment_status,:payment_ref,:taxes,:total_amount,:total_tax,
:discount_amount,:convenience_charge,:grand_total,:status,:order_remark,
:remark,:sale_id)
:remark,:sale_id,:action_times)
@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
if @delivery
json.delivery do |json|

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

@@ -468,26 +468,26 @@
</tr>
</tbody>
</table>
<!-- <table class="table">
<table class="table">
<tr>
<td colspan="2" class="body-td align-left">
<td colspan="2" class="body-td align-left accepted_time">
<span class="font-13">ACCEPTED</span><br>
<b id="accepted_time">Sept 06, 2018(Weds) 10:00 AM</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td colspan="2" class="body-td align-left kitchen_time">
<span class="font-13">SEND TO KITCHEN</span><br>
<b id="send_kitchen_time">Sept 06, 2018(Weds) 11:00 AM</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td colspan="2" class="body-td align-left ready_time">
<span class="font-13">READY TO DELIVERY</span><br>
<b id="ready_delivery_time">Sept 06, 2018(Weds) 12:00 PM</b>
</td>
</tr>
</table> -->
</table>
</div>
<div class="card-footer grand-card-footer">