Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:07:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-05-01 22:02:36 +03:00
parent 9360852ad5
commit 6912b04063
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/commands/SendRecurringInvoices.php
View File

@ -81,10 +81,10 @@ class SendRecurringInvoices extends Command {
$invoice->invitations()->save($invitation); $invoice->invitations()->save($invitation);
} }
$this->mailer->sendInvoice($invoice);
$recurInvoice->last_sent_date = Carbon::now()->toDateTimeString(); $recurInvoice->last_sent_date = Carbon::now()->toDateTimeString();
$recurInvoice->save(); $recurInvoice->save();
$this->mailer->sendInvoice($invoice);
} }
$this->info('Done'); $this->info('Done');

29
app/models/Invoice.php
View File

@ -107,7 +107,9 @@ class Invoice extends EntityModel
'custom_label2', 'custom_label2',
'custom_value2', 'custom_value2',
'custom_client_label1', 'custom_client_label1',
'custom_client_label2']); 'custom_client_label2',
'primary_color',
'secondary_color']);
foreach ($this->invoice_items as $invoiceItem) foreach ($this->invoice_items as $invoiceItem)
{ {
@ -134,6 +136,11 @@ class Invoice extends EntityModel
public function shouldSendToday() public function shouldSendToday()
{ {
if (!$this->start_date || strtotime($this->start_date) > strtotime('now'))
{
return false;
}
$dayOfWeekToday = date('w'); $dayOfWeekToday = date('w');
$dayOfWeekStart = date('w', strtotime($this->start_date)); $dayOfWeekStart = date('w', strtotime($this->start_date));
@ -142,8 +149,7 @@ class Invoice extends EntityModel
if (!$this->last_sent_date) if (!$this->last_sent_date)
{ {
$daysSinceLastSent = 0; return true;
$monthsSinceLastSent = 0;
} }
else else
{ {
@ -162,22 +168,21 @@ class Invoice extends EntityModel
switch ($this->frequency_id) switch ($this->frequency_id)
{ {
case FREQUENCY_WEEKLY: case FREQUENCY_WEEKLY:
return $dayOfWeekStart == $dayOfWeekToday; return $daysSinceLastSent >= 7;
case FREQUENCY_TWO_WEEKS: case FREQUENCY_TWO_WEEKS:
return $dayOfWeekStart == $dayOfWeekToday && (!$daysSinceLastSent || $daysSinceLastSent == 14); return $daysSinceLastSent >= 14;
case FREQUENCY_FOUR_WEEKS: case FREQUENCY_FOUR_WEEKS:
return $dayOfWeekStart == $dayOfWeekToday && (!$daysSinceLastSent || $daysSinceLastSent == 28); return $daysSinceLastSent >= 28;
case FREQUENCY_MONTHLY: case FREQUENCY_MONTHLY:
return $dayOfMonthStart == $dayOfMonthToday || $daysSinceLastSent > 31; return $monthsSinceLastSent >= 1;
case FREQUENCY_THREE_MONTHS: case FREQUENCY_THREE_MONTHS:
return ($dayOfMonthStart == $dayOfMonthToday && (!$daysSinceLastSent || $monthsSinceLastSent == 3)) || $daysSinceLastSent > 92; return $monthsSinceLastSent >= 3;
case FREQUENCY_SIX_MONTHS: case FREQUENCY_SIX_MONTHS:
return ($dayOfMonthStart == $dayOfMonthToday && (!$daysSinceLastSent || $monthsSinceLastSent == 6)) || $daysSinceLastSent > 183; return $monthsSinceLastSent >= 6;
case FREQUENCY_ANNUALLY: case FREQUENCY_ANNUALLY:
return ($dayOfMonthStart == $dayOfMonthToday && (!$daysSinceLastSent || $monthsSinceLastSent == 12)) || $daysSinceLastSent > 365; return $monthsSinceLastSent >= 12;
default: default:
Utils::fatalError("Invalid frequency supplied: " . $this->frequency_id); return false;
break;
} }
return false; return false;