|
|
@@ -188,15 +188,8 @@ class PaypalCycleNotify(View):
|
|
|
end_date = today.strftime('%Y-%m-%d')
|
|
|
transactions = billing_agreement.search_transactions(start_date, end_date)
|
|
|
if transactions.agreement_transaction_list:
|
|
|
- agreement_transaction = transactions.agreement_transaction_list[0]
|
|
|
- logger.info('-->订阅首次扣款，最新一条订阅事务{}'.format(agreement_transaction))
|
|
|
- if agreement_transaction.status != 'Completed':
|
|
|
- logger.info('-->首次订阅扣款状态：{}'.format(agreement_transaction.status))
|
|
|
- red_url = "{SERVER_DOMAIN_SSL}web/paid2/fail.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
|
|
|
- if lang != 'cn':
|
|
|
- red_url = "{SERVER_DOMAIN_SSL}web/paid2/en_fail.html".format(
|
|
|
- SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
|
|
|
- return HttpResponseRedirect(red_url)
|
|
|
+ for item in transactions.agreement_transaction_list:
|
|
|
+ logger.info('--->首次订阅扣款事务:{}'.format(item))
|
|
|
except Exception as e:
|
|
|
logger.info('出错了~查询订阅的事务异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
red_url = "{SERVER_DOMAIN_SSL}web/paid2/fail.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
|
|
|
@@ -358,7 +351,7 @@ class PaypalCycleNotify(View):
|
|
|
|
|
|
if event_type != 'PAYMENT.SALE.COMPLETED':
|
|
|
logger.info('----钩子异常----')
|
|
|
-
|
|
|
+ logger.info('--->webhook回调参数：{}'.format(paypal_body))
|
|
|
# self.get_plan_desc('P-4CG284532S612303METMEINY')
|
|
|
if resource_type == 'sale' and paypal_body.get('state') == 'completed':
|
|
|
paypalrestsdk.configure(PAYPAL_CRD)
|
