diff options
author | Florian Dold <florian@dold.me> | 2022-03-21 18:42:54 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-03-21 18:42:54 +0100 |
commit | add77184cba4f046ffaae4a3872c81861de9b15e (patch) | |
tree | 670881006ee0167066c5f46d54c2cb811be00bb5 | |
parent | 5c5256c5d18c6812e62673b5ce0c2a311ca7385a (diff) | |
download | taler-merchant-demos-add77184cba4f046ffaae4a3872c81861de9b15e.tar.gz taler-merchant-demos-add77184cba4f046ffaae4a3872c81861de9b15e.tar.bz2 taler-merchant-demos-add77184cba4f046ffaae4a3872c81861de9b15e.zip |
migration to new timestamp/duration format
-rw-r--r-- | talermerchantdemos/blog/blog.py | 11 | ||||
-rw-r--r-- | talermerchantdemos/donations/donations.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/talermerchantdemos/blog/blog.py b/talermerchantdemos/blog/blog.py index aa9d20f..5dd1734 100644 --- a/talermerchantdemos/blog/blog.py +++ b/talermerchantdemos/blog/blog.py @@ -61,9 +61,10 @@ def refundable(pay_status): refunded = pay_status.get("refunded") refund_deadline = pay_status.get("contract_terms", {}).get("refund_deadline") assert refunded != None and refund_deadline - t_ms = refund_deadline.get("t_ms") - assert t_ms - rd = Deadline(t_ms) + t_s = refund_deadline.get("t_s") + # FIXME: do not use assert here! + assert t_s + rd = Deadline(t_s * 1000) if not refunded and not rd.isExpired(): return True return False @@ -302,12 +303,12 @@ def post_order(article_name, lang): summary=summary, # FIXME: add support for i18n of summary! # 10 minutes time for a refund - wire_transfer_deadline=dict(t_ms=1000 * int(time.time() + 15 * 30)), + wire_transfer_deadline=dict(t_s=int(time.time() + 15 * 30)), ) order_resp = backend_post( BACKEND_URL, "private/orders", - dict(order=order, refund_delay=dict(d_ms=1000 * 120)), + dict(order=order, refund_delay=dict(d_us=1000 * 1000 * 120)), auth_token=APIKEY, ) return order_resp diff --git a/talermerchantdemos/donations/donations.py b/talermerchantdemos/donations/donations.py index d5fad4c..1a3fb4f 100644 --- a/talermerchantdemos/donations/donations.py +++ b/talermerchantdemos/donations/donations.py @@ -232,7 +232,7 @@ def donate(lang): ), fulfillment_url=fulfillment_url, summary="Donation to {}".format(donation_receiver), - wire_transfer_deadline=dict(t_ms=1000 * int(time.time() + 60)), + wire_transfer_deadline=dict(t_s=int(time.time() + 60)), ) order_resp = backend_instanced_post( donation_receiver, "private/orders", dict(order=order) |