Merge branch 'dev' into 'master'

Dev

See merge request !333
master
Andrey 8 years ago
commit b5167beb04
  1. 2
      finance/views.py
  2. 1
      lms/settings.py

@ -31,7 +31,7 @@ logger_yandex = logging.getLogger('yandex_money')
def test_pay(request): def test_pay(request):
return render_to_response('yandex/test_pay.html', context={ return render_to_response('yandex/test_pay.html', context={
'shop_id': settings.YANDEX_MONEY_SHOP_ID, 'sc_id': settings.YANDEX_MONEY_SCID}) 'shop_id': settings.YANDEX_MONEY_SHOP_ID, 'sc_id': settings.YANDEX_MONEY_TEST_SCID})
class BillListView(APIView): class BillListView(APIView):

@ -43,6 +43,7 @@ DOMAIN = 'https://go.skillbox.ru'
YANDEX_MONEY_DEBUG = False YANDEX_MONEY_DEBUG = False
YANDEX_MONEY_SCID = '149639' YANDEX_MONEY_SCID = '149639'
YANDEX_MONEY_TEST_SCID = '558146'
YANDEX_MONEY_SHOP_ID = '157133' YANDEX_MONEY_SHOP_ID = '157133'
YANDEX_MONEY_SHOP_PASSWORD = 'nu5Xefise' YANDEX_MONEY_SHOP_PASSWORD = 'nu5Xefise'
YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/yandex/fail/' % DOMAIN YANDEX_MONEY_FAIL_URL = '%s/api/v1/finance/yandex/fail/' % DOMAIN

Loading…
Cancel
Save