From 37981602dd7efc84984f340ea51b07d622feee66 Mon Sep 17 00:00:00 2001 From: SDE Date: Tue, 9 Jul 2024 16:03:16 +0300 Subject: [PATCH] 1.4.3 move pay_system sets to settings --- .../pay_systems/DVL_Group_kaz/api/funcs.py | 18 +++++++++++++----- BillingApp/funcs.py | 1 + TWB/settings.py | 8 +++++++- dvldigitalprojects_prod.p12 | Bin 0 -> 5413 bytes 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 dvldigitalprojects_prod.p12 diff --git a/BaseModels/pay_systems/DVL_Group_kaz/api/funcs.py b/BaseModels/pay_systems/DVL_Group_kaz/api/funcs.py index eba1b51..6ff31d8 100644 --- a/BaseModels/pay_systems/DVL_Group_kaz/api/funcs.py +++ b/BaseModels/pay_systems/DVL_Group_kaz/api/funcs.py @@ -3,8 +3,16 @@ from django.conf import settings import requests from requests_pkcs12 import get,post -pkcs12_filename = 'dvldigitalprojects.p12' -pkcs12_password = 'QNlhRStcY7mB' + +# для песочницы +# pkcs12_filename = 'dvldigitalprojects.p12' +# pkcs12_password = 'QNlhRStcY7mB' +# api_pass = 'aPqSRVZhxFjjSqbB' + +# для прода +# pkcs12_filename = 'dvldigitalprojects.p12' +# pkcs12_password = 'fzSBm6WISje7' +# api_pass = 't9g2+bZSvxNxCu+t' def get_domain_url(): @@ -15,9 +23,9 @@ def get_kwargs_for_request(): 'headers': { 'content-type': 'application/json', }, - 'auth': ('dvldigitalprojects', 'aPqSRVZhxFjjSqbB'), - 'pkcs12_filename': pkcs12_filename, - 'pkcs12_password': pkcs12_password + 'auth': ('dvldigitalprojects', settings.API_PASS), + 'pkcs12_filename': settings.PKCS12_FILENAME, + 'pkcs12_password': settings.PKCS12_PASS } def ping(): diff --git a/BillingApp/funcs.py b/BillingApp/funcs.py index e7ef09b..edf11e7 100644 --- a/BillingApp/funcs.py +++ b/BillingApp/funcs.py @@ -70,6 +70,7 @@ def create_subscribe_order(data): f'{data["subscribe"].name} ' f'для пользователя {data["user"].username}', 'options': { + 'force3d': 1, 'auto_charge': 1, 'return_url': f'{sets["domain"]}/profile/page/my_subscribe/' } diff --git a/TWB/settings.py b/TWB/settings.py index cd4069e..d769a02 100644 --- a/TWB/settings.py +++ b/TWB/settings.py @@ -36,9 +36,15 @@ WEBPUSH_SETTINGS = { "VAPID_ADMIN_EMAIL": "tripwithbonus@gmail.com" } - PAY_SYSTEM_URL = 'https://sandboxapi.paymtech.kz/' +PKCS12_PASS = 'QNlhRStcY7mB' +API_PASS = 'aPqSRVZhxFjjSqbB' +PKCS12_FILENAME = 'dvldigitalprojects.p12' +# PAY_SYSTEM_URL = 'https://api.paymtech.kz/' +# PKCS12_PASS = 'fzSBm6WISje7' +# API_PASS = 't9g2+bZSvxNxCu+t' +# PKCS12_FILENAME = 'dvldigitalprojects_prod.p12' SOCIALACCOUNT_LOGIN_ON_GET=True ACCOUNT_DEFAULT_HTTP_PROTOCOL='https' diff --git a/dvldigitalprojects_prod.p12 b/dvldigitalprojects_prod.p12 new file mode 100644 index 0000000000000000000000000000000000000000..86942f71f018ce982f0dda82d8f49ab5f8c4fbd2 GIT binary patch literal 5413 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 L7`~tQAEo^dIPOPY literal 0 HcmV?d00001