diff --git a/app/Services/Pdf/PdfMock.php b/app/Services/Pdf/PdfMock.php index 50203d0000fb..cd188f379ea0 100644 --- a/app/Services/Pdf/PdfMock.php +++ b/app/Services/Pdf/PdfMock.php @@ -507,7 +507,7 @@ class PdfMock '$status_logo' => '
' . ctrans('texts.paid') .'
', '$show_shipping_address' => $this->settings->show_shipping_address ? 'flex' : 'none', '$show_shipping_address_block' => $this->settings->show_shipping_address ? 'block' : 'none', - '$show_shipping_address_visibility' => $this->settings->show_shipping_address ? 'visible' : 'hidden', + '$show_shipping_address_visibility' => $this->settings->show_shipping_address ? '1' : '0', '$start_date' => '31/01/2023', '$end_date' => '31/12/2023', '$history' => '', diff --git a/database/migrations/2023_11_30_042431_2023_11_30_add_payment_visibility.php b/database/migrations/2023_11_30_042431_2023_11_30_add_payment_visibility.php new file mode 100644 index 000000000000..24b860796fe8 --- /dev/null +++ b/database/migrations/2023_11_30_042431_2023_11_30_add_payment_visibility.php @@ -0,0 +1,29 @@ +update(['visible' => 1]); + + \Illuminate\Support\Facades\Artisan::call('ninja:design-update'); + + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +}; diff --git a/resources/views/pdf-designs/plain.html b/resources/views/pdf-designs/plain.html index 10f362007795..a2db2c000911 100644 --- a/resources/views/pdf-designs/plain.html +++ b/resources/views/pdf-designs/plain.html @@ -32,7 +32,6 @@ margin-top: 0; margin-bottom: 0; size: $page_size $page_layout; - } p { @@ -44,19 +43,13 @@ display: grid; grid-template-columns: 1fr 1fr 1fr; line-height: var(--line-height); - margin-bottom:10px; + margin-bottom: 10px; } - .client-wrapper{ + .client-wrapper { display: grid; - gap: 10px; - grid-template-columns: 1fr 1fr 1fr; - grid-template-areas: "a b c "; - grid-auto-columns: minmax(0, 1fr); - grid-auto-flow: column; - justify-content:left; - line-height: var(--line-height); - + grid-template-columns: 1fr auto 1fr; + border: 0px solid #000; } .company-logo { @@ -69,11 +62,18 @@ line-height: var(--line-height); } - #entity-details { - text-align: left; + #entity-container { + border: 0px solid #000; width: 100%; + } + + #entity-details { + text-align: left; line-height: var(--line-height) !important; white-space: nowrap; + border: 0px solid #000; + margin-right: 0; + margin-left: auto; } #entity-details>tr, @@ -92,7 +92,8 @@ display: flex; flex-direction: column; line-height: var(--line-height); - white-space: nowrap; + /* white-space: nowrap; */ + border: 0px solid #000; } #shipping-details { @@ -100,6 +101,7 @@ flex-direction: column; line-height: var(--line-height); white-space: nowrap; + border: 1px solid #000; } [data-ref="table"] { @@ -285,6 +287,13 @@ color: #505050; } + #logo-container { + margin-right: 0; + margin-left: auto; + text-align: right; + border: 0px solid #000; + } + .pqrcode {} /** Useful snippets, uncomment to enable. **/ @@ -332,16 +341,15 @@
-
- - +
+
-
+