cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect address format for invoice documents

Browse Source
This commit is contained in:
omair saleh
2021-06-22 15:17:13 +08:00
parent 4be4013b29
commit fe35dee108
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Address.php
+10
View File
@@ -5,6 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
/**
* Class Address
@@ -58,4 +59,13 @@ class Address extends AbstractModel
{
return $this->BelongsTo(District::class, 'district_id', 'id');
}
/**
* @param Builder $query
* @return Builder
*/
public function scopeDefault(Builder $query)
{
return $query->where('default', '=',true)->first();
}
}
resources/views/pages/pdfs/deliver_order.blade.php
+8 -5
View File
@@ -52,12 +52,15 @@
</div>
<div class="address">
@php
$addresses = $supplier->addresses()->first();
$addresses = $supplier->addresses()->default();
@endphp
{{ $addresses->street_one }}
{{ $addresses->street_two }}
{{ $addresses->state()->first()->name }}
{{ $addresses->district()->first()->name }}
{{ $addresses->street_one }}
{{ $addresses->street_two }},
{{ $addresses->district->name }},
{{ $addresses->post_code }}
{{ $addresses->state->name }},
{{ $addresses->country->name }}
</div>
<div>
Phone: {{ $supplier->contacts()->first()->phone }}
resources/views/pages/pdfs/invoice.blade.php
+8 -5
View File
@@ -51,12 +51,15 @@
</div>
<div class="address">
@php
$addresses = $supplier->addresses()->first();
$addresses = $supplier->addresses()->default();
@endphp
{{ $addresses->street_one }}
{{ $addresses->street_two }}
{{ $addresses->state()->first()->name }}
{{ $addresses->district()->first()->name }}
{{ $addresses->street_one }}
{{ $addresses->street_two }},
{{ $addresses->district->name }},
{{ $addresses->post_code }}
{{ $addresses->state->name }},
{{ $addresses->country->name }}
</div>
<div>
Phone: {{ $supplier->contacts()->first()->phone }}