Skip to content

Commit 3ea81c4

Browse files
jjdejongjjdejong
committed
Further better usage of Eloquent
1 parent b60b1c2 commit 3ea81c4

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎app/Http/Controllers/DocumentController.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public function index(Request $request)
2222
$Name = $request->input('Name');
2323
$template_classes = TemplateClass::query();
2424
if (! is_null($Name)) {
25-
$template_classes = $template_classes->where('name', 'like', $Name.'%');
25+
$template_classes = $template_classes->whereLike('name', $Name.'%');
2626
}
2727
if (! is_null($Notes)) {
28-
$template_classes = $template_classes->where('notes', 'like', $Notes.'%');
28+
$template_classes = $template_classes->whereLike('notes', $Notes.'%');
2929
}
3030

3131
$template_classes = $template_classes->orderby('name')->simplePaginate(config('renewal.general.paginate') == 0 ? 25 : intval(config('renewal.general.paginate')));
@@ -97,42 +97,42 @@ public function select(Matter $matter, Request $request)
9797
if ($value != '') {
9898
switch ($key) {
9999
case 'Category':
100-
$members = $members->where('category', 'LIKE', "$value%");
100+
$members = $members->whereLike('category', "{$value}%");
101101
$oldfilters['Category'] = $value;
102102
break;
103103
case 'Language':
104-
$members = $members->where('language', 'LIKE', "$value%");
104+
$members = $members->whereLike('language', "{$value}%");
105105
$oldfilters['Language'] = $value;
106106
break;
107107
case 'Name':
108108
$members = $members->whereHas('class', function ($query) use ($value) {
109-
$query->where('name', 'LIKE', "$value%");
109+
$query->whereLike('name', "{$value}%");
110110
});
111111
$oldfilters['Name'] = $value;
112112
break;
113113
case 'Summary':
114-
$members = $members->where('summary', 'LIKE', "$value%");
114+
$members = $members->whereLike('summary', "{$value}%");
115115
$oldfilters['Name'] = $value;
116116
break;
117117
case 'Style':
118-
$members = $members->where('style', 'LIKE', "$value%");
118+
$members = $members->whereLike('style', "{$value}%");
119119
$oldfilters['Style'] = $value;
120120
break;
121121
case 'EventName':
122122
$members = $members->whereHas('class', function ($query) use ($value) {
123123
$query->whereHas('eventNames', function ($q2) use ($value) {
124-
$q2->where('event_name_code', '=', "$value");
124+
$q2->where('event_name_code', "$value");
125125
});
126126
});
127127
$oldfilters['EventName'] = $value;
128128
// specific view for within event window
129129
$view = 'documents.select2';
130130
break;
131131
case 'Event':
132-
$event = Event::where('id', '=', "$value")->first();
132+
$event = Event::where('id', "$value")->first();
133133
break;
134134
case 'Task':
135-
$task = Task::where('id', '=', "$value")->first();
135+
$task = Task::where('id', "$value")->first();
136136
$event = $task->trigger;
137137
break;
138138
}

‎app/Http/Controllers/EventNameController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function index(Request $request)
1515
$Name = $request->input('Name');
1616
$ename = EventName::query();
1717
if (! is_null($Code)) {
18-
$ename = $ename->where('code', 'like', $Code.'%');
18+
$ename = $ename->whereLike('code', $Code.'%');
1919
}
2020
if (! is_null($Name)) {
2121
$ename = $ename->where('name', 'like', $Name.'%');

‎app/Http/Controllers/RenewalController.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ public function index(Request $request)
2828

2929
// Get list of active renewals
3030
$renewals = Task::renewals();
31+
3132
if ($step == 0) {
3233
$renewals->where('matter.dead', 0);
3334
}
3435
if ($MyRenewals) {
35-
$renewals->where('assigned_to', Auth::user()->login);
36+
$renewals->where('task.assigned_to', Auth::user()->login);
3637
}
38+
3739
$with_step = false;
3840
$with_invoice = false;
3941
if (!empty($filters)) {
@@ -83,25 +85,28 @@ public function index(Request $request)
8385
}
8486
}
8587
}
86-
// Only display pending renewals at the beginning of the pipeline (CHECK: $with_invoice may not be necessary)
88+
89+
// Only display pending renewals at the beginning of the pipeline
8790
if (!($with_step || $with_invoice)) {
8891
$renewals->where('done', 0);
8992
}
93+
9094
// Order by most recent renewals first in the "Closed" and "Invoice paid" steps
9195
if ($step == 10 || $invoice_step == 3) {
9296
$renewals->orderByDesc('due_date');
9397
}
98+
9499
$renewals = $renewals->simplePaginate(config('renewal.general.paginate', 25));
95-
// Adjust the cost and fee of each renewal based un customized settings
100+
101+
// Adjust the cost and fee of each renewal based on customized settings
96102
$renewals->transform(function ($ren) {
97103
$this->adjustFees($ren, $cost, $fee);
98104
$ren->cost = $cost;
99105
$ren->fee = $fee;
100-
101106
return $ren;
102107
});
103-
$renewals->appends($request->input())->links(); // Keep URL parameters in the paginator links
104-
108+
109+
$renewals->appends($request->input())->links(); // Keep URL parameters in the paginator links
105110
return view('renewals.index', compact('renewals', 'step', 'invoice_step'));
106111
}
107112

