Merge branch 'dev'

events.xml

@@ -6,7 +6,5 @@
     <event on="onQuiqqerProductsFieldDeleteBefore" fire="\QUI\Memberships\Events::onQuiqqerProductsFieldDeleteBefore"/>
 
     <event on="onQuiqqerContractsCreateFromOrder" fire="\QUI\Memberships\Events::onQuiqqerContractsCreateFromOrder"/>
-    <event on="onQuiqqerContractsCancel" fire="\QUI\Memberships\Events::onQuiqqerContractsCancel"/>
     <event on="onQuiqqerContractsDelete" fire="\QUI\Memberships\Events::onQuiqqerContractsDelete"/>
-
 </events>
\ No newline at end of file

src/QUI/Memberships/Events.php

@@ -282,10 +282,10 @@ public static function onQuiqqerOrderSuccessful($Order)
      * If a contract is created from an order, check if the Order also contains a
      *
      * @param Contract $Contract
-     * @param Order $Order
+     * @param QUI\ERP\Order\OrderInProcess $Order
      * @return void
      */
-    public static function onQuiqqerContractsCreateFromOrder(Contract $Contract, Order $Order)
+    public static function onQuiqqerContractsCreateFromOrder(Contract $Contract, $Order)
     {
         $MembershipField = Handler::getProductMembershipField();
 
@@ -326,42 +326,43 @@ public static function onQuiqqerContractsCreateFromOrder(Contract $Contract, Ord
         }
     }
 
-    /**
-     * quiqqer/contracts: onQuiqqerContractsCancel
-     *
-     * Cancel a membership if a contract is cancelled
-     *
-     * @param Contract $Contract
-     * @return void
-     * @throws \QUI\Exception
-     * @throws \Exception
-     */
-    public static function onQuiqqerContractsCancel(Contract $Contract)
-    {
-        $MembershipUsers = MembershipUsersHandler::getInstance();
-
-        $result = QUI::getDataBase()->fetch([
-            'select' => ['id'],
-            'from'   => $MembershipUsers->getDataBaseTableName(),
-            'where'  => [
-                'contractId' => $Contract->getCleanId()
-            ]
-        ]);
-
-        if (empty($result)) {
-            return;
-        }
-
-        /** @var QUI\Memberships\Users\MembershipUser $MembershipUser */
-        $MembershipUser = $MembershipUsers->getChild($result[0]['id']);
-
-        $MembershipUser->setAttributes([
-            'cancelStatus'  => MembershipUsersHandler::CANCEL_STATUS_CANCELLED,
-            'cancelEndDate' => $Contract->getTerminationDate()->format('Y-m-d 23:59:59')
-        ]);
-
-        $MembershipUser->sendConfirmCancelMail();
-    }
+//    /**
+//     * quiqqer/contracts: onQuiqqerContractsCancel
+//     *
+//     * Cancel a membership if a contract is cancelled
+//     *
+//     * @param Contract $Contract
+//     * @return void
+//     * @throws \QUI\Exception
+//     * @throws \Exception
+//     */
+//    public static function onQuiqqerContractsCancel(Contract $Contract)
+//    {
+//        $MembershipUsers = MembershipUsersHandler::getInstance();
+//
+//        $result = QUI::getDataBase()->fetch([
+//            'select' => ['id'],
+//            'from'   => $MembershipUsers->getDataBaseTableName(),
+//            'where'  => [
+//                'contractId' => $Contract->getCleanId()
+//            ]
+//        ]);
+//
+//        if (empty($result)) {
+//            return;
+//        }
+//
+//        /** @var QUI\Memberships\Users\MembershipUser $MembershipUser */
+//        $MembershipUser = $MembershipUsers->getChild($result[0]['id']);
+//
+//        $MembershipUser->setAttributes([
+//            'cancelStatus'  => MembershipUsersHandler::CANCEL_STATUS_CANCELLED,
+//            'cancelEndDate' => $Contract->getTerminationDate()->format('Y-m-d 23:59:59')
+//        ]);
+//
+//
+//        $MembershipUser->sendConfirmCancelMail();
+//    }
 
     /**
      * quiqqer/contracts: onQuiqqerContractsDelete