Merge pull request #379 from enupal/develop

v5.5.1
enupal · Feb 26, 2024 · 1ac6ea0 · 1ac6ea0
2 parents df7de24 + 42ade50
commit 1ac6ea0
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Stripe Payments Changelog
 
+## 5.5.1 - 2024.02.26
+### Fixed
+- Fixed issue where Subscription Grant user group was not updated after updating plan. ([#374])
+
+[#374]: https://github.com/enupal/stripe/issues/374
+
 ## 5.5.0 - 2023.10.30
 ### Added
 - Added Craft CMS requirement `^4.5.0`

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "enupal/stripe",
   "description": "Allows customers sign up for recurring and one-time payments with Stripe, perfect for orders, donations, subscriptions, and events. Create simple payment forms in seconds easily without coding. For Craft CMS 3.x",
   "type": "craft-plugin",
-  "version": "5.5.0",
+  "version": "5.5.1",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/services/Subscriptions.php b/src/services/Subscriptions.php
@@ -257,6 +257,26 @@ public function processSubscriptionGrantEvent(WebhookEvent $event)
 
                 break;
 
+            case 'customer.subscription.updated':
+                // remove current user groups and add new one
+                $userGroups = $user->getGroups();
+                $currentUserGroupIds = [];
+
+                if ($userGroups){
+                    foreach ($userGroups as $userGroup) {
+                        $currentUserGroupIds[] = $userGroup->id;
+                    }
+                }
+
+                $grantUserGroupIds = $this->getCurrentUserGroups();
+                $removedUserGroupIds = array_diff($currentUserGroupIds, $grantUserGroupIds);
+                Craft::$app->getUsers()->assignUserToGroups($user->id, $removedUserGroupIds);
+                Craft::info("Groups (".json_encode($grantUserGroupIds).") removed to user: ".$user->username, __METHOD__);
+
+                // add new plan
+                $this->handleSubscriptionGrants($planId, $user);
+                break;
+
             case 'customer.subscription.deleted':
                 $userGroups = $user->getGroups();
                 $currentUserGroupIds = [];
@@ -334,6 +354,25 @@ public function getUserGroupsByPlanId($planId, $checkRemoveWhenCanceled = false)
         return $newGroups;
     }
 
+    /**
+     * @return array
+     */
+    public function getCurrentUserGroups()
+    {
+        $subscriptionGrants =  (new Query())
+            ->select(['*'])
+            ->from(["{{%enupalstripe_subscriptiongrants}}"])
+            ->all();
+
+        $currentGroups = [];
+
+        foreach ($subscriptionGrants as $subscriptionGrant) {
+            $currentGroups[] = $subscriptionGrant['userGroupId'];
+        }
+
+        return $currentGroups;
+    }
+
     /**
      * @param $planId
      * @return array

diff --git a/src/templates/settings/subscription-grants/_edit.twig b/src/templates/settings/subscription-grants/_edit.twig
@@ -78,7 +78,7 @@
 
     {{ forms.lightswitchField({
         label: "Remove when canceled?"|t('enupal-stripe'),
-        instructions: "Remove this user group if the subscription is canceled (at the end of the billing period)"|t('enupal-stripe'),
+        instructions: "Remove the user from this user group if the subscription is canceled (at the end of the billing period)"|t('enupal-stripe'),
         name: 'removeWhenCanceled',
         on:   subscriptionGrant.removeWhenCanceled
     }) }}