|
|
@@ -139,7 +139,7 @@ class HomeController extends Controller
|
|
|
$query = Note::where('hcp_pro_id', $proID);
|
|
|
switch ($filter) {
|
|
|
case 'not-yet-signed':
|
|
|
- $query = $query->where('is_signed_by_hcp', false)->where('is_cancelled', false);
|
|
|
+ $query = $query->where('is_signed_by_hcp', false);
|
|
|
break;
|
|
|
|
|
|
// more cases can be added as needed
|
|
|
@@ -153,7 +153,7 @@ class HomeController extends Controller
|
|
|
public function bills(Request $request, $filter = '')
|
|
|
{
|
|
|
$proID = $this->performer()->pro->id;
|
|
|
- $query = Bill::where('is_cancelled', false);
|
|
|
+ $query = Bill::where('is_cancelled', false)->orWhere('is_cancelled', null);
|
|
|
switch ($filter) {
|
|
|
case 'not-yet-signed':
|
|
|
$query = $query
|
