diff --git a/client/order.go b/client/order.go
index 4379747..d2ee714 100644
--- a/client/order.go
+++ b/client/order.go
@@ -37,7 +37,7 @@ func (o Order) UpdateORStatus(p model.OrderUpdateORStatus) error {
 
 // CancelDelivery ...
 func (o Order) CancelDelivery(p model.OrderCancelDelivery) error {
-	msg, err := natsio.GetServer().Request(subject.Order.CancelDelivery, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Order.UpdateORStatus, toBytes(p))
 	if err != nil {
 		return err
 	}
diff --git a/json_encoder.go b/json_encoder.go
index af13573..4a0bdb8 100644
--- a/json_encoder.go
+++ b/json_encoder.go
@@ -26,8 +26,3 @@ func (e JSONEncoder) Subscribe(subject string, cb nats.Handler) (*nats.Subscript
 func (e JSONEncoder) Publish(reply string, data interface{}) error {
 	return e.encConn.Publish(reply, data)
 }
-
-// Request ...
-func (e JSONEncoder) Request(subject string, data interface{}, res interface{}) error {
-	return e.encConn.Request(subject, data, res, requestTimeout)
-}
diff --git a/model/location_response.go b/model/location_response.go
index 82866ec..f383d12 100644
--- a/model/location_response.go
+++ b/model/location_response.go
@@ -10,16 +10,19 @@ type ResponseLocationAddress struct {
 type LocationProvince struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
+	Code string `json:"code"`
 }
 
 // LocationDistrict ...
 type LocationDistrict struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
+	Code string `json:"code"`
 }
 
 // LocationWard ...
 type LocationWard struct {
 	ID   string `json:"id"`
 	Name string `json:"name"`
+	Code string `json:"code"`
 }
diff --git a/model/warehouse_response.go b/model/warehouse_response.go
index 2e19c9a..493a921 100644
--- a/model/warehouse_response.go
+++ b/model/warehouse_response.go
@@ -47,9 +47,9 @@ type WarehousePaymentMethod struct {
 // WarehouseDelivery ...
 type WarehouseDelivery struct {
 	DeliveryMethods      []string `json:"deliveryMethods"`
-	PriorityServiceCodes []string `json:"priorityServiceCodes"`
-	EnabledSources       []int    `json:"enabledSources"`
-	Types                []string `json:"types"`
+	PriorityServiceCodes []string `json:"priorityDeliveryServiceCodes"`
+	EnabledSources       []int    `json:"enabledDeliverySources"`
+	Types                []string `json:"type"`
 }
 
 // WarehousePartner ...