Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 22:24:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes for autobill invoice

Browse Source
This commit is contained in:
David Bomba 2020-07-13 08:28:19 +10:00
parent baf5f8f479
commit 0cd3b6925e
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/QueryLogging.php
View File

@ -51,7 +51,7 @@ class QueryLogging
// Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time); // Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
//if($count > 10) //if($count > 10)
Log::info($queries); // Log::info($queries);
} }
} }

31
app/Services/Invoice/AutoBillInvoice.php
View File

@ -44,8 +44,12 @@ class AutoBillInvoice extends AbstractService
if($this->invoice->balance > 0) if($this->invoice->balance > 0)
$gateway_token = $this->getGateway($this->invoice->balance); $gateway_token = $this->getGateway($this->invoice->balance);
else
return $this->invoice->service()->markPaid()->save(); // else
// return $this->invoice->service()->markPaid()->save();
if(!$gateway_token)
return $this->invoice;
$fee = $gateway_token->gateway->calcGatewayFee($this->invoice->balance); $fee = $gateway_token->gateway->calcGatewayFee($this->invoice->balance);
@ -60,13 +64,28 @@ class AutoBillInvoice extends AbstractService
private function getGateway($amount) private function getGateway($amount)
{ {
$gateway_tokens = $this->client->gateway_tokens()->orderBy('is_default', 'DESC'); // $gateway_tokens = $this->client->gateway_tokens()->orderBy('is_default', 'DESC');
return $gateway_tokens->filter(function ($token) use ($amount){ // return $gateway_tokens->filter(function ($token) use ($amount){
return $this->validGatewayLimits($token, $amount); // return $this->validGatewayLimits($token, $amount);
})->all()->first(); // })->all()->first();
$gateway_tokens = $this->client->gateway_tokens()->orderBy('is_default', 'DESC')->get();
foreach($gateway_tokens as $gateway_token)
{
if($this->validGatewayLimits($gateway_token, $amount))
return $gateway_token;
}
// return collect($gateway_tokens)->filter(function ($token) use ($amount){
// return $this->validGatewayLimits($token, $amount);
// })->first();
} }