Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kg-bot committed Oct 3, 2019
2 parents 5cdf861 + bdffafa commit eb2aa8c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/Builders/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(Request $request )
*/
public function get($filters = [] )
{
$filters[] = [ 'limit', '=', 1500 ];
$filters[] = [ 'limit', '=', 1000 ];

$urlFilters = $this->parseFilters( $filters );

Expand Down Expand Up @@ -102,7 +102,7 @@ public function all($filters = [] )

$response = function ( $filters, $page ) {

$filters[] = [ 'limit', '=', 1500 ];
$filters[] = [ 'limit', '=', 1000 ];
$filters[] = [ 'page', '=', $page ];

$urlFilters = $this->parseFilters( $filters );
Expand Down Expand Up @@ -185,4 +185,4 @@ public function setEntity( $new_entity )

return $this->entity;
}
}
}
9 changes: 5 additions & 4 deletions src/Utils/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ public function __construct( $token = null, $options = [], $headers = [] )
{
$token = $token ?? config( 'rackbeat.token' );
$headers = array_merge( $headers, [

'Accept' => 'application/json',
'Content-Type' => 'application/json',

'User-Agent' => config('rackbeat.user_agent'),
'Accept' => 'application/json; charset=utf8',
'Content-Type' => 'application/json; charset=utf8',
'Authorization' => 'Bearer ' . $token,
] );
$options = array_merge( $options, [
Expand Down Expand Up @@ -92,4 +93,4 @@ public function handleWithExceptions( $callback )
throw new RackbeatClientException( $message, $code );
}
}
}
}
3 changes: 2 additions & 1 deletion src/config/rackbeat.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
return [

'token' => env( 'RACKBEAT_API_TOKEN' ),
'user_agent' => env('RACKBEAT_USER_AGENT', 'kg-bot/laravel-rackbeat')
'supplier' => [

'fields' => [
Expand All @@ -20,4 +21,4 @@
],
],
'base_uri' => env( 'RACKBEAT_BASE_URL', 'https://app.rackbeat.com/api/' ),
];
];

0 comments on commit eb2aa8c

Please sign in to comment.