Merge pull request laravel#33 from core45/main

sandervanhooft · Dec 18, 2021 · 42b6de1 · 42b6de1
2 parents da6b6a9 + 04138cb
commit 42b6de1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Subscription.php b/src/Subscription.php
@@ -37,6 +37,7 @@
  * @property string owner_type
  * @property string next_plan
  * @property string plan
+ * @property string name
  * @property int quantity
  * @property mixed scheduled_order_item_id
  * @property OrderItem scheduledOrderItem
@@ -211,6 +212,7 @@ public function swap(string $plan, $invoiceNow = true)
 
         $applyNewSettings = function () use ($newPlan) {
             $this->plan = $newPlan->name();
+            $this->name = $newPlan->name();
         };
 
         $this->restartCycleWithModifications($applyNewSettings, now(), $invoiceNow);

diff --git a/tests/SwapSubscriptionPlanTest.php b/tests/SwapSubscriptionPlanTest.php
@@ -47,6 +47,7 @@ public function canSwapToAnotherPlan()
         $subscription = $subscription->swap('weekly-20-1')->fresh();
 
         $this->assertEquals('weekly-20-1', $subscription->plan);
+        $this->assertEquals('weekly-20-1', $subscription->name);
 
         $this->assertCarbon($now->copy(), $subscription->cycle_started_at);
         $this->assertCarbon($now->copy()->addWeek(), $subscription->cycle_ends_at);
@@ -110,6 +111,7 @@ public function swappingACancelledSubscriptionResumesIt()
             factory(Subscription::class)->make([
                 'ends_at' => now()->addWeek(),
                 'plan' => 'monthly-20-1',
+                'name' => 'monthly-20-1',
             ])
         );
         $subscription->cancel();
@@ -134,6 +136,7 @@ public function canSwapNextCycle()
         $subscription = $subscription->swapNextCycle('weekly-20-1')->fresh();
 
         $this->assertEquals('monthly-10-1', $subscription->plan);
+        $this->assertEquals('monthly-10-1', $subscription->name);
         $this->assertEquals('weekly-20-1', $subscription->next_plan);
 
         // Check that the billing cycle remains intact
@@ -157,6 +160,7 @@ public function canSwapNextCycle()
         Event::assertNotDispatched(SubscriptionPlanSwapped::class);
 
         $this->assertEquals('monthly-10-1', $subscription->plan);
+        $this->assertEquals('monthly-10-1', $subscription->name);
         $this->assertEquals('weekly-20-1', $subscription->next_plan);
 
         Subscription::processOrderItem($new_order_item);
@@ -165,6 +169,7 @@ public function canSwapNextCycle()
 
         $this->assertNull($subscription->next_plan);
         $this->assertEquals('weekly-20-1', $subscription->plan);
+        $this->assertEquals('weekly-20-1', $subscription->name);
 
         // Assert that the subscription cycle reflects the new plan
         $cycle_should_have_started_at = $cycle_should_end_at->copy();
@@ -196,7 +201,7 @@ protected function getUserWithZeroBalance()
     protected function getSubscriptionForUser($user)
     {
         return $user->subscriptions()->save(factory(Subscription::class)->make([
-            "name" => "dummy name",
+            "name" => "monthly-10-1",
             "plan" => "monthly-10-1",
             "cycle_started_at" => now()->subWeeks(2),
             "cycle_ends_at" => now()->subWeeks(2)->addMonth(),