diff --git a/src/app/basket/models/BasketModelAbstract.php b/src/app/basket/models/BasketModelAbstract.php index 2b7117ccb9f0c2b16b77239b15f250dcd7ec919b..17fef4daa2b0d2847159ea62008e3bd2790f4c05 100644 --- a/src/app/basket/models/BasketModelAbstract.php +++ b/src/app/basket/models/BasketModelAbstract.php @@ -150,6 +150,11 @@ abstract class BasketModelAbstract 'where' => ['basket_id = ?'], 'data' => [$aArgs['id']] ]); + DatabaseModel::delete([ + 'table' => 'users_baskets_preferences', + 'where' => ['basket_id = ?'], + 'data' => [$aArgs['id']] + ]); return true; } diff --git a/src/app/basket/models/GroupBasketModelAbstract.php b/src/app/basket/models/GroupBasketModelAbstract.php index 4eaa3cd95757a197c04edd7296218339170e4617..b90b6fa5a6e0b62b72c2e17b475baec719d4d2c3 100644 --- a/src/app/basket/models/GroupBasketModelAbstract.php +++ b/src/app/basket/models/GroupBasketModelAbstract.php @@ -14,6 +14,7 @@ namespace Basket\models; +use Group\models\GroupModel; use SrcCore\models\ValidatorModel; use SrcCore\models\DatabaseModel; @@ -56,6 +57,8 @@ abstract class GroupBasketModelAbstract ValidatorModel::notEmpty($aArgs, ['basketId', 'groupId']); ValidatorModel::stringType($aArgs, ['basketId', 'groupId']); + $group = GroupModel::getByGroupId(['select' => ['id'], 'groupId' => $aArgs['groupId']]); + DatabaseModel::delete([ 'table' => 'groupbasket', 'where' => ['basket_id = ?', 'group_id = ?'], @@ -76,6 +79,11 @@ abstract class GroupBasketModelAbstract 'where' => ['basket_id = ?', 'group_id = ?'], 'data' => [$aArgs['basketId'], $aArgs['groupId']] ]); + DatabaseModel::delete([ + 'table' => 'users_baskets_preferences', + 'where' => ['basket_id = ?', 'group_serial_id = ?'], + 'data' => [$aArgs['basketId'], $group['id']] + ]); return true; } diff --git a/src/app/group/models/GroupModelAbstract.php b/src/app/group/models/GroupModelAbstract.php index 07367a650fe871ccbf32a1ead4aee805c6d47db1..ffbb5de05b22f71a29021ce9d73568f09f3d282f 100644 --- a/src/app/group/models/GroupModelAbstract.php +++ b/src/app/group/models/GroupModelAbstract.php @@ -167,6 +167,11 @@ abstract class GroupModelAbstract 'where' => ['group_id = ?'], 'data' => [$group['group_id']] ]); + DatabaseModel::delete([ + 'table' => 'users_baskets_preferences', + 'where' => ['group_serial_id = ?'], + 'data' => [$aArgs['id']] + ]); return true; }