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

add new delivery type for turbo

Browse Source
This commit is contained in:
phyusin
2018-08-30 17:04:32 +06:30
parent fef6a4ccd0
commit 78da662a57
9 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -109,9 +109,13 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
remark = params[:remark]
if params[:status] && params[:remark]
reason = status +"||"+remark
order_reservation = OrderReservation.find(order_reservation_id)
if !order_reservation.remark.nil?
reason = order_reservation.remark + "//" + status +"||"+remark
else
reason = status +"||"+remark
end
if status == 'REMOVE'
if order_reservation.status == "new" || order_reservation.status == "accepted"
OrderReservation.update_order_reservation(order_reservation_id, nil, "rejected",nil,remark)

2
app/controllers/reports/order_reservation_controller.rb
View File

@@ -1,7 +1,7 @@
class Reports::OrderReservationController < BaseReportController
# authorize_resource :class => false
def index
@providers = [["All",''], ["Direct Delivery","direct_delivery"],["Pick-Up","pick_up"],["food2u","food2u"], ["ygndoor2door","ygndoor2door"]]
@providers = [["All",''], ["Direct Delivery","direct_delivery"],["Pick-Up","pick_up"],["TURBO","turbo"],["food2u","food2u"], ["ygndoor2door","ygndoor2door"]]
@payment_types = [["All",''], ["COD","cash_on_delivery"],["DINGA","dinga"]]
from, to = get_date_range_from_params