add payment type in order reservation

This commit is contained in:
phyusin
2018-06-11 16:19:59 +06:30
parent 859794e291
commit 425e72afe7
5 changed files with 24 additions and 12 deletions

View File

@@ -173,7 +173,6 @@ class OrderReservation < ApplicationRecord
end
def self.send_status_to_ordering(url,ref_no,status,waiting_time=nil,min_type=nil,reason=nil)
puts "send status to ordering"
base_url = 'https://api.doemal.com'
token = '3T-tnlYtFJ-5Z1vY6XQqxQ'
order_reservation = Lookup.collection_of("order_reservation")
@@ -400,7 +399,7 @@ class OrderReservation < ApplicationRecord
if filter.blank?
keyword = ''
else
keyword = "status LIKE '%#{filter}%'"
keyword = "status LIKE '%#{filter}%' OR payment_type LIKE '%#{filter}%'"
end
if from.present? && to.present?
@@ -411,7 +410,7 @@ class OrderReservation < ApplicationRecord
else
select("order_reservations.*, deliveries.provider, deliveries.delivery_fee")
.joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id")
.where("status LIKE '%#{filter}%'")
.where("status LIKE '%#{filter}%' OR payment_type LIKE '%#{filter}%'")
end
end