Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

asposewordscloud/apis/words_api.py

@@ -289,7 +289,7 @@ def append_document_online(self, request, **kwargs):  # noqa: E501
         asynchronous HTTP request, please pass is_async=True
 
         :param is_async bool
-        :param document file : The document. (required)
+        :param document file : Original document. (required)
         :param document_list DocumentEntryList : <see cref="DocumentEntryList"/> with a list of documents to append. (required)
         :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
         :param password str : Password for opening an encrypted document.
@@ -7562,7 +7562,7 @@ def get_document_field_names_online(self, request, **kwargs):  # noqa: E501
         asynchronous HTTP request, please pass is_async=True
 
         :param is_async bool
-        :param document file : The document. (required)
+        :param template file : The template document. (required)
         :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
         :param password str : Password for opening an encrypted document.
         :param use_non_merge_fields bool : The flag indicating whether to use non merge fields. If true, result includes "mustache" field names.
@@ -18783,7 +18783,7 @@ def save_as_with_http_info(self, request, **kwargs):  # noqa: E501
             collection_formats=http_params['collection_formats']))
 
     def save_as_online(self, request, **kwargs):  # noqa: E501
-        """Converts a document in cloud storage to the specified format.  # noqa: E501
+        """Converts a document to the specified format.  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass is_async=True
@@ -18812,7 +18812,7 @@ def save_as_online(self, request, **kwargs):  # noqa: E501
             return data
 
     def save_as_online_with_http_info(self, request, **kwargs):  # noqa: E501
-        """Converts a document in cloud storage to the specified format.  # noqa: E501
+        """Converts a document to the specified format.  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass is_async=True
@@ -19110,7 +19110,7 @@ def save_as_tiff_with_http_info(self, request, **kwargs):  # noqa: E501
             collection_formats=http_params['collection_formats']))
 
     def save_as_tiff_online(self, request, **kwargs):  # noqa: E501
-        """Converts a document in cloud storage to TIFF format using detailed conversion settings.  # noqa: E501
+        """Converts a document to TIFF format using detailed conversion settings.  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass is_async=True
@@ -19156,7 +19156,7 @@ def save_as_tiff_online(self, request, **kwargs):  # noqa: E501
             return data
 
     def save_as_tiff_online_with_http_info(self, request, **kwargs):  # noqa: E501
-        """Converts a document in cloud storage to TIFF format using detailed conversion settings.  # noqa: E501
+        """Converts a document to TIFF format using detailed conversion settings.  # noqa: E501
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass is_async=True

asposewordscloud/models/requests/append_document_online_request.py

@@ -34,7 +34,7 @@ class AppendDocumentOnlineRequest(BaseRequestObject):
     """
     Request model for append_document_online operation.
     Initializes a new instance.
-    :param document The document.
+    :param document Original document.
     :param document_list <see cref="DocumentEntryList"/> with a list of documents to append.
     :param load_encoding Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
     :param password Password for opening an encrypted document.

asposewordscloud/models/requests/get_document_field_names_online_request.py

@@ -34,22 +34,22 @@ class GetDocumentFieldNamesOnlineRequest(BaseRequestObject):
     """
     Request model for get_document_field_names_online operation.
     Initializes a new instance.
-    :param document The document.
+    :param template The template document.
     :param load_encoding Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
     :param password Password for opening an encrypted document.
     :param use_non_merge_fields The flag indicating whether to use non merge fields. If true, result includes "mustache" field names.
     """
 
-    def __init__(self, document, load_encoding=None, password=None, use_non_merge_fields=None):
-        self.document = document
+    def __init__(self, template, load_encoding=None, password=None, use_non_merge_fields=None):
+        self.template = template
         self.load_encoding = load_encoding
         self.password = password
         self.use_non_merge_fields = use_non_merge_fields
 
     def create_http_request(self, api_client):
-        # verify the required parameter 'document' is set
-        if self.document is None:
-            raise ValueError("Missing the required parameter `document` when calling `get_document_field_names_online`")  # noqa: E501
+        # verify the required parameter 'template' is set
+        if self.template is None:
+            raise ValueError("Missing the required parameter `template` when calling `get_document_field_names_online`")  # noqa: E501
 
         path = '/v4.0/words/online/get/mailMerge/FieldNames'
         path_params = {}
@@ -83,8 +83,8 @@ def create_http_request(self, api_client):
             ['multipart/form-data'])  # noqa: E501
 
         form_params = []
-        if self.document is not None:
-            form_params.append(['document', self.document, 'file'])  # noqa: E501
+        if self.template is not None:
+            form_params.append(['template', self.template, 'file'])  # noqa: E501
 
         body_params = None
         return {

test/api/mail_merge/test_mail_merge_fileds.py

@@ -39,7 +39,7 @@ def test_get_document_field_names_online(self):
         mail_merge_folder = 'DocumentActions/MailMerge'
         local_document_file = 'SampleExecuteTemplate.docx'
 
-        request = asposewordscloud.models.requests.GetDocumentFieldNamesOnlineRequest(document = open(os.path.join(self.local_test_folder, mail_merge_folder + '/' + local_document_file), 'rb'), use_non_merge_fields = True)
+        request = asposewordscloud.models.requests.GetDocumentFieldNamesOnlineRequest(template = open(os.path.join(self.local_test_folder, mail_merge_folder + '/' + local_document_file), 'rb'), use_non_merge_fields = True)
 
         result = self.words_api.get_document_field_names_online(request)
         self.assertIsNotNone(result, 'Error has occurred.')