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

Timezone fix for recurring invoices

Browse Source
This commit is contained in:
Hillel Coren 2017-03-13 14:56:43 +02:00
parent 462032f2fc
commit 9543dd3a34
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Models/Invoice.php
View File

@ -14,6 +14,7 @@ use DateTime;
use Illuminate\Database\Eloquent\SoftDeletes;
use Laracasts\Presenter\PresentableTrait;
use Utils;
use Carbon;
/**
* Class Invoice.
@ -1166,28 +1167,24 @@ class Invoice extends EntityModel implements BalanceAffecting
return false;
}
if (! $this->start_date || strtotime($this->start_date) > strtotime('now')) {
$account = $this->account;
$timezone = $account->getTimezone();
if (! $this->start_date || Carbon::parse($this->start_date, $timezone)->isFuture()) {
return false;
}
if ($this->end_date && strtotime($this->end_date) < strtotime('now')) {
if ($this->end_date && Carbon::parse($this->end_date, $timezone)->isPast()) {
return false;
}
$dayOfWeekToday = date('w');
$dayOfWeekStart = date('w', strtotime($this->start_date));
$dayOfMonthToday = date('j');
$dayOfMonthStart = date('j', strtotime($this->start_date));
if (! $this->last_sent_date) {
return true;
} else {
$date1 = new DateTime($this->last_sent_date);
$date2 = new DateTime();
$diff = $date2->diff($date1);
$daysSinceLastSent = $diff->format('%a');
$monthsSinceLastSent = ($diff->format('%y') * 12) + $diff->format('%m');
$date1 = Carbon::parse($this->last_sent_date, $timezone);
$date2 = Carbon::now($timezone);
$daysSinceLastSent = $date1->diffInDays($date2);
$monthsSinceLastSent = $date1->diffInMonths($date2);
if ($daysSinceLastSent == 0) {
return false;