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

Fix for tests

Browse Source
This commit is contained in:
Hillel Coren 2016-06-07 14:39:53 +03:00
parent 1e837c2368
commit f4fcc81871
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Ninja/Mailers/UserMailer.php
View File

@ -36,10 +36,10 @@ class UserMailer extends Mailer
public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null) public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null)
{ {
if (!$user->email) { if (! $user->email || $user->cannot('view', $invoice)) {
return; return;
} }
$entityType = $invoice->getEntityType(); $entityType = $invoice->getEntityType();
$view = ($notificationType == 'approved' ? ENTITY_QUOTE : ENTITY_INVOICE) . "_{$notificationType}"; $view = ($notificationType == 'approved' ? ENTITY_QUOTE : ENTITY_INVOICE) . "_{$notificationType}";
$account = $user->account; $account = $user->account;
@ -65,7 +65,7 @@ class UserMailer extends Mailer
'invoice' => $invoice->invoice_number, 'invoice' => $invoice->invoice_number,
'client' => $client->getDisplayName() 'client' => $client->getDisplayName()
]); ]);
$this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);
} }
@ -89,7 +89,7 @@ class UserMailer extends Mailer
'contactName' => $invitation->contact->getDisplayName(), 'contactName' => $invitation->contact->getDisplayName(),
'invoiceNumber' => $invoice->invoice_number, 'invoiceNumber' => $invoice->invoice_number,
]; ];
$this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);
} }
} }

1
database/seeds/UserTableSeeder.php
View File

@ -42,6 +42,7 @@ class UserTableSeeder extends Seeder
'primary_color' => $faker->hexcolor, 'primary_color' => $faker->hexcolor,
'timezone_id' => 1, 'timezone_id' => 1,
'company_id' => $company->id, 'company_id' => $company->id,
'is_admin' => 1,
]); ]);
$user = User::create([ $user = User::create([