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

Recurring invoices at wrong date #1404

Browse Source
This commit is contained in:
Hillel Coren 2017-03-29 18:05:02 +03:00
parent bd6edb2d2c
commit 35fd940806
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Invoice.php
View File

@ -1181,10 +1181,18 @@ class Invoice extends EntityModel implements BalanceAffecting
if (! $this->last_sent_date) { if (! $this->last_sent_date) {
return true; return true;
} else { } 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); $date1 = Carbon::parse($this->last_sent_date, $timezone);
$date2 = Carbon::now($timezone); $date2 = Carbon::now($timezone);
$daysSinceLastSent = $date1->diffInDays($date2); $daysSinceLastSent = $date1->diffInDays($date2);
$monthsSinceLastSent = $date1->diffInMonths($date2); $monthsSinceLastSent = $date1->diffInMonths($date2);
*/
if ($daysSinceLastSent == 0) { if ($daysSinceLastSent == 0) {
return false; return false;

4
app/Models/Traits/GeneratesNumbers.php
View File

@ -161,8 +161,8 @@ trait GeneratesNumbers
if (count($matches) > 1) { if (count($matches) > 1) {
$format = $matches[1]; $format = $matches[1];
$search[] = $matches[0]; $search[] = $matches[0];
//$date = date_create()->format($format); $date = date_create()->format($format);
$date = Carbon::now(session(SESSION_TIMEZONE, DEFAULT_TIMEZONE))->format($format); //$date = Carbon::now(session(SESSION_TIMEZONE, DEFAULT_TIMEZONE))->format($format);
$replace[] = str_replace($format, $date, $matches[1]); $replace[] = str_replace($format, $date, $matches[1]);
} }