Merge pull request #45 from sendinblue/feature_new-changes

ekta-slit · web-flow · commit 297696b1d9ad · 2018-11-27T18:27:14.000+05:30
Mixed changes for different definitions
diff --git a/docs/CreateEmailCampaign.md b/docs/CreateEmailCampaign.md
@@ -22,7 +22,7 @@ Name | Type | Description | Notes
 **footer** | **String** | Footer of the email campaign | [optional] 
 **header** | **String** | Header of the email campaign | [optional] 
 **utmCampaign** | **String** | Customize the utm_campaign value. If this field is empty, the campaign name will be used. Only alphanumeric characters and spaces are allowed | [optional] 
-**params** | **Object** | Pass the set of attributes to customize the type classic campaign. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;}. Only available if &#39;type&#39; is &#39;classic&#39; | [optional] 
+**params** | **Object** | Pass the set of attributes to customize the type classic campaign. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;}. Only available if &#39;type&#39; is &#39;classic&#39;. It&#39;s considered only if campaign is in New Template Language format. The New Template Language is dependent on the values of &#39;subject&#39;, &#39;htmlContent/htmlUrl&#39;, &#39;sender.name&#39; &amp; &#39;toField&#39; | [optional] 
 
 
 <a name="TypeEnum"></a>
diff --git a/docs/CreateSmsCampaign.md b/docs/CreateSmsCampaign.md
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **String** | Name of the campaign | 
 **sender** | **String** | Name of the sender. The number of characters is limited to 11 | 
-**content** | **String** | Content of the message. The maximum characters used per SMS is 160, if used more than that, it will be counted as more than one SMS | [optional] 
+**content** | **String** | Content of the message. The maximum characters used per SMS is 160, if used more than that, it will be counted as more than one SMS | 
 **recipients** | [**CreateSmsCampaignRecipients**](CreateSmsCampaignRecipients.md) |  | [optional] 
 **scheduledAt** | **Date** | UTC date-time on which the campaign has to run (YYYY-MM-DDTHH:mm:ss.SSSZ). Prefer to pass your timezone in date-time format for accurate result. | [optional] 
 
diff --git a/docs/CreateSmsCampaignRecipients.md b/docs/CreateSmsCampaignRecipients.md
@@ -4,6 +4,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **listIds** | **[Number]** | Lists Ids to send the campaign to. REQUIRED if scheduledAt is not empty | 
-**exclusionListIds** | **[Number]** | List ids which have to be excluded from a campaign | 
+**exclusionListIds** | **[Number]** | List ids which have to be excluded from a campaign | [optional] 
 
 
diff --git a/docs/GetAggregatedReport.md b/docs/GetAggregatedReport.md
@@ -15,5 +15,6 @@ Name | Type | Description | Notes
 **spamReports** | **Number** | Number of complaint (spam report) for the timeframe | 
 **blocked** | **Number** | Number of blocked contact emails for the timeframe | 
 **invalid** | **Number** | Number of invalid emails for the timeframe | 
+**unsubscribed** | **Number** | Number of unsubscribed emails for the timeframe | 
 
 
diff --git a/docs/GetEmailEventReportEvents.md b/docs/GetEmailEventReportEvents.md
@@ -41,6 +41,8 @@ Name | Type | Description | Notes
 
 * `blocked` (value: `"blocked"`)
 
+* `unsubscribed` (value: `"unsubscribed"`)
+
 
 
 
diff --git a/docs/GetReportsReports.md b/docs/GetReportsReports.md
@@ -15,5 +15,6 @@ Name | Type | Description | Notes
 **spamReports** | **Number** | Number of complaints (spam reports) for the date | 
 **blocked** | **Number** | Number of blocked emails for the date | 
 **invalid** | **Number** | Number of invalid emails for the date | 
+**unsubscribed** | **Number** | Number of unsubscribed emails for the date | 
 
 
diff --git a/docs/GetSmsCampaignOverview.md b/docs/GetSmsCampaignOverview.md
@@ -8,7 +8,6 @@ Name | Type | Description | Notes
 **status** | **String** | Status of the SMS Campaign | 
 **content** | **String** | Content of the SMS Campaign | 
 **scheduledAt** | **Date** | UTC date-time on which SMS campaign is scheduled. Should be in YYYY-MM-DDTHH:mm:ss.SSSZ format | 
