merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Invoice Settings Moved

This commit is contained in:
devansh bawari 2021-06-23 10:14:54 +05:30
parent 69b410a418
commit 806f58bfd7
5 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
View File

@ -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'
];
}
}

4
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -127,9 +127,9 @@
<h1 class="text-center">{{ __('admin::app.sales.invoices.invoice') }}</h1>
</div>
</div>
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo'))
@if (core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo'))
<div class="image">
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo')) }}"/>
</div>
@endif
<div class="merchant-details">

50
packages/Webkul/Sales/src/Config/system.php
View File

@ -1,6 +1,9 @@
<?php
return [
/**
* Order Settings
*/
[
'key' => '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,
],
]
]
],
];

8
packages/Webkul/Sales/src/Generators/InvoiceSequencer.php
View File

@ -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();
}

4
packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
View File

@ -129,9 +129,9 @@
<h1 class="text-center">{{ __('admin::app.sales.invoices.invoice') }}</h1>
</div>
</div>
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.logo'))
@if (core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo'))
<div class="image">
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}" alt=""/>
<img class="logo" src="{{ Storage::url(core()->getConfigData('sales.invoice_setttings.invoice_slip_design.logo')) }}" alt=""/>
</div>
@endif
<div class="merchant-details">