From baa16f6adbd2deee861f13512b173ece4e48555a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 6 Aug 2021 14:02:23 +0200 Subject: [PATCH 1/3] :WEEK notation --- app/Utils/Traits/MakesInvoiceValues.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 1dd38dd75ad3..595a8848069e 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -358,6 +358,12 @@ trait MakesInvoiceValues ':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'), ':YEAR' => now()->year, ':QUARTER' => 'Q' . now()->quarter, + ':WEEK' => \sprintf( + '%s %s %s', + Carbon::now()->translatedFormat($this->client->date_format()), + ctrans('texts.to'), + Carbon::now()->addDays(7)->translatedFormat($this->client->date_format()) + ), ], 'raw' => [ ':MONTH' => now()->month, From d10ffefd7e371f21a69621579ba512802f81afd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 6 Aug 2021 14:04:46 +0200 Subject: [PATCH 2/3] :WEEK_BEFORE notation --- app/Utils/Traits/MakesInvoiceValues.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 595a8848069e..a244e49f85f6 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -358,6 +358,12 @@ trait MakesInvoiceValues ':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'), ':YEAR' => now()->year, ':QUARTER' => 'Q' . now()->quarter, + ':WEEK_BEFORE' => \sprintf( + '%s %s %s', + Carbon::now()->subDays(7)->translatedFormat($this->client->date_format()), + ctrans('texts.to'), + Carbon::now()->translatedFormat($this->client->date_format()) + ), ':WEEK' => \sprintf( '%s %s %s', Carbon::now()->translatedFormat($this->client->date_format()), From 8bacd14d918a4e8d3a2d4535a6cdbfdc1d4c1234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 6 Aug 2021 14:07:07 +0200 Subject: [PATCH 3/3] :WEEK_AHEAD notation --- app/Utils/Traits/MakesInvoiceValues.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index a244e49f85f6..d37539a5ab99 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -364,6 +364,12 @@ trait MakesInvoiceValues ctrans('texts.to'), Carbon::now()->translatedFormat($this->client->date_format()) ), + ':WEEK_AHEAD' => \sprintf( + '%s %s %s', + Carbon::now()->addDays(7)->translatedFormat($this->client->date_format()), + ctrans('texts.to'), + Carbon::now()->addDays(14)->translatedFormat($this->client->date_format()) + ), ':WEEK' => \sprintf( '%s %s %s', Carbon::now()->translatedFormat($this->client->date_format()),