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

update order and reserve and receipt rake

Browse Source
This commit is contained in:
Aung Myo
2018-04-20 17:03:18 +06:30
parent 983baa88c9
commit 97ec370a8f
5 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ if @order
:requested_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type,
:payment_status,:payment_ref,:total_amount,:total_tax,
:discount_amount,:grand_total,:status,:order_remark,
:reservation_remark)
:reservation_remark,:sale_id)
@delivery = Delivery.find_by_order_reservation_id(@order.order_reservation_id)
if @delivery
json.delivery do |json|
@@ -22,4 +22,9 @@ if @order
json.customer_name @customer.name
json.phone @customer.contact_no
if @order.sale_id
@receipt_no = Sale.find(@order.sale_id).receipt_no
json.receipt_no @receipt_no
end
end

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

@@ -152,11 +152,12 @@
<div class="card-header custom-card-header" style="color:">
<table class="table">
<tr>
<td width ="70%" class="header-td align-left">
<td width ="30%" class="header-td align-left">
<b class="col-pink font-16"><span id="sr_number"></span> </b>
<span class="font-13"><span id="delivery_info"></span></span>
</td>
<td width ="30%" class="header-td font-16 align-right"><b><span id="contact_info">0065 4321</span></b></td>
<td class="header-td align-left"></td>
<td width ="50%" class="header-td font- align-right"><b><span id="contact_info"></span></b></td>
</tr>
</table>
</div>