Commits · a5b63f953948021501c3cefc33e1d8a3fb40f6e0 · Wyh / supplier

13 Oct, 2020 2 commits
- Merge remote-tracking branch 'origin/dev' into dev · a5b63f95
```
# Conflicts:
#	base-module/build.gradle
#	gradle.properties
```
  Wyh committed Oct 13, 2020
  a5b63f95 Browse Files
- 10.13 修復了一些打印BUG · f444e261
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Oct 13, 2020
  f444e261 Browse Files
11 Oct, 2020 1 commit

點1個有細項/套餐的食物>再點單點食物>單點食物會自帶了上面有細項/套餐的食物
2、0元總金額/0元食品,不能打折扣
3、新增ToPrintQRCode字段控制結賬打印積分碼

committed Oct 11, 2020

30 Sep, 2020 5 commits
- 9.30 1、未創建訂單印單失敗問題 · d2117b69
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 30, 2020
  d2117b69 Browse Files
- 9.30 1、上菜紙單號為null問題 · 74eb1901
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 30, 2020
  74eb1901 Browse Files
- 1、自動會有折扣的問題 · 93eb173b
  宁斌 committed Sep 30, 2020
  
  93eb173b Browse Files
- 9.30 1、印單，結賬單。。。單號取值 2、PRJ多語言沒有配置則不顯示 · 0218422a
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 30, 2020
  0218422a Browse Files
- 9.30 清理編譯警告代碼 · 6f431b7e
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 30, 2020
  6f431b7e Browse Files
29 Sep, 2020 10 commits

Merge remote-tracking branch 'origin/dev' into dev · 9e31d381

# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/orderManager/AllOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/activity/orderManager/OrderDetailActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/adapter/OrderCenterAdapter.java

committed Sep 29, 2020

9e31d381 Browse Files

9.29 1、編譯通過合併 · cfedb696
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Sep 29, 2020
cfedb696 Browse Files
9.29 1、餐廳擴展表列表編輯頁面 2、PRJ調整字體大小 3、合併TimeUtil工具類 · 1190a2a6
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Sep 29, 2020
1190a2a6 Browse Files
1、修改okhttp连接读写超时时间 · 5b439e38
宁斌 committed Sep 29, 2020

5b439e38 Browse Files

Merge branch 'master' into dev · aa84411e

# Conflicts:
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/orderManager/AllOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/activity/orderManager/OrderDetailActivity.java

committed Sep 29, 2020

aa84411e Browse Files

1、1.0.8正式版 · 5c281d9e
宁斌 committed Sep 29, 2020

5c281d9e Browse Files
Merge branch 'master' into dev · 7ccaeb3d
宁斌 committed Sep 29, 2020

7ccaeb3d Browse Files

Merge remote-tracking branch 'origin/master' · d78a94ea

# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Function.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/orderManager/AllOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/activity/orderManager/OrderDetailActivity.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/adapter/OrderCenterAdapter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/adapter/TableAdapter.java

committed Sep 29, 2020

d78a94ea Browse Files

1、dev分支 1.0.7正式代码 · 1019d223
宁斌 committed Sep 29, 2020

1019d223 Browse Files
9.29 1、餐廳擴展表列表編輯頁面 2、PRJ調整字體大小 3、合併TimeUtil工具類 · 4fc55fca
```
Signed-off-by: Wyh <1239658231>
```
Wyh committed Sep 29, 2020
4fc55fca Browse Files

26 Sep, 2020 3 commits
- Merge remote-tracking branch 'origin/master' · 5ff59c46
```
# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
```
  宁斌 committed Sep 26, 2020
  5ff59c46 Browse Files
- 9.26 1、打印長圖問題 2、擴展表數據 3、打印頭單，統計數 4、自動接單優化 5、是否打印PDF功能優化 · f410fc61
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 26, 2020
  f410fc61 Browse Files
- base-mode拆分 · 20ed4383
  宁斌 committed Sep 26, 2020
  
  20ed4383 Browse Files
24 Sep, 2020 5 commits
- 9.24 1.顯示是否打印PDF 2、獲取登陸人數優化 · 73b28016
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 24, 2020
  73b28016 Browse Files
- 1、餐檯代碼結構調整 2、賬單管理折扣未送單先送單再進入結賬頁 · 3639ad20
  宁斌 committed Sep 24, 2020
  
  3639ad20 Browse Files
- Merge branch 'master' into table_mode_structure_optimization · 9a665eff
  宁斌 committed Sep 24, 2020
  
  9a665eff Browse Files
- 1、修改訂單不可多選食品 · 751713eb
  宁斌 committed Sep 24, 2020
  
  751713eb Browse Files
- 隐藏分檯操作 · b3c4c556
  宁斌 committed Sep 24, 2020
  
  b3c4c556 Browse Files
23 Sep, 2020 5 commits
- Merge remote-tracking branch 'origin/master' into master · ea884f5b
  Wyh committed Sep 23, 2020
  
  ea884f5b Browse Files
- 9.23 1、調用是否打印PDF接口 2、打印機支持多語言BUG · f1f8f0c0
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 23, 2020
  f1f8f0c0 Browse Files
- 1、使用會員未送單，結賬前先送單 · ea4cdbc5
  宁斌 committed Sep 23, 2020
  
  ea4cdbc5 Browse Files
- 9.23 1、application方法參數修改 2、凍鏈自動接單 3、外送息屏優化 4、外送通知檢測 5、追加貼士BUG修復 6、BBPOS打印提示優化 7、外送獲取訂單列表優化 · 9f8088c0
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 23, 2020
  9f8088c0 Browse Files
- 1、新增積分支付 2、使用優惠券部分問題處理 · 2857da0d
  宁斌 committed Sep 23, 2020
  
  2857da0d Browse Files
19 Sep, 2020 1 commit
- 9.19 1.優化切換環境 2、冷鏈切換餐廳營業狀態BUG · d5d670d8
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 19, 2020
  d5d670d8 Browse Files
16 Sep, 2020 2 commits
- 9.16 預約單數量和配置 · f5957536
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 16, 2020
  f5957536 Browse Files
- 9.16 1、改為凍鏈接單 2、打印prj加上頁數 3、預約單數量和配置 · cd3c227f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 16, 2020
  cd3c227f Browse Files
12 Sep, 2020 1 commit
- 9.12 1、預約單問題 2、prj打印頁數 3、冷鏈歷史訂單 4、冷鏈修改餐廳營業狀態 5、冷鏈搜索問題 6、二維碼模塊問題修改 7、營業報表小數點限制 · 2ceb6509
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 12, 2020
  2ceb6509 Browse Files
11 Sep, 2020 4 commits
- Merge remote-tracking branch 'origin/master' into master · 7d5e8b8b
```
# Conflicts:
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
```
  Wyh committed Sep 11, 2020
  7d5e8b8b Browse Files
- 9.11 修改外賣模塊名，冷鏈報錯問題 · 9cda6142
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 11, 2020
  9cda6142 Browse Files
- 1、打印积分二维码问题处理 · 2bcca59b
  宁斌 committed Sep 11, 2020
  
  2bcca59b Browse Files
- 9.11 1、餘額顯示修改 2、刷新餘額 3、新建預點餐模塊 · 182fcbd9
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Sep 11, 2020
  182fcbd9 Browse Files
10 Sep, 2020 1 commit
- 1、外賣自取訂單詳情頁閃退 2、送單打印上菜紙失敗 · e136398a
  宁斌 committed Sep 10, 2020
  
  e136398a Browse Files