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 0000000..86942f7 Binary files /dev/null and b/dvldigitalprojects_prod.p12 differ