Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 08:24:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for Task Status

Browse Source
This commit is contained in:
David Bomba 2023-02-15 11:55:16 +11:00
parent 453042f7e8
commit 342f33b5e1
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/Http/Controllers/BaseController.php
View File

@ -11,32 +11,33 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Account;
use App\Models\BankIntegration;
use App\Models\BankTransaction;
use App\Models\BankTransactionRule;
use App\Models\CompanyGateway;
use App\Models\Design;
use App\Models\ExpenseCategory;
use App\Models\GroupSetting;
use App\Models\PaymentTerm;
use App\Models\Scheduler;
use App\Models\TaxRate;
use App\Models\User; use App\Models\User;
use App\Models\Webhook;
use App\Transformers\ArraySerializer;
use App\Transformers\EntityTransformer;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Models\Design;
use App\Utils\Statics; use App\Utils\Statics;
use App\Utils\Traits\AppSetup; use App\Models\Account;
use Illuminate\Contracts\Container\BindingResolutionException; use App\Models\TaxRate;
use Illuminate\Database\Eloquent\Builder; use App\Models\Webhook;
use App\Models\Scheduler;
use App\Models\TaskStatus;
use App\Models\PaymentTerm;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use League\Fractal\Manager; use League\Fractal\Manager;
use League\Fractal\Pagination\IlluminatePaginatorAdapter; use App\Models\GroupSetting;
use League\Fractal\Resource\Collection; use App\Models\CompanyGateway;
use App\Utils\Traits\AppSetup;
use App\Models\BankIntegration;
use App\Models\BankTransaction;
use App\Models\ExpenseCategory;
use League\Fractal\Resource\Item; use League\Fractal\Resource\Item;
use App\Models\BankTransactionRule;
use App\Transformers\ArraySerializer;
use App\Transformers\EntityTransformer;
use League\Fractal\Resource\Collection;
use Illuminate\Database\Eloquent\Builder;
use League\Fractal\Serializer\JsonApiSerializer; use League\Fractal\Serializer\JsonApiSerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use Illuminate\Contracts\Container\BindingResolutionException;
/** /**
* Class BaseController. * Class BaseController.
@ -911,8 +912,9 @@ class BaseController extends Controller
else else
$query->where('user_id', '=', auth()->user()->id); $query->where('user_id', '=', auth()->user()->id);
} }
elseif(in_array($this->entity_type,[Design::class, GroupSetting::class, PaymentTerm::class])){ elseif(in_array($this->entity_type, [Design::class, GroupSetting::class, PaymentTerm::class, TaskStatus::class])){
// nlog($this->entity_type); nlog("inside");
nlog($this->entity_type);
} }
else else
$query->where('user_id', '=', auth()->user()->id)->orWhere('assigned_user_id', auth()->user()->id); $query->where('user_id', '=', auth()->user()->id)->orWhere('assigned_user_id', auth()->user()->id);