Merge branch 'viettel-ffm' into develop
This commit is contained in:
		
						commit
						c19ab6b61e
					
				| 
						 | 
					@ -14,7 +14,7 @@ type AuthRes struct {
 | 
				
			||||||
type UpdateLogisticInfoPayload struct {
 | 
					type UpdateLogisticInfoPayload struct {
 | 
				
			||||||
	PrintLabelLink string `json:"print_label_link"`
 | 
						PrintLabelLink string `json:"print_label_link"`
 | 
				
			||||||
	TrackingCode   string `json:"tracking_code"`
 | 
						TrackingCode   string `json:"tracking_code"`
 | 
				
			||||||
	OrID           int    `json:"or_id,omitempty"`
 | 
						OrCode         string `json:"or_code,omitempty"`
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type CancelORPayload struct {
 | 
					type CancelORPayload struct {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,7 @@ const (
 | 
				
			||||||
	baseURLAuthProd = ""
 | 
						baseURLAuthProd = ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pathAuth                 = "/realms/wms/protocol/openid-connect/token"
 | 
						pathAuth                 = "/realms/wms/protocol/openid-connect/token"
 | 
				
			||||||
	pathUpdateORLogisticInfo = "/wms-core/api/v1/obms/outbound-request/outbound-request-partner/%d"
 | 
						pathUpdateORLogisticInfo = "/wms-core/api/v1/obms/outbound-request/outbound-request-partner/%s"
 | 
				
			||||||
	pathCreateOR             = "/wms-core/api/v1/obms/outbound-request/outbound-request-partner/hab"
 | 
						pathCreateOR             = "/wms-core/api/v1/obms/outbound-request/outbound-request-partner/hab"
 | 
				
			||||||
	pathCancelOR             = "/wms-core/api/v1/obms/outbound-request/cancel"
 | 
						pathCancelOR             = "/wms-core/api/v1/obms/outbound-request/cancel"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,7 +98,8 @@ func (c *Client) CreateOR(p ORPayload) (*ORResult, error) {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (c *Client) UpdateORLogisticInfo(p UpdateLogisticInfoPayload) error {
 | 
					func (c *Client) UpdateORLogisticInfo(p UpdateLogisticInfoPayload) error {
 | 
				
			||||||
	apiURL := c.getBaseURL() + fmt.Sprintf(pathUpdateORLogisticInfo, p.OrID)
 | 
						apiURL := c.getBaseURL() + fmt.Sprintf(pathUpdateORLogisticInfo, p.OrCode)
 | 
				
			||||||
 | 
						p.OrCode = ""
 | 
				
			||||||
	token, err := c.getToken()
 | 
						token, err := c.getToken()
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		return err
 | 
							return err
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue