Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support recurring invoices in Zapier

Browse Source
This commit is contained in:
Hillel Coren 2017-01-29 13:32:16 +02:00
parent 2843265ce5
commit a657e84838
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Ninja/Mailers/ContactMailer.php
View File

@ -59,6 +59,10 @@ class ContactMailer extends Mailer
*/ */
public function sendInvoice(Invoice $invoice, $reminder = false, $pdfString = false) public function sendInvoice(Invoice $invoice, $reminder = false, $pdfString = false)
{ {
if ($invoice->is_recurring) {
return false;
}
$invoice->load('invitations', 'client.language', 'account'); $invoice->load('invitations', 'client.language', 'account');
$entityType = $invoice->getEntityType(); $entityType = $invoice->getEntityType();

10
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -366,15 +366,15 @@ class InvoiceRepository extends BaseRepository
} }
if ($invoice->is_recurring) { if ($invoice->is_recurring) {
if ($invoice->start_date && $invoice->start_date != Utils::toSqlDate($data['start_date'])) { if (isset($data['start_date']) && $invoice->start_date && $invoice->start_date != Utils::toSqlDate($data['start_date'])) {
$invoice->last_sent_date = null; $invoice->last_sent_date = null;
} }
$invoice->frequency_id = $data['frequency_id'] ? $data['frequency_id'] : 0; $invoice->frequency_id = array_get($data, 'frequency_id', 0);
$invoice->start_date = Utils::toSqlDate($data['start_date']); $invoice->start_date = Utils::toSqlDate(array_get($data, 'start_date'));
$invoice->end_date = Utils::toSqlDate($data['end_date']); $invoice->end_date = Utils::toSqlDate(array_get($data, 'end_date'));
$invoice->client_enable_auto_bill = isset($data['client_enable_auto_bill']) && $data['client_enable_auto_bill'] ? true : false; $invoice->client_enable_auto_bill = isset($data['client_enable_auto_bill']) && $data['client_enable_auto_bill'] ? true : false;
$invoice->auto_bill = isset($data['auto_bill']) ? intval($data['auto_bill']) : AUTO_BILL_OFF; $invoice->auto_bill = array_get($data, 'auto_bill_id') ?: array_get($data, 'auto_bill', AUTO_BILL_OFF);
if ($invoice->auto_bill < AUTO_BILL_OFF || $invoice->auto_bill > AUTO_BILL_ALWAYS ) { if ($invoice->auto_bill < AUTO_BILL_OFF || $invoice->auto_bill > AUTO_BILL_ALWAYS ) {
$invoice->auto_bill = AUTO_BILL_OFF; $invoice->auto_bill = AUTO_BILL_OFF;

4
app/Services/PaymentService.php
View File

@ -45,6 +45,10 @@ class PaymentService extends BaseService
*/ */
public function autoBillInvoice(Invoice $invoice) public function autoBillInvoice(Invoice $invoice)
{ {
if ( ! $invoice->canBePaid()) {
return false;
}
/** @var \App\Models\Client $client */ /** @var \App\Models\Client $client */
$client = $invoice->client; $client = $invoice->client;