Skip to content

Commit e6290ce

Browse files
committed
fix: invoice view
1 parent 196e00e commit e6290ce

File tree

1 file changed

+33
-30
lines changed

1 file changed

+33
-30
lines changed

resources/views/backend/invoice/viewOne.blade.php

+33-30
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@
118118
}
119119
</style>
120120
@endPushOnce
121+
@php
122+
$years = $invoice->fiscalYears;
123+
$fiscal = $years->where('year', $year)->first() ?? $years->latest()->first();
124+
@endphp
121125

122126
@section('content')
123127
<!-- start page title -->
@@ -130,18 +134,18 @@
130134
<button class="btn btn-primary waves-effect waves-light m-2 d-print-none d-block" id="cmd">Print</button>
131135
</div>
132136
<div>
133-
<div class="row">
134-
@isset($basic->header_image)
135-
<div class="d-flex border my-5 justify-content-center">
136-
<img style="object-fit: cover; max-width:1240px;height:250px;"
137-
src="{{ asset('storage/' . app('setting')->basic->header_image) }}" alt="">
137+
<div class="row">
138+
@isset($basic->header_image)
139+
<div class="d-flex border my-5 justify-content-center">
140+
<img style="object-fit: cover; max-width:1240px;height:250px;"
141+
src="{{ asset('storage/' . app('setting')->basic->header_image) }}" alt="">
142+
</div>
143+
@else
144+
<div class="p-5 text-center">
145+
No Header Image found
146+
</div>
147+
@endisset
138148
</div>
139-
@else
140-
<div class="p-5 text-center">
141-
No Header Image found
142-
</div>
143-
@endisset
144-
</div>
145149
<div class="row table-col">
146150
<div class="col-sm-4 col-md-3 table-cell">
147151
<div class="pe-2 mb-2">
@@ -163,13 +167,13 @@
163167
<div class="mb-3">
164168
<label for="issue-date" class="mb-0 d-block">Date of Issue</label>
165169
<div class="d-flex align-items-center">
166-
{{ Carbon\Carbon::parse($invoice->fiscalYears()->where('year', $year)->first()->pivot->issue_date)->format('F d, Y') }}
170+
{{ Carbon\Carbon::parse($fiscal->pivot->issue_date)->format('F d, Y') }}
167171
</div>
168172
</div>
169173
<div class="mb-3">
170174
<label for="issue-date" class="mb-0 d-block">Due Date</label>
171175
<div class="d-flex align-items-center">
172-
{{ Carbon\Carbon::parse($invoice->fiscalYears()->where('year', $year)->first()->pivot->due_date)->format('F d, Y') }}
176+
{{ Carbon\Carbon::parse($fiscal->pivot->due_date)->format('F d, Y') }}
173177
</div>
174178
</div>
175179
</div>
@@ -188,15 +192,15 @@
188192
<div class="d-flex justify-content-end mb-2">
189193
<p class="mb-0">Amount Due (USD) <br>
190194
<span class="fs-1 fw-bold text-black"
191-
id="amount-due-vue">{{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->due ?? '' }}Tk</span>
195+
id="amount-due-vue">{{ $fiscal->pivot->due ?? '' }}Tk</span>
192196
</p>
193197
</div>
194198
<div class="fw-bold d-flex justify-content-end">
195199
<h4> Year: {{ $year }}</h4>
196200
</div>
197201
@php
198202
$color = 'dark';
199-
switch ($invoice->fiscalYears()->where('year', $year)->first()->pivot->status) {
203+
switch ($fiscal->pivot->status) {
200204
case 'sent':
201205
$color = '#1abc9c';
202206
break;
@@ -218,7 +222,7 @@
218222
<div style="font-weight: 600;margin-bottom:.5rem; text-align:end;">
219223
<span style="margin-right:1rem; ">Status:</span>
220224
<span
221-
style="background: {{ $color }};padding:0.3rem 0.6rem; border-radius:0.3rem;color:white;">{{ str($invoice->fiscalYears()->where('year', $year)->first()->pivot->status)->title() }}</span>
225+
style="background: {{ $color }};padding:0.3rem 0.6rem; border-radius:0.3rem;color:white;">{{ str($fiscal->pivot->status)->title() }}</span>
222226
</d>
223227
</div>
224228
</div>
@@ -276,7 +280,7 @@
276280
<div style="font-weight: 600;display:table-row">
277281
<div style="margin-right: 1rem;display:table-cell">Sub Total:</div>
278282
<div style="display:table-cell;text-align:end;">
279-
{{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->sub_total }}
283+
{{ $fiscal->pivot->sub_total }}
280284
Tk</div>
281285
</h3>
282286
</div>
@@ -287,7 +291,7 @@
287291
<div style="margin-right: 1rem;display:table-cell">Discount:</div>
288292
<div style="display:table-cell;text-align:end;color:#1abc9c;">
289293
-
290-
{{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->discount }}
294+
{{ $fiscal->pivot->discount }}
291295
Tk</div>
292296
</h3>
293297
</div>
@@ -330,7 +334,7 @@
330334
<div style="font-weight: 600;display:table-row">
331335
<div style="margin-right: 1rem;display:table-cell">Total:</div>
332336
<div style="display:table-cell;text-align:end;">
333-
{{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->demand }}
337+
{{ $fiscal->pivot->demand }}
334338
Tk</div>
335339
</h3>
336340
</div>
@@ -369,7 +373,7 @@
369373
<div style="display:table-cell;width:50%;">Demand</div>
370374
<div style="display:table-cell;text-align:end;">:</div>
371375
<div style="display:table-cell;text-align:end;">
372-
{{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->demand }}
376+
{{ $fiscal->pivot->demand }}
373377
Tk</div>
374378
</h3>
375379
</div>
@@ -379,7 +383,7 @@
379383
<div style="display:table-cell;width:50%;">Paid</div>
380384
<div style="display:table-cell;text-align:end;">:</div>
381385
<div style="display:table-cell;text-align:end;color:#1abc9c;">
382-
- {{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->paid }}
386+
- {{ $fiscal->pivot->paid }}
383387
Tk</div>
384388
</h3>
385389
</div>
@@ -389,7 +393,7 @@
389393
<div style="display:table-cell;width:50%;">Due</div>
390394
<div style="display:table-cell;text-align:end;">:</div>
391395
<div style="display:table-cell;text-align:end;">
392-
{{ $invoice->fiscalYears()->where('year', $year)->first()->pivot->due }}
396+
{{ $fiscal->pivot->due }}
393397
Tk</div>
394398
</h3>
395399
</div>
@@ -414,15 +418,14 @@
414418
</div>
415419
<div class="row">
416420
@isset(app('setting')->basic->footer_image)
417-
<div class="d-flex border my-2 justify-content-center">
418-
<img style="object-fit: cover; max-width:1240px;height:250px;"
419-
src="{{ asset('storage/' . app('setting')->basic->footer_image) }}" alt="">
420-
</div>
421-
421+
<div class="d-flex border my-2 justify-content-center">
422+
<img style="object-fit: cover; max-width:1240px;height:250px;"
423+
src="{{ asset('storage/' . app('setting')->basic->footer_image) }}" alt="">
424+
</div>
422425
@else
423-
<div class="p-5 text-center">
424-
No Footer Image found
425-
</div>
426+
<div class="p-5 text-center">
427+
No Footer Image found
428+
</div>
426429
@endisset
427430
</div>
428431

0 commit comments

Comments
 (0)