-**testSent** | **Boolean** | Retrieved the status of test SMS sending. (true&#x3D;Test SMS has been sent  false&#x3D;Test SMS has not been sent) | 
 **sender** | **String** | Sender of the SMS Campaign | 
 **createdAt** | **Date** | Creation UTC date-time of the SMS campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
 **modifiedAt** | **Date** | UTC date-time of last modification of the SMS campaign (YYYY-MM-DDTHH:mm:ss.SSSZ) | 
@@ -28,7 +27,7 @@ Name | Type | Description | Notes
 
 * `suspended` (value: `"suspended"`)
 
-* `in_process` (value: `"in_process"`)
+* `inProcess` (value: `"inProcess"`)
 
 
 
diff --git a/docs/SMSCampaignsApi.md b/docs/SMSCampaignsApi.md
@@ -184,6 +184,8 @@ var apiInstance = new SibApiV3Sdk.SMSCampaignsApi();
 
 var opts = { 
   'status': "status_example", // String | Status of campaign.
+  'startDate': new Date("2013-10-20T19:20:30+01:00"), // Date | Mandatory if endDate is used. Starting (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either 'status' not passed and if passed is set to 'sent' )
+  'endDate': new Date("2013-10-20T19:20:30+01:00"), // Date | Mandatory if startDate is used. Ending (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either 'status' not passed and if passed is set to 'sent' )
   'limit': 500, // Number | Number limitation for the result returned
   'offset': 0 // Number | Beginning point in the list to retrieve from.
 };
@@ -200,6 +202,8 @@ apiInstance.getSmsCampaigns(opts).then(function(data) {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **status** | **String**| Status of campaign. | [optional] 
+ **startDate** | **Date**| Mandatory if endDate is used. Starting (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either &#39;status&#39; not passed and if passed is set to &#39;sent&#39; ) | [optional] 
+ **endDate** | **Date**| Mandatory if startDate is used. Ending (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either &#39;status&#39; not passed and if passed is set to &#39;sent&#39; ) | [optional] 
  **limit** | **Number**| Number limitation for the result returned | [optional] [default to 500]
  **offset** | **Number**| Beginning point in the list to retrieve from. | [optional] [default to 0]
 
diff --git a/docs/SendEmail.md b/docs/SendEmail.md
@@ -9,7 +9,7 @@ Name | Type | Description | Notes
 **replyTo** | **String** | Email address which shall be used by campaign recipients to reply back | [optional] 
 **attachmentUrl** | **String** | Absolute url of the attachment (no local file). Extension allowed: xlsx, xls, ods, docx, docm, doc, csv, pdf, txt, gif, jpg, jpeg, png, tif, tiff, rtf, bmp, cgm, css, shtml, html, htm, zip, xml, ppt, pptx, tar, ez, ics, mobi, msg, pub and eps | [optional] 
 **attachment** | [**[SendEmailAttachment]**](SendEmailAttachment.md) | Pass the list of content (base64 encoded) and name of the attachment. For example, [{&#39;content&#39;:&#39;base64 encoded content 1&#39;, &#39;name&#39;:&#39;attcahment1&#39;}, {&#39;content&#39;:&#39;base64 encoded content 2&#39;, &#39;name&#39;:&#39;attcahment2&#39;}]. | [optional] 
-**headers** | **Object** | Pass the set of headers that shall be sent along the mail headers in the original email. &#39;X-Mailin-IP&#39; header can be set (only for dedicated ip users) to mention the IP to be used for sending transactional emails. For example, {&#39;Content-Type&#39;:&#39;text/html&#39;, &#39;charset&#39;:&#39;iso-8859-1&#39;, &#39;X-Mailin-IP&#39;:&#39;1.2.3.4&#39;} | [optional] 
+**headers** | **Object** | Pass the set of headers that shall be sent along the mail headers in the original email. &#39;sender.ip&#39; header can be set (only for dedicated ip users) to mention the IP to be used for sending transactional emails. For example, {&#39;Content-Type&#39;:&#39;text/html&#39;, &#39;charset&#39;:&#39;iso-8859-1&#39;, &#39;sender.ip&#39;:&#39;1.2.3.4&#39;} | [optional] 
 **attributes** | **Object** | Pass the set of attributes to customize the template. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;} | [optional] 
 **tags** | **[String]** | Tag your emails to find them more easily | [optional] 
 
diff --git a/docs/SendSmtpEmail.md b/docs/SendSmtpEmail.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **subject** | **String** | Subject of the message. Mandatory if &#39;templateId&#39; is not passed | [optional] 
 **replyTo** | [**SendSmtpEmailReplyTo**](SendSmtpEmailReplyTo.md) |  | [optional] 
 **attachment** | [**[SendSmtpEmailAttachment]**](SendSmtpEmailAttachment.md) | Pass the absolute URL (no local file) or the base64 content of the attachment along with the attachment name (Mandatory if attachment content is passed). For example, [{&#39;url&#39;:&#39;https://attachment.domain.com/myAttachmentFromUrl.jpg&#39;, &#39;name&#39;:&#39;My attachment 1&#39;}, {&#39;content&#39;:&#39;base64 exmaple content&#39;, &#39;name&#39;:&#39;My attachment 2&#39;}]. Allowed extensions for attachment file: xlsx, xls, ods, docx, docm, doc, csv, pdf, txt, gif, jpg, jpeg, png, tif, tiff, rtf, bmp, cgm, css, shtml, html, htm, zip, xml, ppt, pptx, tar, ez, ics, mobi, msg, pub and eps ( Ignored if &#39;templateId&#39; is passed ) | [optional] 
-**headers** | **Object** | Pass the set of headers that shall be sent along the mail headers in the original email. &#39;X-Mailin-IP&#39; header can be set (only for dedicated ip users) to mention the IP to be used for sending transactional emails. For example, {&#39;Content-Type&#39;:&#39;text/html&#39;, &#39;charset&#39;:&#39;iso-8859-1&#39;, &#39;X-Mailin-IP&#39;:&#39;1.2.3.4&#39;} | [optional] 
+**headers** | **Object** | Pass the set of headers that shall be sent along the mail headers in the original email. &#39;sender.ip&#39; header can be set (only for dedicated ip users) to mention the IP to be used for sending transactional emails. For example, {&#39;Content-Type&#39;:&#39;text/html&#39;, &#39;charset&#39;:&#39;iso-8859-1&#39;, &#39;sender.ip&#39;:&#39;1.2.3.4&#39;} | [optional] 
 **templateId** | **Number** | Id of the template | [optional] 
-**params** | **Object** | Pass the set of attributes to customize the template. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;}. | [optional] 
+**params** | **Object** | Pass the set of attributes to customize the template. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;}. It&#39;s considered only if template is in New Template Language format. | [optional] 
 **tags** | **[String]** | Tag your emails to find them more easily | [optional] 
 
 
diff --git a/docs/SendTransacSms.md b/docs/SendTransacSms.md
@@ -6,7 +6,7 @@ Name | Type | Description | Notes
 **sender** | **String** | Name of the sender. Only alphanumeric characters. No more than 11 characters | 
 **recipient** | **String** | Mobile number to send SMS with the country code | 
 **content** | **String** | Content of the message. If more than 160 characters long, will be sent as multiple text messages | 
-**type** | **String** | Type of the SMS | [optional] [default to &#39;transactional&#39;]
+**type** | **String** | Type of the SMS. Marketing SMS messages are those sent typically with marketing content. Transactional SMS messages are sent to individuals and are triggered in response to some action, such as a sign-up, purchase, etc. | [optional] [default to &#39;transactional&#39;]
 **tag** | **String** | Tag of the message | [optional] 
 **webUrl** | **String** | Webhook to call for each event triggered by the message (delivered etc.) | [optional] 
 
diff --git a/docs/UpdateEmailCampaign.md b/docs/UpdateEmailCampaign.md
@@ -20,6 +20,6 @@ Name | Type | Description | Notes
 **footer** | **String** | Footer of the email campaign | [optional] 
 **header** | **String** | Header of the email campaign | [optional] 
 **utmCampaign** | **String** | Customize the utm_campaign value. If this field is empty, the campaign name will be used. Only alphanumeric characters and spaces are allowed | [optional] 
-**params** | **Object** | Pass the set of attributes to customize the type &#39;classic&#39; campaign. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;}. | [optional] 
+**params** | **Object** | Pass the set of attributes to customize the type &#39;classic&#39; campaign. For example, {&#39;FNAME&#39;:&#39;Joe&#39;, &#39;LNAME&#39;:&#39;Doe&#39;}. The &#39;params&#39; field will get updated, only if the campaign is in New Template Language, else ignored. The New Template Language is dependent on the values of &#39;subject&#39;, &#39;htmlContent/htmlUrl&#39;, &#39;sender.name&#39; &amp; &#39;toField&#39; | [optional] 
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sib-api-v3-sdk",
-  "version": "7.0.3",
+  "version": "7.0.4",
   "description": "Official SendinBlue provided RESTFul API V3 nodejs library",
   "license": "ISC",
   "main": "src/index.js",
diff --git a/src/api/SMSCampaignsApi.js b/src/api/SMSCampaignsApi.js
@@ -212,6 +212,8 @@
      * Returns the informations for all your created SMS campaigns
      * @param {Object} opts Optional parameters
      * @param {module:model/String} opts.status Status of campaign.
+     * @param {Date} opts.startDate Mandatory if endDate is used. Starting (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either &#39;status&#39; not passed and if passed is set to &#39;sent&#39; )
+     * @param {Date} opts.endDate Mandatory if startDate is used. Ending (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either &#39;status&#39; not passed and if passed is set to &#39;sent&#39; )
      * @param {Number} opts.limit Number limitation for the result returned (default to 500)
      * @param {Number} opts.offset Beginning point in the list to retrieve from. (default to 0)
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/GetSmsCampaigns} and HTTP response
@@ -225,6 +227,8 @@
       };
       var queryParams = {
         'status': opts['status'],
+        'startDate': opts['startDate'],
+        'endDate': opts['endDate'],
         'limit': opts['limit'],
         'offset': opts['offset'],
       };
@@ -251,6 +255,8 @@
      * Returns the informations for all your created SMS campaigns
      * @param {Object} opts Optional parameters
      * @param {module:model/String} opts.status Status of campaign.
+     * @param {Date} opts.startDate Mandatory if endDate is used. Starting (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either &#39;status&#39; not passed and if passed is set to &#39;sent&#39; )
+     * @param {Date} opts.endDate Mandatory if startDate is used. Ending (urlencoded) UTC date-time (YYYY-MM-DDTHH:mm:ss.SSSZ) to filter the sent sms campaigns. Prefer to pass your timezone in date-time format for accurate result ( only available if either &#39;status&#39; not passed and if passed is set to &#39;sent&#39; )
      * @param {Number} opts.limit Number limitation for the result returned (default to 500)
      * @param {Number} opts.offset Beginning point in the list to retrieve from. (default to 0)
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/GetSmsCampaigns}
diff --git a/src/model/CreateEmailCampaign.js b/src/model/CreateEmailCampaign.js
@@ -243,7 +243,7 @@
    */
   exports.prototype['utmCampaign'] = undefined;
   /**
-   * Pass the set of attributes to customize the type classic campaign. For example, {'FNAME':'Joe', 'LNAME':'Doe'}. Only available if 'type' is 'classic'
+   * Pass the set of attributes to customize the type classic campaign. For example, {'FNAME':'Joe', 'LNAME':'Doe'}. Only available if 'type' is 'classic'. It's considered only if campaign is in New Template Language format. The New Template Language is dependent on the values of 'subject', 'htmlContent/htmlUrl', 'sender.name' & 'toField'
    * @member {Object} params
    */
   exports.prototype['params'] = undefined;
diff --git a/src/model/CreateSmsCampaign.js b/src/model/CreateSmsCampaign.js
@@ -46,13 +46,14 @@
    * @class
    * @param name {String} Name of the campaign
    * @param sender {String} Name of the sender. The number of characters is limited to 11
+   * @param content {String} Content of the message. The maximum characters used per SMS is 160, if used more than that, it will be counted as more than one SMS
    */
-  var exports = function(name, sender) {
+  var exports = function(name, sender, content) {
     var _this = this;
 
     _this['name'] = name;
     _this['sender'] = sender;
-
+    _this['content'] = content;
 
 
   };
diff --git a/src/model/CreateSmsCampaignRecipients.js b/src/model/CreateSmsCampaignRecipients.js
@@ -45,13 +45,12 @@
    * @alias module:model/CreateSmsCampaignRecipients
    * @class
    * @param listIds {Array.<Number>} Lists Ids to send the campaign to. REQUIRED if scheduledAt is not empty
-   * @param exclusionListIds {Array.<Number>} List ids which have to be excluded from a campaign
    */
-  var exports = function(listIds, exclusionListIds) {
+  var exports = function(listIds) {
     var _this = this;
 
     _this['listIds'] = listIds;
-    _this['exclusionListIds'] = exclusionListIds;
+
   };
 
   /**
diff --git a/src/model/GetAggregatedReport.js b/src/model/GetAggregatedReport.js
@@ -56,8 +56,9 @@
    * @param spamReports {Number} Number of complaint (spam report) for the timeframe
    * @param blocked {Number} Number of blocked contact emails for the timeframe
    * @param invalid {Number} Number of invalid emails for the timeframe
+   * @param unsubscribed {Number} Number of unsubscribed emails for the timeframe
    */
-  var exports = function(range, requests, delivered, hardBounces, softBounces, clicks, uniqueClicks, opens, uniqueOpens, spamReports, blocked, invalid) {
+  var exports = function(range, requests, delivered, hardBounces, softBounces, clicks, uniqueClicks, opens, uniqueOpens, spamReports, blocked, invalid, unsubscribed) {
     var _this = this;
 
     _this['range'] = range;
@@ -72,6 +73,7 @@
     _this['spamReports'] = spamReports;
     _this['blocked'] = blocked;
     _this['invalid'] = invalid;
+    _this['unsubscribed'] = unsubscribed;
   };
 
   /**
@@ -121,6 +123,9 @@
       if (data.hasOwnProperty('invalid')) {
         obj['invalid'] = ApiClient.convertToType(data['invalid'], 'Number');
       }
+      if (data.hasOwnProperty('unsubscribed')) {
+        obj['unsubscribed'] = ApiClient.convertToType(data['unsubscribed'], 'Number');
+      }
     }
     return obj;
   }
@@ -185,6 +190,11 @@
    * @member {Number} invalid
    */
   exports.prototype['invalid'] = undefined;
+  /**
+   * Number of unsubscribed emails for the timeframe
+   * @member {Number} unsubscribed
+   */
+  exports.prototype['unsubscribed'] = undefined;
 
 
 
diff --git a/src/model/GetEmailEventReportEvents.js b/src/model/GetEmailEventReportEvents.js
@@ -221,7 +221,12 @@
      * value: "blocked"
      * @const
      */
-    "blocked": "blocked"  };
+    "blocked": "blocked",
+    /**
+     * value: "unsubscribed"
+     * @const
+     */
+    "unsubscribed": "unsubscribed"  };
 
 
   return exports;
diff --git a/src/model/GetReportsReports.js b/src/model/GetReportsReports.js
@@ -56,8 +56,9 @@
    * @param spamReports {Number} Number of complaints (spam reports) for the date
    * @param blocked {Number} Number of blocked emails for the date
    * @param invalid {Number} Number of invalid emails for the date
+   * @param unsubscribed {Number} Number of unsubscribed emails for the date
    */
-  var exports = function(_date, requests, delivered, hardBounces, softBounces, clicks, uniqueClicks, opens, uniqueOpens, spamReports, blocked, invalid) {
+  var exports = function(_date, requests, delivered, hardBounces, softBounces, clicks, uniqueClicks, opens, uniqueOpens, spamReports, blocked, invalid, unsubscribed) {
     var _this = this;
 
     _this['date'] = _date;
@@ -72,6 +73,7 @@
     _this['spamReports'] = spamReports;
     _this['blocked'] = blocked;
     _this['invalid'] = invalid;
+    _this['unsubscribed'] = unsubscribed;
   };
 
   /**
@@ -121,6 +123,9 @@
       if (data.hasOwnProperty('invalid')) {
         obj['invalid'] = ApiClient.convertToType(data['invalid'], 'Number');
       }
+      if (data.hasOwnProperty('unsubscribed')) {
+        obj['unsubscribed'] = ApiClient.convertToType(data['unsubscribed'], 'Number');
+      }
     }
     return obj;
   }
@@ -185,6 +190,11 @@
    * @member {Number} invalid
    */
   exports.prototype['invalid'] = undefined;
+  /**
+   * Number of unsubscribed emails for the date
+   * @member {Number} unsubscribed
+   */
+  exports.prototype['unsubscribed'] = undefined;
 
 
 
diff --git a/src/model/GetSmsCampaign.js b/src/model/GetSmsCampaign.js
diff --git a/src/model/GetSmsCampaignOverview.js b/src/model/GetSmsCampaignOverview.js
diff --git a/src/model/SendEmail.js b/src/model/SendEmail.js
diff --git a/src/model/SendSmtpEmail.js b/src/model/SendSmtpEmail.js
diff --git a/src/model/SendTransacSms.js b/src/model/SendTransacSms.js
diff --git a/src/model/UpdateEmailCampaign.js b/src/model/UpdateEmailCampaign.js
diff --git a/test/model/GetAggregatedReport.spec.js b/test/model/GetAggregatedReport.spec.js
diff --git a/test/model/GetReportsReports.spec.js b/test/model/GetReportsReports.spec.js
diff --git a/test/model/GetSmsCampaignOverview.spec.js b/test/model/GetSmsCampaignOverview.spec.js

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ Name \| Type \| Description \| Notes`
`41`	`41`
`42`	`42`	* `blocked` (value: `"blocked"`)
`43`	`43`
	`44`	+* `unsubscribed` (value: `"unsubscribed"`)
	`45`	`+`
`44`	`46`
`45`	`47`
`46`	`48`