|
|
|
|
@ -59,8 +59,8 @@ class BillListView(APIView): |
|
|
|
|
i['bill'] = bill_obj |
|
|
|
|
i['yandex_pay'] = None |
|
|
|
|
invoice, _is_create = Invoice.objects.update_or_create(**i) |
|
|
|
|
if i['method'] == 'Y': |
|
|
|
|
yandex_pay, _is_create = Payment.objects.get_or_create( |
|
|
|
|
if i['method'] == 'Y' and invoice.yandex_pay is None: |
|
|
|
|
yandex_pay = Payment.objects.create( |
|
|
|
|
order_amount=i['price'], |
|
|
|
|
shop_amount=0, |
|
|
|
|
customer_number=bill_obj.user.id, |
|
|
|
|
@ -152,14 +152,12 @@ class YandexPay(APIView): |
|
|
|
|
'scid': pay.scid, |
|
|
|
|
'sum': pay.order_amount, |
|
|
|
|
'customerNumber': pay.customer_number, |
|
|
|
|
# 'orderNumber': pay.order_number, |
|
|
|
|
'orderNumber': pay.order_number, |
|
|
|
|
'cps_email': pay.cps_email, |
|
|
|
|
'shopSuccessURL': settings.YANDEX_MONEY_SUCCESS_URL, |
|
|
|
|
'shopFailURL': settings.YANDEX_MONEY_FAIL_URL, |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
logger_yandex.info(r) |
|
|
|
|
|
|
|
|
|
return redirect(r.url) |
|
|
|
|
|
|
|
|
|
except Payment.DoesNotExist: |
|
|
|
|
|