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

change some func:

Browse Source
This commit is contained in:
phyusin
2018-05-02 16:33:04 +06:30
parent 0e87ba87f3
commit 965962e49d
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/order_reservation.rb
View File

@@ -201,7 +201,7 @@ class OrderReservation < ApplicationRecord
end
def self.get_pending_orders
order_reservation = OrderReservation.select("order_reservations.*,deliveries.provider,deliveries.delivery_type")
order_reservation = OrderReservation.select("order_reservations.*,del.provider,del.delivery_type")
.joins(" JOIN deliveries as del on del.order_reservation_id=order_reservations.order_reservation_id")
.where("order_reservations.status='new'")
.order("order_reservations.order_reservation_id desc, order_reservations.created_at desc")