|
@@ -1033,6 +1033,13 @@ OFFSET {$offset} LIMIT {$perPage}
|
|
|
$bills = $bills->where('code', '=', $filter);
|
|
|
}
|
|
|
|
|
|
+ $filter = $request->input('clientName');
|
|
|
+ if ($filter) {
|
|
|
+ $bills = $bills->whereHas('client', function($q) use ($filter){
|
|
|
+ return $q->where('name_first', 'ilike', $filter)->orWhere('name_last', 'ilike', $filter);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
$bills = $bills->orderBy('effective_date', 'desc')->paginate();
|
|
|
|
|
|
$companies = Company::where('is_active', true)->orderBy('name')->get();
|
|
@@ -1063,29 +1070,6 @@ OFFSET {$offset} LIMIT {$perPage}
|
|
|
|
|
|
$bills = Bill::where('is_cancelled', false)->whereRaw("(code = 'RM RMM' OR code = 'RM MCP')");
|
|
|
|
|
|
- /*if(!$request->input('t') || $request->input('t') === 'hcp') {
|
|
|
- $bills = $bills
|
|
|
- ->where('hcp_expected_payment_amount', '>', 0)
|
|
|
- ->where('is_signed_by_hcp', true);
|
|
|
- if ($targetPro) {
|
|
|
- $bills = $bills->where('hcp_pro_id', $targetPro->id);
|
|
|
- }
|
|
|
- if($request->input('c')) {
|
|
|
- $bills = $bills->whereRaw('(SELECT company_id from company_pro where id = hcp_company_pro_id) = ' . $request->input('c'));
|
|
|
- }
|
|
|
- }
|
|
|
- else if($request->input('t') === 'na') {
|
|
|
- $bills = $bills
|
|
|
- ->where('generic_pro_expected_payment_amount', '>', 0)
|
|
|
- ->where('is_signed_by_generic_pro', true);
|
|
|
- if ($targetPro) {
|
|
|
- $bills = $bills->where('generic_pro_id', $targetPro->id);
|
|
|
- }
|
|
|
- if($request->input('c')) {
|
|
|
- $bills = $bills->whereRaw('(SELECT company_id from company_pro where id = generic_company_pro_id) = ' . $request->input('c'));
|
|
|
- }
|
|
|
- }*/
|
|
|
-
|
|
|
$filter = $request->input('f');
|
|
|
switch ($filter) {
|
|
|
case 'verified':
|