Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2021-10-26 06:46:33 +11:00
commit 3533a51c79
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Cron/RecurringInvoicesCron.php
View File

@ -71,7 +71,7 @@ class RecurringInvoicesCron
SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db);
}
catch(\Exception $e){
nlog("Unable to sending recurring invoice {$recurring_invoice->id}");
nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage());
}
});
@ -107,7 +107,7 @@ class RecurringInvoicesCron
SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db);
}
catch(\Exception $e){
nlog("Unable to sending recurring invoice {$recurring_invoice->id}");
nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage());
}
});

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

@ -73,13 +73,14 @@ class SendRecurring implements ShouldQueue
$invoice->date = now()->format('Y-m-d');
$invoice->due_date = $this->recurring_invoice->calculateDueDate(now()->format('Y-m-d'));
$invoice->recurring_id = $this->recurring_invoice->id;
$invoice->saveQuietly();
if($invoice->client->getSetting('auto_email_invoice'))
{
$invoice = $invoice->service()
->markSent()
->applyNumber()
// ->createInvitations() //need to only link invitations to those in the recurring invoice
//->createInvitations() //need to only link invitations to those in the recurring invoice
->fillDefaults()
->save();

2
app/Models/GatewayType.php
View File

@ -84,7 +84,7 @@ class GatewayType extends StaticModel
case self::EPS:
return ctrans('texts.eps');
case self::BECS:
return ctrans('tets.becs');
return ctrans('texts.becs');
case self::ACSS:
return ctrans('texts.acss');
case self::DIRECT_DEBIT:

2
app/Services/Invoice/MarkSent.php
View File

@ -33,7 +33,7 @@ class MarkSent extends AbstractService
{
/* Return immediately if status is not draft */
if ($this->invoice->fresh()->status_id != Invoice::STATUS_DRAFT) {
if ($this->invoice && $this->invoice->fresh()->status_id != Invoice::STATUS_DRAFT) {
return $this->invoice;
}

2
resources/views/portal/ninja2020/gateways/stripe/becs/becs_debit.blade.php
View File

@ -22,7 +22,7 @@
</label>
<div id="mandate-acceptance">
<input type="checkbox" id="becs-mandate-acceptance" class="input mr-4">
<label for="becs-mandate-acceptance">{{ctrans('texts.becs_mandat')}}</label>
<label for="becs-mandate-acceptance">{{ctrans('texts.becs_mandate')}}</label>
</div>
</form>
@endcomponent