From 806f58bfd73dd7e7e1fcd999444b4c70577c90e4 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 23 Jun 2021 10:14:54 +0530 Subject: [PATCH] Invoice Settings Moved --- .../src/Http/Requests/ConfigurationForm.php | 8 +-- .../views/sales/invoices/pdf.blade.php | 4 +- packages/Webkul/Sales/src/Config/system.php | 50 ++++++++++++------- .../Sales/src/Generators/InvoiceSequencer.php | 8 +-- .../customers/account/orders/pdf.blade.php | 4 +- 5 files changed, 43 insertions(+), 31 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php index 424a72379..df7bf6af1 100644 --- a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php +++ b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php @@ -70,11 +70,11 @@ class ConfigurationForm extends FormRequest ]); } - if (request()->has('sales.orderSettings.invoice_slip_design.logo') - && ! request()->input('sales.orderSettings.invoice_slip_design.logo.delete') + if (request()->has('sales.invoice_setttings.invoice_slip_design.logo') + && ! request()->input('sales.invoice_setttings.invoice_slip_design.logo.delete') ) { $this->rules = array_merge($this->rules, [ - 'sales.orderSettings.invoice_slip_design.logo' => 'required|mimes:bmp,jpeg,jpg,png,webp|max:5000', + 'sales.invoice_setttings.invoice_slip_design.logo' => 'required|mimes:bmp,jpeg,jpg,png,webp|max:5000', ]); } @@ -102,7 +102,7 @@ class ConfigurationForm extends FormRequest return [ 'general.design.admin_logo.logo_image' => 'Logo Image', 'general.design.admin_logo.favicon' => 'Favicon Image', - 'sales.orderSettings.invoice_slip_design.logo' => 'Invoice Logo' + 'sales.invoice_setttings.invoice_slip_design.logo' => 'Invoice Logo' ]; } } \ No newline at end of file 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 75a1b8c01..30e619ddb 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 @@ -127,9 +127,9 @@

{{ __('admin::app.sales.invoices.invoice') }}

- @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) + @if (core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo'))
- +
@endif
diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php index 7c6c9830a..b120c6bfb 100644 --- a/packages/Webkul/Sales/src/Config/system.php +++ b/packages/Webkul/Sales/src/Config/system.php @@ -1,6 +1,9 @@ 'sales.orderSettings', 'name' => 'admin::app.admin.system.order-settings', @@ -44,9 +47,32 @@ return [ ], ] ], [ - 'key' => 'sales.orderSettings.invoice_number', - 'name' => 'admin::app.admin.system.invoice-number', + 'key' => 'sales.orderSettings.minimum-order', + 'name' => 'admin::app.admin.system.minimum-order', 'sort' => 1, + 'fields' => [ + [ + 'name' => 'minimum_order_amount', + 'title' => 'admin::app.admin.system.minimum-order-amount', + 'type' => 'text', + 'validation' => 'decimal', + 'channel_based' => true, + 'locale_based' => true, + ], + ] + ], + + /** + * Invoice Settings + */ + [ + 'key' => 'sales.invoice_setttings', + 'name' => 'admin::app.admin.system.invoice-settings', + 'sort' => 4, + ], [ + 'key' => 'sales.invoice_setttings.invoice_number', + 'name' => 'admin::app.admin.system.invoice-number', + 'sort' => 0, 'fields' => [ [ 'name' => 'invoice_number_prefix', @@ -82,23 +108,9 @@ return [ ], ] ], [ - 'key' => 'sales.orderSettings.minimum-order', - 'name' => 'admin::app.admin.system.minimum-order', - 'sort' => 2, - 'fields' => [ - [ - 'name' => 'minimum_order_amount', - 'title' => 'admin::app.admin.system.minimum-order-amount', - 'type' => 'text', - 'validation' => 'decimal', - 'channel_based' => true, - 'locale_based' => true, - ], - ] - ], [ - 'key' => 'sales.orderSettings.invoice_slip_design', + 'key' => 'sales.invoice_setttings.invoice_slip_design', 'name' => 'admin::app.admin.system.invoice-slip-design', - 'sort' => 3, + 'sort' => 2, 'fields' => [ [ 'name' => 'logo', @@ -108,5 +120,5 @@ return [ 'channel_based' => true, ], ] - ] + ], ]; diff --git a/packages/Webkul/Sales/src/Generators/InvoiceSequencer.php b/packages/Webkul/Sales/src/Generators/InvoiceSequencer.php index 5946d6e13..45bed6b4d 100644 --- a/packages/Webkul/Sales/src/Generators/InvoiceSequencer.php +++ b/packages/Webkul/Sales/src/Generators/InvoiceSequencer.php @@ -24,13 +24,13 @@ class InvoiceSequencer extends Sequencer */ public function setAllConfigs() { - $this->prefix = core()->getConfigData('sales.orderSettings.invoice_number.invoice_number_prefix'); + $this->prefix = core()->getConfigData('sales.invoice_setttings.invoice_number.invoice_number_prefix'); - $this->length = core()->getConfigData('sales.orderSettings.invoice_number.invoice_number_length'); + $this->length = core()->getConfigData('sales.invoice_setttings.invoice_number.invoice_number_length'); - $this->suffix = core()->getConfigData('sales.orderSettings.invoice_number.invoice_number_suffix'); + $this->suffix = core()->getConfigData('sales.invoice_setttings.invoice_number.invoice_number_suffix'); - $this->generatorClass = core()->getConfigData('sales.orderSettings.invoice_number.invoice_number_generator_class'); + $this->generatorClass = core()->getConfigData('sales.invoice_setttings.invoice_number.invoice_number_generator_class'); $this->lastId = $this->getLastId(); } diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php index 45d3a557e..3b13087b1 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php @@ -129,9 +129,9 @@

{{ __('admin::app.sales.invoices.invoice') }}

- @if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) + @if (core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo'))
- +
@endif