From 3ce949f0aabd5b4e12d7c161618ec60d69c20f3d Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 1 Oct 2020 10:50:34 +0200 Subject: [PATCH] Fix #3880 --- app/Api/V1/Controllers/PiggyBankController.php | 4 +--- app/Repositories/PiggyBank/ModifiesPiggyBanks.php | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Api/V1/Controllers/PiggyBankController.php b/app/Api/V1/Controllers/PiggyBankController.php index 6f03988f79..dda2c1e60e 100644 --- a/app/Api/V1/Controllers/PiggyBankController.php +++ b/app/Api/V1/Controllers/PiggyBankController.php @@ -43,9 +43,7 @@ use League\Fractal\Resource\Item; */ class PiggyBankController extends Controller { - /** @var PiggyBankRepositoryInterface The piggy bank repository */ - private $repository; - + private PiggyBankRepositoryInterface $repository; /** * PiggyBankController constructor. diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php index 81de55e795..1c8eac52fc 100644 --- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php +++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php @@ -437,9 +437,9 @@ trait ModifiesPiggyBanks //piggy zelf naar 7 /** @var User $user */ $user = $this->user; - $user->piggyBanks()->where('order', '<=', $newOrder)->where('order', '>', $oldOrder) + $user->piggyBanks()->where('piggy_banks.order', '<=', $newOrder)->where('piggy_banks.order', '>', $oldOrder) ->where('piggy_banks.id', '!=', $piggyBank->id) - ->update(['order' => DB::raw('piggy_banks.order-1')]); + ->update(['piggy_banks.order' => DB::raw('piggy_banks.order-1')]); $piggyBank->order = $newOrder; $piggyBank->save(); } @@ -450,9 +450,9 @@ trait ModifiesPiggyBanks // 8 naar 2 /** @var User $user */ $user = $this->user; - $user->piggyBanks()->where('order', '>=', $newOrder)->where('order', '<', $oldOrder) + $user->piggyBanks()->where('piggy_banks.order', '>=', $newOrder)->where('piggy_banks.order', '<', $oldOrder) ->where('piggy_banks.id', '!=', $piggyBank->id) - ->update(['order' => DB::raw('piggy_banks.order+1')]); + ->update(['piggy_banks.order' => DB::raw('piggy_banks.order+1')]); $piggyBank->order = $newOrder; $piggyBank->save(); }