Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Send Email (#3347)

Browse Source 
* fixes for travis

* Fixes for OpenAPI docs

* Fixes for send -> send_email
This commit is contained in:
David Bomba 2020-02-18 08:08:27 +11:00 committed by GitHub
parent 2be8d89b98
commit 0690d615dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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)

1
app/Http/Controllers/OpenAPI/ClientContactSchema.php
View File

@ -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="________"),

4
app/Repositories/InvoiceRepository.php
View File

@ -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();
}
}

4
app/Repositories/QuoteRepository.php
View File

@ -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();
}
}

4
app/Services/Invoice/CreateInvitations.php
View File

@ -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();
}
});

4
app/Services/Quote/CreateInvitations.php
View File

@ -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();
}
});