Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for send now functionality of recurring invoice

Browse Source
This commit is contained in:
David Bomba 2022-09-16 12:49:09 +10:00
parent 3d58f5652e
commit 090d4c994a
4 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/RecurringInvoiceController.php
View File

@ -210,7 +210,7 @@ class RecurringInvoiceController extends BaseController
event(new RecurringInvoiceWasCreated($recurring_invoice, $recurring_invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); event(new RecurringInvoiceWasCreated($recurring_invoice, $recurring_invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
return $this->itemResponse($recurring_invoice); return $this->itemResponse($recurring_invoice->fresh());
} }
/** /**

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

@ -99,7 +99,7 @@ class SendRecurring implements ShouldQueue
/* 09-01-2022 ensure we create the PDFs at this point in time! */ /* 09-01-2022 ensure we create the PDFs at this point in time! */
$invoice->service()->touchPdf(true); $invoice->service()->touchPdf(true);
nlog('updating recurring invoice dates'); //nlog('updating recurring invoice dates');
/* Set next date here to prevent a recurring loop forming */ /* Set next date here to prevent a recurring loop forming */
$this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate(); $this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate();
$this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient(); $this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient();
@ -111,9 +111,9 @@ class SendRecurring implements ShouldQueue
$this->recurring_invoice->setCompleted(); $this->recurring_invoice->setCompleted();
} }
nlog('next send date = '.$this->recurring_invoice->next_send_date); //nlog('next send date = '.$this->recurring_invoice->next_send_date);
// nlog('remaining cycles = '.$this->recurring_invoice->remaining_cycles); // nlog('remaining cycles = '.$this->recurring_invoice->remaining_cycles);
nlog('last send date = '.$this->recurring_invoice->last_sent_date); //nlog('last send date = '.$this->recurring_invoice->last_sent_date);
$this->recurring_invoice->save(); $this->recurring_invoice->save();

8
app/Services/Recurring/RecurringService.php
View File

@ -109,6 +109,8 @@ class RecurringService
if ($request->has('send_now') && $request->input('send_now') == 'true' && $this->recurring_entity->invoices()->count() == 0) { if ($request->has('send_now') && $request->input('send_now') == 'true' && $this->recurring_entity->invoices()->count() == 0) {
$this->sendNow(); $this->sendNow();
return $this;
} }
if(isset($this->recurring_entity->client)) if(isset($this->recurring_entity->client))
@ -125,10 +127,12 @@ class RecurringService
if($this->recurring_entity instanceof RecurringInvoice && $this->recurring_entity->status_id == RecurringInvoice::STATUS_DRAFT){ if($this->recurring_entity instanceof RecurringInvoice && $this->recurring_entity->status_id == RecurringInvoice::STATUS_DRAFT){
$this->start()->save(); $this->start()->save();
SendRecurring::dispatch($this->recurring_entity, $this->recurring_entity->company->db); SendRecurring::dispatchSync($this->recurring_entity, $this->recurring_entity->company->db);
} }
return $this->recurring_entity; $this->recurring_entity = $this->recurring_entity->fresh();
return $this;
} }

40
composer.lock generated
View File

@ -378,16 +378,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.235.8", "version": "3.235.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "cc33d53d735a3835adff212598f2a20ee9ac9531" "reference": "103d38254ef7fc6659ecb08f4b18bc1299011f8a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc33d53d735a3835adff212598f2a20ee9ac9531", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/103d38254ef7fc6659ecb08f4b18bc1299011f8a",
"reference": "cc33d53d735a3835adff212598f2a20ee9ac9531", "reference": "103d38254ef7fc6659ecb08f4b18bc1299011f8a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -466,9 +466,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.235.8" "source": "https://github.com/aws/aws-sdk-php/tree/3.235.9"
}, },
"time": "2022-09-14T18:18:31+00:00" "time": "2022-09-15T18:22:15+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
@ -3483,16 +3483,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v9.30.0", "version": "v9.30.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "2ca2b168a3e995a8ec6ea2805906379095d20080" "reference": "9533f7926f31939f25a620fbbf545318c18c943f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2ca2b168a3e995a8ec6ea2805906379095d20080", "url": "https://api.github.com/repos/laravel/framework/zipball/9533f7926f31939f25a620fbbf545318c18c943f",
"reference": "2ca2b168a3e995a8ec6ea2805906379095d20080", "reference": "9533f7926f31939f25a620fbbf545318c18c943f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3585,7 +3585,8 @@
"phpstan/phpstan": "^1.4.7", "phpstan/phpstan": "^1.4.7",
"phpunit/phpunit": "^9.5.8", "phpunit/phpunit": "^9.5.8",
"predis/predis": "^1.1.9|^2.0", "predis/predis": "^1.1.9|^2.0",
"symfony/cache": "^6.0" "symfony/cache": "^6.0",
"symfony/uid": "^6.0"
}, },
"suggest": { "suggest": {
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
@ -3620,7 +3621,8 @@
"symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.0).", "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.0).",
"symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).", "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).",
"symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).", "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)." "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
"symfony/uid": "Required to generate ULIDs for Eloquent (^6.0)."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -3664,7 +3666,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2022-09-13T14:06:14+00:00" "time": "2022-09-15T13:15:47+00:00"
}, },
{ {
"name": "laravel/serializable-closure", "name": "laravel/serializable-closure",
@ -4891,16 +4893,16 @@
}, },
{ {
"name": "microsoft/microsoft-graph", "name": "microsoft/microsoft-graph",
"version": "1.74.0", "version": "1.75.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/microsoftgraph/msgraph-sdk-php.git", "url": "https://github.com/microsoftgraph/msgraph-sdk-php.git",
"reference": "a43deb66661917d92bf62de1f29f6799b30ea91c" "reference": "e14d68d8e78f217ab0c303169c389c4ebf5d9e11"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/a43deb66661917d92bf62de1f29f6799b30ea91c", "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/e14d68d8e78f217ab0c303169c389c4ebf5d9e11",
"reference": "a43deb66661917d92bf62de1f29f6799b30ea91c", "reference": "e14d68d8e78f217ab0c303169c389c4ebf5d9e11",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4936,9 +4938,9 @@
"homepage": "https://developer.microsoft.com/en-us/graph", "homepage": "https://developer.microsoft.com/en-us/graph",
"support": { "support": {
"issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues", "issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues",
"source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.74.0" "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/1.75.0"
}, },
"time": "2022-08-31T12:12:48+00:00" "time": "2022-09-15T14:43:49+00:00"
}, },
{ {
"name": "mollie/mollie-api-php", "name": "mollie/mollie-api-php",