From aa3a201b1819006dc786a4b788adf6d58c03b609 Mon Sep 17 00:00:00 2001
From: anbuiselly <105765792+anbuiselly@users.noreply.github.com>
Date: Mon, 12 Dec 2022 14:07:28 +0700
Subject: [PATCH 1/5] edit response warehouse

---
 model/warehouse_response.go | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/model/warehouse_response.go b/model/warehouse_response.go
index c667290..79b02c4 100644
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@@ -129,19 +129,21 @@ type ResponseLatLng struct {
 
 // WarehouseNatsResponse ...
 type WarehouseNatsResponse struct {
-	ID             string                    `json:"_id"`
-	Staff          string                    `json:"staff"`
-	BusinessType   string                    `json:"businessType"`
-	Name           string                    `json:"name"`
-	SearchString   string                    `json:"searchString"`
-	Slug           string                    `json:"slug"`
-	Status         string                    `json:"status"`
-	Supplier       string                    `json:"supplier"`
-	Contact        ResponseWarehouseContact  `json:"contact"`
-	Location       ResponseWarehouseLocation `json:"location"`
-	Configurations WarehouseConfiguration    `json:"configurations"`
-	CreatedAt      time.Time                 `json:"createdAt"`
-	UpdatedAt      time.Time                 `json:"updatedAt"`
+	ID                    string                    `json:"_id"`
+	Staff                 string                    `json:"staff"`
+	BusinessType          string                    `json:"businessType"`
+	Name                  string                    `json:"name"`
+	SearchString          string                    `json:"searchString"`
+	Slug                  string                    `json:"slug"`
+	Status                string                    `json:"status"`
+	Supplier              string                    `json:"supplier"`
+	Contact               ResponseWarehouseContact  `json:"contact"`
+	Location              ResponseWarehouseLocation `json:"location"`
+	Configurations        WarehouseConfiguration    `json:"configurations"`
+	CreatedAt             time.Time                 `json:"createdAt"`
+	UpdatedAt             time.Time                 `json:"updatedAt"`
+	IsPendingActive       bool                      `json:"isPendingActive"`
+	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
 }
 
 // WarehouseInfo ...

From c1a5444e5e948184fc7b68ff87d21fad2e5d1c82 Mon Sep 17 00:00:00 2001
From: anbuiselly <105765792+anbuiselly@users.noreply.github.com>
Date: Mon, 12 Dec 2022 14:25:40 +0700
Subject: [PATCH 2/5] edit res warehouse

---
 model/warehouse_response.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/model/warehouse_response.go b/model/warehouse_response.go
index 79b02c4..b73807e 100644
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@@ -142,7 +142,6 @@ type WarehouseNatsResponse struct {
 	Configurations        WarehouseConfiguration    `json:"configurations"`
 	CreatedAt             time.Time                 `json:"createdAt"`
 	UpdatedAt             time.Time                 `json:"updatedAt"`
-	IsPendingActive       bool                      `json:"isPendingActive"`
 	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
 }
 

From 67a5afa9338886dc3394c78f1e9725650ce0c2e8 Mon Sep 17 00:00:00 2001
From: anbuiselly <105765792+anbuiselly@users.noreply.github.com>
Date: Wed, 14 Dec 2022 10:52:38 +0700
Subject: [PATCH 3/5] add field IsPendingInactive

---
 model/warehouse_response.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/model/warehouse_response.go b/model/warehouse_response.go
index b73807e..6359ae3 100644
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@@ -143,6 +143,7 @@ type WarehouseNatsResponse struct {
 	CreatedAt             time.Time                 `json:"createdAt"`
 	UpdatedAt             time.Time                 `json:"updatedAt"`
 	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
+	IsPendingInactive     bool                      `json:"isPendingInactive"`
 }
 
 // WarehouseInfo ...

From ea80206619deaf97867f35c8f8b00588c1e9614b Mon Sep 17 00:00:00 2001
From: buiphuan0211 <57066954+buiphuan0211@users.noreply.github.com>
Date: Tue, 20 Dec 2022 11:13:11 +0700
Subject: [PATCH 4/5] add field from-to holiday WarehouseNatsResponse

---
 model/warehouse_response.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/model/warehouse_response.go b/model/warehouse_response.go
index 6359ae3..78427f3 100644
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@@ -144,6 +144,8 @@ type WarehouseNatsResponse struct {
 	UpdatedAt             time.Time                 `json:"updatedAt"`
 	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
 	IsPendingInactive     bool                      `json:"isPendingInactive"`
+	HolidayFrom           time.Time                 `json:"holidayFrom"`
+	HolidayTo             time.Time                 `json:"holidayTo"`
 }
 
 // WarehouseInfo ...

From 77ec5ee6c1f1f3278c24df6298bb27adead628cc Mon Sep 17 00:00:00 2001
From: buiphuan0211 <57066954+buiphuan0211@users.noreply.github.com>
Date: Tue, 20 Dec 2022 11:48:36 +0700
Subject: [PATCH 5/5] delete field form-to-holiday in WarehouseNatsResponse

---
 model/warehouse_response.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/model/warehouse_response.go b/model/warehouse_response.go
index 78427f3..6359ae3 100644
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@@ -144,8 +144,6 @@ type WarehouseNatsResponse struct {
 	UpdatedAt             time.Time                 `json:"updatedAt"`
 	ReasonPendingInactive string                    `json:"reasonPendingInactive"`
 	IsPendingInactive     bool                      `json:"isPendingInactive"`
-	HolidayFrom           time.Time                 `json:"holidayFrom"`
-	HolidayTo             time.Time                 `json:"holidayTo"`
 }
 
 // WarehouseInfo ...