Selly-Modules
/
natsio
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

mergeDev/campaign #73

Closed
Ghost wants to merge 208 commits from mergeDev/campaign into develop
pull from: mergeDev/campaign
merge into: Selly-Modules:develop
Conversation 0 Commits 208 Files Changed 54 +15 -9
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dcbf82a4d0 - Show all commits

1
client/seller.go
View File

@ -79,7 +79,6 @@ func (s Seller) GetListSellerInfoSupportChatByIDs(p model.GetListSellerSupportCh
if err := json.Unmarshal(msg.Data, &r); err != nil { if err := json.Unmarshal(msg.Data, &r); err != nil {
return nil, err return nil, err
} }
if r.Error != "" { if r.Error != "" {
return nil, errors.New(r.Error) return nil, errors.New(r.Error)

7
model/warehouse_response.go
View File

@ -26,6 +26,13 @@ type WarehouseConfiguration struct {
Delivery WarehouseDelivery `json:"delivery"` Delivery WarehouseDelivery `json:"delivery"`
Other WarehouseOther `json:"other"` Other WarehouseOther `json:"other"`
Food WarehouseFood `json:"food"` Food WarehouseFood `json:"food"`
AutoConfirmOrder WarehouseOrderConfirm `json:"autoConfirmOrder"`
}
// WarehouseOrderConfirm ...
type WarehouseOrderConfirm struct {
IsEnable bool `json:"isEnable"`
ConfirmDelayInSeconds int64 `json:"confirmDelayInSeconds"`
} }
// WarehouseFood ... // WarehouseFood ...