From eb9d82d25af9dbe0e6131af7cfa3bf5e0b7291a2 Mon Sep 17 00:00:00 2001
From: bigboy <bez.b.unix@gmail.com>
Date: Mon, 24 Apr 2017 15:24:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D1=8F=D0=B2=D0=BE=D0=BA=20=D1=81=20=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B2=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 finance/models.py | 11 +++++++++--
 finance/tasks.py  |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/finance/models.py b/finance/models.py
index 32dfaeb..344cf05 100755
--- a/finance/models.py
+++ b/finance/models.py
@@ -2,6 +2,8 @@
 import json
 import urllib
 import datetime
+from json import JSONDecodeError
+
 from django.db import models
 import django.utils.timezone
 from access.models import User, TrafHistory
@@ -304,6 +306,7 @@ class Bill(models.Model):
 class ServiceRequest(models.Model):
     SERVICE_REQUEST_STATUS = (
         ('S', u'Не обработан'),
+        ('E', u'Ошибка контекста'),
         ('W', u'В работе'),
         ('F', u'Продан'),
         ('B', u'Не продал')
@@ -367,7 +370,11 @@ class ServiceRequest(models.Model):
 
     def sent_to_amo(self):
         if self.data:
-            data = json.loads(self.data.replace("'", "\""))
+            try:
+                data = json.loads(self.data.replace("'", "\""))
+            except JSONDecodeError:
+                self.status = "E"
+
         else:
             name = ''
             phone = ''
@@ -399,7 +406,7 @@ class ServiceRequest(models.Model):
             data['name'] = 'empty'
 
         urllib.request.urlopen(out_uri('https://skill-box.ru/amocrm/CreateLead.php', data))
-        if not self.send:
+        if not self.send and self.status != 'E':
             data['host'] = self.host
             self.send = True
             self.save()
diff --git a/finance/tasks.py b/finance/tasks.py
index b331b34..bc1ace7 100755
--- a/finance/tasks.py
+++ b/finance/tasks.py
@@ -1,6 +1,9 @@
 # coding=utf-8
 from celery.task import periodic_task
 from datetime import timedelta, datetime
+
+from django.db.models import Q
+
 from finance.models import Price, Bill, ServiceRequest
 from courses.models import CourseMap
 
@@ -32,6 +35,6 @@ def price_map_migrator():
 
 @periodic_task(run_every=timedelta(minutes=1))
 def sent_service_request_to_amo():
-    sr = ServiceRequest.objects.filter(send=False, send_date__lt=datetime.now()).exclude(name='TEST').first()
+    sr = ServiceRequest.objects.filter(send=False, send_date__lt=datetime.now()).exclude(Q(name='TEST')| Q(status='E')).first()
     if sr:
         sr.sent_to_amo()