ship_engine 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff6f9fe87091300cfeb8367882a1aeff70cd88900058d89c4a615b272b5391b
-  data.tar.gz: 4ae33dfb71036a68ec1dc9dfdf663233492dc04fa98f777cb8930485700de7dd
+  metadata.gz: 3372e8b729c37a76eb81fec8f382880f8e31d33cdce291347b3d6e05b943a695
+  data.tar.gz: 50f31432378d9c402f3a64c5d71f1d3b8da1518147f4163c75a172651462d798
 SHA512:
-  metadata.gz: 2aaa816a5c793cd464c33ba25db0f414e58bc513a0cbbbf3f63c7305e11db2f42b43abc790bc799350a5f29cc4c27b7748a23c14a505194d60d494957d2c2015
-  data.tar.gz: 90b1d2703c66832610e1230284a0dfa41f1e845e74265daebd7bd97536f1ac4dc86bdd3495e0e9d616f993e98235ac947b13f3d5cd871cf7499bb0f7e9bf3fec
+  metadata.gz: 594e17a90c3a75dd8296afe09a7af3040731e3fee14a5275b4f68758c937b45f17ac4b86129e3cd8bdd0213cfe1ba5fe5b168f4058c7502a58619cad65ee006b
+  data.tar.gz: 43c762c521a5b0f783b3fbd247b6bac7f4a57fb2c336373c837e521f3941bab5e2f7627f437a68100cb0344603e6bd9efda7ee1d9b05299a9513c43cc0fa5514

data/docs/BatchesApi.md

@@ -19,7 +19,7 @@ Method | HTTP request | Description
 
 ## add_to_batch
 
-> String add_to_batch(batch_id, add_to_batch_request_body)
+> String add_to_batch(add_to_batch_request_body, batch_id)
 
 Add to a Batch
 
@@ -39,12 +39,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::BatchesApi.new
-batch_id = 'batch_id_example' # String | Batch ID
 add_to_batch_request_body = ShipEngine::AddToBatchRequestBody.new # AddToBatchRequestBody | 
+batch_id = 'batch_id_example' # String | Batch ID
 
 begin
   #Add to a Batch
