From 5489ade5ff7fec64603c129422aab602b979273a Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 7 Jun 2016 14:40:54 +0300 Subject: [PATCH] Fix for tests --- app/Ninja/Mailers/UserMailer.php | 8 ++++---- database/seeds/UserTableSeeder.php | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/Ninja/Mailers/UserMailer.php b/app/Ninja/Mailers/UserMailer.php index b08d50d7838f..0435a9af62d1 100644 --- a/app/Ninja/Mailers/UserMailer.php +++ b/app/Ninja/Mailers/UserMailer.php @@ -36,10 +36,10 @@ class UserMailer extends Mailer public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null) { - if (!$user->email) { + if (! $user->email || $user->cannot('view', $invoice)) { return; } - + $entityType = $invoice->getEntityType(); $view = ($notificationType == 'approved' ? ENTITY_QUOTE : ENTITY_INVOICE) . "_{$notificationType}"; $account = $user->account; @@ -64,7 +64,7 @@ class UserMailer extends Mailer 'invoice' => $invoice->invoice_number, 'client' => $client->getDisplayName() ]); - + $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); } @@ -88,7 +88,7 @@ class UserMailer extends Mailer 'contactName' => $invitation->contact->getDisplayName(), 'invoiceNumber' => $invoice->invoice_number, ]; - + $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data); } } diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php index dbaba660b75c..e86bbe4e1443 100644 --- a/database/seeds/UserTableSeeder.php +++ b/database/seeds/UserTableSeeder.php @@ -20,7 +20,7 @@ class UserTableSeeder extends Seeder $faker = Faker\Factory::create(); $company = Company::create(); - + $account = Account::create([ 'name' => $faker->name, 'address1' => $faker->streetAddress, @@ -28,7 +28,7 @@ class UserTableSeeder extends Seeder 'city' => $faker->city, 'state' => $faker->state, 'postal_code' => $faker->postcode, - 'country_id' => Country::all()->random()->id, + 'country_id' => Country::all()->random()->id, 'account_key' => str_random(RANDOM_KEY_LENGTH), 'invoice_terms' => $faker->text($faker->numberBetween(50, 300)), 'work_phone' => $faker->phoneNumber, @@ -50,12 +50,13 @@ class UserTableSeeder extends Seeder 'confirmed' => true, 'notify_sent' => false, 'notify_paid' => false, + 'is_admin' => 1, ]); Affiliate::create([ 'affiliate_key' => SELF_HOST_AFFILIATE_KEY ]); - + } -} \ No newline at end of file +}