diff --git a/events.xml b/events.xml index df256be428fb9956a0e2fafd1554eb2c44a4f8f0..d4883c71a2056d78e97692f2e10a8b8a0ec3c8d9 100644 --- a/events.xml +++ b/events.xml @@ -3,4 +3,5 @@ <event on="onQuiqqerProductsCalcListProduct" fire="\QUI\ERP\Discount\EventHandling::onQuiqqerProductsCalcListProduct"/> <event on="onQuiqqerProductsCalcList" fire="\QUI\ERP\Discount\EventHandling::onQuiqqerProductsCalcList"/> <event on="onQuiqqerProductsCalcProduct" fire="\QUI\ERP\Discount\EventHandling::onQuiqqerProductsCalcListProduct"/> + <event on="onQuiqqerMigrationV2" fire="\QUI\ERP\Discount\EventHandling::onQuiqqerMigrationV2"/> </events> \ No newline at end of file diff --git a/src/QUI/ERP/Discount/Discount.php b/src/QUI/ERP/Discount/Discount.php index b9b2171d23d138b1907afdf56fd898e95a564c1f..399ae32bf3d5f0444e3467c7b50e899085505a57 100644 --- a/src/QUI/ERP/Discount/Discount.php +++ b/src/QUI/ERP/Discount/Discount.php @@ -356,7 +356,7 @@ public function canUsedBy(QUI\Interfaces\Users\User $User): bool /* @var $Group QUI\Groups\Group */ foreach ($discountGroups as $gid) { foreach ($groupsOfUser as $Group) { - if ($Group->getUsers() == $gid) { + if ($Group->getId() == $gid) { return true; } diff --git a/src/QUI/ERP/Discount/EventHandling.php b/src/QUI/ERP/Discount/EventHandling.php index c1de6ebd394ac430919641bce93713eadfcdec9a..f7f1551f1710ad7bae2d5a1b7fc421bcf633cfd9 100644 --- a/src/QUI/ERP/Discount/EventHandling.php +++ b/src/QUI/ERP/Discount/EventHandling.php @@ -13,6 +13,8 @@ use QUI\ERP\Products\Utils\Calc; use QUI\ERP\Products\Product\ProductList; +use QUI\System\Console\Tools\MigrationV2; + use function array_filter; use function explode; @@ -319,4 +321,15 @@ public static function onQuiqqerProductsCalcList( } } } + + + public static function onQuiqqerMigrationV2(MigrationV2 $Console): void + { + $Console->writeLn('- Migrate discounts'); + + QUI\Utils\MigrationV1ToV2::migrateUserGroupField( + QUI::getDBTableName('discounts'), + 'user_groups' + ); + } }