-  result = api_instance.add_to_batch(batch_id, add_to_batch_request_body)
+  result = api_instance.add_to_batch(add_to_batch_request_body, batch_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling BatchesApi->add_to_batch: #{e}"
@@ -56,8 +56,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **batch_id** | **String**| Batch ID | 
  **add_to_batch_request_body** | [**AddToBatchRequestBody**](AddToBatchRequestBody.md)|  | 
+ **batch_id** | **String**| Batch ID | 
 
 ### Return type
 
@@ -415,7 +415,7 @@ Name | Type | Description  | Notes
 
 ## process_batch
 
-> String process_batch(batch_id, process_batch_request_body)
+> String process_batch(process_batch_request_body, batch_id)
 
 Process Batch ID Labels
 
@@ -435,12 +435,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::BatchesApi.new
-batch_id = 'batch_id_example' # String | Batch ID
 process_batch_request_body = ShipEngine::ProcessBatchRequestBody.new # ProcessBatchRequestBody | 
+batch_id = 'batch_id_example' # String | Batch ID
 
 begin
   #Process Batch ID Labels
-  result = api_instance.process_batch(batch_id, process_batch_request_body)
+  result = api_instance.process_batch(process_batch_request_body, batch_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling BatchesApi->process_batch: #{e}"
@@ -452,8 +452,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **batch_id** | **String**| Batch ID | 
  **process_batch_request_body** | [**ProcessBatchRequestBody**](ProcessBatchRequestBody.md)|  | 
+ **batch_id** | **String**| Batch ID | 
 
 ### Return type
 
@@ -471,7 +471,7 @@ Name | Type | Description  | Notes
 
 ## remove_from_batch
 
-> String remove_from_batch(batch_id, remove_from_batch_request_body)
+> String remove_from_batch(remove_from_batch_request_body, batch_id)
 
 Remove From Batch
 
@@ -491,12 +491,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::BatchesApi.new
-batch_id = 'batch_id_example' # String | Batch ID
 remove_from_batch_request_body = ShipEngine::RemoveFromBatchRequestBody.new # RemoveFromBatchRequestBody | 
+batch_id = 'batch_id_example' # String | Batch ID
 
 begin
   #Remove From Batch
-  result = api_instance.remove_from_batch(batch_id, remove_from_batch_request_body)
+  result = api_instance.remove_from_batch(remove_from_batch_request_body, batch_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling BatchesApi->remove_from_batch: #{e}"
@@ -508,8 +508,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **batch_id** | **String**| Batch ID | 
  **remove_from_batch_request_body** | [**RemoveFromBatchRequestBody**](RemoveFromBatchRequestBody.md)|  | 
+ **batch_id** | **String**| Batch ID | 
 
 ### Return type
 

data/docs/CarrierAccountsApi.md

@@ -13,7 +13,7 @@ Method | HTTP request | Description
 
 ## connect_carrier
 
-> ConnectCarrierResponseBody connect_carrier(carrier_name, connect_carrier_request_body)
+> ConnectCarrierResponseBody connect_carrier(connect_carrier_request_body, carrier_name)
 
 Connect a carrier account
 
@@ -33,12 +33,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::CarrierAccountsApi.new
-carrier_name = ShipEngine::CarrierName.new # CarrierName | The carrier name, such as `stamps_com`, `ups`, `fedex`, or `dhl_express`.
 connect_carrier_request_body = ShipEngine::ConnectCarrierRequestBody.new # ConnectCarrierRequestBody | 
+carrier_name = ShipEngine::CarrierName.new # CarrierName | The carrier name, such as `stamps_com`, `ups`, `fedex`, or `dhl_express`.
 
 begin
   #Connect a carrier account
-  result = api_instance.connect_carrier(carrier_name, connect_carrier_request_body)
+  result = api_instance.connect_carrier(connect_carrier_request_body, carrier_name)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling CarrierAccountsApi->connect_carrier: #{e}"
@@ -50,8 +50,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **carrier_name** | [**CarrierName**](.md)| The carrier name, such as `stamps_com`, `ups`, `fedex`, or `dhl_express`. | 
  **connect_carrier_request_body** | [**ConnectCarrierRequestBody**](ConnectCarrierRequestBody.md)|  | 
+ **carrier_name** | [**CarrierName**](.md)| The carrier name, such as `stamps_com`, `ups`, `fedex`, or `dhl_express`. | 
 
 ### Return type
 
@@ -181,7 +181,7 @@ Name | Type | Description  | Notes
 
 ## update_carrier_settings
 
-> String update_carrier_settings(carrier_name, carrier_id, update_carrier_settings_request_body)
+> String update_carrier_settings(update_carrier_settings_request_body, carrier_name, carrier_id)
 
 Update carrier settings
 
@@ -201,13 +201,13 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::CarrierAccountsApi.new
+update_carrier_settings_request_body = ShipEngine::UpdateCarrierSettingsRequestBody.new # UpdateCarrierSettingsRequestBody | 
 carrier_name = ShipEngine::CarrierNameWithSettings.new # CarrierNameWithSettings | The carrier name, such as `stamps_com`, `ups`, `fedex`, or `dhl_express`.
 carrier_id = 'se-28529731' # String | Carrier ID
-update_carrier_settings_request_body = ShipEngine::UpdateCarrierSettingsRequestBody.new # UpdateCarrierSettingsRequestBody | 
 
 begin
   #Update carrier settings
-  result = api_instance.update_carrier_settings(carrier_name, carrier_id, update_carrier_settings_request_body)
+  result = api_instance.update_carrier_settings(update_carrier_settings_request_body, carrier_name, carrier_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling CarrierAccountsApi->update_carrier_settings: #{e}"
@@ -219,9 +219,9 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **update_carrier_settings_request_body** | [**UpdateCarrierSettingsRequestBody**](UpdateCarrierSettingsRequestBody.md)|  | 
  **carrier_name** | [**CarrierNameWithSettings**](.md)| The carrier name, such as `stamps_com`, `ups`, `fedex`, or `dhl_express`. | 
  **carrier_id** | **String**| Carrier ID | 
- **update_carrier_settings_request_body** | [**UpdateCarrierSettingsRequestBody**](UpdateCarrierSettingsRequestBody.md)|  | 
 
 ### Return type
 

data/docs/CarriersApi.md

@@ -15,7 +15,7 @@ Method | HTTP request | Description
 
 ## add_funds_to_carrier
 
-> AddFundsToCarrierResponseBody add_funds_to_carrier(carrier_id, add_funds_to_carrier_request_body)
+> AddFundsToCarrierResponseBody add_funds_to_carrier(add_funds_to_carrier_request_body, carrier_id)
 
 Add Funds To Carrier
 
@@ -35,12 +35,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::CarriersApi.new
-carrier_id = 'se-28529731' # String | Carrier ID
 add_funds_to_carrier_request_body = ShipEngine::AddFundsToCarrierRequestBody.new # AddFundsToCarrierRequestBody | 
+carrier_id = 'se-28529731' # String | Carrier ID
 
 begin
   #Add Funds To Carrier
-  result = api_instance.add_funds_to_carrier(carrier_id, add_funds_to_carrier_request_body)
+  result = api_instance.add_funds_to_carrier(add_funds_to_carrier_request_body, carrier_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling CarriersApi->add_funds_to_carrier: #{e}"
@@ -52,8 +52,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **carrier_id** | **String**| Carrier ID | 
  **add_funds_to_carrier_request_body** | [**AddFundsToCarrierRequestBody**](AddFundsToCarrierRequestBody.md)|  | 
+ **carrier_id** | **String**| Carrier ID | 
 
 ### Return type
 

data/docs/LabelsApi.md

@@ -72,7 +72,7 @@ Name | Type | Description  | Notes
 
 ## create_label_from_rate
 
-> CreateLabelFromRateResponseBody create_label_from_rate(rate_id, create_label_from_rate_request_body)
+> CreateLabelFromRateResponseBody create_label_from_rate(create_label_from_rate_request_body, rate_id)
 
 Purchase Label with Rate ID
 
@@ -92,12 +92,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::LabelsApi.new
-rate_id = 'rate_id_example' # String | Rate ID
 create_label_from_rate_request_body = ShipEngine::CreateLabelFromRateRequestBody.new # CreateLabelFromRateRequestBody | 
+rate_id = 'rate_id_example' # String | Rate ID
 
 begin
   #Purchase Label with Rate ID
-  result = api_instance.create_label_from_rate(rate_id, create_label_from_rate_request_body)
+  result = api_instance.create_label_from_rate(create_label_from_rate_request_body, rate_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling LabelsApi->create_label_from_rate: #{e}"
@@ -109,8 +109,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **rate_id** | **String**| Rate ID | 
  **create_label_from_rate_request_body** | [**CreateLabelFromRateRequestBody**](CreateLabelFromRateRequestBody.md)|  | 
+ **rate_id** | **String**| Rate ID | 
 
 ### Return type
 
@@ -128,7 +128,7 @@ Name | Type | Description  | Notes
 
 ## create_label_from_shipment
 
-> CreateLabelFromShipmentResponseBody create_label_from_shipment(shipment_id, create_label_from_shipment_request_body)
+> CreateLabelFromShipmentResponseBody create_label_from_shipment(create_label_from_shipment_request_body, shipment_id)
 
 Purchase Label with Shipment ID
 
@@ -148,12 +148,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::LabelsApi.new
-shipment_id = 'shipment_id_example' # String | Shipment ID
 create_label_from_shipment_request_body = ShipEngine::CreateLabelFromShipmentRequestBody.new # CreateLabelFromShipmentRequestBody | 
+shipment_id = 'shipment_id_example' # String | Shipment ID
 
 begin
   #Purchase Label with Shipment ID
-  result = api_instance.create_label_from_shipment(shipment_id, create_label_from_shipment_request_body)
+  result = api_instance.create_label_from_shipment(create_label_from_shipment_request_body, shipment_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling LabelsApi->create_label_from_shipment: #{e}"
@@ -165,8 +165,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **shipment_id** | **String**| Shipment ID | 
  **create_label_from_shipment_request_body** | [**CreateLabelFromShipmentRequestBody**](CreateLabelFromShipmentRequestBody.md)|  | 
+ **shipment_id** | **String**| Shipment ID | 
 
 ### Return type
 
@@ -184,7 +184,7 @@ Name | Type | Description  | Notes
 
 ## create_return_label
 
-> CreateReturnLabelResponseBody create_return_label(label_id, create_return_label_request_body)
+> CreateReturnLabelResponseBody create_return_label(create_return_label_request_body, label_id)
 
 Create a return label
 
@@ -204,12 +204,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::LabelsApi.new
-label_id = 'label_id_example' # String | Label ID
 create_return_label_request_body = ShipEngine::CreateReturnLabelRequestBody.new # CreateReturnLabelRequestBody | 
+label_id = 'label_id_example' # String | Label ID
 
 begin
   #Create a return label
-  result = api_instance.create_return_label(label_id, create_return_label_request_body)
+  result = api_instance.create_return_label(create_return_label_request_body, label_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling LabelsApi->create_return_label: #{e}"
@@ -221,8 +221,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **label_id** | **String**| Label ID | 
  **create_return_label_request_body** | [**CreateReturnLabelRequestBody**](CreateReturnLabelRequestBody.md)|  | 
+ **label_id** | **String**| Label ID | 
 
 ### Return type
 

data/docs/PackageTypesApi.md

@@ -226,7 +226,7 @@ This endpoint does not need any parameter.
 
 ## update_package_type
 
-> String update_package_type(package_id, update_package_type_request_body)
+> String update_package_type(update_package_type_request_body, package_id)
 
 Update Custom Package Type By ID
 
@@ -246,12 +246,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::PackageTypesApi.new
-package_id = 'package_id_example' # String | Package ID
 update_package_type_request_body = ShipEngine::UpdatePackageTypeRequestBody.new # UpdatePackageTypeRequestBody | 
+package_id = 'package_id_example' # String | Package ID
 
 begin
   #Update Custom Package Type By ID
-  result = api_instance.update_package_type(package_id, update_package_type_request_body)
+  result = api_instance.update_package_type(update_package_type_request_body, package_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling PackageTypesApi->update_package_type: #{e}"
@@ -263,8 +263,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **package_id** | **String**| Package ID | 
  **update_package_type_request_body** | [**UpdatePackageTypeRequestBody**](UpdatePackageTypeRequestBody.md)|  | 
+ **package_id** | **String**| Package ID | 
 
 ### Return type
 

data/docs/ShipmentsApi.md

@@ -598,7 +598,7 @@ Name | Type | Description  | Notes
 
 ## update_shipment
 
-> UpdateShipmentResponseBody update_shipment(shipment_id, update_shipment_request_body)
+> UpdateShipmentResponseBody update_shipment(update_shipment_request_body, shipment_id)
 
 Update Shipment By ID
 
@@ -618,12 +618,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::ShipmentsApi.new
-shipment_id = 'shipment_id_example' # String | Shipment ID
 update_shipment_request_body = ShipEngine::UpdateShipmentRequestBody.new # UpdateShipmentRequestBody | 
+shipment_id = 'shipment_id_example' # String | Shipment ID
 
 begin
   #Update Shipment By ID
-  result = api_instance.update_shipment(shipment_id, update_shipment_request_body)
+  result = api_instance.update_shipment(update_shipment_request_body, shipment_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling ShipmentsApi->update_shipment: #{e}"
@@ -635,8 +635,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **shipment_id** | **String**| Shipment ID | 
  **update_shipment_request_body** | [**UpdateShipmentRequestBody**](UpdateShipmentRequestBody.md)|  | 
+ **shipment_id** | **String**| Shipment ID | 
 
 ### Return type
 

data/docs/WarehousesApi.md

@@ -226,7 +226,7 @@ This endpoint does not need any parameter.
 
 ## update_warehouse
 
-> String update_warehouse(warehouse_id, update_warehouse_request_body)
+> String update_warehouse(update_warehouse_request_body, warehouse_id)
 
 Update WareHouse By Id
 
@@ -246,12 +246,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::WarehousesApi.new
-warehouse_id = 'warehouse_id_example' # String | Warehouse ID
 update_warehouse_request_body = ShipEngine::UpdateWarehouseRequestBody.new # UpdateWarehouseRequestBody | 
+warehouse_id = 'warehouse_id_example' # String | Warehouse ID
 
 begin
   #Update WareHouse By Id
-  result = api_instance.update_warehouse(warehouse_id, update_warehouse_request_body)
+  result = api_instance.update_warehouse(update_warehouse_request_body, warehouse_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling WarehousesApi->update_warehouse: #{e}"
@@ -263,8 +263,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **warehouse_id** | **String**| Warehouse ID | 
  **update_warehouse_request_body** | [**UpdateWarehouseRequestBody**](UpdateWarehouseRequestBody.md)|  | 
+ **warehouse_id** | **String**| Warehouse ID | 
 
 ### Return type
 

data/docs/WebhooksApi.md

@@ -226,7 +226,7 @@ This endpoint does not need any parameter.
 
 ## update_webhook
 
-> String update_webhook(webhook_id, update_webhook_request_body)
+> String update_webhook(update_webhook_request_body, webhook_id)
 
 Update a Webhook
 
@@ -246,12 +246,12 @@ ShipEngine.configure do |config|
 end
 
 api_instance = ShipEngine::WebhooksApi.new
-webhook_id = 'webhook_id_example' # String | Webhook ID
 update_webhook_request_body = ShipEngine::UpdateWebhookRequestBody.new # UpdateWebhookRequestBody | 
+webhook_id = 'webhook_id_example' # String | Webhook ID
 
 begin
   #Update a Webhook
-  result = api_instance.update_webhook(webhook_id, update_webhook_request_body)
+  result = api_instance.update_webhook(update_webhook_request_body, webhook_id)
   p result
 rescue ShipEngine::ApiError => e
   puts "Exception when calling WebhooksApi->update_webhook: #{e}"
@@ -263,8 +263,8 @@ end
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **webhook_id** | **String**| Webhook ID | 
  **update_webhook_request_body** | [**UpdateWebhookRequestBody**](UpdateWebhookRequestBody.md)|  | 
+ **webhook_id** | **String**| Webhook ID | 
 
 ### Return type
 

data/lib/ship_engine/api/batches_api.rb

@@ -21,25 +21,29 @@ module ShipEngine
     end
     # Add to a Batch
     # Add a Shipment or Rate to a Batch
-    # @param batch_id [String] Batch ID
     # @param add_to_batch_request_body [AddToBatchRequestBody] 
+    # @param batch_id [String] Batch ID
     # @param [Hash] opts the optional parameters
     # @return [String]
-    def add_to_batch(batch_id, add_to_batch_request_body, opts = {})
-      data, _status_code, _headers = add_to_batch_with_http_info(batch_id, add_to_batch_request_body, opts)
+    def add_to_batch(add_to_batch_request_body, batch_id, opts = {})
+      data, _status_code, _headers = add_to_batch_with_http_info(add_to_batch_request_body, batch_id, opts)
       data
     end
 
     # Add to a Batch
     # Add a Shipment or Rate to a Batch
-    # @param batch_id [String] Batch ID
     # @param add_to_batch_request_body [AddToBatchRequestBody] 
+    # @param batch_id [String] Batch ID
     # @param [Hash] opts the optional parameters
     # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
-    def add_to_batch_with_http_info(batch_id, add_to_batch_request_body, opts = {})
+    def add_to_batch_with_http_info(add_to_batch_request_body, batch_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: BatchesApi.add_to_batch ...'
       end
+      # verify the required parameter 'add_to_batch_request_body' is set
+      if @api_client.config.client_side_validation && add_to_batch_request_body.nil?
+        fail ArgumentError, "Missing the required parameter 'add_to_batch_request_body' when calling BatchesApi.add_to_batch"
+      end
       # verify the required parameter 'batch_id' is set
       if @api_client.config.client_side_validation && batch_id.nil?
         fail ArgumentError, "Missing the required parameter 'batch_id' when calling BatchesApi.add_to_batch"
@@ -57,10 +61,6 @@ module ShipEngine
         fail ArgumentError, "invalid value for 'batch_id' when calling BatchesApi.add_to_batch, must conform to the pattern #{pattern}."
       end
 
-      # verify the required parameter 'add_to_batch_request_body' is set
-      if @api_client.config.client_side_validation && add_to_batch_request_body.nil?
-        fail ArgumentError, "Missing the required parameter 'add_to_batch_request_body' when calling BatchesApi.add_to_batch"
-      end
       # resource path
       local_var_path = '/v1/batches/{batch_id}/add'.sub('{' + 'batch_id' + '}', CGI.escape(batch_id.to_s))
 
@@ -548,25 +548,29 @@ module ShipEngine
 
     # Process Batch ID Labels
     # Process Batch ID Labels
-    # @param batch_id [String] Batch ID
     # @param process_batch_request_body [ProcessBatchRequestBody] 
+    # @param batch_id [String] Batch ID
     # @param [Hash] opts the optional parameters
     # @return [String]
-    def process_batch(batch_id, process_batch_request_body, opts = {})
-      data, _status_code, _headers = process_batch_with_http_info(batch_id, process_batch_request_body, opts)
+    def process_batch(process_batch_request_body, batch_id, opts = {})
+      data, _status_code, _headers = process_batch_with_http_info(process_batch_request_body, batch_id, opts)
       data
     end
 
     # Process Batch ID Labels
     # Process Batch ID Labels
-    # @param batch_id [String] Batch ID
     # @param process_batch_request_body [ProcessBatchRequestBody] 
+    # @param batch_id [String] Batch ID
     # @param [Hash] opts the optional parameters
     # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
-    def process_batch_with_http_info(batch_id, process_batch_request_body, opts = {})
+    def process_batch_with_http_info(process_batch_request_body, batch_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: BatchesApi.process_batch ...'
       end
+      # verify the required parameter 'process_batch_request_body' is set
+      if @api_client.config.client_side_validation && process_batch_request_body.nil?
+        fail ArgumentError, "Missing the required parameter 'process_batch_request_body' when calling BatchesApi.process_batch"
+      end
       # verify the required parameter 'batch_id' is set
       if @api_client.config.client_side_validation && batch_id.nil?
         fail ArgumentError, "Missing the required parameter 'batch_id' when calling BatchesApi.process_batch"
@@ -584,10 +588,6 @@ module ShipEngine
         fail ArgumentError, "invalid value for 'batch_id' when calling BatchesApi.process_batch, must conform to the pattern #{pattern}."
       end
 
-      # verify the required parameter 'process_batch_request_body' is set
-      if @api_client.config.client_side_validation && process_batch_request_body.nil?
-        fail ArgumentError, "Missing the required parameter 'process_batch_request_body' when calling BatchesApi.process_batch"
-      end
       # resource path
       local_var_path = '/v1/batches/{batch_id}/process/labels'.sub('{' + 'batch_id' + '}', CGI.escape(batch_id.to_s))
 
@@ -631,25 +631,29 @@ module ShipEngine
 
     # Remove From Batch
     # Remove a shipment or rate from a batch
-    # @param batch_id [String] Batch ID
     # @param remove_from_batch_request_body [RemoveFromBatchRequestBody] 
+    # @param batch_id [String] Batch ID
     # @param [Hash] opts the optional parameters
     # @return [String]
-    def remove_from_batch(batch_id, remove_from_batch_request_body, opts = {})
-      data, _status_code, _headers = remove_from_batch_with_http_info(batch_id, remove_from_batch_request_body, opts)
+    def remove_from_batch(remove_from_batch_request_body, batch_id, opts = {})
+      data, _status_code, _headers = remove_from_batch_with_http_info(remove_from_batch_request_body, batch_id, opts)
       data
     end
 
     # Remove From Batch
     # Remove a shipment or rate from a batch
-    # @param batch_id [String] Batch ID
     # @param remove_from_batch_request_body [RemoveFromBatchRequestBody] 
+    # @param batch_id [String] Batch ID
     # @param [Hash] opts the optional parameters
     # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
-    def remove_from_batch_with_http_info(batch_id, remove_from_batch_request_body, opts = {})
+    def remove_from_batch_with_http_info(remove_from_batch_request_body, batch_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: BatchesApi.remove_from_batch ...'
       end
+      # verify the required parameter 'remove_from_batch_request_body' is set
+      if @api_client.config.client_side_validation && remove_from_batch_request_body.nil?
+        fail ArgumentError, "Missing the required parameter 'remove_from_batch_request_body' when calling BatchesApi.remove_from_batch"
+      end
       # verify the required parameter 'batch_id' is set
       if @api_client.config.client_side_validation && batch_id.nil?
         fail ArgumentError, "Missing the required parameter 'batch_id' when calling BatchesApi.remove_from_batch"
@@ -667,10 +671,6 @@ module ShipEngine
         fail ArgumentError, "invalid value for 'batch_id' when calling BatchesApi.remove_from_batch, must conform to the pattern #{pattern}."
       end
 
-      # verify the required parameter 'remove_from_batch_request_body' is set
-      if @api_client.config.client_side_validation && remove_from_batch_request_body.nil?
-        fail ArgumentError, "Missing the required parameter 'remove_from_batch_request_body' when calling BatchesApi.remove_from_batch"
-      end
       # resource path
       local_var_path = '/v1/batches/{batch_id}/remove'.sub('{' + 'batch_id' + '}', CGI.escape(batch_id.to_s))