merge branch viettel-ffm into develop

Reviewed-on: #166

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 ...

subject/warehouse.go

@@ -9,54 +9,56 @@ func getWarehouseValue(val string) string {
 }
 
 var Warehouse = struct {
-	SyncWarehouseIntoServiceSupplier string
-	CreateWarehouseIntoServiceSupplier string
-	UpdateWarehouseIntoServiceSupplier string
-	CreateOutboundRequest              string
-	UpdateOutboundRequestLogistic      string
-	CancelOutboundRequest              string
-	GetConfiguration                   string
-	SyncORStatus                       string
-	WebhookTNC                         string
-	WebhookShiip                     string
-	WebhookGlobalCare                  string
-	WebhookOnPoint                     string
-	FindOne                            string
-	FindByCondition                    string
-	Distinct                           string
-	Count                              string
-	AfterUpdateWarehouse               string
-	AfterCreateWarehouse               string
-	UpdateIsClosedSupplier             string
-	GetWarehouses                      string
-	UpdateORDeliveryStatus             string
+	SyncWarehouseIntoServiceSupplier     string
+	CreateWarehouseIntoServiceSupplier   string
+	UpdateWarehouseIntoServiceSupplier   string
+	CreateOutboundRequest                string
+	UpdateOutboundRequestLogistic        string
+	CancelOutboundRequest                string
+	GetConfiguration                     string
+	SyncORStatus                         string
+	WebhookTNC                           string
+	WebhookShiip                         string
+	WebhookGlobalCare                    string
+	WebhookOnPoint                       string
+	WebhookViettelFFM                    string
+	FindOne                              string
+	FindByCondition                      string
+	Distinct                             string
+	Count                                string
+	AfterUpdateWarehouse                 string
+	AfterCreateWarehouse                 string
+	UpdateIsClosedSupplier               string
+	GetWarehouses                        string
+	UpdateORDeliveryStatus               string
 	UpdateStatusWarehousePendingInactive string
 	UpdateIsSellyMall                    string
 	UpdateWarehouseConfig                string
 	BulkWriteWarehouseConfig             string
 	GetListWarehouseConfig               string
 }{
-	SyncWarehouseIntoServiceSupplier: getWarehouseValue("sync_warehouse_into_service_supplier"),
-	CreateWarehouseIntoServiceSupplier: getWarehouseValue("create_warehouse_into_service_supplier"),
-	UpdateWarehouseIntoServiceSupplier: getWarehouseValue("update_warehouse_into_service_supplier"),
-	AfterCreateWarehouse:               getWarehouseValue("after_create_warehouse"),
-	AfterUpdateWarehouse:               getWarehouseValue("after_update_warehouse"),
-	CreateOutboundRequest:              getWarehouseValue("create_outbound_request"),
-	UpdateOutboundRequestLogistic:      getWarehouseValue("update_outbound_request_logistic_info"),
-	CancelOutboundRequest:              getWarehouseValue("cancel_outbound_request"),
-	GetConfiguration:                   getWarehouseValue("get_configuration"),
-	SyncORStatus:                       getWarehouseValue("sync_or_status"),
-	WebhookTNC:                         getWarehouseValue("webhook_tnc"),
-	WebhookShiip:                     getWarehouseValue("webhook_shiip"),
-	WebhookGlobalCare:                  getWarehouseValue("webhook_global_care"),
-	WebhookOnPoint:                     getWarehouseValue("webhook_on_point"),
-	FindOne:                            getWarehouseValue("find_one"),
-	FindByCondition:                    getWarehouseValue("find_all_by_condition"),
-	Distinct:                           getWarehouseValue("distinct"),
-	Count:                              getWarehouseValue("count"),
-	UpdateIsClosedSupplier:             getWarehouseValue("update_is_closed_supplier"),
-	GetWarehouses:                      getWarehouseValue("get_warehouses"),
-	UpdateORDeliveryStatus:             getWarehouseValue("update_or_delivery_status"),
+	SyncWarehouseIntoServiceSupplier:     getWarehouseValue("sync_warehouse_into_service_supplier"),
+	CreateWarehouseIntoServiceSupplier:   getWarehouseValue("create_warehouse_into_service_supplier"),
+	UpdateWarehouseIntoServiceSupplier:   getWarehouseValue("update_warehouse_into_service_supplier"),
+	AfterCreateWarehouse:                 getWarehouseValue("after_create_warehouse"),
+	AfterUpdateWarehouse:                 getWarehouseValue("after_update_warehouse"),
+	CreateOutboundRequest:                getWarehouseValue("create_outbound_request"),
+	UpdateOutboundRequestLogistic:        getWarehouseValue("update_outbound_request_logistic_info"),
+	CancelOutboundRequest:                getWarehouseValue("cancel_outbound_request"),
+	GetConfiguration:                     getWarehouseValue("get_configuration"),
+	SyncORStatus:                         getWarehouseValue("sync_or_status"),
+	WebhookTNC:                           getWarehouseValue("webhook_tnc"),
+	WebhookShiip:                         getWarehouseValue("webhook_shiip"),
+	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"),
+	Count:                                getWarehouseValue("count"),
+	UpdateIsClosedSupplier:               getWarehouseValue("update_is_closed_supplier"),
+	GetWarehouses:                        getWarehouseValue("get_warehouses"),
+	UpdateORDeliveryStatus:               getWarehouseValue("update_or_delivery_status"),
 	UpdateStatusWarehousePendingInactive: getWarehouseValue("update_pending_active_product_by_warehouse_ids"),
 	UpdateIsSellyMall:                    getWarehouseValue("update_is_selly_mall"),
 	UpdateWarehouseConfig:                getWarehouseValue("update_warehouse_config"),