43"> 43
-            android:layout_width="70dp"
44
-            android:layout_height="match_parent"
45
-            android:gravity="center_vertical|right"
46
-            android:orientation="horizontal"
47
-            android:paddingRight="9dp"
48
-            android:visibility="invisible">
49
-
50
-
51
-            <ImageView
52
-                android:id="@+id/iv_options"
53
-                android:layout_width="32dp"
54
-                android:layout_height="32dp"
55
-                android:layout_marginLeft="6dp"
56
-                android:src="@drawable/option" />
57
-
58
-        </LinearLayout>
59
-
60
-    </LinearLayout>
61
-
62
-    <LinearLayout
63
-        android:layout_width="match_parent"
64
-        android:layout_height="match_parent"
65
-        android:layout_below="@id/title_bar_with_back_btn"
66
-        android:orientation="vertical">
67
-
68
-        <ImageView
69
-            android:id="@+id/iv_qrcode"
70
-            android:layout_width="240dp"
71
-            android:layout_height="240dp"
72
-            android:layout_gravity="center_horizontal"
73
-            android:layout_margin="8dp"/>
74
-
75
-        <Button
76
-            android:id="@+id/btn_print_qr"
77
-            android:layout_width="wrap_content"
78
-            android:layout_height="wrap_content"
79
-            android:text="@string/print_qr"
80
-            android:layout_gravity="center_horizontal"
81
-            android:textSize="16sp"
82
-            android:textColor="@color/white"
83
-            android:background="@drawable/print_rounded_rect_bg"
84
-            android:layout_marginBottom="5dp"
85
-            android:paddingLeft="35dp"
86
-            android:paddingRight="35dp"
87
-            android:paddingBottom="5dp"
88
-            android:paddingTop="5dp"/>
89
-
90
-        <LinearLayout
91
-            android:layout_width="match_parent"
92
-            android:layout_height="38dp"
93
-            android:gravity="center_vertical"
94
-            android:orientation="horizontal"
95
-            android:paddingLeft="12dp">
96
-
97
-            <TextView
98
-                android:layout_width="wrap_content"
99
-                android:layout_height="wrap_content"
100
-                android:text="@string/printer_status"
101
-                android:textColor="@color/grey"
102
-                android:textSize="14sp" />
103
-        </LinearLayout>
104
-
105
-
106
-        <LinearLayout
107
-            android:layout_width="match_parent"
108
-            android:layout_height="42dp"
109
-            android:background="@color/white"
110
-            android:gravity="center_vertical"
111
-            android:orientation="horizontal"
112
-            android:paddingLeft="12dp">
113
-
114
-            <TextView
115
-                android:id="@+id/tv_printer_status"
116
-                android:layout_width="match_parent"
117
-                android:layout_height="match_parent"
118
-                android:gravity="center_vertical"
119
-                android:text="@string/click_to_query"
120
-                android:textColor="@color/dark_grey"
121
-                android:textSize="16sp" />
122
-        </LinearLayout>
123
-
124
-
125
-        <LinearLayout
126
-            android:layout_width="match_parent"
127
-            android:layout_height="38dp"
128
-            android:gravity="center_vertical"
129
-            android:orientation="horizontal"
130
-            android:paddingLeft="12dp">
131
-
132
-            <TextView
133
-                android:layout_width="wrap_content"
134
-                android:layout_height="wrap_content"
135
-                android:text="@string/bluetooth_status"
136
-                android:textColor="@color/grey"
137
-                android:textSize="14sp" />
138
-        </LinearLayout>
139
-
140
-
141
-        <LinearLayout
142
-            android:layout_width="match_parent"
143
-            android:layout_height="42dp"
144
-            android:background="@color/white"
145
-            android:gravity="center_vertical"
146
-            android:orientation="horizontal"
147
-            android:paddingLeft="12dp">
148
-
149
-            <TextView
150
-                android:id="@+id/tv_bluetooth_status"
151
-                android:layout_width="0dp"
152
-                android:layout_height="wrap_content"
153
-                android:layout_weight="1"
154
-                android:text="@string/bt_is_enabled"
155
-                android:textColor="@color/dark_grey"
156
-                android:textSize="16sp" />
157
-
158
-
159
-            <ToggleButton
160
-                android:id="@+id/tb_bluetooth_switch"
161
-                android:layout_width="56dp"
162
-                android:layout_height="19dp"
163
-                android:layout_marginRight="12dp"
164
-                android:background="@drawable/toggle_button_selector"
165
-                android:checked="true"
166
-                android:gravity="center"
167
-                android:textColor="@color/white"
168
-                android:textOff="@null"
169
-                android:textOn="@null" />
170
-
171
-        </LinearLayout>
172
-
173
-        <ListView
174
-            android:id="@+id/listview_bt_devices"
175
-            android:layout_width="match_parent"
176
-            android:layout_height="match_parent"
177
-            android:background="@color/white"
178
-            android:paddingLeft="12dp"
179
-            android:paddingRight="6dp"
180
-            android:listSelector="@color/transparent"
181
-            android:cacheColorHint="@color/transparent"/>
182
-
183
-    </LinearLayout>
184
-
185
-
186
-</RelativeLayout>

