Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 23:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9213 from turbo124/v5-develop

Browse Source 
v5.8.19
This commit is contained in:
David Bomba 2024-01-30 13:28:08 +11:00 committed by GitHub
commit aa954b466e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.18 5.8.19

2
app/Http/Controllers/PaymentController.php
View File

@ -520,7 +520,7 @@ class PaymentController extends BaseController
if($action == 'template' && $user->can('view', $payments->first())) { if($action == 'template' && $user->can('view', $payments->first())) {
$hash_or_response = request()->boolean('send_email') ? 'email sent' : \Illuminate\Support\Str::uuid(); $hash_or_response = request()->boolean('send_email') ? 'email sent' : \Illuminate\Support\Str::uuid();
nlog($payments->pluck('hashed_id')->toArray());
TemplateAction::dispatch( TemplateAction::dispatch(
$payments->pluck('hashed_id')->toArray(), $payments->pluck('hashed_id')->toArray(),
$request->template_id, $request->template_id,

2
app/Jobs/Payment/EmailPayment.php
View File

@ -58,7 +58,7 @@ class EmailPayment implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
if ($this->company->is_disabled || ($this->contact->email ?? false)) { if ($this->company->is_disabled || (!$this->contact->email ?? false)) {
return; return;
} }

5
app/Services/Payment/PaymentService.php
View File

@ -21,11 +21,8 @@ class PaymentService
{ {
use MakesHash; use MakesHash;
private $payment; public function __construct(public Payment $payment)
public function __construct($payment)
{ {
$this->payment = $payment;
} }
public function manualPayment($invoice): ?Payment public function manualPayment($invoice): ?Payment

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.8.18'), 'app_version' => env('APP_VERSION', '5.8.19'),
'app_tag' => env('APP_TAG', '5.8.18'), 'app_tag' => env('APP_TAG', '5.8.19'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),