← All changes | app/Http/Controllers/FrontendControllers/CustomerOrderController.php +29 -5 1.6.1 → 1.7.0 View file →

		@@ -29,9 +29,8 @@
29	29	use FluentCart\App\Services\Renderer\Receipt\TaxSummaryHelper;
30	30	use FluentCart\Framework\Database\Orm\Builder;
31	31	use FluentCart\Framework\Database\Orm\Relations\HasMany;
32	32	use FluentCart\Framework\Http\Request\Request;
33		-use FluentCart\App\Services\DateTime\DateTime;
34	33	use FluentCart\Framework\Support\Arr;
35	34	use FluentCart\Framework\Support\Collection;
36	35	use FluentCart\Framework\Validator\Validator;
37	36	use FluentCartPro\App\Modules\Licensing\Models\License;
		@@ -63,9 +62,9 @@
63	62	$page = (int)$request->get('page', 1);
64	63	$search = $request->getSafe('search', 'sanitize_text_field');
65	64
66	65	$orders = Order::query()
67		- ->select(['invoice_no', 'id', 'parent_id', 'total_amount', 'fee_total', 'uuid', 'type', 'status', 'created_at'])
	66	+ ->select(['invoice_no', 'id', 'parent_id', 'total_amount', 'fee_total', 'currency', 'uuid', 'type', 'status', 'created_at'])
68	67	->with(['order_items' => function ($query) {
69	68	$query->select('id', 'order_id', 'object_id', 'post_title', 'title', 'quantity', 'payment_type', 'line_meta', 'other_info');
70	69	}])
71	70	->where('customer_id', $customer->id)
		@@ -82,11 +81,12 @@
82	81	->paginate($perPage, ['*'], 'page', $page);
83	82
84	83	$orders->transform(function ($order) {
85	84	return [
86		- 'created_at' => DateTime::gmtToTimezone($order->created_at, Arr::get($order->config, 'user_tz', wp_timezone_string()))->format('Y-m-d H:i:s'),
	85	+ 'created_at' => $order->created_at->format('Y-m-d H:i:s'),
87	86	'invoice_no' => $order->invoice_no,
88	87	'total_amount' => $order->total_amount,
	88	+ 'currency' => $order->currency,
89	89	'uuid' => $order->uuid,
90	90	'type' => $order->type,
91	91	'status' => $order->status,
92	92	'renewals_count' => $order->renewals_count,
		@@ -238,12 +238,36 @@
238	238	$variationIds[] = $item->object_id;
239	239	$productIds[] = $item->post_id;
240	240	}
241	241
	242	+
	243	+ $upgradableVariationIds = [];
	244	+ $isUpgradeEligibleOrder = in_array($order->payment_status, [
	245	+ Status::PAYMENT_PAID,
	246	+ Status::PAYMENT_PARTIALLY_PAID,
	247	+ Status::PAYMENT_PARTIALLY_REFUNDED
	248	+ ]);
	249	+
	250	+ if ($isUpgradeEligibleOrder && $variationIds) {
	251	+ $upgradableVariationIds = Meta::query()
	252	+ ->where('meta_key', 'variant_upgrade_path')
	253	+ ->where('object_type', 'variant_upgrade')
	254	+ ->whereIn('object_id', $variationIds)
	255	+ ->pluck('object_id')
	256	+ ->toArray();
	257	+ }
	258	+
	259	+ foreach ($orderItems as &$orderItem) {
	260	+ $orderItem['has_upgrade_paths'] = Arr::get($orderItem, 'payment_type') === 'onetime'
	261	+ && !Arr::get($orderItem, 'line_meta.parent_item_id')
	262	+ && in_array(Arr::get($orderItem, 'variation_id'), $upgradableVariationIds);
	263	+ }
	264	+ unset($orderItem);
	265	+
242	266	$formattedOrderData = [
243	267	'fulfillment_type' => $order->fulfillment_type,
244	268	'type' => $order->type,
245		- 'created_at' => DateTime::gmtToTimezone($order->created_at, Arr::get($order->config, 'user_tz', wp_timezone_string()))->format('Y-m-d H:i:s'),
	269	+ 'created_at' => $order->created_at->format('Y-m-d H:i:s'),
246	270	'invoice_no' => $order->invoice_no,
247	271	'currency' => $order->currency,
248	272	'uuid' => $order->uuid,
249	273	'order_items' => $orderItems,
		@@ -278,9 +302,9 @@
278	302	];
279	303
280	304	$formattedOrderData['subscriptions'] = $order->subscriptions
281	305	->filter(function ($subscription) {
282		- return !in_array($subscription->status, [Status::SUBSCRIPTION_PENDING, Status::SUBSCRIPTION_INTENDED]);
	306	+ return $subscription->isVisibleToCustomer();
283	307	})
284	308	->map(function ($subscription) {
285	309	return OrderService::transformSubscription($subscription);
286	310	});