+ 0 - 63
app/src/main/res/layout/pop_session_qr.xml

@@ -1,63 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
-    android:layout_width="match_parent"
4
-    android:layout_height="match_parent">
5
-
6
-    <RelativeLayout
7
-        android:id="@+id/click_to_dismiss"
8
-        android:layout_width="match_parent"
9
-        android:layout_height="match_parent"
10
-        android:background="@color/popup_bg">
11
-
12
-        <LinearLayout
13
-            android:id="@+id/popup_anima"
14
-            android:layout_width="300dp"
15
-            android:layout_height="360dp"
16
-            android:layout_centerInParent="true"
17
-            android:gravity="center"
18
-            android:background="@color/pop_bg_color"
19
-            android:orientation="vertical">
20
-
21
-
22
-            <ImageView
23
-                android:layout_marginTop="16dp"
24
-                android:id="@+id/iv_group_qrcode"
25
-                android:layout_width="200dp"
26
-                android:layout_height="200dp"
27
-             />
28
-
29
-            <TextView
30
-                android:layout_marginTop="16dp"
31
-                android:layout_width="wrap_content"
32
-                android:layout_height="wrap_content"
33
-                android:text="@string/scan_qr_join_group"
34
-                android:textColor="@color/grey"
35
-                android:textSize="12sp" />
36
-
37
-            <Button
38
-                android:id="@+id/btn_print_qr"
39
-                android:layout_width="wrap_content"
40
-                android:layout_height="wrap_content"
41
-                android:paddingLeft="8dp"
42
-                android:paddingRight="8dp"
43
-                android:paddingBottom="5dp"
44
-                android:paddingTop="5dp"
45
-                android:textSize="14sp"
46
-                android:textColor="@color/dark_grey"
47
-                android:layout_marginTop="10dp"
48
-                android:text="@string/print_qr"/>
49
-
50
-            <TextView
51
-                android:id="@+id/tv_printer_set"
52
-                android:layout_marginTop="16dp"
53
-                android:padding="5dp"
54
-                android:layout_width="wrap_content"
55
-                android:layout_height="wrap_content"
56
-                android:text="@string/check_printer"
57
-                android:textColor="@color/light_blue"
58
-                android:textSize="12sp" />
59
-
60
-        </LinearLayout>
61
-
62
-    </RelativeLayout>
63
-</RelativeLayout>

+ 2 - 71
app/src/main/res/values/strings.xml

@@ -64,58 +64,6 @@
64 64
 
65 65
     <string name="no_order_msg">暂无新购买消息</string>
66 66
 
