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

remove git conflict

Browse Source
This commit is contained in:
phyusin
2018-09-07 17:44:57 +06:30
parent aecccffa1e
commit fa421ee718
7 changed files with 35 additions and 19 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

@@ -1,7 +1,7 @@
if @order
json.(@order, :order_reservation_id,:order_reservation_type,:customer_id,
:requested_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
: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)

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

@@ -429,6 +429,12 @@
<b><span id="expected_time"></span> MINS</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left pickup-time">
<span class="font-13">PICK-UP TIME</span><br>
<b id="pickup_time"></b>
</td>
</tr>
<tr>
<td class="body-td align-left">
<span class="font-13">NAME</span><br>