deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added schedule:list, fixed traffic import service, fixed invoice generation with charges and credit amounts

Browse Source
This commit is contained in:
Deon George
2020-05-29 14:10:10 +10:00
parent 7f1681f0b7
commit 121aa5b31c
6 changed files with 67 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Classes/External/Supplier.php vendored
View File

@@ -40,7 +40,7 @@ abstract class Supplier
'query'=>[
$this->login_user_field=>$this->o->stats_username,
$this->login_pass_field=>$this->o->stats_password,
$this->date_field=>$this->o->stats_lastupdate,
$this->date_field=>$this->o->stats_lastupdate->format('Y-m-d'),
],
/*
'headers' => [
@@ -52,7 +52,7 @@ abstract class Supplier
$api_remain = Arr::get($result->getHeader('X-RateLimit-Remaining'),0);
$api_reset = Arr::get($result->getHeader('X-RateLimit-Reset'),0);
if ($api_remain == 0) {
if ($api_remain === 0 AND $api_reset) {
Log::error('API Throttle.',['m'=>__METHOD__]);
Cache::put('api_throttle',$api_reset,now()->addSeconds($api_reset));
}
@@ -86,7 +86,7 @@ abstract class Supplier
$this->_columns = $expect;
if ($this->_columns->diff($fields)->count()) {
abort('500','Missing columns in data: '.join('|',$this->_columns->diff($fields)->toArray()));
abort('500','Missing columns in data: '.join('|',$this->_columns->diff($fields)->toArray()).' got: '.join('|',$fields));
}
return $fields->intersect($this->_columns);