Suport code_image relation

FFIB преди 5 години
родител
ревизия
575794412f
променени са 2 файла, в които са добавени 12 реда и са изтрити 0 реда
  1. 10 0
      integral/models.py
  2. 2 0
      page/sale_views.py

+ 10 - 0
integral/models.py

@@ -99,6 +99,7 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):
99 99
     lon = models.FloatField(_(u'lon'), default=1.0, help_text=u'经度')
100 100
 
101 101
     image = models.FileField(_(u'image'), upload_to=upload_path, blank=True, null=True, help_text=u'图片')
102
+    code_image = models.FileField(_(u'code_image'), upload_to=upload_path, blank=True, null=True, help_text=u'序列号图片')
102 103
 
103 104
     has_scan = models.BooleanField(_(u'has_scan'), default=False, help_text=_(u'是否被消费者扫过'), db_index=True)
104 105
 
@@ -133,6 +134,14 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):
133 134
     @property
134 135
     def image_url(self):
135 136
         return upload_file_url(self.image)
137
+    
138
+    @property
139
+    def code_image_path(self):
140
+        return upload_file_path(self.image)
141
+
142
+    @property
143
+    def code_image_url(self):
144
+        return upload_file_url(self.image)
136 145
 
137 146
     @property
138 147
     def admindata(self):
@@ -150,5 +159,6 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):
150 159
             'dupload': self.dupload,
151 160
             'has_scan': self.has_scan,
152 161
             'image': self.image_url,
162
+            'code_image': self.code_image_url,
153 163
             'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d'),
154 164
         }

+ 2 - 0
page/sale_views.py

@@ -44,6 +44,7 @@ def clerk_sale_submit_api(request):
44 44
     consumer_phone = request.POST.get('consumer_phone', '')
45 45
 
46 46
     file_path = request.POST.get('file_path', '')
47
+    code_image_path = request.POST.get('code_image_path', '')
47 48
 
48 49
     trackingNo = request.POST.get('trackingNo', '')
49 50
 
@@ -128,6 +129,7 @@ def clerk_sale_submit_api(request):
128 129
         lat=lat,
129 130
         lon=lon,
130 131
         image=file_path,
132
+        code_image=code_image_path,
131 133
         test_user=clerk.test_user,
132 134
         test_sn=test_sn,
133 135
         ym=ymd[:6],