Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00
Code Issues Releases Activity

Merge pull request #9214 from turbo124/v5-develop

Browse Source 
Send users to overview page instead of edit for React
This commit is contained in:
David Bomba 2024-01-30 15:31:05 +11:00 committed by GitHub
commit 40dbaeedba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ class SearchController extends Controller
'name' => $client->present()->name(), 'name' => $client->present()->name(),
'type' => '/client', 'type' => '/client',
'id' => $client->hashed_id, 'id' => $client->hashed_id,
'path' => "/clients/{$client->hashed_id}/edit" 'path' => "/clients/{$client->hashed_id}"
]; ];
$client->contacts->each(function ($contact) { $client->contacts->each(function ($contact) {

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

@ -59,6 +59,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)) {
nlog("company disabled - or - contact email not found");
return; return;
} }

3
app/Listeners/Invoice/InvoiceEmailFailedActivity.php
View File

@ -58,7 +58,8 @@ class InvoiceEmailFailedActivity implements ShouldQueue
$fields->client_contact_id = $event->invitation->client_contact_id; $fields->client_contact_id = $event->invitation->client_contact_id;
$fields->company_id = $event->invitation->invoice->company_id; $fields->company_id = $event->invitation->invoice->company_id;
$fields->activity_type_id = Activity::EMAIL_INVOICE_FAILED; $fields->activity_type_id = Activity::EMAIL_INVOICE_FAILED;
$fields->notes = $event->message ?? '';
$this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars); $this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars);
} }
} }

9
app/Listeners/Invoice/InvoiceFailedEmailNotification.php
View File

@ -11,10 +11,11 @@
namespace App\Listeners\Invoice; namespace App\Listeners\Invoice;
use App\Libraries\MultiDB;
use App\Jobs\Mail\NinjaMailer; use App\Jobs\Mail\NinjaMailer;
use App\Jobs\Mail\NinjaMailerJob; use App\Jobs\Mail\NinjaMailerJob;
use App\Jobs\Mail\NinjaMailerObject; use App\Jobs\Mail\NinjaMailerObject;
use App\Libraries\MultiDB; use Illuminate\Support\Facades\Cache;
use App\Mail\Admin\EntityFailedSendObject; use App\Mail\Admin\EntityFailedSendObject;
use App\Utils\Traits\Notifications\UserNotifies; use App\Utils\Traits\Notifications\UserNotifies;
@ -36,7 +37,8 @@ class InvoiceFailedEmailNotification
{ {
MultiDB::setDb($event->company->db); MultiDB::setDb($event->company->db);
$first_notification_sent = true; if(Cache::has("invoice_failed_email_notification_{$event->invitation->key}"))
return;
$invoice = $event->invitation->invoice; $invoice = $event->invitation->invoice;
@ -58,8 +60,9 @@ class InvoiceFailedEmailNotification
$nmo = null; $nmo = null;
$first_notification_sent = false;
} }
} }
Cache::put("invoice_failed_email_notification_{$event->invitation->key}", true, 60 * 60);
} }
} }