From 8e5051acd366f5dece77154b83e9869e3e649792 Mon Sep 17 00:00:00 2001
From: vishal-webkul <vishal.kushwaha650@webkul.com>
Date: Wed, 22 Jul 2020 15:31:35 +0530
Subject: [PATCH 1/2] issue #3547 fixed

---
 packages/Webkul/Core/src/Models/Country.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/Webkul/Core/src/Models/Country.php b/packages/Webkul/Core/src/Models/Country.php
index 1b6fbd783..9c3ac5a41 100755
--- a/packages/Webkul/Core/src/Models/Country.php
+++ b/packages/Webkul/Core/src/Models/Country.php
@@ -12,4 +12,16 @@ class Country extends TranslatableModel implements CountryContract
     public $translatedAttributes = ['name'];
 
     protected $with = ['translations'];
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = parent::toArray();
+
+        $array['name'] = $this->name;
+
+        return $array;
+    }
 }
\ No newline at end of file

From 617871299616a85cebc7a013b204755fe37d0a00 Mon Sep 17 00:00:00 2001
From: vishal-webkul <vishal.kushwaha650@webkul.com>
Date: Fri, 24 Jul 2020 10:59:57 +0530
Subject: [PATCH 2/2] fixed city missing issue in checkout page

---
 .../src/Resources/views/checkout/onepage/review.blade.php     | 4 ++--
 .../Resources/views/shop/checkout/onepage/review.blade.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 59a507f44..16b9b5b2f 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
@@ -19,7 +19,7 @@
                             <b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
                         </li>
                         <li class="mb-10">
-                            {{ $billingAddress->address1 }},<br/> {{ $billingAddress->state }}
+                            {{ $billingAddress->address1 }}, {{ $billingAddress->city }}<br/> {{ $billingAddress->state }}
                         </li>
                         <li class="mb-10">
                             {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
@@ -50,7 +50,7 @@
                             <b>{{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}</b>
                         </li>
                         <li class="mb-10">
-                            {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
+                            {{ $shippingAddress->address1 }}, {{ $shippingAddress->city }}<br/> {{ $shippingAddress->state }}
                         </li>
                         <li class="mb-10">
                             {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}
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 38858b6ae..3f4c710af 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
@@ -26,7 +26,7 @@
                                     {{ $billingAddress->name }}
                                 </li><br />
                                 <li>
-                                    {{ $billingAddress->address1 }}, <br />{{ $billingAddress->state }}
+                                    {{ $billingAddress->address1 }}, {{ $billingAddress->city }} <br />{{ $billingAddress->state }}
                                 </li><br />
                                 <li>
                                     {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
@@ -55,7 +55,7 @@
                                     {{ $shippingAddress->name }}
                                 </li><br/>
                                 <li>
-                                    {{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
+                                    {{ $shippingAddress->address1 }}, {{ $shippingAddress->city }}<br/> {{ $shippingAddress->state }}
                                 </li><br/>
                                 <li>
                                     {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}