Merge branch 'main' of github.com:craftcms/stripe

src/Plugin.php

@@ -27,6 +27,7 @@
 use craft\helpers\Html;
 use craft\helpers\UrlHelper;
 use craft\models\FieldLayout;
+use craft\records\User as UserRecord;
 use craft\services\Elements;
 use craft\services\Fields;
 use craft\services\Utilities;
@@ -54,6 +55,7 @@
 use craft\web\UrlManager;
 use yii\base\Event;
 use yii\base\InvalidConfigException;
+use yii\base\ModelEvent;
 
 /**
  * Stripe plugin
@@ -143,6 +145,7 @@ public function init()
             $this->registerResaveCommands();
             $this->registerBehaviors();
             $this->registerConditionRules();
+            $this->handleUserElementChanges();
 
             if (!$request->getIsConsoleRequest()) {
                 if ($request->getIsCpRequest()) {
@@ -169,12 +172,6 @@ public function init()
                 ->onUpdate(self::PC_PATH_SUBSCRIPTION_FIELD_LAYOUTS, [$subscriptionService, 'handleChangedFieldLayout'])
                 ->onRemove(self::PC_PATH_SUBSCRIPTION_FIELD_LAYOUTS, [$subscriptionService, 'handleDeletedFieldLayout']);
 
-//            // Globally register stripe webhooks registry event handlers
-//            Registry::addHandler(Topics::PRODUCTS_CREATE, new ProductHandler());
-//            Registry::addHandler(Topics::PRODUCTS_DELETE, new ProductHandler());
-//            Registry::addHandler(Topics::PRODUCTS_UPDATE, new ProductHandler());
-//            Registry::addHandler(Topics::INVENTORY_LEVELS_UPDATE, new ProductHandler());
-
             // get stripe environment from the secret key
             $this->stripeMode = $this->getStripeMode();
             $this->stripeBaseUrl = "$this->dashboardUrl/$this->stripeMode";
@@ -515,6 +512,32 @@ function(RegisterConditionRulesEvent $event) {
         );
     }
 
+    /**
+     * Maybe sync changed user email from Craft to Stripe.
+     *
+     * @return void
+     */
+    private function handleUserElementChanges(): void
+    {
+        Event::on(UserRecord::class, UserRecord::EVENT_BEFORE_UPDATE, function(ModelEvent $event) {
+            $userRecord = $event->sender;
+            $user = Craft::$app->getUsers()->getUserById($userRecord->id);
+            if ($user->isCredentialed) {
+                $oldEmail = $userRecord->getOldAttribute('email');
+                $newEmail = $userRecord->getAttribute('email');
+                if ($oldEmail != $newEmail) {
+                    $customers = $user->getStripeCustomers();
+                    if (!empty($customers)) {
+                        $client = $this->getApi()->getClient();
+                        foreach ($customers as $customer) {
+                            $client->customers->update($customer->stripeId, ['email' => $newEmail]);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
     /**
      * @inheritdoc
      */

src/elements/Product.php

@@ -326,6 +326,7 @@ protected static function defineDefaultTableAttributes(string $source): array
             'stripeId',
             'stripeStatus',
             'stripeEdit',
+            'link',
         ];
     }
 

src/migrations/Install.php

@@ -106,6 +106,7 @@ public function createTables(): void
             'dateCreated' => $this->dateTime()->notNull(),
             'dateUpdated' => $this->dateTime()->notNull(),
             'uid' => $this->string(),
+            'prices' => $this->text()->defaultValue(null),
         ]);
 
         $this->archiveTableIfExists(Table::PAYMENTMETHODDATA);
@@ -194,10 +195,6 @@ private function createGeneratedColumns(): void
         $this->execute("ALTER TABLE " . Table::SUBSCRIPTIONDATA . " ADD COLUMN " .
             $db->quoteColumnName('trialEnd') . " VARCHAR(255) GENERATED ALWAYS AS (" .
             $qb->jsonExtract('data', ['trial_end']) . ") STORED;");
-        // prices
-        $this->execute("ALTER TABLE " . Table::SUBSCRIPTIONDATA . " ADD COLUMN " .
-            $db->quoteColumnName('prices') . " VARCHAR(255) GENERATED ALWAYS AS (" .
-            $qb->jsonExtract('data', ['items', 'data[*]', 'price', 'id']) . ") STORED;");
 
         // invoice data
         // created

src/models/Settings.php

@@ -51,6 +51,11 @@ class Settings extends Model
      */
     public string $productTemplate = '';
 
+    /**
+     * @var bool Whether updating credentialed user's email address should update Stripe customer(s)
+     */
+    public bool $syncChangedUserEmailsToStripe = true;
+
     /**
      * @var mixed
      */

src/services/Checkout.php

@@ -9,6 +9,7 @@
 
 use Craft;
 use craft\elements\User;
+use craft\helpers\UrlHelper;
 use craft\stripe\elements\Price;
 use craft\stripe\events\CheckoutSessionEvent;
 use craft\stripe\models\Customer;
@@ -69,7 +70,13 @@ public function getCheckoutUrl(
             }
         }
 
-        return $this->startCheckoutSession(array_values($lineItems), $customer, $successUrl, $cancelUrl, $params);
+        return $this->startCheckoutSession(
+            array_values($lineItems),
+            $customer,
+            UrlHelper::siteUrl($successUrl),
+            UrlHelper::siteUrl($cancelUrl),
+            $params,
+        );
     }
 
     /**

src/services/Subscriptions.php

@@ -100,6 +100,7 @@ public function createOrUpdateSubscription(StripeSubscription $subscription): bo
             'title' => $subscription->description ?? $subscription->id,
             'stripeStatus' => $subscription->status,
             'data' => Json::decode($subscription->toJSON()),
+            'prices' => array_map(fn($item) => $item['price']['id'], $subscription->items->data),
         ];
 
         // Set attributes on the element to emulate it having been loaded with JOINed data: