change order reservation -not finished

This commit is contained in:
phyusin
2018-05-09 11:28:01 +06:30
parent 313f1b2909
commit 4faee913f3
13 changed files with 211 additions and 35 deletions

View File

@@ -75,4 +75,12 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
end
end
end
def update_status
order_reservation_id = params[:id]
status = params[:status]
remark = params[:remark]
end
end

View File

@@ -3,6 +3,7 @@ class Origami::OrderReservationController < BaseOrigamiController
def index
@order = OrderReservation.latest_order #.active
@count_on_order = OrderReservation.get_count_on_order
@count_on_completed = OrderReservation.get_count_on_completed
end
def update

View File

@@ -1,7 +1,7 @@
class Reports::OrderReservationController < BaseReportController
# authorize_resource :class => false
def index
@providers = [["All",''], ["food2u","food2u"], ["Self Pick-Up","pick_up"], ["Ygndoor2door","ygndoor2door"], ["Direct Delivery","direct_delivery"]]
@providers = [["All",''], ["food2u","food2u"], ["Pick-Up","pick_up"], ["ygndoor2door","ygndoor2door"], ["Direct Delivery","direct_delivery"]]
from, to = get_date_range_from_params
@@ -19,7 +19,7 @@ class Reports::OrderReservationController < BaseReportController
end
provider = params[:provider]
@sale_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider)
@order_reservation_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider)
@from = from
@to = to
# get printer info