Skip to content

Commit 46629cd

Browse files
mdparvej45mdparvej45
committed
reslove conflict.
2 parents 195bf52 + ec6a7d2 commit 46629cd

File tree

3 files changed

+66
-65
lines changed

3 files changed

+66
-65
lines changed

‎app/Http/Controllers/Frontend/Page/PageController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33

44
namespace App\Http\Controllers\Frontend\Page;
55

6-
use App\Models\Banner;
76
use App\Models\Map;
87
use App\Models\Info;
98
use App\Models\User;
109
use App\Models\About;
10+
use App\Models\Banner;
1111
use App\Models\Course;
1212
use App\Models\Review;
1313
use App\Enums\PageName;
1414
use App\Models\Industry;
15+
use App\Models\Purchase;
1516
use App\Models\Achievement;
1617
use App\Models\Appointment;
1718
use App\Models\Testimonial;

‎app/Http/Controllers/PurchaseController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class PurchaseController extends Controller
1414
public function index()
1515
{
1616
$banners= Banner::latest()->get();
17-
$purchaseItem= Purchase::where('approved',1)->latest()->get();
17+
$purchaseItem= Purchase::where('user_id', auth()->id())->orderBy('id', 'desc')->take(10)->get();
1818
return view('frontend.pages.purchasesItems.purchases',compact('purchaseItem','banners'));
1919
}
2020

‎resources/views/frontend/pages/purchasesItems/purchases.blade.php

+63-63
Original file line numberDiff line numberDiff line change
@@ -6,75 +6,75 @@
66
{{-- Services --}}
77
@section('main')
88
<div class="container">
9-
<div class="row justify-content-center">
10-
<div class="col-md-12">
11-
<h4 class="my-5 text-center" style="font-size:28px; font-weight:600;">Purchase Items
12-
</h4>
13-
</div>
14-
<div class="mb-3 col-sm-8 col-xl-3">
15-
@forelse ($purchaseItem as $item)
16-
@php
17-
$model = app('App\Models\\' . $item->purchasable_type);
18-
$modelTableRowID = $model::find($item->id);
19-
@endphp
20-
<div class="w-100 h-100">
21-
<div class="p-3 border d-flex flex-column align-items-center">
22-
<span class="text-muted text-start">
23-
{{ $item->purchasable_type }}
24-
</span>
25-
<span class="text-dark text-capitalize" href="">
26-
@if ($modelTableRowID->title)
27-
<h6>{{ $modelTableRowID->title }}</h6>
28-
@elseif($modelTableRowID->name)
29-
<h6>{{ $modelTableRowID->name }}</h6>
30-
@endif
9+
<h4 class="my-5" style="font-size:28px; font-weight:600;">Purchase Items
10+
</h4>
11+
12+
<div class="row mb-3" >
13+
@forelse ($purchaseItem as $item)
14+
@php
15+
$model = app('App\Models\\' . $item->purchasable_type);
16+
$modelTableRowID = $model::find($item->id);
17+
@endphp
18+
<div class="col-md-4">
19+
<div class="w-100 h-100">
20+
<h6 class="{{ $item->approved == 1 ? 'text-success' : 'text-danger' }}">
21+
{{ $item->approved == 1 ? 'Approved.' : 'Pendding for Approved.' }}</h6>
22+
<div class="d-flex flex-column align-items-center border p-3">
23+
<span class="text-muted text-start">
24+
{{ $item->purchasable_type }}
25+
</span>
26+
<span class="text-dark text-capitalize" href="">
27+
@if ($modelTableRowID->title)
28+
<h6>{{ $modelTableRowID->title }}</h6>
29+
@elseif($modelTableRowID->name)
30+
<h6>{{ $modelTableRowID->name }}</h6>
31+
@endif
3132

32-
</span>
33-
<span class=" text-muted">
34-
{{ $item->name }}
35-
</span>
36-
<span class=" text-muted">
37-
Contact Number: {{ $item->contact_number }}
38-
</span>
39-
<span class="text-muted">
40-
Transaction Id: {{ $item->trx_id }}
41-
</span>
42-
<span class="text-muted">
43-
Payment Date: {{ $item->payment_date }}
44-
</span>
45-
<span class=" text-muted">
46-
Expire Date: {{ $item->expire_date }}
47-
</span>
48-
</div>
49-
<div class="p-2 bg-primary custom-grid">
50-
<span class="mb-1 text-black d-block">
51-
Payble Amount: {{ $item->payable_amount }}
52-
</span>
53-
<span class="mb-1 text-black d-block">
54-
Paid Amount: {{ $item->paid }}
55-
</span>
56-
<span class="mb-1 text-black d-block">
57-
Due Amount: {{ $item->due }}
58-
</span>
59-
</div>
60-
</div>
61-
@empty
62-
<div class="mx-auto row">
63-
{{-- <div class="col-md-2"></div> --}}
64-
<div class="col-md-12">
65-
<img loading="lazy" src="{{ asset('frontend/assets/images/no_data.jpg') }}"
66-
style="height:100%; width:100%" class="img-fluid" alt="Responsive image">
67-
</div>
68-
<div class="col-md-2"></div>
69-
</div>
70-
@endforelse
33+
</span>
34+
<span class=" text-muted">
35+
{{ $item->name }}
36+
</span>
37+
<span class=" text-muted">
38+
Contact Number: {{ $item->contact_number }}
39+
</span>
40+
<span class="text-muted">
41+
Transaction Id: {{ $item->trx_id }}
42+
</span>
43+
<span class="text-muted">
44+
Payment Date: {{ $item->payment_date }}
45+
</span>
46+
<span class=" text-muted">
47+
Expire Date: {{ $item->expire_date }}
48+
</span>
49+
</div>
50+
<div class="bg-primary p-2 custom-grid">
51+
<span class="mb-1 text-black d-block">
52+
Payble Amount: {{ $item->payable_amount }}
53+
</span>
54+
<span class="mb-1 text-black d-block">
55+
Paid Amount: {{ $item->paid }}
56+
</span>
57+
<span class="mb-1 text-black d-block">
58+
Due Amount: {{ $item->due }}
59+
</span>
60+
</div>
61+
</div>
62+
</div>
63+
@empty
64+
<div class="row">
65+
<div class="col-md-2"></div>
66+
<div class="col-md-8">
67+
<img loading="lazy" class="w-100" src="{{ asset('frontend/assets/images/no_data.jpg') }}"
68+
style="height:100%;" class="img-fluid p-5" alt="Responsive image">
69+
</div>
70+
<div class="col-md-2"></div>
7171
</div>
72-
<div class="col-md-2"></div>
72+
@endforelse
7373
</div>
7474
</div>
7575
@endsection
7676

77-
{{-- <section class="px-2 my-5 px-lg-12">
77+
{{-- <section class="px-lg-12 px-2 my-5">
7878
7979
</section> --}}
8080
@push('customJs')

0 commit comments

Comments
 (0)