Merge pull request #1284 from concur/preview

Livesite merge

api-reference/authentication/apidoc.markdown

@@ -316,7 +316,7 @@ With this grant, the user has two authentication options:
 
 With both options, once the user is successfully authenticated and the user authorizes your application, the user will be redirected to the redirect_URI specified in the initial /authorize call with a temporary token appended.
 
-`<redirect_uri>?cc=<token>`
+`<redirect_uri>?geolocation=<token_geolocation>&cc=<token>`
 
 *If the user is not successfully authenticated or does not authorize the scopes for your application, an error code and description will be appended to the redirect URI. Please refer to the [Response Codes](#response_codes) section for more information.*
 

api-reference/authentication/company-auth.markdown

@@ -78,6 +78,7 @@ client_id=your-client_id
 &grant_type=password
 &username=<companyId>
 &password=<authtoken>
+&credtype=authtoken
 ```
 
 **Response**

api-reference/authentication/get-users31.markdown

@@ -78,6 +78,7 @@ successful call, responds with
       "PrimaryEmail": "johndoe@gmail.com",
       "EmployeeID": "johndoe@gmail.com",
       "ID": "99BFFFC3-C0BE-44FF-A441-AE1FFFFFF75B8",
+      "Emails": ["PrimaryEmail", "VerifiedEmail", "email2", "email3", "email4", "email5"],
       "OrganizationUnit": null,
       "MiddleName": "",
       "LastName": "Doe",
@@ -91,6 +92,7 @@ successful call, responds with
       "PrimaryEmail": "janedoe@gmail.com",
       "EmployeeID": "janedoe@gmail.com",
       "ID": "55FFF504-C7B8-49FF-9E15-6248FFFFFCDB",
+      "Emails": ["PrimaryEmail", "VerifiedEmail", "email2", "email3", "email4", "email5"],
       "OrganizationUnit": null,
       "MiddleName": "",
       "LastName": "Doe",

api-reference/direct-connects/hotel-service-2/Error-handling.markdown

@@ -5,8 +5,8 @@ layout: reference
 
 ## Errors
 
-Concur is able to handle HTTP errors, but the preference is for the supplier to return an OTA error whenever possible.  Concur only ever expects one OTA error per message.  Any extra errors will be ignored. 
-Currently OTA Warnings are not supported and will be ignored. 
+Concur is able to handle HTTP errors, but the preference is for the supplier to return an OTA error whenever possible.  Concur only ever expects one OTA error per message.  Any extra errors will be ignored.
+Currently OTA Warnings are not supported and will be ignored.
 
 If the error is specifically related to application level errors, please do not respond with any other error types (HTTP etc.). If you have server level issues, then it is OK to respond with HTTP standard error codes.
 
@@ -21,14 +21,14 @@ Errors should always be returned in a response. For example:
 			EchoToken="11111111-2222-3333-4444-555555555555" PrimaryLangID="en"
 			Version="4">
 			<Errors>
-				<Error Code="322" ShortText="No availability" Type="13"</Error>
+				<Error Code="322" ShortText="No availability" Type="13"></Error>
 			</Errors>
 		</OTA_HotelSearchRS>
 	</soap:Body>
 </soap:Envelope>
 ```
 
-If an error is present in any message, then the content of that message is discarded and only the error element is processed. Any text from the supplier will be logged and a Concur message will be displayed to the user.  Currently Concur does not support displaying of supplier generated errors directly in the UI.  Concur only uses the very first Error that is returned, therefore any excess Error elements are dropped.  Any Errors without a Type attribute will automatically be treated as '1' meaning Unknown.  See the Error Types table below. 
+If an error is present in any message, then the content of that message is discarded and only the error element is processed. Any text from the supplier will be logged and a Concur message will be displayed to the user.  Currently Concur does not support displaying of supplier generated errors directly in the UI.  Concur only uses the very first Error that is returned, therefore any excess Error elements are dropped.  Any Errors without a Type attribute will automatically be treated as '1' meaning Unknown.  See the Error Types table below.
 
 | Element | Required | Data Type | Description |
 |---------|----------|-----------|-------------|
@@ -57,7 +57,7 @@ Concur supports the following Error Type Codes in any of the responses:
 | Code | Name              | Description |
 |------|-------------------|-------------|
 | 1    | Unknown           | Indicates an unknown error. |
-| 2    | No implementation | Indicates that the target business system has no implementation for the intended request. | 
+| 2    | No implementation | Indicates that the target business system has no implementation for the intended request. |
 | 13   | Application error | Indicates that an involved back-end application returned an error which is passed back in the response message. |
 
 **Note:** The OTA Error-Type code of 4 - Authentication (Indicates the message lacks adequate security credentials.) is not expected by Concur.  For all authentication errors Concur expects an HTTP 403.
@@ -89,9 +89,3 @@ Concur expects the following Errors under the given Error Types:
 | 748        | Invalid corporate ID                        | Requestor ID should be provided in ShortText. |
 | 400        | Invalid property code                       | List of comma separated Hotel Codes should be provided in ShortText. Example: "HTL4444,HTL5555" |
 | 385        | Invalid confirmation or cancellation number | Reservation ID should be provided in ShortText. |
-
-
-
-
-
-

api-reference/direct-connects/hotel-service-2/Reservation.markdown

@@ -8,7 +8,7 @@ layout: reference
 Message to reserve a hotel.
 
 
-| SOAPAction | OTA name | Message structure | 
+| SOAPAction | OTA name | Message structure |
 |------------|----------|-------------------|
 | book       | HotelRes | OTA_HotelResRQ |
 
@@ -29,7 +29,7 @@ Message to reserve a hotel.
 |---------------|----------|-----------|-------------|
 | RoomStays     | Y        | Complex   | A reference to identify the booking. |
 | ResGuests     | Y        | Complex   | List of Guests.  Concur only supports one guest. |
-| ResGlobalInfo | N        | Complex   | Contains various information that affects the Reservation as a whole, typically list of reward programs (see Memberships). |
+| ResGlobalInfo | N        | Complex   | Contains various information that affects the Reservation as a whole, typically list of reward programs (see Memberships) or itinerary remarks (see Comments). |
 
 
 **RoomStays**
@@ -77,6 +77,7 @@ Message to reserve a hotel.
 | CardType       | Y        | StringLength1to32 | something |
 | CardHolderName | Y        | StringLength1to32 | The name on the card |
 | CardNumber     | Y        | Complex           | The Card Number |
+| Address        | Y        | Complex           | Refer to Address in Search |
 
 
 **CardNumber**
@@ -166,16 +167,19 @@ Message to reserve a hotel.
 
 **ResGlobalInfo**
 
+**Note:** This structure is used in both request and response. Different elements are used in each of them.
+
 | Element     | Required | Data Type | Description |
 |-------------|----------|-----------|-------------|
-| Memberships | N        | Complex   | A collection of Memberships, provides a list of reward programs like e.g. loyalty cards. |
+| Memberships | N        | Complex   | (request only) A collection of Memberships, provides a list of reward programs like e.g. loyalty cards. |
+| Comments    | N        | Complex   | (response only) A collection of Comments, provides a list of arbitrary reservation comments like e.g. modification code. |
 
 
 **Memberships**
 
 | Element    | Required | Data Type | Description |
 |------------|----------|-----------|-------------|
-| Membership | N        | Complex   | A recurring element that identifies the type of reward program and customer's identification number for this program. |
+| Membership | N        | Complex   | A recurring element that identifies the type of reservation comment. |
 
 
 **Membership**
@@ -185,6 +189,18 @@ Message to reserve a hotel.
 | *ProgramCode* | Y        | StringLength1to32 | The code or name of the reward program (e.g. "HotelLoyaltyProgram"). |
 | *AccountID*   | Y        | StringLength1to64 | The account identification number for this particular member in this particular program. |
 
+**Comments**
+
+| Element    | Required | Data Type | Description |
+|------------|----------|-----------|-------------|
+| Comment | N        | Complex   | A recurring element that carries reservation comment. Up to 9 Comment elements. |
+
+**Comment**
+
+| Element       | Required | Data Type         | Description |
+|---------------|----------|-------------------|-------------|
+| *Name*        | N        | StringLength1to64 | Attribute containing comment title. |
+| *Text*        | Y        | string            | Comment payload. Up to 3 Text elements in the comment. Up to 200 characters in the Text. |
 
 ### TPA Extensions
 
@@ -257,4 +273,3 @@ Message to reserve a hotel.
 | Element   | Required | Data Type | Description |
 |-----------|----------|-----------|-------------|
 | RatePlans | Y        | Complex   | something |
-

api-reference/direct-connects/hotel-service-2/Search.markdown

@@ -142,7 +142,7 @@ The radius element is used along with the Hotel Preference to categorize the sea
 
 | Element       | Required | Data Type | Description |
 |---------------|----------|-----------|-------------|
-| ContactNumber | N        | Complex   | Element which contains the ContactNumber. Concur only excepts 1 ContactNumber element. |
+| ContactNumber | N        | Complex   | Element which contains the ContactNumber. Concur only accepts one (first) ContactNumber of each supported type. |
 
 
 **ContactNumber**
@@ -151,7 +151,7 @@ The radius element is used along with the Hotel Preference to categorize the sea
 |-------------------|----------|-------------------|-------------|
 | CountryAccessCode | N        | StringLength1to32 | The Country code. |
 | PhoneNumber       | Y        | StringLength1to32 | The phone number. |
-| PhoneTechType     | N        | String            | Concur currently only supports a PhoneTechType set to "1" **to be removed** |
+| PhoneTechType     | N        | String            | Concur currently only supports a PhoneTechType set to "1" (phone) or "3" (fax). You can omit this field only in case you are providing one contact number. Anyway, we suggest to fill the type in all cases, it may become mandatory in the future. |
 
 
 **Award**

api-reference/index.markdown

@@ -10,7 +10,7 @@ redirect_from:
 
 If you’re new to the Concur APIs, follow these steps to make your first API call and try some of our APIs.  For App Center Partners, this overview lets you know what to expect during Development, Certification, and Support: 
 
-Enterprise B2B apps: <https://prezi.com/p/lw0qqy51zcmd/> (this does not pertain to a Triplink app integration)
+Enterprise (B2B apps): <https://prezi.com/p/lw0qqy51zcmd/> (this does not pertain to a Triplink app integration)
 
 eReceipt apps (B2C apps): <https://prezi.com/p/ur2i1m8thynz/> (this does not pertain to a Triplink app integration)
 

manage-apps/go-to-market.html

@@ -118,9 +118,9 @@ <h2>Marketing Support</h2>
                           </a>
                         </p>
                         <p>Dial-in information:<br>
-                           Toll-free: +1-866-668-0721<br>
+                           Toll-free: +1-866-668-0721 (US)<br>
                            PIN: 595-125-5429<br>
-                           <a class="btn white" href="https://www.tcconline.com/listNumbersByCode.action?confCode=3608516019" target="_blank">View Global Numbers</a>
+                           <a class="btn white" href="https://www.tcconline.com/listNumbersByCode.action?confCode=5951255429" target="_blank">View Global Numbers</a>
                         </p>
                         <p>
                           <a class="btn white" href="mailto:AppCenterMarketing@concur.com" onClick="ga('send', 'event', 'Email', 'Send', 'mailto:AppCenterMarketing@concur.com', {nonInteraction: true});">

tools-support/release-notes/index.markdown

@@ -36,7 +36,7 @@ layout: reference
 | [September](AppCenter_ReleaseNotes_September 2017_DRAFT.docx) | [September](AppCenter_ReleaseNotes_Sept 2016_FINAL.pdf) | [September](AppCenter_ReleaseNotes_Sept2015FINAL.pdf) | [September][1-5] |
 | [October](AppCenter_ReleaseNotes_October 2017_DRAFT.pdf) | [October](AppCenter_ReleaseNotes_Oct 2016_FINAL.pdf) | [October](AppCenter_ReleaseNotes_Oct2015FINAL_10_16_15.pdf) | [October][1-6] |
 | -- | [November](AppCenter_ReleaseNotes_Nov 2016_FINAL.pdf) | -- | [November][1-7] |
-| -- | [December](AppCenter_ReleaseNotes_Dec 2016_FINAL.pdf) | [December](AppCenter_ReleaseNotes_December2015FINAL.pdf) | [December][1-8] |
+| [December](AppCenter_ReleaseNotes_December 2017_Final.pdf) | [December](AppCenter_ReleaseNotes_Dec 2016_FINAL.pdf) | [December](AppCenter_ReleaseNotes_December2015FINAL.pdf) | [December][1-8] |
 
 
 # Combined App Center and Developer Platform Release Notes