67
-    <string name="print_qr">打印二维码</string>
68
-
69
-    <string name="check_bluetooth">请检查手机蓝牙是否开启</string>
70
-
71
-    <string name="check_printer">打印遇到问题了?去设置</string>
72
-
73
-    <string name="printer_settings">打印机设置</string>
74
-
75
-    <string name="printer_status">打印机状态</string>
76
-
77
-    <string name="query_processing">正在查询打印机状态</string>
78
-
79
-    <string name="bluetooth_status">蓝牙状态</string>
80
-
81
-    <string name="bt_is_enabled">蓝牙已打开</string>
82
-
83
-    <string name="bt_is_disabled">蓝牙已关闭</string>
84
-
85
-    <string name="connected_device">已连接设备</string>
86
-
87
-    <string name="discover_device">搜索设备</string>
88
-
89
-    <string name="paired_devices">已配对设备</string>
90
-
91
-    <string name="bt_discover_complete">蓝牙设备搜索完成</string>
92
-
93
-    <string name="new_usable_devices">新可用设备</string>
94
-
95
-    <string name="printer_is_ok">打印机工作正常</string>
96
-
97
-    <string name="printer_offline">已脱机,请检查</string>
98
-
99
-    <string name="printer_is_connected">已连接打印机</string>
100
-
101
-    <string name="printer_is_disconnected">已断开打印机</string>
102
-
103
-    <string name="click_to_connect">点击连接</string>
104
-
105
-    <string name="connecting">尝试连接中</string>
106
-
107
-    <string name="click_to_query">点击查询打印机状态</string>
108
-
109
-    <string name="go_check_printer">请检查打印机</string>
110
-
111
-    <string name="printer_port_open_fail">打印机端口打开失败</string>
112
-
113
-    <string name="printer_status_query_fail">打印机状态查询失败</string>
114
-
115
-    <string name="printer_service_boot_fail">打印机服务连接失败,请退出应用重试</string>
116
-
117
-    <string name="not_set_printer_yet">尚未设置打印机,去设置</string>
118
-
119 67
     <string name="box_setting">盒子设置</string>
120 68
 
121 69
     <string name="box_no">盒子编号</string>
@@ -176,25 +124,6 @@
176 124
 
177 125
     <string name="upload_settings">上传管理</string>
178 126
 
179
-    <string name="sync_time_server_error">时间同步出错,请检查网络连接</string>
180
-    <string name="sync_time_box_error">时间同步出错,请检查盒子是否打开</string>
181
-
182
-    <string name="time_syncing">正在同步时间...</string>
183
-
184
-    <string name="time_sync_retry">重新同步</string>
185
-
186
-    <string name="box_upgrade_found">发现可用的box软件更新</string>
187
-
188
-    <string name="upgrade_now">立即更新</string>
189
-
190
-    <string name="upgrade_later">下次再说</string>
191
-
192
-    <string name="box_is_upgrading">box软件更新中,约需要一分钟,请勿关闭电源...</string>
193
-
194
-    <string name="box_updating_fail">box软件更新失败,请检查box与手机是否处在同一网络</string>
195
-
196
-    <string name="box_update_success">box软件更新成功,欢迎使用</string>
197
-
198 127
     <string name="back_to_work">返回</string>
199 128
 
200 129
     <string name="exit_session_confirm">退出提示</string>
@@ -203,4 +132,6 @@
203 132
 
204 133
     <string name="cancel">取消</string>
205 134
 
135
+    <string name="check_box_time">请检查手机时间设置是否正确</string>
136
+
206 137
 </resources>

:art: Update SaleclerkInfo.data · ffe1e50851 - Gogs: Go Git Service

:art: Update SaleclerkInfo.data

huangqimin001 2 ans auparavant
Parent
Commettre
ffe1e50851
1 fichiers modifiés avec 1 ajouts et 0 suppressions
  1. 1 0
      mch/models.py

+ 1 - 0
mch/models.py

@@ -516,6 +516,7 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin):
516 516
         return {
517 517
             'distributor_id': self.distributor_id,
518 518
             'distributor_name': self.distributor_name,
519
+            'franchiser_name': self.distributor_name,
519 520
             'clerk_id': self.clerk_id,
520 521
             'clerk_name': self.clerk_name,
521 522
             'clerk_sex': self.clerk_sex,