diff --git a/.travis.yml b/.travis.yml index 7bd43141e4d2..6ac17c87d872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ before_script: script: - php ./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml - #- php artisan dusk + - php artisan dusk #- npm test after_success: - bash <(curl -s https://codecov.io/bash) diff --git a/app/Http/Controllers/OpenAPI/ClientContactSchema.php b/app/Http/Controllers/OpenAPI/ClientContactSchema.php index 85f0dcfa62bd..632441ff6f91 100644 --- a/app/Http/Controllers/OpenAPI/ClientContactSchema.php +++ b/app/Http/Controllers/OpenAPI/ClientContactSchema.php @@ -22,6 +22,7 @@ * @OA\Property(property="is_primary", type="boolean", example=true, description="________"), * @OA\Property(property="confirmed", type="boolean", example=true, description="________"), * @OA\Property(property="is_locked", type="boolean", example=true, description="________"), + * @OA\Property(property="send_email", type="boolean", example=true, description="________"), * @OA\Property(property="failed_logins", type="number", format="integer", example="3", description="________"), * @OA\Property(property="email_verified_at", type="number", format="integer", example="134341234234", description="________"), * @OA\Property(property="paid_to_date", type="number", format="float", example="10.00", description="________"), diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php index a67c49e7bf2e..00bb336327d4 100644 --- a/app/Repositories/InvoiceRepository.php +++ b/app/Repositories/InvoiceRepository.php @@ -56,9 +56,9 @@ class InvoiceRepository extends BaseRepository { if (isset($data['client_contacts'])) { foreach ($data['client_contacts'] as $contact) { - if ($contact['send'] == 1) { + if ($contact['send_email'] == 1) { $client_contact = ClientContact::find($this->decodePrimaryKey($contact['id'])); - $client_contact->send = true; + $client_contact->send_email = true; $client_contact->save(); } } diff --git a/app/Repositories/QuoteRepository.php b/app/Repositories/QuoteRepository.php index c7bcffea6a07..c551d8b0def8 100644 --- a/app/Repositories/QuoteRepository.php +++ b/app/Repositories/QuoteRepository.php @@ -47,9 +47,9 @@ class QuoteRepository extends BaseRepository if (isset($data['client_contacts'])) { foreach ($data['client_contacts'] as $contact) { - if ($contact['send'] == 1) { + if ($contact['send_email'] == 1) { $client_contact = ClientContact::find($this->decodePrimaryKey($contact['id'])); - $client_contact->send = true; + $client_contact->send_email = true; $client_contact->save(); } } diff --git a/app/Services/Invoice/CreateInvitations.php b/app/Services/Invoice/CreateInvitations.php index b1f6c09fecef..d7c29cdb8bc7 100644 --- a/app/Services/Invoice/CreateInvitations.php +++ b/app/Services/Invoice/CreateInvitations.php @@ -37,12 +37,12 @@ class CreateInvitations extends AbstractService ->whereInvoiceId($this->invoice->id) ->first(); - if (!$invitation && $contact->send) { + if (!$invitation && $contact->send_email) { $ii = InvoiceInvitationFactory::create($this->invoice->company_id, $this->invoice->user_id); $ii->invoice_id = $this->invoice->id; $ii->client_contact_id = $contact->id; $ii->save(); - } elseif ($invitation && !$contact->send) { + } elseif ($invitation && !$contact->send_email) { $invitation->delete(); } }); diff --git a/app/Services/Quote/CreateInvitations.php b/app/Services/Quote/CreateInvitations.php index 1fb1f56c52d6..9d7391622b26 100644 --- a/app/Services/Quote/CreateInvitations.php +++ b/app/Services/Quote/CreateInvitations.php @@ -22,12 +22,12 @@ class CreateInvitations ->whereQuoteId($quote->id) ->first(); - if (!$invitation && $contact->send) { + if (!$invitation && $contact->send_email) { $ii = QuoteInvitationFactory::create($quote->company_id, $quote->user_id); $ii->quote_id = $quote->id; $ii->client_contact_id = $contact->id; $ii->save(); - } elseif ($invitation && !$contact->send) { + } elseif ($invitation && !$contact->send_email) { $invitation->delete(); } });