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

Two Seperate Form Merged

This commit is contained in:
Devansh 2020-08-28 00:09:28 +05:30
parent 64c80783f8
commit cc425ad13a
4 changed files with 70 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,20 +100,32 @@
</div>
@endif
<div class="merchant-details">
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.store_name'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.store-name') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.store_name') }}</div>
@if (core()->getConfigData('sales.shipping.origin.store_name'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.store-name') }}:</span> {{ core()->getConfigData('sales.shipping.origin.store_name') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.address'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.address') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }}</div>
@if (core()->getConfigData('sales.shipping.origin.address1'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.address') }}:</span> {{ core()->getConfigData('sales.shipping.origin.address1') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.contact'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.contact') }}</div>
@if (core()->getConfigData('sales.shipping.origin.city'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.city') }}:</span> {{ core()->getConfigData('sales.shipping.origin.city') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.vat_number'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.vat_number') }}</div>
@if (core()->getConfigData('sales.shipping.origin.state'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.state') }}:</span> {{ core()->getConfigData('sales.shipping.origin.state') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.bank_details'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.bank_details') }}</div>
@if (core()->getConfigData('sales.shipping.origin.country'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.country') }}:</span> {{ core()->getConfigData('sales.shipping.origin.country') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.zipcode'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.zip') }}:</span> {{ core()->getConfigData('sales.shipping.origin.zipcode') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.contact'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.contact') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.vat_number'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.vat_number') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.bank_details'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.shipping.origin.bank_details') }}</div>
@endif
</div>
</div>
@ -285,4 +297,5 @@
</div>
</body>
</html>
</html>
{{ dd('here') }}

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

@ -55,36 +55,6 @@ 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,
]
]
]
];

28
packages/Webkul/Shipping/src/Config/system.php
View File

@ -107,6 +107,13 @@ return [
'validation' => 'required',
'channel_based' => true,
'locale_based' => true,
], [
'name' => 'city',
'title' => 'admin::app.admin.system.city',
'type' => 'text',
'validation' => 'required',
'channel_based' => true,
'locale_based' => false,
], [
'name' => 'address1',
'title' => 'admin::app.admin.system.street-address',
@ -122,12 +129,25 @@ return [
'channel_based' => true,
'locale_based' => false,
], [
'name' => 'city',
'title' => 'admin::app.admin.system.city',
'name' => 'store_name',
'title' => 'admin::app.admin.system.store-name',
'type' => 'text',
'validation' => 'required',
'channel_based' => true,
'locale_based' => false,
], [
'name' => 'vat_number',
'title' => 'admin::app.admin.system.vat-number',
'type' => 'text',
'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,
]
]
]

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

@ -104,20 +104,32 @@
</div>
@endif
<div class="merchant-details">
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.store_name'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.store-name') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.store_name') }}</div>
@if (core()->getConfigData('sales.shipping.origin.store_name'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.store-name') }}:</span> {{ core()->getConfigData('sales.shipping.origin.store_name') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.address'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.address') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }}</div>
@if (core()->getConfigData('sales.shipping.origin.address1'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.address') }}:</span> {{ core()->getConfigData('sales.shipping.origin.address1') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.contact'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.contact') }}</div>
@if (core()->getConfigData('sales.shipping.origin.city'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.city') }}:</span> {{ core()->getConfigData('sales.shipping.origin.city') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.vat_number'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.vat_number') }}</div>
@if (core()->getConfigData('sales.shipping.origin.state'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.state') }}:</span> {{ core()->getConfigData('sales.shipping.origin.state') }}</div>
@endif
@if (core()->getConfigData('sales.orderSettings.invoice_slip_design.bank_details'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.bank_details') }}</div>
@if (core()->getConfigData('sales.shipping.origin.country'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.country') }}:</span> {{ core()->getConfigData('sales.shipping.origin.country') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.zipcode'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.zip') }}:</span> {{ core()->getConfigData('sales.shipping.origin.zipcode') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.contact'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.contact-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.contact') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.vat_number'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.vat-number') }}:</span> {{ core()->getConfigData('sales.shipping.origin.vat_number') }}</div>
@endif
@if (core()->getConfigData('sales.shipping.origin.bank_details'))
<div><span class="merchant-details-title">{{ __('admin::app.admin.system.bank-details') }}:</span> {{ core()->getConfigData('sales.shipping.origin.bank_details') }}</div>
@endif
</div>
</div>