From cc425ad13a27006c1b4ae6ceeef0e1f172e02620 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Fri, 28 Aug 2020 00:09:28 +0530
Subject: [PATCH] Two Seperate Form Merged

---
 .../views/sales/invoices/pdf.blade.php        | 35 +++++++++++++------
 packages/Webkul/Sales/src/Config/system.php   | 30 ----------------
 .../Webkul/Shipping/src/Config/system.php     | 28 ++++++++++++---
 .../customers/account/orders/pdf.blade.php    | 32 +++++++++++------
 4 files changed, 70 insertions(+), 55 deletions(-)

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 9798f3a80..5c41cc583 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
@@ -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>
\ No newline at end of file
+</html>
+{{ dd('here') }}
\ No newline at end of file
diff --git a/packages/Webkul/Sales/src/Config/system.php b/packages/Webkul/Sales/src/Config/system.php
index 107c34b2d..23f6d2537 100644
--- a/packages/Webkul/Sales/src/Config/system.php
+++ b/packages/Webkul/Sales/src/Config/system.php
@@ -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,
-            ]
         ]
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Config/system.php b/packages/Webkul/Shipping/src/Config/system.php
index 5e41be967..7ceca2c07 100755
--- a/packages/Webkul/Shipping/src/Config/system.php
+++ b/packages/Webkul/Shipping/src/Config/system.php
@@ -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,
             ]
         ]
     ]
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 e4377e634..a89bc1672 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
@@ -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>