merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Issue #3547 fixed"

This commit is contained in:
Jitendra Singh 2020-07-27 15:16:02 +05:30 committed by GitHub
parent bb5f331d66
commit 74adb7233a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/Webkul/Core/src/Models/Country.php
View File

@ -12,16 +12,4 @@ 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;
}
}

4
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -19,7 +19,7 @@
<b>{{ $billingAddress->first_name }} {{ $billingAddress->last_name }}</b>
</li>
<li class="mb-10">
{{ $billingAddress->address1 }}, {{ $billingAddress->city }}<br/> {{ $billingAddress->state }}
{{ $billingAddress->address1 }},<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 }}, {{ $shippingAddress->city }}<br/> {{ $shippingAddress->state }}
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
</li>
<li class="mb-10">
{{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}

4
packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/review.blade.php
View File

@ -26,7 +26,7 @@
{{ $billingAddress->name }}
</li><br />
<li>
{{ $billingAddress->address1 }}, {{ $billingAddress->city }} <br />{{ $billingAddress->state }}
{{ $billingAddress->address1 }}, <br />{{ $billingAddress->state }}
</li><br />
<li>
{{ core()->country_name($billingAddress->country) }} {{ $billingAddress->postcode }}
@ -55,7 +55,7 @@
{{ $shippingAddress->name }}
</li><br/>
<li>
{{ $shippingAddress->address1 }}, {{ $shippingAddress->city }}<br/> {{ $shippingAddress->state }}
{{ $shippingAddress->address1 }},<br/> {{ $shippingAddress->state }}
</li><br/>
<li>
{{ core()->country_name($shippingAddress->country) }} {{ $shippingAddress->postcode }}