Merge branch 'dev' into 'master'

Dev

See merge request !156
master
Andrey 8 years ago
commit a94f0d9c62
  1. 4
      finance/views.py
  2. 4
      lms/settings.py

@ -155,8 +155,8 @@ class YandexPay(APIView):
'customerNumber': pay.customer_number,
'orderNumber': pay.order_number,
'cps_email': pay.cps_email,
# 'shopSuccessURL': settings.YANDEX_MONEY_SUCCESS_URL,
# 'shopFailURL': settings.YANDEX_MONEY_FAIL_URL,
'shopSuccessURL': settings.YANDEX_MONEY_SUCCESS_URL,
'shopFailURL': settings.YANDEX_MONEY_FAIL_URL,
})
logger_yandex.info("user with email %s start pay payment_id %s", (pay.user.email, pay.id))

@ -55,8 +55,8 @@ YANDEX_MONEY_DEBUG = False
YANDEX_MONEY_SCID = '149639'
YANDEX_MONEY_SHOP_ID = '157133'
YANDEX_MONEY_SHOP_PASSWORD = 'nu5Xefise'
YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/fail/' % DOMAIN
YANDEX_MONEY_SUCCESS_URL = '%s/api/v1/finance/success/' % DOMAIN
YANDEX_MONEY_FAIL_URL = '%s/' % DOMAIN
YANDEX_MONEY_SUCCESS_URL = '%s/' % DOMAIN
# информировать о случаях, когда модуль вернул Яндекс.Кассе ошибку
YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True
# Application definition

Loading…
Cancel
Save