‎app/Http/Controllers/RuleController.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,30 @@ public function index(Request $request)
2727
}
2828
if (!is_null($Trigger)) {
2929
$rule = $rule->whereHas('trigger', function ($q) use ($Trigger) {
30-
$q->where('name', 'like', $Trigger . '%');
30+
$q->whereLike('name', "{$Trigger}%");
3131
});
3232
}
3333
if (!is_null($Country)) {
3434
$rule = $rule->whereHas('country', function ($q) use ($Country) {
35-
$q->where('name', 'like', $Country . '%');
35+
$q->whereLike('name', "{$Country}%");
3636
});
3737
}
3838
if (!is_null($Category)) {
3939
$rule = $rule->whereHas('category', function ($q) use ($Category) {
40-
$q->where('category', 'like', $Category . '%');
40+
$q->whereLike('category', "{$Category}%");
4141
});
4242
}
4343
if (!is_null($Detail)) {
44-
$rule = $rule->where('detail', 'like', $Detail . '%');
44+
$rule = $rule->whereLike('detail', "{$Detail}%");
4545
}
4646
if (!is_null($Type)) {
4747
$rule = $rule->whereHas('type', function ($q) use ($Type) {
48-
$q->where('type', 'like', $Type . '%');
48+
$q->whereLike('type', "{$Type}%");
4949
});
5050
}
5151
if (!is_null($Origin)) {
5252
$rule = $rule->whereHas('origin', function ($q) use ($Origin) {
53-
$q->where('name', 'like', $Origin . '%');
53+
$q->whereLike('name', "{$Origin}%");
5454
});
5555
}
5656
$ruleslist = $rule->with(['country:iso,name', 'trigger:code,name', 'category:code,category', 'origin:iso,name', 'type:code,type', 'taskInfo:code,name'])

‎app/Models/Matter.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,6 @@ public function entered()
249249
->whereCode('ENT')->withDefault();
250250
}
251251

252-
/*public function status()
253-
{
254-
return $this->hasOne('Event::class')
255-
->latest('event_date');
256-
}*/
257-
258252
public function priority()
259253
{
260254
return $this->hasMany(Event::class)
@@ -521,6 +515,7 @@ function ($q) use ($authUserId) {
521515
$sortkey = 'caseref';
522516
$sortdir = 'asc';
523517
}
518+
524519
foreach ($multi_filter as $key => $value) {
525520
if ($value != '') {
526521
switch ($key) {

0 commit comments

Comments
 (0)