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