order reservation pdf setting

This commit is contained in:
phyusin
2018-11-29 13:19:29 +06:30
parent ed6310d462
commit 27f76e291b
5 changed files with 100 additions and 22 deletions

View File

@@ -5,11 +5,7 @@ class Origami::OrderReservationController < BaseOrigamiController
@count_on_order = OrderReservation.get_count_on_order
@count_on_completed = OrderReservation.get_count_on_completed
@shop = Shop.find_by_id(1)
receipt_bill = Lookup.collection_of("order_reservation")
@receipt_bill = 0
if !receipt_bill[0].nil?
@receipt_bill = receipt_bill[0][1]
end
@receipt_bill = check_receipt_bill
end
def update
@@ -23,6 +19,7 @@ class Origami::OrderReservationController < BaseOrigamiController
end
remark = params[:remark]
access_code = params[:access_code]
receipt_bill = check_receipt_bill
order_reserve = OrderReservation.find_by_transaction_ref(params[:ref_no])
if !order_reserve.nil?
@@ -45,7 +42,7 @@ class Origami::OrderReservationController < BaseOrigamiController
end
elsif @status == "completed"
if order_reserve.status == "ready_to_delivery"
result = OrderReservation.update_doemal_payment(order_reserve,current_user)
result = OrderReservation.update_doemal_payment(order_reserve,current_user,receipt_bill)
else
Rails.logger.debug "Order reservation :: " + order_reserve.to_json + " :: send status ::" + @status
result = {status: false, message: 'Could not deliver order!'}
@@ -106,4 +103,19 @@ class Origami::OrderReservationController < BaseOrigamiController
render :json => order_reservation
end
def check_receipt_bill
receipt_bill = Lookup.collection_of("order_reservation")
status = 0
if !receipt_bill.nil?
receipt_bill.each do |receipt|
if receipt[0].strip.downcase == "receiptbill"
status = receipt[1].to_i
end
end
end
return status
end
end