← All changes
|
app/Http/Controllers/FrontendControllers/CustomerOrderController.php
+2
-1
1.6.6
→
1.7.0
View file →
| @@ -238,8 +238,9 @@ | ||
| 238 | 238 | $variationIds[] = $item->object_id; |
| 239 | 239 | $productIds[] = $item->post_id; |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | + | |
| 242 | 243 | $upgradableVariationIds = []; |
| 243 | 244 | $isUpgradeEligibleOrder = in_array($order->payment_status, [ |
| 244 | 245 | Status::PAYMENT_PAID, |
| 245 | 246 | Status::PAYMENT_PARTIALLY_PAID, |
| @@ -301,9 +302,9 @@ | ||
| 301 | 302 | ]; |
| 302 | 303 | |
| 303 | 304 | $formattedOrderData['subscriptions'] = $order->subscriptions |
| 304 | 305 | ->filter(function ($subscription) { |
| 305 | - return !in_array($subscription->status, [Status::SUBSCRIPTION_PENDING, Status::SUBSCRIPTION_INTENDED]); | |
| 306 | + return $subscription->isVisibleToCustomer(); | |
| 306 | 307 | }) |
| 307 | 308 | ->map(function ($subscription) { |
| 308 | 309 | return OrderService::transformSubscription($subscription); |
| 309 | 310 | }); |