From d0d6f2b04679e476e536cb280f3b3876dfdc7d9a Mon Sep 17 00:00:00 2001
From: Steffen Mahler <steffen.mahler@haendlerbund.de>
Date: Wed, 20 May 2020 17:44:03 +0200
Subject: [PATCH] add field company_name to bliss views

---
 .../Webkul/Admin/src/DataGrids/AddressDataGrid.php     |  9 +++++++++
 packages/Webkul/Admin/src/Resources/lang/en/app.php    |  1 +
 .../Admin/src/Resources/views/sales/address.blade.php  |  5 +++--
 .../views/checkout/onepage/customer-info.blade.php     | 10 +++++++++-
 .../Resources/views/checkout/onepage/review.blade.php  | 10 ++++++++--
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
index ede09c495..ad6a82b52 100644
--- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php
@@ -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'),
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index b13b2ec4e..86e2873e1 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -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',
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php
index 1bf6bffe2..04b7de670 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/address.blade.php
@@ -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 }} 
\ No newline at end of file
+{{ __('shop::app.checkout.onepage.contact') }} : {{ $address->phone }}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index 90fa8652c..c5611fcd6 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -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">
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
index 95c493b9a..59a507f44 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
@@ -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 }}