diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php index e8c3c4740436..8a433c896aca 100644 --- a/app/Filters/RecurringExpenseFilters.php +++ b/app/Filters/RecurringExpenseFilters.php @@ -58,7 +58,7 @@ class RecurringExpenseFilters extends QueryFilters return $this->builder; } - $table = 'expenses'; + $table = 'recurring_expenses'; $filters = explode(',', $filter); return $this->builder->where(function ($query) use ($filters, $table) { diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php index 4eb17f127df3..befc31f1d71f 100644 --- a/app/Filters/RecurringInvoiceFilters.php +++ b/app/Filters/RecurringInvoiceFilters.php @@ -53,7 +53,7 @@ class RecurringInvoiceFilters extends QueryFilters return $this->builder; } - $table = 'recurring_'; + $table = 'recurring_invoices'; $filters = explode(',', $filter); return $this->builder->where(function ($query) use ($filters, $table) { diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 716d0deb2c59..af241cd412fb 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -22,6 +22,7 @@ use App\Utils\Traits\AppSetup; use Illuminate\Contracts\Container\BindingResolutionException; use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; +use Illuminate\Support\Str; use League\Fractal\Manager; use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Resource\Collection; @@ -619,7 +620,9 @@ class BaseController extends Controller $query->with($includes); - if (auth()->user() && ! auth()->user()->hasPermission('view_'.lcfirst(class_basename($this->entity_type)))) { + // 10-01-2022 need to ensure we snake case properly here to ensure permissions work as expected + // if (auth()->user() && ! auth()->user()->hasPermission('view_'.lcfirst(class_basename($this->entity_type)))) { + if (auth()->user() && ! auth()->user()->hasPermission('view'.lcfirst(class_basename(Str::snake($this->entity_type))))) { $query->where('user_id', '=', auth()->user()->id); }