From b2e30dcff61f3ad91d245142ab3be3d2cdbac2de Mon Sep 17 00:00:00 2001 From: Devansh Date: Wed, 26 Aug 2020 16:05:57 +0530 Subject: [PATCH] More Merchant Details Added --- .../views/sales/invoices/pdf.blade.php | 31 +++++++++++++++---- packages/Webkul/Sales/src/Config/system.php | 24 ++++++++++++++ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php index 59212d4fa..9798f3a80 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php @@ -80,10 +80,17 @@ width: 70px; } + .merchant-details { + margin-bottom: 5px; + } + + .merchant-details-title { + font-weight: bold; + } - +
@@ -92,10 +99,22 @@
@endif -
-

- {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }} -

+
+ @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.store_name')) +
{{ __('admin::app.admin.system.store-name') }}: {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.store_name') }}
+ @endif + @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.address')) +
{{ __('admin::app.admin.system.address') }}: {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }}
+ @endif + @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.contact')) +
{{ __('admin::app.admin.system.contact-number') }}: {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.contact') }}
+ @endif + @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.vat_number')) +
{{ __('admin::app.admin.system.vat-number') }}: {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.vat_number') }}
+ @endif + @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.bank_details')) +
{{ __('admin::app.admin.system.bank-details') }}: {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.bank_details') }}
+ @endif
@@ -266,4 +285,4 @@
- + \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index bf2e373f2..107c34b2d 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -55,11 +55,35 @@ return [ 'validation' => 'mimes:jpeg,bmp,png,jpg', 'channel_based' => true, ], + [ + 'name' => 'store_name', + 'title' => 'admin::app.admin.system.store-name', + 'type' => 'text', + 'channel_based' => true, + ], + [ + 'name' => 'vat_number', + 'title' => 'admin::app.admin.system.vat-number', + 'type' => 'text', + 'channel_based' => true, + ], [ 'name' => 'address', 'title' => 'admin::app.admin.system.address', 'type' => 'textarea', 'channel_based' => true, + ], + [ + 'name' => 'contact', + 'title' => 'admin::app.admin.system.contact-number', + 'type' => 'text', + 'channel_based' => true, + ], + [ + 'name' => 'bank_details', + 'title' => 'admin::app.admin.system.bank-details', + 'type' => 'textarea', + 'channel_based' => true, ] ] ]