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

remove invoice_email_list from settings

Browse Source
This commit is contained in:
David Bomba 2019-05-31 11:10:05 +10:00
parent 7ccd9114aa
commit 6c80df9835
4 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DataMapper/ClientSettings.php
View File

@ -88,7 +88,6 @@ class ClientSettings extends BaseSettings
*/ */
public $industry_id; public $industry_id;
public $size_id; public $size_id;
public $invoice_email_list; //default comma separated list of contact ids to email
/** /**
* Cast object values and return entire class * Cast object values and return entire class
@ -116,7 +115,6 @@ class ClientSettings extends BaseSettings
'entity' => Client::class, 'entity' => Client::class,
'industry_id' => NULL, 'industry_id' => NULL,
'size_id' => NULL, 'size_id' => NULL,
'invoice_email_list' => NULL,
]; ];
} }

4
app/Jobs/RecurringInvoice/SendRecurring.php
View File

@ -58,8 +58,8 @@ class SendRecurring
$invoice->save(); $invoice->save();
// Queue: Emails for invoice // Queue: Emails for invoice
// $this->recurring_invoice->settings->invoice_email_list //todo comma separated list of emails to fire this email to // foreach invoice->invitations
// Fire Payment if auto-bill is enabled // Fire Payment if auto-bill is enabled
if($this->recurring_invoice->settings->auto_bill) if($this->recurring_invoice->settings->auto_bill)
//PAYMENT ACTION HERE TODO //PAYMENT ACTION HERE TODO

63
app/Listeners/Invoice/CreateInvoiceInvitations.php
View File

@ -1,63 +0,0 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com)
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Listeners\Invoice;
use App\Models\ClientContact;
use App\Models\InvoiceInvitation;
use App\Utils\Traits\MakesHash;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Facades\Log;
class CreateInvoiceInvitations
{
use MakesHash;
/**
* Create the event listener.
*
* @return void
*/
public function __construct()
{
//
}
/**
* Handle the creation of invitations for an invoice.
* We only ever create one invitation per contact.
*
* @param object $event
* @return void
*/
public function handle($event)
{
$invoice = $event->invoice;
$contacts = ClientContact::whereIn('id', explode(',', $invoice->settings->invoice_email_list))->get();
$contacts->each(function ($contact) use($invoice) {
$i = InvoiceInvitation::firstOrCreate([
'client_contact_id' => $contact->id,
'invoice_id' => $invoice->id
],
[
'company_id' => $invoice->company_id,
'user_id' => $invoice->user_id,
'invitation_key' => $this->createDbHash($invoice->company->db),
]);
});
}
}

9
app/Repositories/InvoiceRepository.php
View File

@ -55,7 +55,8 @@ class InvoiceRepository extends BaseRepository
$invoice->save(); $invoice->save();
$this->saveInvitations($data['invitations'], $invoice); if(array_key_exists('invitations', $data))
$this->saveInvitations($data['invitations'], $invoice);
$invoice_calc = new InvoiceCalc($invoice, $invoice->settings); $invoice_calc = new InvoiceCalc($invoice, $invoice->settings);
@ -128,12 +129,12 @@ class InvoiceRepository extends BaseRepository
foreach($invitations as $invitation) foreach($invitations as $invitation)
{ {
//only update new invitations //only insert new invitations
if(strlen($invitation['invitation_key']) == 0) if(! array_key_exists('id', $invitation) || strlen($invitation['id']) == 0)
{ {
$invitation = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id); $invitation = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id);
$invitation->client_contact_id = $invitation->['client_contact_id']; $invitation->client_contact_id = $invitation['client_contact_id'];
$invitation->invoice_id = $invoice->id; $invitation->invoice_id = $invoice->id;
$invitation->save(); $invitation->save();