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

Merge pull request #8578 from lamaral/v5-develop

Browse Source 
Add :MONTHYEAR keyword to recurring expenses
This commit is contained in:
David Bomba 2023-06-30 15:50:25 +10:00 committed by GitHub
commit 5fb4de2356
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Factory/RecurringExpenseToExpenseFactory.php
View File

@ -95,6 +95,11 @@ class RecurringExpenseToExpenseFactory
$replacements = [ $replacements = [
'literal' => [ 'literal' => [
':MONTHYEAR' => \sprintf(
'%s %s',
Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
now()->year,
),
':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'), ':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
':YEAR' => now()->year, ':YEAR' => now()->year,
':QUARTER' => 'Q'.now()->quarter, ':QUARTER' => 'Q'.now()->quarter,
@ -240,6 +245,17 @@ class RecurringExpenseToExpenseFactory
$output = \Carbon\Carbon::create()->month($output)->translatedFormat('F'); $output = \Carbon\Carbon::create()->month($output)->translatedFormat('F');
} }
if ($matches->keys()->first() == ':MONTHYEAR') {
$final_date = now()->addMonths($output-now()->month);
$output = \sprintf(
'%s %s',
$final_date->translatedFormat('F'),
$final_date->year,
);
}
$value = preg_replace( $value = preg_replace(
$target, $target,
$output, $output,