TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

replace city & state object with their name

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/assets/js/app.js": "/assets/js/app.js?id=b43f30be09501b5efa70",
"/assets/js/app.js": "/assets/js/app.js?id=03057c22d0c8dd7a3478",
"/assets/css/crater.css": "/assets/css/crater.css?id=108e3a8d009e7d38018c"
}

4
resources/assets/js/views/estimates/Create.vue
View File

@ -46,7 +46,7 @@
{{ selectedCustomer.billing_address.address_street_2 }}
</label>
<label v-if="selectedCustomer.billing_address.city && selectedCustomer.billing_address.state">
{{ selectedCustomer.billing_address.city.name }}, {{ selectedCustomer.billing_address.state.name }} {{ selectedCustomer.billing_address.zip }}
{{ selectedCustomer.billing_address.city }}, {{ selectedCustomer.billing_address.state }} {{ selectedCustomer.billing_address.zip }}
</label>
<label v-if="selectedCustomer.billing_address.country">
{{ selectedCustomer.billing_address.country.name }}
@ -71,7 +71,7 @@
{{ selectedCustomer.shipping_address.address_street_2 }}
</label>
<label v-if="selectedCustomer.shipping_address.city && selectedCustomer.shipping_address">
{{ selectedCustomer.shipping_address.city.name }}, {{ selectedCustomer.shipping_address.state.name }} {{ selectedCustomer.shipping_address.zip }}
{{ selectedCustomer.shipping_address.city }}, {{ selectedCustomer.shipping_address.state }} {{ selectedCustomer.shipping_address.zip }}
</label>
<label v-if="selectedCustomer.shipping_address.country" class="country">
{{ selectedCustomer.shipping_address.country.name }}

4
resources/assets/js/views/invoices/Create.vue
View File

@ -44,7 +44,7 @@
{{ selectedCustomer.billing_address.address_street_2 }}
</label>
<label v-if="selectedCustomer.billing_address.city && selectedCustomer.billing_address.state">
{{ selectedCustomer.billing_address.city.name }}, {{ selectedCustomer.billing_address.state.name }} {{ selectedCustomer.billing_address.zip }}
{{ selectedCustomer.billing_address.city }}, {{ selectedCustomer.billing_address.state }} {{ selectedCustomer.billing_address.zip }}
</label>
<label v-if="selectedCustomer.billing_address.country">
{{ selectedCustomer.billing_address.country.name }}
@ -69,7 +69,7 @@
{{ selectedCustomer.shipping_address.address_street_2 }}
</label>
<label v-if="selectedCustomer.shipping_address.city && selectedCustomer.shipping_address">
{{ selectedCustomer.shipping_address.city.name }}, {{ selectedCustomer.shipping_address.state.name }} {{ selectedCustomer.shipping_address.zip }}
{{ selectedCustomer.shipping_address.city }}, {{ selectedCustomer.shipping_address.state }} {{ selectedCustomer.shipping_address.zip }}
</label>
<label v-if="selectedCustomer.shipping_address.country" class="country">
{{ selectedCustomer.shipping_address.country.name }}

8
resources/views/app/pdf/estimate/partials/billing-address.blade.php
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)

4
resources/views/app/pdf/estimate/partials/company-address.blade.php
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>

8
resources/views/app/pdf/invoice/partials/billing-address.blade.php
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>

4
resources/views/app/pdf/invoice/partials/company-address.blade.php
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>

8
resources/views/app/pdf/invoice/partials/shipping-address.blade.php
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)