160
|
160
|
def shot_image_path(self):
|
|
161
|
161
|
return upload_file_path(self.shot_image)
|
|
|
|
@@ -163,10 +163,10 @@ class ComplementCodeLogInfo(BaseModelMixin):
|
|
163
|
163
|
@property
|
|
164
|
164
|
def invoice_image_url(self):
|
|
165
|
165
|
return upload_file_url(self.invoice_image)
|
|
166
|
|
-
|
|
|
166
|
+
|
|
167
|
167
|
@property
|
|
168
|
168
|
def invoice_image_path(self):
|
|
169
|
|
- return upload_file_path(self.invoice_image)
|
|
|
169
|
+ return upload_file_path(self.invoice_image)
|
|
170
|
170
|
|
|
171
|
171
|
@property
|
|
172
|
172
|
def data(self):
|
|
|
|
@@ -6,8 +6,8 @@ from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url,
|
|
6
|
6
|
from shortuuidfield import ShortUUIDField
|
|
7
|
7
|
from TimeConvert import TimeConvert as tc
|
|
8
|
8
|
|
|
9
|
|
-from mch.models import ModelInfo
|
|
10
|
9
|
from coupon.models import CouponInfo
|
|
|
10
|
+from mch.models import ModelInfo
|
|
11
|
11
|
from simditor.fields import RichTextField
|
|
12
|
12
|
|
|
13
|
13
|
|
|
|
|
@@ -4,6 +4,7 @@ from django.conf.urls import url
|
|
4
|
4
|
|
|
5
|
5
|
from page import info_views, oauth_views, preauth_views, sale_views, screen_views, supersr_views
|
|
6
|
6
|
|
|
|
7
|
+
|
|
7
|
8
|
urlpatterns = [
|
|
8
|
9
|
url(r'^clerk$', oauth_views.clerk_oauth, name='clerk_oauth'), # 店员授权页面
|
|
9
|
10
|
url(r'^clerk/info$', info_views.clerk_info_oauth, name='clerk_info_oauth'), # 店员信息授权页面
|
|
|
|
@@ -1,8 +1,7 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
|
-from TimeConvert import TimeConvert as tc
|
|
4
|
|
-
|
|
5
|
3
|
from group.models import GroupInfo, GroupUserInfo
|
|
|
4
|
+from TimeConvert import TimeConvert as tc
|
|
6
|
5
|
|
|
7
|
6
|
|
|
8
|
7
|
def is_group_admin(group_id, admin_id):
|
|
|
|
@@ -1,6 +1,7 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
3
|
from message.models import SystemMessageInfo
|
|
|
4
|
+
|
|
4
|
5
|
from utils.redis.rmessage import get_system_message_delete_info, get_system_message_read_info
|
|
5
|
6
|
|
|
6
|
7
|
|
|
|
|
@@ -7,8 +7,8 @@ from django.conf import settings
|
|
7
|
7
|
from django.core.files.storage import default_storage
|
|
8
|
8
|
from django.db import transaction
|
|
9
|
9
|
from django_file_md5 import calculate_md5
|
|
10
|
|
-
|
|
11
|
10
|
from photo.models import PhotoUUIDInfo
|
|
|
11
|
+
|
|
12
|
12
|
from utils.qiniucdn import upload_file_path
|
|
13
|
13
|
from utils.thumbnail_utils import make_thumbnail
|
|
14
|
14
|
from utils.watermark_utils import watermark_wrap
|
|
|
|
@@ -7,8 +7,8 @@ from django.conf import settings
|
|
7
|
7
|
from django.core.files.storage import default_storage
|
|
8
|
8
|
from django.db import transaction
|
|
9
|
9
|
from django_file_md5 import calculate_md5
|
|
10
|
|
-
|
|
11
|
10
|
from photo.models import PhotoUUIDInfo
|
|
|
11
|
+
|
|
12
|
12
|
from utils.thumbnail_utils import make_thumbnail
|
|
13
|
13
|
from utils.watermark_utils import watermark_wrap
|
|
14
|
14
|
|