Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 10:34:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reserved keywords are aware of date in recurring invoice PDF preview

Browse Source
This commit is contained in:
Gary Turner 2022-11-25 11:33:16 +00:00
parent 599a866fdf
commit 5cc52b57d8
2 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/Utils/Helpers.php
View File

@ -106,9 +106,10 @@ class Helpers
* *
* @param string $value * @param string $value
* @param Client|Company $entity * @param Client|Company $entity
* @param null|Carbon $currentDateTime
* @return null|string * @return null|string
*/ */
public static function processReservedKeywords(?string $value, $entity): ?string public static function processReservedKeywords(?string $value, $entity, $currentDateTime = null): ?string
{ {
if (! $value) { if (! $value) {
return ''; return '';
@ -132,71 +133,75 @@ class Helpers
Carbon::setLocale($entity->locale()); Carbon::setLocale($entity->locale());
if (!$currentDateTime) {
$currentDateTime = Carbon::now();
}
$replacements = [ $replacements = [
'literal' => [ 'literal' => [
':MONTH_BEFORE' => \sprintf( ':MONTH_BEFORE' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->subMonth(1)->translatedFormat($entity->date_format()), $currentDateTime->copy()->subMonth(1)->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->subDay(1)->translatedFormat($entity->date_format()), $currentDateTime->copy()->subDay(1)->translatedFormat($entity->date_format()),
), ),
':YEAR_BEFORE' => \sprintf( ':YEAR_BEFORE' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->subYear(1)->translatedFormat($entity->date_format()), $currentDateTime->copy()->subYear(1)->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->subDay(1)->translatedFormat($entity->date_format()), $currentDateTime->copy()->subDay(1)->translatedFormat($entity->date_format()),
), ),
':MONTH_AFTER' => \sprintf( ':MONTH_AFTER' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->translatedFormat($entity->date_format()), $currentDateTime->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->addMonth(1)->subDay(1)->translatedFormat($entity->date_format()), $currentDateTime->copy()->addMonth(1)->subDay(1)->translatedFormat($entity->date_format()),
), ),
':YEAR_AFTER' => \sprintf( ':YEAR_AFTER' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->translatedFormat($entity->date_format()), $currentDateTime->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->addYear(1)->subDay(1)->translatedFormat($entity->date_format()), $currentDateTime->copy()->addYear(1)->subDay(1)->translatedFormat($entity->date_format()),
), ),
':MONTHYEAR' => \sprintf( ':MONTHYEAR' => \sprintf(
'%s %s', '%s %s',
Carbon::createFromDate(now()->month)->translatedFormat('F'), Carbon::createFromDate($currentDateTime->month)->translatedFormat('F'),
now()->year, $currentDateTime->year,
), ),
':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'), ':MONTH' => Carbon::createFromDate($currentDateTime->year, $currentDateTime->month)->translatedFormat('F'),
':YEAR' => now()->year, ':YEAR' => $currentDateTime->year,
':QUARTER' => 'Q'.now()->quarter, ':QUARTER' => 'Q'.$currentDateTime->quarter,
':WEEK_BEFORE' => \sprintf( ':WEEK_BEFORE' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->subDays(7)->translatedFormat($entity->date_format()), $currentDateTime->copy()->subDays(7)->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->subDays(1)->translatedFormat($entity->date_format()) $currentDateTime->copy()->subDays(1)->translatedFormat($entity->date_format())
), ),
':WEEK_AHEAD' => \sprintf( ':WEEK_AHEAD' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->addDays(7)->translatedFormat($entity->date_format()), $currentDateTime->copy()->addDays(7)->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->addDays(13)->translatedFormat($entity->date_format()) $currentDateTime->copy()->addDays(13)->translatedFormat($entity->date_format())
), ),
':WEEK' => \sprintf( ':WEEK' => \sprintf(
'%s %s %s', '%s %s %s',
Carbon::now()->translatedFormat($entity->date_format()), $currentDateTime->translatedFormat($entity->date_format()),
ctrans('texts.to'), ctrans('texts.to'),
Carbon::now()->addDays(6)->translatedFormat($entity->date_format()) $currentDateTime->copy()->addDays(6)->translatedFormat($entity->date_format())
), ),
], ],
'raw' => [ 'raw' => [
':MONTHYEAR' => now()->month, ':MONTHYEAR' => $currentDateTime->month,
':MONTH' => now()->month, ':MONTH' => $currentDateTime->month,
':YEAR' => now()->year, ':YEAR' => $currentDateTime->year,
':QUARTER' => now()->quarter, ':QUARTER' => $currentDateTime->quarter,
], ],
'ranges' => [ 'ranges' => [
'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month), 'MONTHYEAR' => Carbon::createFromDate($currentDateTime->year, $currentDateTime->month),
], ],
'ranges_raw' => [ 'ranges_raw' => [
'MONTH' => now()->month, 'MONTH' => $currentDateTime->month,
'YEAR' => now()->year, 'YEAR' => $currentDateTime->year,
], ],
]; ];
@ -221,12 +226,12 @@ class Helpers
continue; continue;
} }
$_left = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y'); $_left = Carbon::createFromDate($currentDateTime->year, $currentDateTime->month)->translatedFormat('F Y');
$_right = ''; $_right = '';
// If right side doesn't have any calculations, replace with raw ranges keyword. // If right side doesn't have any calculations, replace with raw ranges keyword.
if (! Str::contains($right, ['-', '+', '/', '*'])) { if (! Str::contains($right, ['-', '+', '/', '*'])) {
$_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y'); $_right = Carbon::createFromDate($currentDateTime->year, $currentDateTime->month)->translatedFormat('F Y');
} }
// If right side contains one of math operations, calculate. // If right side contains one of math operations, calculate.
@ -237,7 +242,7 @@ class Helpers
$_value = explode($_operation, $right); // [MONTHYEAR, 4] $_value = explode($_operation, $right); // [MONTHYEAR, 4]
$_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y'); $_right = Carbon::createFromDate($currentDateTime->year, $currentDateTime->month)->addMonths($_value[1])->translatedFormat('F Y');
} }
$replacement = sprintf('%s to %s', $_left, $_right); $replacement = sprintf('%s to %s', $_left, $_right);
@ -304,7 +309,7 @@ class Helpers
} }
if ($matches->keys()->first() == ':MONTHYEAR') { if ($matches->keys()->first() == ':MONTHYEAR') {
$final_date = now()->addMonths($output - now()->month); $final_date = $currentDateTime->copy()->addMonths($output - $currentDateTime->month);
$output = \sprintf( $output = \sprintf(
'%s %s', '%s %s',

9
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -295,8 +295,13 @@ trait MakesInvoiceValues
$data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item; $data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item;
$data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service; $data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service;
$data[$key][$table_type.'.notes'] = Helpers::processReservedKeywords($item->notes, $entity); $currentDateTime = null;
$data[$key][$table_type.'.description'] = Helpers::processReservedKeywords($item->notes, $entity); if (isset($this->entity->next_send_date)) {
$currentDateTime = Carbon::parse($this->entity->next_send_date);
}
$data[$key][$table_type.'.notes'] = Helpers::processReservedKeywords($item->notes, $entity, $currentDateTime);
$data[$key][$table_type.'.description'] = Helpers::processReservedKeywords($item->notes, $entity, $currentDateTime);
$data[$key][$table_type.".{$_table_type}1"] = strlen($item->custom_value1) >= 1 ? $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}1", $item->custom_value1, $entity) : ''; $data[$key][$table_type.".{$_table_type}1"] = strlen($item->custom_value1) >= 1 ? $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}1", $item->custom_value1, $entity) : '';
$data[$key][$table_type.".{$_table_type}2"] = strlen($item->custom_value2) >= 1 ? $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}2", $item->custom_value2, $entity) : ''; $data[$key][$table_type.".{$_table_type}2"] = strlen($item->custom_value2) >= 1 ? $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}2", $item->custom_value2, $entity) : '';