From 790c8690cd19573a9b5c754284023a9dd7cff893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:11:34 +0200 Subject: [PATCH 01/12] Add $dir & $dir_text_align variables --- app/Services/PdfMaker/Design.php | 2 +- app/Utils/HtmlEngine.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index eeafbbd2d981..76595fc02a2f 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -450,7 +450,7 @@ class Design extends BaseDesign ['element' => 'img', 'properties' => ['src' => '$invoiceninja.whitelabel', 'style' => 'height: 2.5rem;', 'hidden' => $this->entity->user->account->isPaid() ? 'true' : 'false', 'id' => 'invoiceninja-whitelabel-logo']], ]], ]], - ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side'], 'elements' => []], + ['element' => 'div', 'properties' => ['class' => 'totals-table-right-side', 'dir' => '$dir'], 'elements' => []], ]; if ($this->type == 'delivery_note') { diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 70dda9a6edea..4b562decc19f 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -433,6 +433,9 @@ class HtmlEngine $data['$paymentLink'] = ['value' => ''.ctrans('texts.view_payment').'', 'label' => ctrans('texts.view_payment')]; $data['$portalButton'] = &$data['$paymentLink']; + $data['$dir'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'rtl' : 'ltr', 'label' => '']; + $data['$dir_text_align'] = ['value' => optional($this->client->language())->locale === 'ar' ? 'right' : 'left', 'label' => '']; + $arrKeysLength = array_map('strlen', array_keys($data)); array_multisort($arrKeysLength, SORT_DESC, $data); From 74d60e19f3fbe0e1e05949522392c3d2ff7d3a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:27:43 +0200 Subject: [PATCH 02/12] Update plain.html --- resources/views/pdf-designs/plain.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 1acac373e8ce..f6ff091b7d51 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -132,7 +132,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -223,7 +223,7 @@ alt="$company.name logo" /> -
+
From 0ac0e8cae39de7f3c74fe95d8168ee0ca2c260fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:28:49 +0200 Subject: [PATCH 03/12] Update clean.html --- resources/views/pdf-designs/clean.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/clean.html b/resources/views/pdf-designs/clean.html index f92129cd831a..1859255dad54 100644 --- a/resources/views/pdf-designs/clean.html +++ b/resources/views/pdf-designs/clean.html @@ -156,7 +156,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -248,7 +248,7 @@

$entity_label

-
+
From aae968f83ae70d99071fa150289e63a0a3cf7a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:31:14 +0200 Subject: [PATCH 04/12] Update bold.html --- resources/views/pdf-designs/bold.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/bold.html b/resources/views/pdf-designs/bold.html index 7a97341591cb..a491a9323046 100644 --- a/resources/views/pdf-designs/bold.html +++ b/resources/views/pdf-designs/bold.html @@ -156,7 +156,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -305,7 +305,7 @@
-
+
From 010597374efb38b77077203f8655e434a2181dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:32:58 +0200 Subject: [PATCH 05/12] Update modern.html --- resources/views/pdf-designs/modern.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index ace80dd8ed15..c8f00b4f2f07 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -189,7 +189,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -232,7 +232,7 @@ [data-ref="total_table-footer"] { margin-top: 2rem; - margin-bottom: 2rem + margin-bottom: 2rem; } /** Repeating header & footer styling. */ @@ -307,7 +307,7 @@ From 63d65a98ff241f807fa23f5dfa678e082a024934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:34:43 +0200 Subject: [PATCH 06/12] Update business.html --- resources/views/pdf-designs/business.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index 152b464b131d..fe23173e83f1 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -193,7 +193,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -293,7 +293,7 @@
-
+
From 8ade7fd8a936a86442a9cd552c2c4dd879ab94ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:35:55 +0200 Subject: [PATCH 07/12] Update creative.html --- resources/views/pdf-designs/creative.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/creative.html b/resources/views/pdf-designs/creative.html index c41cd1c20ee1..9acdf7cc9e14 100644 --- a/resources/views/pdf-designs/creative.html +++ b/resources/views/pdf-designs/creative.html @@ -158,7 +158,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -258,7 +258,7 @@ #$entity_number -
+
From d79d783e71009c183996298555965c33b983bc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:36:59 +0200 Subject: [PATCH 08/12] Update elegant.html --- resources/views/pdf-designs/elegant.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/elegant.html b/resources/views/pdf-designs/elegant.html index eaa2db9dbf17..6b1c0b46337a 100644 --- a/resources/views/pdf-designs/elegant.html +++ b/resources/views/pdf-designs/elegant.html @@ -152,7 +152,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -261,7 +261,7 @@

$details_label

-
+
From f4c938b8190bbd9b3dc2be34fc23c53c10813553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 11:52:38 +0200 Subject: [PATCH 09/12] Update hipster.html --- resources/views/pdf-designs/hipster.html | 39 +++++++++++++++--------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index cd1d498ceffa..84f6c951ec78 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -167,7 +167,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -213,6 +213,16 @@ margin-bottom: 0; } + .entity-details-wrapper > * { + direction: $dir; + } + + .entity-details-wrapper { + display: flex; + flex-wrap: wrap; + direction: $dir; + } + /** Useful snippets, uncomment to enable. **/ /** Hide company logo **/ @@ -271,30 +281,31 @@

$entity_label

- - $entity_number_label: +
+ + $entity_number_label: + $entity_number - - +
+ +
$date_label: $date - - +
+ +
$payment_due_label: $payment_due - - +
+ +
$amount_due_label: $amount_due - +
From 9837a70f6530e01553291588a83f4b93f380e988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 12:09:26 +0200 Subject: [PATCH 10/12] Update playful.html --- resources/views/pdf-designs/playful.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pdf-designs/playful.html b/resources/views/pdf-designs/playful.html index 29e919c90f02..31bbbfe608a9 100644 --- a/resources/views/pdf-designs/playful.html +++ b/resources/views/pdf-designs/playful.html @@ -184,7 +184,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; margin-top: .75rem; } @@ -301,7 +301,7 @@
-
+
From 9a5c3554e2fff09a8aa076899ea41cf5e02a018b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 12:12:11 +0200 Subject: [PATCH 11/12] Update tech.html --- resources/views/pdf-designs/tech.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/pdf-designs/tech.html b/resources/views/pdf-designs/tech.html index 0286427fe932..f0dd99bc488a 100644 --- a/resources/views/pdf-designs/tech.html +++ b/resources/views/pdf-designs/tech.html @@ -190,7 +190,7 @@ } #table-totals>.totals-table-right-side>*> :nth-child(1) { - text-align: left; + text-align: "$dir_text_align"; padding: 7px; } @@ -278,15 +278,15 @@
-
+
$payment_due_label: $payment_due -
+
-
+
$amount_due_label: $amount_due -
+ From b0eb3fe05c82068fc5b5d68674092c2b658b04e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Mon, 16 Aug 2021 12:12:33 +0200 Subject: [PATCH 12/12] Update migration --- ...19_update_designs.php => 2021_08_16_115919_update_designs.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/migrations/{2021_08_10_115919_update_designs.php => 2021_08_16_115919_update_designs.php} (100%) diff --git a/database/migrations/2021_08_10_115919_update_designs.php b/database/migrations/2021_08_16_115919_update_designs.php similarity index 100% rename from database/migrations/2021_08_10_115919_update_designs.php rename to database/migrations/2021_08_16_115919_update_designs.php