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

Merge pull request #4108 from turbo124/v2

Browse Source 
Bug fixes for recurring.
This commit is contained in:
David Bomba 2020-09-27 19:28:57 +10:00 committed by GitHub
commit 9bdfacd49b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 109 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/Console/Commands/RecurringCommand.php Normal file
View File

@ -0,0 +1,53 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Console\Commands;
use App\Jobs\Cron\RecurringInvoicesCron;
use App\Models\Design;
use Illuminate\Console\Command;
class RecurringCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'ninja:send-recurring';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Sends the recurring invoices';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
RecurringInvoicesCron::dispatchNow();
}
}

7
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Requests\RecurringInvoice;
use App\Http\Requests\Request;
use App\Models\Client;
use App\Models\RecurringInvoice;
use App\Utils\Traits\CleanLineItems;
use App\Utils\Traits\MakesHash;
@ -98,7 +99,11 @@ class StoreRecurringInvoiceRequest extends Request
if(isset($input['auto_bill']))
$input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
else{
$client = Client::find($this->decodePrimaryKey($input['client_id']));
$input['auto_bill'] = $client->getSetting('auto_bill');
}
$this->replace($input);
}

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

@ -14,12 +14,15 @@ namespace App\Jobs\Cron;
use App\Jobs\RecurringInvoice\SendRecurring;
use App\Libraries\MultiDB;
use App\Models\RecurringInvoice;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Log;
class RecurringInvoicesCron
{
use Dispatchable;
/**
* Create a new job instance.
*
@ -41,25 +44,34 @@ class RecurringInvoicesCron
if (! config('ninja.db.multi_db_enabled')) {
$recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->cursor();
$recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now())->cursor();
Log::info(Carbon::now()->addMinutes(30).' Sending Recurring Invoices. Count = '.$recurring_invoices->count());
Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count().' On Database # '.$db);
$recurring_invoices->each(function ($recurring_invoice, $key) {
info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date);
$recurring_invoices->each(function ($recurring_invoice, $key) {
SendRecurring::dispatch($recurring_invoice, $recurring_invoice->company->db);
});
} else {
//multiDB environment, need to
foreach (MultiDB::$dbs as $db) {
MultiDB::setDB($db);
$recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->cursor();
$recurring_invoices = RecurringInvoice::whereDate('next_send_date', '=', now())->cursor();
Log::info(Carbon::now()->addMinutes(30).' Sending Recurring Invoices. Count = '.$recurring_invoices->count().' On Database # '.$db);
Log::info(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count().' On Database # '.$db);
$recurring_invoices->each(function ($recurring_invoice, $key) {
info("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date);
SendRecurring::dispatch($recurring_invoice, $recurring_invoice->company->db);
});
}
}

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

@ -54,15 +54,19 @@ class SendRecurring implements ShouldQueue
*/
public function handle() : void
{
info(" in the handle ");
// Generate Standard Invoice
$invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client);
$invoice = $invoice->service()
->markSent()
->applyRecurringNumber()
->applyNumber()
->createInvitations()
->save();
info("Invoice {$invoice->number} created");
$invoice->invitations->each(function ($invitation) use ($invoice) {
$email_builder = (new InvoiceEmail())->build($invitation);
@ -76,6 +80,7 @@ class SendRecurring implements ShouldQueue
if($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $this->recurring_invoice->auto_bill_enabled)
$invoice->service()->autoBill()->save();
info("updating recurring invoice dates");
/* Set next date here to prevent a recurring loop forming */
$this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate()->format('Y-m-d');
$this->recurring_invoice->remaining_cycles = $this->recurring_invoice->remainingCycles();
@ -85,6 +90,10 @@ class SendRecurring implements ShouldQueue
if ($this->recurring_invoice->remaining_cycles == 0)
$this->recurring_invoice->setCompleted();
info($this->recurring_invoice->next_send_date);
info($this->recurring_invoice->remaining_cycles);
info($this->recurring_invoice->last_sent_date);
$this->recurring_invoice->save();
if ($invoice->invitations->count() > 0)

2
app/Listeners/SendVerificationNotification.php
View File

@ -47,7 +47,7 @@ class SendVerificationNotification implements ShouldQueue
MultiDB::setDB($event->company->db);
try {
$event->user->notify(new VerifyUser($event->user));
$event->user->notify(new VerifyUser($event->user, $event->company));
Ninja::registerNinjaUser($event->user);

1
app/Models/Gateway.php
View File

@ -21,6 +21,7 @@ class Gateway extends StaticModel
'is_secure' => 'boolean',
'recommended' => 'boolean',
//'visible' => 'boolean',
//'sort_order' => 'int',
'updated_at' => 'timestamp',
'created_at' => 'timestamp',
'default_gateway_type_id' => 'string',

5
app/Models/RecurringInvoice.php
View File

@ -200,6 +200,11 @@ class RecurringInvoice extends BaseModel
public function nextSendDate() :?Carbon
{
if(!$this->next_send_date){
return null;
// $this->next_send_date = now()->format('Y-m-d');
}
switch ($this->frequency_id) {
case self::FREQUENCY_WEEKLY:
return Carbon::parse($this->next_send_date)->addWeek();

1
app/Notifications/Admin/EntitySentNotification.php
View File

@ -101,6 +101,7 @@ class EntitySentNotification extends Notification implements ShouldQueue
'button' => ctrans("texts.view_{$this->entity_name}"),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
];
return (new MailMessage)

2
app/Notifications/Admin/EntityViewedNotification.php
View File

@ -146,6 +146,8 @@ class EntityViewedNotification extends Notification implements ShouldQueue
'button' => ctrans("texts.view_{$this->entity_name}"),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
];
return $data;

2
app/Notifications/Admin/InvoiceSentNotification.php
View File

@ -96,6 +96,8 @@ class InvoiceSentNotification extends Notification implements ShouldQueue
'button' => ctrans('texts.view_invoice'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
];
return (new MailMessage)

2
app/Notifications/Admin/InvoiceViewedNotification.php
View File

@ -96,6 +96,8 @@ class InvoiceViewedNotification extends Notification implements ShouldQueue
'button' => ctrans('texts.view_invoice'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
];
return (new MailMessage)

1
app/Notifications/Admin/NewPartialPaymentNotification.php
View File

@ -94,6 +94,7 @@ class NewPartialPaymentNotification extends Notification implements ShouldQueue
'button' => ctrans('texts.view_payment'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
];
return (new MailMessage)

1
app/Notifications/Admin/NewPaymentNotification.php
View File

@ -97,6 +97,7 @@ class NewPaymentNotification extends Notification implements ShouldQueue
'button' => ctrans('texts.view_payment'),
'signature' => $this->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->settings,
];
return (new MailMessage)

1
app/Notifications/NewAccountCreated.php
View File

@ -73,6 +73,7 @@ class NewAccountCreated extends Notification implements ShouldQueue
'button' => ctrans('texts.account_login'),
'signature' => $this->company->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->company->settings,
];
return (new MailMessage)

1
app/Notifications/Ninja/NewAccountCreated.php
View File

@ -73,6 +73,7 @@ class NewAccountCreated extends Notification implements ShouldQueue
'button' => ctrans('texts.account_login'),
'signature' => $this->company->settings->email_signature,
'logo' => $this->company->present()->logo(),
'settings' => $this->company->settings,
];
return (new MailMessage)

6
app/Notifications/Ninja/VerifyUser.php
View File

@ -32,9 +32,12 @@ class VerifyUser extends Notification implements ShouldQueue
*/
protected $user;
public function __construct($user)
private $company;
public function __construct($user, $company)
{
$this->user = $user;
$this->company = $company;
}
/**
@ -63,6 +66,7 @@ class VerifyUser extends Notification implements ShouldQueue
'button' => ctrans('texts.button_confirmation_message'),
'signature' => '',
'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png',
'settings' => $this->company->settings,
];
return (new MailMessage)

1
composer.json
View File

@ -48,7 +48,6 @@
"maennchen/zipstream-php": "^1.2",
"nwidart/laravel-modules": "^6.0",
"omnipay/paypal": "^3.0",
"omnipay/stripe": "^3.0",
"predis/predis": "^1.1",
"sentry/sentry-laravel": "^1.8",
"spatie/browsershot": "^3.37",