Merge pull request 'fix-holiday-product-merge-dev' (#133) from fix-holiday-product-merge-dev into develop
Reviewed-on: #133
This commit is contained in:
commit
eb242f5b52
|
@ -183,9 +183,9 @@ func (w Warehouse) UpdateORDeliveryStatus(p model.WarehouseORUpdateDeliveryStatu
|
|||
return nil
|
||||
}
|
||||
|
||||
// UpdatePendingInActiveProductByWarehouseIDs ...
|
||||
func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePendingInActiveProductRequest) error {
|
||||
msg, err := natsio.GetServer().Request(subject.Warehouse.UpdatePendingInActiveProductByWarehouseIDs, toBytes(p))
|
||||
// UpdateStatusWarehousePendingInactive ...
|
||||
func (w Warehouse) UpdateStatusWarehousePendingInactive(p model.UpdateStatusWarehousePendingInactiveRequest) error {
|
||||
msg, err := natsio.GetServer().Request(subject.Warehouse.UpdateStatusWarehousePendingInactive, toBytes(p))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -195,7 +195,7 @@ func (w Warehouse) UpdatePendingInActiveProductByWarehouseIDs(p model.UpdatePend
|
|||
}
|
||||
|
||||
if err = json.Unmarshal(msg.Data, &r); err != nil {
|
||||
return fmt.Errorf("nats: update_pending_in_active_product_by_warehouse_ids %v", err)
|
||||
return fmt.Errorf("nats: update_status_warehouse_pending_inactive %v", err)
|
||||
}
|
||||
if r.Error != "" {
|
||||
return errors.New(r.Error)
|
||||
|
|
|
@ -115,7 +115,13 @@ type WarehouseORUpdateDeliveryStatus struct {
|
|||
DeliveryStatus string `json:"deliveryStatus"`
|
||||
}
|
||||
|
||||
// UpdatePendingInActiveProductRequest ...
|
||||
type UpdatePendingInActiveProductRequest struct {
|
||||
WarehouseIDs []string `json:"warehouseIDs"`
|
||||
// UpdateStatusWarehousePendingInactiveRequest ...
|
||||
type UpdateStatusWarehousePendingInactiveRequest struct {
|
||||
Warehouses []UpdateStatusWarehousePendingInactive `json:"warehouses"`
|
||||
}
|
||||
|
||||
// UpdateStatusWarehousePendingInactive ...
|
||||
type UpdateStatusWarehousePendingInactive struct {
|
||||
WarehouseID string `json:"warehouse"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ var Warehouse = struct {
|
|||
UpdateIsClosedSupplier string
|
||||
GetWarehouses string
|
||||
UpdateORDeliveryStatus string
|
||||
UpdatePendingInActiveProductByWarehouseIDs string
|
||||
UpdateStatusWarehousePendingInactive string
|
||||
}{
|
||||
SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"),
|
||||
CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
|
||||
|
@ -53,5 +53,5 @@ var Warehouse = struct {
|
|||
UpdateIsClosedSupplier: getWarehouseValue("update_is_closed_supplier"),
|
||||
GetWarehouses: getWarehouseValue("get_warehouses"),
|
||||
UpdateORDeliveryStatus: getWarehouseValue("update_or_delivery_status"),
|
||||
UpdatePendingInActiveProductByWarehouseIDs: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
|
||||
UpdateStatusWarehousePendingInactive: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue