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

Add four month frequency

Browse Source
This commit is contained in:
Hillel Coren 2017-10-25 12:22:01 +03:00
parent 96a5a5ac6e
commit 147dbc4ecc
6 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Constants.php
View File

@ -224,8 +224,9 @@ if (! defined('APP_NAME')) {
define('FREQUENCY_MONTHLY', 4);
define('FREQUENCY_TWO_MONTHS', 5);
define('FREQUENCY_THREE_MONTHS', 6);
define('FREQUENCY_SIX_MONTHS', 7);
define('FREQUENCY_ANNUALLY', 8);
define('FREQUENCY_FOUR_MONTHS', 7);
define('FREQUENCY_SIX_MONTHS', 8);
define('FREQUENCY_ANNUALLY', 9);
define('SESSION_TIMEZONE', 'timezone');
define('SESSION_CURRENCY', 'currency');

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

@ -345,6 +345,9 @@ trait GeneratesNumbers
case FREQUENCY_THREE_MONTHS:
$resetDate->addMonths(3);
break;
case FREQUENCY_FOUR_MONTHS:
$resetDate->addMonths(4);
break;
case FREQUENCY_SIX_MONTHS:
$resetDate->addMonths(6);
break;

5
app/Models/Traits/HasRecurrence.php
View File

@ -63,6 +63,8 @@ trait HasRecurrence
return $monthsSinceLastSent >= 2;
case FREQUENCY_THREE_MONTHS:
return $monthsSinceLastSent >= 3;
case FREQUENCY_FOUR_MONTHS:
return $monthsSinceLastSent >= 4;
case FREQUENCY_SIX_MONTHS:
return $monthsSinceLastSent >= 6;
case FREQUENCY_ANNUALLY:
@ -100,6 +102,9 @@ trait HasRecurrence
case FREQUENCY_THREE_MONTHS:
$rule = 'FREQ=MONTHLY;INTERVAL=3;';
break;
case FREQUENCY_FOUR_MONTHS:
$rule = 'FREQ=MONTHLY;INTERVAL=4;';
break;
case FREQUENCY_SIX_MONTHS:
$rule = 'FREQ=MONTHLY;INTERVAL=6;';
break;

10
database/migrations/2017_10_17_083846_add_default_rates.php
View File

@ -23,6 +23,16 @@ class AddDefaultRates extends Migration
Schema::table('projects', function ($table) {
$table->decimal('task_rate', 12, 4)->default(0);
});
// Add 'Four Months' frequency option
if (DB::table('frequencies')->count() == 8) {
DB::table('frequencies')->where('id', '=', 7)->update(['name' => 'Four months']);
DB::table('frequencies')->where('id', '=', 8)->update(['name' => 'Six months']);
DB::table('frequencies')->insert(['name' => 'Annually']);
DB::statement('update invoices set frequency_id = frequency_id + 1 where frequency_id >= 7');
DB::statement('update recurring_expenses set frequency_id = frequency_id + 1 where frequency_id >= 7');
DB::statement('update accounts set reset_counter_frequency_id = reset_counter_frequency_id + 1 where reset_counter_frequency_id >= 7');
}
}
/**

1
database/seeds/FrequencySeeder.php
View File

@ -15,6 +15,7 @@ class FrequencySeeder extends Seeder
['name' => 'Monthly'],
['name' => 'Two months'],
['name' => 'Three months'],
['name' => 'Four months'],
['name' => 'Six months'],
['name' => 'Annually'],
];

1
resources/lang/en/texts.php
View File

@ -1385,6 +1385,7 @@ $LANG = array(
'freq_four_weeks' => 'Four weeks',
'freq_monthly' => 'Monthly',
'freq_three_months' => 'Three months',
'freq_four_months' => 'Four months',
'freq_six_months' => 'Six months',
'freq_annually' => 'Annually',