Skip to content

Commit 9e18f88

Browse files
committed
Correcting merge conflicts
1 parent 560e552 commit 9e18f88

File tree

1 file changed

+8
-46
lines changed

1 file changed

+8
-46
lines changed

README.md

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,14 @@ $ composer install
4444
require 'vendor/autoload.php';
4545
```
4646
Now the needed code should be available within your project. At the top of your PHP script require the autoloader, if you are using a MVC such as CodeIgnitor or Laravel review their autoload guides.
47-
Obtain API credintials [https://{your-company}.checkfront.com/manage/developer/](https://{your-company}.checkfront.com/manage/developer/)
4847

48+
**API credintials:** [https://{your-company}.checkfront.com/manage/developer/](https://{your-company}.checkfront.com/manage/developer/)
4949

5050

51-
---
52-
5351
> The repo example files are a good place to start.
5452
5553
```shell
56-
PHP-SDK # → Root of Service
54+
PHP-SDK # → Root of Service
5755
└── examples/
5856
└── cart
5957
├── Cart.php # → Main wrapper class, ADD API KEY
@@ -64,7 +62,6 @@ PHP-SDK # → Root of Service
6462
```
6563

6664
#### OAuth2 Access
67-
6865
```php
6966
<?php
7067
$Checkfront = new Checkfront(
@@ -77,50 +74,23 @@ $Checkfront = new Checkfront(
7774
?>
7875
```
7976

80-
#### Token Access
81-
82-
##### OAuth2 Access
83-
84-
```php
85-
<?
86-
$Checkfront = new Checkfront(
87-
array(
88-
'host'=>'your-company.checkfront.com',
89-
'consumer_key' => '5010076404ec1809470508',
90-
'consumer_secret' => 'ba0a5c0c509445024c374fcd264d41e816b02d4e',
91-
'redirect_uri'=>'oob',
92-
)
93-
);
94-
?>
95-
```
9677

97-
##### Token Access
78+
#### Token Access
9879

9980
```php
10081
<?php
10182
$Checkfront = new Checkfront(
102-
<<<<<<< HEAD
10383
array(
104-
'host'=>'your-company.checkfront.com',
84+
'host' => 'your-company.checkfront.com',
10585
'auth_type' => 'token',
106-
'api_key' => '5010076404ec1809470508',
86+
'api_key' => '5010076404ec1809470508',
10787
'api_secret' => 'ba0a5c0c509445024c374fcd264d41e816b02d4e',
10888
));
109-
=======
110-
array(
111-
'host'=>'your-company.checkfront.com',
112-
'auth_type' => 'token',
113-
'api_key' => '5010076404ec1809470508',
114-
'api_secret' => 'ba0a5c0c509445024c374fcd264d41e816b02d4e',
115-
)
116-
);
117-
>>>>>>> 04fe00c... Update README.md
11889
?>
11990
```
12091

12192
#### PHP Examples
12293
```php
123-
<<<<<<< HEAD
12494
<?php
12595
// Get items rates and availbility
12696
$items = $Checkfront->get('item',array(
@@ -130,30 +100,22 @@ $items = $Checkfront->get('item',array(
130100

131101
print_r( $items );
132102

133-
// fetch all bookings
103+
// Fetch all bookings
134104
public function query_booking()
135105
{
136106
$response = $this->Checkfront->get('booking/index');
137107
return $response;
138108
}
139109

140110
print_r(query_booking() );
141-
=======
142-
<?
143-
/* Get items rates and availbility*/
144-
$Checkfront->get('item',array(
145-
'start_date'=>date('Y-m-d'),
146-
'end_date'=>date('Y-m-d',strtotime('+3 days'))
147-
));
148-
>>>>>>> 04fe00c... Update README.md
149111
?>
150112
```
151113

152-
---
114+
153115

154116
Notifications via Checkfront API
155117
===
156-
Send reminders to guests as they arrive with details and directions. Send a thank you message when they jet home.
118+
Send reminders to guests as they arrive with details and directions. Send a follow-up thank you message as your guests jet home.
157119

158120
## Overview
159121
Traveling to new areas requires planning for the unexpected and help from trusted travel partners. Have tips and maps sent to your guests a day before they arrive via email or text message.

0 commit comments

Comments
 (0)