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

add field company_name to bliss views

This commit is contained in:
Steffen Mahler 2020-05-20 17:44:03 +02:00
parent 4842eb4de6
commit d0d6f2b046
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
View File

@ -82,6 +82,15 @@ class AddressDataGrid extends DataGrid
'filterable' => true,
]);
$this->addColumn([
'index' => 'company_name',
'label' => trans('admin::app.customers.addresses.company-name'),
'type' => 'string',
'searchable' => true,
'sortable' => true,
'filterable' => true,
]);
$this->addColumn([
'index' => 'address1',
'label' => trans('admin::app.customers.addresses.address-1'),

1
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -901,6 +901,7 @@ return [
'address-list' => 'Address\'s List',
'order-list' => 'Order\'s List',
'address-id' => 'Address ID',
'company-name' => 'Company Name',
'address-1' => 'Address 1',
'city' => 'City',
'state-name' => 'State',

5
packages/Webkul/Admin/src/Resources/views/sales/address.blade.php
View File

@ -1,6 +1,7 @@
{{ $address->name }}</br>
{{ $address->company_name ?? '' }}</br>
<b>{{ $address->name }}</b></br>
{{ $address->address1 }}</br>
{{ $address->city }}</br>
{{ $address->state }}</br>
{{ core()->country_name($address->country) }} {{ $address->postcode }}</br></br>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $address->phone }}
{{ __('shop::app.checkout.onepage.contact') }} : {{ $address->phone }}

10
packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
View File

@ -17,6 +17,10 @@
</label>
<ul class="address-card-list" style="float: right; width: 85%;">
<li class="mb-5" v-if="addresses.company-name != ''">
@{{ addresses.company_name }}
</li>
<li class="mb-10">
<b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
</li>
@ -269,8 +273,12 @@
</label>
<ul class="address-card-list" style="float: right; width: 85%;">
<li class="mb-5" v-if="addresses.company-name != ''">
@{{ addresses.company_name }}
</li>
<li class="mb-10">
<b>@{{ allAddress.first_name }} @{{ allAddress.last_name }},</b>
<b>@{{ addresses.first_name }} @{{ addresses.last_name }},</b>
</li>
<li class="mb-5">

10
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -13,7 +13,10 @@
<div class="card-content">
<ul>
<li class="mb-10">
{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}
{{ $billingAddress->company_name ?? '' }}
</li>
<li class="mb-10">
<b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
@ -41,7 +44,10 @@
<div class="card-content">
<ul>
<li class="mb-10">
{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}
{{ $shippingAddress->company_name ?? '' }}
</li>
<li class="mb-10">
<b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}