Commits · 8ef87d755019af7a98fbe81c47851ab7b9ae7e94 · Wyh / supplier

22 Aug, 2020 1 commit
- 1、餐檯模式部分數據不對問題處理 · 8ef87d75
  宁斌 committed Aug 22, 2020
  
  8ef87d75 Browse Files
20 Aug, 2020 2 commits
- Merge remote-tracking branch 'origin/master' · 1385fdee
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionManager.java
#	base-module/src/main/res/values/ids.xml
#	login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
```
  Wyh committed Aug 20, 2020
  1385fdee Browse Files
- 8.20 1、優化報錯推送內容 2、每日營業報表 3、新增重新加載view 4、更改選擇餐廳頁面 5、派送員報表 6、新增選擇時間view 7、外送按鈕權限控制 8、修改外送的提示音 · eb12ef4f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 20, 2020
  eb12ef4f Browse Files
15 Aug, 2020 3 commits
- 功能权限控制完善 · 649170bf
  宁斌 committed Aug 15, 2020
  
  649170bf Browse Files
- 使用会员调整 · 03737d19
  宁斌 committed Aug 15, 2020
  
  03737d19 Browse Files
- 8.15 1、每日營業報表及打印功能 2、外賣接單按鈕權限控制 · 114cb283
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 15, 2020
  114cb283 Browse Files
13 Aug, 2020 3 commits
- 8.13 1、物流取消提示 2、lalamove選擇運輸工具 3、lalamove取消物流後可再次選擇運輸工具 · ea7060d3
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 13, 2020
  ea7060d3 Browse Files
- 8.13 · 275bd337
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 13, 2020
  275bd337 Browse Files
- 8.13 1、PRJ打印新增外賣和自取時間 2、修復USB打印bug 3、添加immersionbar狀態欄工具依賴，修改首頁狀態欄顯示 · cca5a5c7
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 13, 2020
  cca5a5c7 Browse Files
08 Aug, 2020 10 commits
- 8.08 1、外送接單支付方式顯示字段修改 2、更多報表報錯修復 · d48dff72
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 08, 2020
  d48dff72 Browse Files
- Merge remote-tracking branch 'origin/master' · faca8b9d
  Wyh committed Aug 08, 2020
  
  faca8b9d Browse Files
- 8.8 1.新訂單提示音BUG修復 2、外送接單支付方式顯示字段修改 · d258cdd8
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 08, 2020
  d258cdd8 Browse Files
- 1、1.0.4正式包代码 · c0ae1b36
  宁斌 committed Aug 08, 2020
  
  c0ae1b36 Browse Files
- Merge remote-tracking branch 'origin/master' · e4829c0e
  宁斌 committed Aug 08, 2020
  
  e4829c0e Browse Files
- 8.08 修復最大登陸數BUG · 04a91a6f
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 08, 2020
  04a91a6f Browse Files
- Merge remote-tracking branch 'origin/master' · 738da8ae
  宁斌 committed Aug 08, 2020
  
  738da8ae Browse Files
- 8.8 最大登陸數限制 · a8ba4a08
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 08, 2020
  a8ba4a08 Browse Files
- Merge remote-tracking branch 'origin/master' · a82553ee
  宁斌 committed Aug 08, 2020
  
  a82553ee Browse Files
- 结账新增tableId字段传给后台 · 65b9d944
  宁斌 committed Aug 08, 2020
  
  65b9d944 Browse Files
07 Aug, 2020 2 commits

Merge remote-tracking branch 'origin/master' · f920b567
Wyh committed Aug 07, 2020

f920b567 Browse Files

8.07 1、是否打印賬單上問題 2、報警推送內容優化 3、心跳斷開報警優化 3、套餐不能打印PRJ問題 4、賬單印單打印多張功能… · 97c4767f

8.07 1、是否打印賬單上問題 2、報警推送內容優化 3、心跳斷開報警優化 3、套餐不能打印PRJ問題 4、賬單印單打印多張功能 5、歷史訂單詳情顯示多種支付方式 6、加入lalamove配送方式 7、打印機默認字體大小調整 8、針式打印流程優化

Signed-off-by: Wyh <1239658231>

committed Aug 07, 2020

97c4767f Browse Files

05 Aug, 2020 1 commit
- 1、默認選中數調整 · b28ba3bd
  宁斌 committed Aug 05, 2020
  
  b28ba3bd Browse Files
01 Aug, 2020 3 commits
- Merge remote-tracking branch 'origin/master' · 98706bfa
  Wyh committed Aug 01, 2020
  
  98706bfa Browse Files
- 8.01 1、食品是否打印至賬單功能 2、外賣接單多種支付方式 3、登陸接口錯誤報警 4、優化外送結賬打印 · c3c5c732
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Aug 01, 2020
  c3c5c732 Browse Files
- 1、分檯打印狀態問題 2、分檯轉移食品問題 3、分檯結賬問題 · e55a852e
  宁斌 committed Aug 01, 2020
  
  e55a852e Browse Files
31 Jul, 2020 3 commits
- 1、餐牌返回餐檯為紅檯問題 2、分檯重置 3、折扣結構邏輯問題 · 19692ff3
  宁斌 committed Jul 31, 2020
  
  19692ff3 Browse Files
- 1、餐牌返回餐檯為紅檯問題 2、分檯重置 3、折扣結構邏輯問題 · 495d306d
  宁斌 committed Jul 31, 2020
  
  495d306d Browse Files
- 1、餐牌返回餐檯為紅檯問題 · 8c343e7a
```
2、分檯重置
3、折扣結構邏輯問題
```
  宁斌 committed Jul 31, 2020
  8c343e7a Browse Files
30 Jul, 2020 1 commit
- 7.30 1、登陸頁面插畫更換 2、上菜紙、印單、結賬單打印調整 3、第三方物流接口報警推送 4、修改訂單狀態報警推送 5、打印邏輯優化 · 70cf3b69
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Jul 30, 2020
  70cf3b69 Browse Files
29 Jul, 2020 2 commits
- 7.29 1.心跳斷開提示圖標和聲音 2.獲取不到訂單時提示音 3.出現問題推送給相應人員 4.每日營業報表打印功能 · 6bdf3095
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Jul 29, 2020
  6bdf3095 Browse Files
- 1、相同食品主食品數量合併 · 183a3d74
  宁斌 committed Jul 29, 2020
  
  183a3d74 Browse Files
28 Jul, 2020 2 commits
- 1、結賬支持多種支付方式 · 67a1c0bc
  宁斌 committed Jul 28, 2020
  
  67a1c0bc Browse Files
- 1、结账支付二种支付方式 · 9f67a4da
  宁斌 committed Jul 28, 2020
  
  9f67a4da Browse Files
25 Jul, 2020 1 commit
- 7.25 修改打印邏輯,USB打印調通，打印機加上預設值 · 9d9f4fd6
```
Signed-off-by: Wyh <1239658231>
```
  Wyh committed Jul 25, 2020
  9d9f4fd6 Browse Files
24 Jul, 2020 3 commits
- Merge remote-tracking branch 'origin/master' · 01a85f27
```
# Conflicts:
#	base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/BillMethodAdapter.java
```
  Wyh committed Jul 24, 2020
  01a85f27 Browse Files
- 7.24 修改打印邏輯 · 66d91c45
  Wyh committed Jul 24, 2020
  
  66d91c45 Browse Files
- 1、輸入會員手機號獲取會員信息 · ff6f0816
  宁斌 committed Jul 24, 2020
  
  ff6f0816 Browse Files
22 Jul, 2020 1 commit
- 7.22 · 2fd4d7af
  Wyh committed Jul 22, 2020
  
  2fd4d7af Browse Files
18 Jul, 2020 1 commit
- . · 51a1f96b
  Wyh committed Jul 18, 2020
  
  51a1f96b Browse Files
17 Jul, 2020 1 commit
- printCurrency文件提交 · bdae41ef
  Wyh committed Jul 17, 2020
  
  bdae41ef Browse Files