replace city & state object with their name

This commit is contained in:
raishvaria
2019-12-04 09:37:22 +05:30
parent f4ca6d4b73
commit 9bcec9bd75
9 changed files with 22 additions and 22 deletions

View File

@ -16,12 +16,12 @@
{{$estimate->user->billingaddress->address_street_2}}<br>
@endif
@if($estimate->user->billingaddress->city && $estimate->user->billingaddress->city->name)
{{$estimate->user->billingaddress->city->name}},
@if($estimate->user->billingaddress->city && $estimate->user->billingaddress->city)
{{$estimate->user->billingaddress->city}},
@endif
@if($estimate->user->billingaddress->state && $estimate->user->billingaddress->state->name)
{{$estimate->user->billingaddress->state->name}}.
@if($estimate->user->billingaddress->state && $estimate->user->billingaddress->state)
{{$estimate->user->billingaddress->state}}.
@endif
@if($estimate->user->billingaddress->zip)

View File

@ -12,10 +12,10 @@
{{$company_address->addresses[0]['address_street_2']}} <br>
@endif
@if($company_address->addresses[0]['city'])
{{$company_address->addresses[0]['city']->name}}
{{$company_address->addresses[0]['city']}}
@endif
@if($company_address->addresses[0]['state'])
{{$company_address->addresses[0]['state']->name}}
{{$company_address->addresses[0]['state']}}
@endif
@if($company_address->addresses[0]['zip'])
{{$company_address->addresses[0]['zip']}} <br>

View File

@ -14,11 +14,11 @@
@if($invoice->user->billingaddress->address_street_2)
{{$invoice->user->billingaddress->address_street_2}}<br>
@endif
@if($invoice->user->billingaddress->city && $invoice->user->billingaddress->city->name)
{{$invoice->user->billingaddress->city->name}},
@if($invoice->user->billingaddress->city && $invoice->user->billingaddress->city)
{{$invoice->user->billingaddress->city}},
@endif
@if($invoice->user->billingaddress->state && $invoice->user->billingaddress->state->name)
{{$invoice->user->billingaddress->state->name}}.
@if($invoice->user->billingaddress->state && $invoice->user->billingaddress->state)
{{$invoice->user->billingaddress->state}}.
@endif
@if($invoice->user->billingaddress->zip)
{{$invoice->user->billingaddress->zip}}<br>

View File

@ -12,10 +12,10 @@
{{$company_address->addresses[0]['address_street_2']}} <br>
@endif
@if($company_address->addresses[0]['city'])
{{$company_address->addresses[0]['city']->name}}
{{$company_address->addresses[0]['city']}}
@endif
@if($company_address->addresses[0]['state'])
{{$company_address->addresses[0]['state']->name}}
{{$company_address->addresses[0]['state']}}
@endif
@if($company_address->addresses[0]['zip'])
{{$company_address->addresses[0]['zip']}} <br>

View File

@ -16,12 +16,12 @@
{{$invoice->user->shippingaddress->address_street_2}}<br>
@endif
@if($invoice->user->shippingaddress->city && $invoice->user->shippingaddress->city->name)
{{$invoice->user->shippingaddress->city->name}},
@if($invoice->user->shippingaddress->city && $invoice->user->shippingaddress->city)
{{$invoice->user->shippingaddress->city}},
@endif
@if($invoice->user->shippingaddress->state && $invoice->user->shippingaddress->state->name)
{{$invoice->user->shippingaddress->state->name}}.
@if($invoice->user->shippingaddress->state && $invoice->user->shippingaddress->state)
{{$invoice->user->shippingaddress->state}}.
@endif
@if($invoice->user->shippingaddress->zip)