Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 08:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for reminder activities

Browse Source
This commit is contained in:
David Bomba 2023-05-17 09:32:23 +10:00
parent fde5e28cb1
commit 4e8c603d3a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Company/CreateCompany.php
View File

@ -152,7 +152,7 @@ class CreateCompany
$company->save(); $company->save();
$user = $company->account->users()->first(); $user = $this->account->users()->orderBy('id','asc')->first();
$tax_rate = TaxRateFactory::create($company->id, $user->id); $tax_rate = TaxRateFactory::create($company->id, $user->id);
$tax_rate->name = $company->tax_data->regions->EU->subregions->ES->tax_name; $tax_rate->name = $company->tax_data->regions->EU->subregions->ES->tax_name;

11
app/Listeners/Invoice/InvoiceReminderEmailActivity.php
View File

@ -46,12 +46,21 @@ class InvoiceReminderEmailActivity implements ShouldQueue
$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id; $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
$reminder = match($event->template){
'reminder1' => 63,
'reminder2' => 64,
'reminder3' => 65,
'reminder_endless' => 66,
'endless_reminder' => 66,
default => 6,
};
$fields->user_id = $user_id; $fields->user_id = $user_id;
$fields->invoice_id = $event->invitation->invoice_id; $fields->invoice_id = $event->invitation->invoice_id;
$fields->company_id = $event->invitation->company_id; $fields->company_id = $event->invitation->company_id;
$fields->client_contact_id = $event->invitation->client_contact_id; $fields->client_contact_id = $event->invitation->client_contact_id;
$fields->client_id = $event->invitation->invoice->client_id; $fields->client_id = $event->invitation->invoice->client_id;
$fields->activity_type_id = $event->reminder; $fields->activity_type_id = $reminder;
$this->activity_repo->save($fields, $event->invitation, $event->event_vars); $this->activity_repo->save($fields, $event->invitation, $event->event_vars);
} }

2
app/Models/Invoice.php
View File

@ -824,7 +824,7 @@ class Invoice extends BaseModel
case 'custom1': case 'custom1':
case 'custom2': case 'custom2':
case 'custom3': case 'custom3':
event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), $template)); event(new InvoiceWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), $template));
break; break;
default: default:
// code... // code...