From 22c5b2e71210ec83354757223b0a5a67d7a0bcee Mon Sep 17 00:00:00 2001 From: joamag Date: Mon, 30 May 2016 18:22:05 +0100 Subject: [PATCH] better redirect url support --- src/budy/controllers/api/order.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/budy/controllers/api/order.py b/src/budy/controllers/api/order.py index c0672ddb..2900d1c8 100644 --- a/src/budy/controllers/api/order.py +++ b/src/budy/controllers/api/order.py @@ -345,11 +345,15 @@ def set_voucher(self, key): def wait_payment(self, key): empty_bag = self.field("empty_bag", True, cast = bool) order = budy.Order.get(key = key, rules = False) - order.wait_payment_s(notify = True) + result = order.wait_payment_s(notify = True) bag = budy.Bag.from_session() if empty_bag and bag: bag.empty_s() order = order.reload(map = True) - return order + redirect_url = result if type(result) in appier.legacy.STRINGS else None + return dict( + redirect_url = redirect_url, + order = order + ) @appier.route("/api/orders//pay", "PUT", json = True) @appier.ensure(token = "user") @@ -361,7 +365,8 @@ def pay(self, key): bag = budy.Bag.from_session() if empty_bag and bag: bag.empty_s() order = order.reload(map = True) + redirect_url = result if type(result) in appier.legacy.STRINGS else None return dict( - result = result, + redirect_url = redirect_url, order = order )