Merge branch 'develop' of git.selly.red:Selly-Modules/natsio into feature/get-freeship-by-supplierids
This commit is contained in:
		
						commit
						dcbf82a4d0
					
				| 
						 | 
					@ -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)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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 ...
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue