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 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 @@ {{ $billingAddress->first_name }} {{ $billingAddress->last_name }}
  • - {{ $billingAddress->address1 }},
    {{ $billingAddress->state }} + {{ $billingAddress->address1 }}, {{ $billingAddress->city }}
    {{ $billingAddress->state }}
  • {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }} @@ -50,7 +50,7 @@ {{ $shippingAddress->first_name }} {{ $shippingAddress->last_name }}
  • - {{ $shippingAddress->address1 }},
    {{ $shippingAddress->state }} + {{ $shippingAddress->address1 }}, {{ $shippingAddress->city }}
    {{ $shippingAddress->state }}
  • {{ 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 }}

  • - {{ $billingAddress->address1 }},
    {{ $billingAddress->state }} + {{ $billingAddress->address1 }}, {{ $billingAddress->city }}
    {{ $billingAddress->state }}

  • {{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }} @@ -55,7 +55,7 @@ {{ $shippingAddress->name }}

  • - {{ $shippingAddress->address1 }},
    {{ $shippingAddress->state }} + {{ $shippingAddress->address1 }}, {{ $shippingAddress->city }}
    {{ $shippingAddress->state }}

  • {{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}