more yandex

.gitignore

@@ -12,3 +12,4 @@ distribute-*.tar.gz
 *.swp
 _public_html/
 celerybeat-schedule
+yandex_money.log

project/customer/callbacks.py

@@ -0,0 +1,21 @@
+# encoding:utf-8
+from datetime import date
+
+from django.dispatch import receiver
+
+from yandex_money.signals import payment_completed
+
+from customer.models import License
+
+
+@receiver(payment_completed)
+def pay_license(sender, **kwargs):
+    try:
+        print '!!!!!!!!!!!!!'
+        license = License.objects.get(id=sender.order_number)
+        license.paid_date = date.today()
+        license.status = 1
+        license.save()
+    except:
+        print 8789879787897, '@@@@@@@@@@@@@@@@'
+        pass

project/customer/views/license.py

@@ -54,12 +54,11 @@ def order_license(request):
                                                        payment_type=Payment.PAYMENT_TYPE.AC,
                                                        order_number=new_license.id,
                                                        )
-            # payment.customer_number=self.buyer.phone
             payment.user=request.user
-            payment.cps_email=''
+            # payment.cps_email=request.user.email
-            # payment.cps_phone=self.buyer.phone
+            payment.customer_number=request.user.email
+            # payment.customer_number=request.user.profile.get_company_name().strip()
             payment.save()
-            # return redirect('https://demomoney.yandex.ru/eshop.xml', **payment.__dict__)
             return redirect(reverse('yamoney_confirm', kwargs={'payment_id': payment.id}))
 
         return redirect(reverse('customer_license_list'))
@@ -133,29 +132,20 @@ def payment_result(request):
 
 @csrf_exempt
 def payment_success(request):
-    if request.method == 'POST':
+    nInvId = request.GET.get('orderNumber')
-        try:
+    order = License.objects.get(pk=nInvId)
-            nInvId = request.POST.get('InvId')
-            order = License.objects.get(pk=nInvId)
 
-            context = {'success': True, 'order_num': nInvId}
+    context = {'success': True, 'order_num': nInvId}
-            return TemplateResponse(request, 'customer/profile/end_order.html', context)
+    return TemplateResponse(request, 'customer/profile/end_order.html', context)
-        except License.DoesNotExist:
-            return HttpResponseForbidden()
-    else:
-        return HttpResponseForbidden()
 
 
 @csrf_exempt
 def payment_fail(request):
-    if request.method == 'POST':
+    try:
-        try:
+        nInvId = request.GET.get('')
-            nInvId = request.POST.get('InvId')
 
-            message = u"Возникла проблема. Ваш Заказ не оплачен. Попробуйте оформить заявку снова, или позвоните по номеру."
+        message = u"Возникла проблема. Ваш Заказ не оплачен. Попробуйте оформить заявку снова, или позвоните по номеру."
 
-            return TemplateResponse(request, 'customer/profile/end_order.html', {'message': message, 'success': False})
+        return TemplateResponse(request, 'customer/profile/end_order.html', {'message': message, 'success': False})
-        except Order.DoesNotExist:
+    except Order.DoesNotExist:
-            return HttpResponseForbidden()
-    else:
         return HttpResponseForbidden()

project/settings.py

@@ -3,10 +3,14 @@
 # Django settings for project project.
 
 import os
+import sys
 from imp import find_module
 
 path = lambda *xs: os.path.abspath(os.path.join(os.path.dirname(__file__), *xs))
 
+sys.path.insert(1, path('..'))
+sys.path.insert(1, path('.'))
+sys.path.insert(1, path('project'))
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
@@ -230,7 +234,7 @@ LOGGING = {
         'yandex_money': {
             'level': 'DEBUG',
             'class': 'logging.handlers.RotatingFileHandler',
-            'filename': path('yandex_money.log'),
+            'filename': path('../yandex_money.log'),
             'maxBytes': 1024 * 1024 * 5,
             'backupCount': 5,
         },
@@ -344,11 +348,12 @@ THUMBNAIL_PROCESSORS = (
 )
 
 YANDEX_MONEY_DEBUG = False
-YANDEX_MONEY_SCID = 12345
+YANDEX_MONEY_SCID = 546996
-YANDEX_MONEY_SHOP_ID = 56789
+YANDEX_MONEY_SHOP_ID = 92585
 YANDEX_MONEY_SHOP_PASSWORD = 'sQuMtorHE02U'
 YANDEX_MONEY_FAIL_URL = 'https://dokumentor.ru/my/payment/fail/'
 YANDEX_MONEY_SUCCESS_URL = 'https://dokumentor.ru/my/payment/success/'
+YANDEX_MONEY_PAYMENT_URL = 'https://demomoney.yandex.ru/eshop.xml'
 # информировать о случаях, когда модуль вернул Яндекс.Кассе ошибку
 YANDEX_MONEY_MAIL_ADMINS_ON_PAYMENT_ERROR = True
 

project/urls.py

@@ -29,8 +29,8 @@ urlpatterns = patterns('',
 
     url(r'^user/', include('project.myauth.urls')),
     url(r'^captcha/', include('captcha.urls')),
-    url(r'^', include('cms.urls')),
     url(r'^yandex-money/', include('yandex_money.urls')),
+    url(r'^', include('cms.urls')),
 )