From f04abcbc850381a863cbf064990aefb8520af230 Mon Sep 17 00:00:00 2001
From: Steffen Mahler <steffen.mahler@haendlerbund.de>
Date: Fri, 22 May 2020 08:31:11 +0200
Subject: [PATCH] add field company_name to views

---
 .../src/Resources/views/sales/invoices/pdf.blade.php      | 2 ++
 .../views/customers/account/orders/pdf.blade.php          | 4 +++-
 .../views/emails/sales/new-admin-order.blade.php          | 8 ++++++++
 .../emails/sales/new-inventorysource-shipment.blade.php   | 8 ++++++++
 .../Resources/views/emails/sales/new-invoice.blade.php    | 8 ++++++++
 .../src/Resources/views/emails/sales/new-order.blade.php  | 8 ++++++++
 .../src/Resources/views/emails/sales/new-refund.blade.php | 8 ++++++++
 .../Resources/views/emails/sales/new-shipment.blade.php   | 8 ++++++++
 .../Resources/views/emails/sales/order-cancel.blade.php   | 8 ++++++++
 .../views/shop/checkout/onepage/review.blade.php          | 6 ++++++
 10 files changed, 67 insertions(+), 1 deletion(-)

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 4a8d831af..3953c6a3d 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
@@ -130,6 +130,7 @@
                         <tbody>
                             <tr>
                                 <td>
+                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
                                     <p>{{ $invoice->order->billing_address->name }}</p>
                                     <p>{{ $invoice->order->billing_address->address1 }}</p>
                                     <p>{{ $invoice->order->billing_address->city }}</p>
@@ -140,6 +141,7 @@
 
                                 @if ($invoice->order->shipping_address)
                                     <td>
+                                        <p>{{ $invoice->order->shipping_address->company_name ?? '' }}</p>
                                         <p>{{ $invoice->order->shipping_address->name }}</p>
                                         <p>{{ $invoice->order->shipping_address->address1 }}</p>
                                         <p>{{ $invoice->order->shipping_address->city }}</p>
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 dfe110825..58046625b 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
@@ -96,7 +96,7 @@
                         <img class="logo" src="{{ Storage::url(core()->getConfigData('sales.orderSettings.invoice_slip_design.logo')) }}"/>
                     </div>
                 @endif
-                
+
                 <div class="address">
                     <p>
                       <b> {{ core()->getConfigData('sales.orderSettings.invoice_slip_design.address') }} </b>
@@ -135,6 +135,7 @@
                         <tbody>
                             <tr>
                                 <td>
+                                    <p>{{ $invoice->order->billing_address->company_name ?? '' }}</p>
                                     <p>{{ $invoice->order->billing_address->name }}</p>
                                     <p>{{ $invoice->order->billing_address->address1 }}</p>
                                     <p>{{ $invoice->order->billing_address->city }}</p>
@@ -148,6 +149,7 @@
 
                                 @if ($invoice->order->shipping_address)
                                     <td>
+                                        <p>{{ $invoice->order->shipping_address->company_name ?? '' }}</p>
                                         <p>{{ $invoice->order->shipping_address->name }}</p>
                                         <p>{{ $invoice->order->shipping_address->address1 }}</p>
                                         <p>{{ $invoice->order->shipping_address->city }}</p>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
index ec6933735..f3d8e1c05 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
@@ -38,6 +38,10 @@
                     {{ __('shop::app.mail.order.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -70,6 +74,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
index 3564b7bfd..287eaf453 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
@@ -39,6 +39,10 @@
                     {{ __('shop::app.mail.order.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -81,6 +85,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
index 5c24a70fd..6a1b71ce5 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
@@ -38,6 +38,10 @@
                         {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
                     <div>
                         {{ $order->shipping_address->name }}
                     </div>
@@ -71,6 +75,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
index a1b58f641..eb148b2b3 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
@@ -35,6 +35,10 @@
                         {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
                     <div>
                         {{ $order->shipping_address->name }}
                     </div>
@@ -68,6 +72,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
index 8bd270795..993108341 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-refund.blade.php
@@ -37,6 +37,10 @@
                         {{ __('shop::app.mail.order.shipping-address') }}
                     </div>
 
+                    <div>
+                        {{ $order->shipping_address->company_name ?? '' }}
+                    </div>
+
                     <div>
                         {{ $order->shipping_address->name }}
                     </div>
@@ -70,6 +74,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index d5fabb734..a4d99b383 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -36,6 +36,10 @@
                     {{ __('shop::app.mail.order.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -78,6 +82,10 @@
                     {{ __('shop::app.mail.order.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
index 2b0139e1c..494c2747c 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
@@ -34,6 +34,10 @@
                     {{ __('shop::app.mail.order.cancel.shipping-address') }}
                 </div>
 
+                <div>
+                    {{ $order->shipping_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->shipping_address->name }}
                 </div>
@@ -66,6 +70,10 @@
                     {{ __('shop::app.mail.order.cancel.billing-address') }}
                 </div>
 
+                <div>
+                    {{ $order->billing_address->company_name ?? '' }}
+                </div>
+
                 <div>
                     {{ $order->billing_address->name }}
                 </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
index 1fde1befb..38858b6ae 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
@@ -19,6 +19,9 @@
 
                         <div class="card-content">
                             <ul type="none">
+                                <li>
+                                    {{ $billingAddress->company_name ?? '' }}
+                                </li><br />
                                 <li>
                                     {{ $billingAddress->name }}
                                 </li><br />
@@ -45,6 +48,9 @@
 
                         <div class="card-content">
                             <ul>
+                                <li>
+                                    {{ $shippingAddress->company_name ?? '' }}
+                                </li><br/>
                                 <li>
                                     {{ $shippingAddress->name }}
                                 </li><br/>