From dfdccfa86ad794cb79b0db6f7242b7fcf24961bf Mon Sep 17 00:00:00 2001 From: Sinh Date: Tue, 18 Jun 2024 11:11:24 +0700 Subject: [PATCH 1/5] add partner product code --- model/warehouse_request.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/model/warehouse_request.go b/model/warehouse_request.go index ce61c2b..f1aec8d 100644 --- a/model/warehouse_request.go +++ b/model/warehouse_request.go @@ -37,11 +37,12 @@ type InsuranceOpts struct { // OutboundRequestItem ... type OutboundRequestItem struct { - SupplierSKU string `json:"supplierSKU"` - Quantity int64 `json:"quantity"` - UnitCode string `json:"unitCode"` - Price float64 `json:"price"` - Name string `json:"name"` + SupplierSKU string `json:"supplierSKU"` + Quantity int64 `json:"quantity"` + UnitCode string `json:"unitCode"` + Price float64 `json:"price"` + Name string `json:"name"` + PartnerProductCode string `json:"partnerProductCode"` } // CustomerInfo ... -- 2.34.1 From 2b0d33efc2d64c7408739b5bd78674b4386dc9ae Mon Sep 17 00:00:00 2001 From: Sinh Date: Tue, 18 Jun 2024 15:14:57 +0700 Subject: [PATCH 2/5] update nats subject --- subject/warehouse.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subject/warehouse.go b/subject/warehouse.go index 517a8a1..77e18cd 100644 --- a/subject/warehouse.go +++ b/subject/warehouse.go @@ -19,6 +19,7 @@ var Warehouse = struct { WebhookTNC string WebhookGlobalCare string WebhookOnPoint string + WebhookViettelFFM string FindOne string FindByCondition string Distinct string @@ -46,6 +47,7 @@ var Warehouse = struct { WebhookTNC: getWarehouseValue("webhook_tnc"), WebhookGlobalCare: getWarehouseValue("webhook_global_care"), WebhookOnPoint: getWarehouseValue("webhook_on_point"), + WebhookViettelFFM: getWarehouseValue("webhook_viettel_ffm"), FindOne: getWarehouseValue("find_one"), FindByCondition: getWarehouseValue("find_all_by_condition"), Distinct: getWarehouseValue("distinct"), -- 2.34.1 From ff223e2b46f74c232785075722c0db1a726713ad Mon Sep 17 00:00:00 2001 From: Nguyen Minh Date: Wed, 3 Jul 2024 15:36:56 +0700 Subject: [PATCH 3/5] update model warehouse response nats --- model/warehouse_response.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/model/warehouse_response.go b/model/warehouse_response.go index 676cea3..4c6ff5a 100644 --- a/model/warehouse_response.go +++ b/model/warehouse_response.go @@ -61,12 +61,14 @@ type WarehouseSupplier struct { // WarehouseOrder ... type WarehouseOrder struct { - MinimumValue float64 `json:"minimumValue"` - PaymentMethod WarehousePaymentMethod `json:"paymentMethod"` - IsLimitNumberOfPurchases bool `json:"isLimitNumberOfPurchases"` - LimitNumberOfPurchases int64 `json:"limitNumberOfPurchases"` - NotifyOnNewOrder WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"` - LabelSize string `json:"labelSize"` + MinimumValue float64 `json:"minimumValue"` + PaymentMethod WarehousePaymentMethod `json:"paymentMethod"` + IsLimitNumberOfPurchases bool `json:"isLimitNumberOfPurchases"` + LimitNumberOfPurchases int64 `json:"limitNumberOfPurchases"` + NotifyOnNewOrder WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"` + LabelSize string `json:"labelSize"` + MaximumOrderValue float64 `json:"maximumOrderValue"` + MaximumNumberPerBuyerEachMonth float64 `json:"maximumNumberPerBuyerEachMonth"` } // WarehouseConfigNotifyOnNewOrder ... -- 2.34.1 From 7ab8f1f3a547319bf1843b9ea6e555f1e41c662c Mon Sep 17 00:00:00 2001 From: Nguyen Minh Date: Wed, 3 Jul 2024 16:45:50 +0700 Subject: [PATCH 4/5] update --- model/warehouse_response.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/warehouse_response.go b/model/warehouse_response.go index 4c6ff5a..bb314dd 100644 --- a/model/warehouse_response.go +++ b/model/warehouse_response.go @@ -68,7 +68,7 @@ type WarehouseOrder struct { NotifyOnNewOrder WarehouseConfigNotifyOnNewOrder `json:"notifyOnNewOrder"` LabelSize string `json:"labelSize"` MaximumOrderValue float64 `json:"maximumOrderValue"` - MaximumNumberPerBuyerEachMonth float64 `json:"maximumNumberPerBuyerEachMonth"` + MaximumNumberPerBuyerEachMonth int64 `json:"maximumNumberPerBuyerEachMonth"` } // WarehouseConfigNotifyOnNewOrder ... -- 2.34.1 From 78194a2d43e0913008ebd98724de0a27a517b3f5 Mon Sep 17 00:00:00 2001 From: Nguyen Minh Date: Mon, 5 Aug 2024 10:18:45 +0700 Subject: [PATCH 5/5] add-field-store-code-warehouse --- model/warehouse_response.go | 1 + 1 file changed, 1 insertion(+) diff --git a/model/warehouse_response.go b/model/warehouse_response.go index bb314dd..a6e9b7e 100644 --- a/model/warehouse_response.go +++ b/model/warehouse_response.go @@ -157,6 +157,7 @@ type WarehouseNatsResponse struct { ReasonPendingInactive string `json:"reasonPendingInactive"` IsPendingInactive bool `json:"isPendingInactive"` IsFromInternational bool `json:"isFromInternational"` + StoreCode string `json:"storeCode"` } // WarehouseInfo ... -- 2.34.1