Skip to content

Commit fc1bd5d

Browse files
mhsunmhsun
committed
bazar manage completed and all options related to member menu done
1 parent 3df06de commit fc1bd5d

File tree

6 files changed

+72
-6
lines changed

6 files changed

+72
-6
lines changed

‎app/Http/Controllers/BazarController.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function assign() {
1717
}
1818

1919
public function assignMember(Request $request) {
20-
$validate = $request->validate([
20+
$request->validate([
2121
'member_id' => 'required|integer|max:8',
2222
'date_from' => 'required|date|date-format:Y-m-d',
2323
'date_to' => 'required|date|date-format:Y-m-d|'
@@ -30,6 +30,13 @@ public function assignMember(Request $request) {
3030
->withInput();
3131
}
3232

33+
$doExist = Bazar::where('date_from','>=', $request->date_from)->where('date_to','<=', $request->date_to)->get();
34+
if (count($doExist) > 0) {
35+
return redirect()
36+
->back()
37+
->with('error','A member is already assigned between the date entered')
38+
->withInput();
39+
}
3340
$bazar = new Bazar();
3441
$bazar->assigned_user = $request->member_id;
3542
$bazar->assigned_by = \Illuminate\Support\Facades\Auth::user()->id;
@@ -53,4 +60,5 @@ public function manageAssignedMembers() {
5360

5461
return view('admin.bazar.bazar_list',$data);
5562
}
63+
5664
}

‎app/Http/Controllers/MemberController.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Controllers;
44

5+
use App\MonthlyBill;
56
use Illuminate\Http\Request;
67
use App\User;
78
use Illuminate\Support\Facades\Session;
@@ -106,7 +107,10 @@ public function leaveMember(Request $request, $id) {
106107
return redirect('/member/manage')->with('message','Member leave made successfully');
107108
}
108109

109-
public function showBillList($id) {
110-
110+
public function showMemberBill($id) {
111+
$data['memberBill'] = MonthlyBill::where('user_id',$id)->get();
112+
return view('admin.user.bill_list',$data);
111113
}
114+
115+
112116
}

‎resources/views/admin/bazar/bazar_form.blade.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
<div class="col-lg-12">
99
<div class="panel panel-default">
1010
<div class="panel-heading">Form Elements</div>
11-
<span class="text-center" style="text-align: center; color: green;">{{ Session::get('message') ? Session::get('message') : "" }}</span>
12-
<span class="text-center" style="text-align: center; color: red;">{{ Session::get('error') ? Session::get('error') : "" }}</span>
11+
@if (Session::get('message'))
12+
<p class="text-center" style="color: green;">{{ Session::get('message')}}</p>
13+
@endif
14+
@if (Session::get('error'))
15+
<p class="text-center" style="color: red;">{{ Session::get('error') }}</p>
16+
@endif
1317
<div class="panel-body">
1418
<div class="col-md-offset-3 col-md-6">
1519
{!! Form::open() !!}

‎resources/views/admin/user/bill_list.blade.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
@extends('admin.master')
2+
@section('title')
3+
Manage Member
4+
@endsection
5+
@section('main_content')
6+
<div class="col-sm-9 col-sm-offset-3 col-lg-10 col-lg-offset-2 main">
7+
<div class="row">
8+
<div class="col-lg-12">
9+
<div class="panel panel-default">
10+
<div class="panel-heading">Member's List</div>
11+
<div class="panel-body">
12+
@if (Session::get('message'))
13+
<p class="text-center" style="color: green;">{{ Session::get('message')}}</p>
14+
@endif
15+
@if (Session::get('error'))
16+
<p class="text-center" style="color: red;">{{ Session::get('error') }}</p>
17+
@endif
18+
<table data-toggle="table" data-url="tables/data1.json" data-show-refresh="true" data-show-toggle="true" data-show-columns="true" data-search="true" data-select-item-name="toolbar1" data-pagination="true" data-sort-name="name" data-sort-order="desc">
19+
<thead>
20+
<tr>
21+
<th data-field="month" data-sortable="true">Month</th>
22+
<th data-field="phone" data-sortable="true">House Rent</th>
23+
<th data-field="email" data-sortable="true">Utility Bill</th>
24+
<th data-field="date" data-sortable="true">Food Bill</th>
25+
<th data-field="leave_date" data-sortable="true">Due Amount</th>
26+
<th data-field="action" data-sortable="true">Action</th>
27+
</tr>
28+
</thead>
29+
@foreach($memberBill as $bill)
30+
<tr>
31+
<td>{{ $bill->month }}</td>
32+
<td>{{ $bill->house_rent }}</td>
33+
<td>{{ $bill->utility_bill }}</td>
34+
<td>{{ $bill->food_bill }}</td>
35+
<td>{{ $bill->due_amount }}</td>
36+
<td>
37+
<a href="{{ url('member/bill-list/'.$bill->id) }}" class="btn btn-success btn-xs" title="Monthly Bill"><i class="fa fa-clipboard-list"></i></a>
38+
<a href="{{ url('member/edit/'.$bill->id) }}" class="btn btn-warning btn-xs" title="Edit Member"><i class="fa fa-edit"></i></a>
39+
<a href="{{ url('member/delete/'.$bill->id) }}"class="btn btn-danger btn-xs" title="Delete Member"><i class="fa fa-trash"></i></a>
40+
</td>
41+
</tr>
42+
@endforeach
43+
</table>
44+
</div>
45+
</div>
46+
</div>
47+
</div>
48+
</div><!--/.row-->
49+
@endsection

‎resources/views/admin/user/user_list.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<td>{{ $member->join_date }}</td>
3535
<td>{{ $member->leave_date != null ? $member->leave_date : "Present" }}</td>
3636
<td>
37-
<a href="{{ url('member/bill-list/'.$member->id) }}" class="btn btn-success btn-xs" title="Monthly Bill"><i class="fa fa-clipboard-list"></i></a>
37+
<a href="{{ url('member/show-bill/'.$member->id) }}" class="btn btn-success btn-xs" title="Monthly Bill"><i class="fa fa-clipboard-list"></i></a>
3838
<a href="{{ url('member/edit/'.$member->id) }}" class="btn btn-warning btn-xs" title="Edit Member"><i class="fa fa-edit"></i></a>
3939
@if ($member->leave_date == null)
4040
<a href="{{ url('member/make-leave/'.$member->id) }}" class="btn btn-info btn-xs" title="Make Member Leave"><i class="fa fa-arrow-circle-right"></i></a>

‎routes/web.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
Route::get('/member/delete/{id}','MemberController@deleteMember');
3434
Route::get('/member/make-leave/{id}','MemberController@showLeaveForm');
3535
Route::post('/member/make-leave/{id}','MemberController@leaveMember');
36+
Route::get('/member/show-bill/{id}','MemberController@showMemberBill');
3637

3738
Route::get('/bazar/assign','BazarController@assign');
3839
Route::post('/bazar/assign','BazarController@assignMember');

0 commit comments

Comments
 (0)