Merge branch 'next' into 'master'

Next

See merge request !8

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

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;
                 }
 

src/QUI/ERP/Discount/EventHandling.php

@@ -12,6 +12,7 @@
 use QUI\ERP\Products\Product\UniqueProduct;
 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 +320,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'
+        );
+    }
 }