From 6e04329a243564d8b865497f481756586a3270a7 Mon Sep 17 00:00:00 2001 From: Thomas Gambier <thomas.gambier@nexedi.com> Date: Fri, 13 Dec 2019 11:24:34 +0100 Subject: [PATCH] slapos_wechat: pay the correct amount with the correct currency --- .../scripts/WechatEvent_generateNavigationPage.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/master/bt5/slapos_wechat/WorkflowTemplateItem/portal_workflow/wechat_interface_workflow/scripts/WechatEvent_generateNavigationPage.py b/master/bt5/slapos_wechat/WorkflowTemplateItem/portal_workflow/wechat_interface_workflow/scripts/WechatEvent_generateNavigationPage.py index 39910281d..86f2a0277 100644 --- a/master/bt5/slapos_wechat/WorkflowTemplateItem/portal_workflow/wechat_interface_workflow/scripts/WechatEvent_generateNavigationPage.py +++ b/master/bt5/slapos_wechat/WorkflowTemplateItem/portal_workflow/wechat_interface_workflow/scripts/WechatEvent_generateNavigationPage.py @@ -24,15 +24,11 @@ transaction_date, transaction_id = payment_transaction.PaymentTransaction_genera if transaction_id is None: raise ValueError, "Transaction already registered" -today = now.toZone('UTC').asdatetime().strftime('%Y%m%d') wechat_dict = { 'out_trade_no': payment_transaction.getRelativeUrl().split('/')[1].encode('utf-8'), - 'total_fee': 1, #str(int(round((payment_transaction.PaymentTransaction_getTotalPayablePrice() * -100), 0))), - 'fee_type': "CNY", #payment_transaction.getResourceValue().Currency_getIntegrationMapping(), + 'total_fee': str(int(round((payment_transaction.PaymentTransaction_getTotalPayablePrice() * -100), 0))), + 'fee_type': payment_transaction.getResourceValue().Currency_getIntegrationMapping(), 'body': "Rapid Space Virtual Machine".encode('utf-8') - #'vads_trans_date': now.toZone('UTC').asdatetime().strftime('%Y%m%d%H%M%S'), - #'vads_trans_id': transaction_id, - # TODO } html_document = context.WechatEvent_callWechatServiceNavigation(state_change, wechat_dict) -- 2.30.9