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

add payment type filter for order reservation

Browse Source
This commit is contained in:
phyusin
2018-07-03 10:34:24 +06:30
parent e94024644d
commit 60a1ef61a4
5 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,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"]]
@payment_types = [["All",''], ["COD","cash_on_delivery"],["DINGA","dinga"]]
from, to = get_date_range_from_params
@@ -19,7 +20,8 @@ class Reports::OrderReservationController < BaseReportController
end
provider = params[:provider]
@order_reservation_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider)
payment_type = params[:payment_type]
@order_reservation_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider,payment_type)
@from = from
@to = to
# get printer info