← All changes | app/Services/OrderService.php +53 -3 1.5.1 → 1.7.1 View file →

		@@ -6,8 +6,9 @@
6	6	use FluentCart\Api\StoreSettings;
7	7	use FluentCart\App\App;
8	8	use FluentCart\App\Helpers\AddressHelper;
9	9	use FluentCart\App\Helpers\Helper;
	10	+use FluentCart\App\Helpers\Status;
10	11	use FluentCart\App\Models\Model;
11	12	use FluentCart\App\Models\Order;
12	13	use FluentCart\App\Models\OrderItem;
13	14	use FluentCart\App\Models\OrderMeta;
		@@ -13,8 +14,11 @@
13	14	use FluentCart\App\Models\OrderMeta;
14	15	use FluentCart\App\Models\OrderTransaction;
15	16	use FluentCart\App\Models\ProductVariation;
16	17	use FluentCart\App\Models\Subscription;
	18	+use FluentCart\App\Modules\Subscriptions\Services\SystemChargeService;
	19	+use FluentCart\App\Services\Payments\PaymentHelper;
	20	+use FluentCart\App\Services\Renderer\CheckoutFieldsSchema;
17	21	use FluentCart\Framework\Support\Arr;
18	22
19	23	class OrderService
20	24	{
		@@ -78,13 +82,24 @@
78	82	private static function finalizeAddress($address, $type): array
79	83	{
80	84	$fullName = Arr::get($address, 'full_name', '');
81	85	$name = Arr::get($address, 'name', '');
	86	+ $explicitFirstName = trim((string) Arr::get($address, 'first_name', ''));
	87	+ $explicitLastName = trim((string) Arr::get($address, 'last_name', ''));
82	88	$address['full_name'] = $fullName ?? $name;
83	89	$address['first_name'] = AddressHelper::guessFirstNameAndLastName($address['full_name']);
84	90	$address['type'] = $type;
85	91	$name = $fullName ?? $name;
86		- $address = array_merge($address, AddressHelper::guessFirstNameAndLastName($name));
	92	+
	93	+ // In First/Last mode the customer typed both names, so keep them as
	94	+ // typed. Guessing from the joined name would turn "Alex" + "de Silva"
	95	+ // into "Alex de" + "Silva". Full-name-only addresses are still guessed.
	96	+ if (!CheckoutFieldsSchema::isFullNameRequired() && $explicitFirstName !== '') {
	97	+ $address['first_name'] = $explicitFirstName;
	98	+ $address['last_name'] = $explicitLastName;
	99	+ } else {
	100	+ $address = array_merge($address, AddressHelper::guessFirstNameAndLastName($name));
	101	+ }
87	102	$address['name'] = Arr::get($address, 'first_name', '') . ' ' . Arr::get($address, 'last_name', '');
88	103	return $address;
89	104	}
90	105
		@@ -618,12 +633,33 @@
618	633	'reactivate_url' => $subscription->getReactivateUrl(),
619	634	'can_upgrade' => $subscription->canUpgrade(),
620	635	'can_switch_payment_method' => $subscription->canSwitchPaymentMethod(),
621	636	'can_update_payment_method' => $subscription->canUpdatePaymentMethod(),
622		- 'item_name' => $subscription->item_name
	637	+ 'collection_method' => $subscription->collection_method,
	638	+ 'is_auto_charged' => $subscription->isSystem(),
	639	+ 'item_name' => $subscription->display_item_name
623	640	];
624	641	}
625	642
	643	+ /**
	644	+ * A system renewal order still inside its auto-charge retry window has no
	645	+ * Pay Now — the charge is coming automatically. Other renewals unaffected.
	646	+ */
	647	+ protected static function renewalPayNowAllowed(Order $order): bool
	648	+ {
	649	+ if (!$order->parent_id) {
	650	+ return true;
	651	+ }
	652	+
	653	+ $subscription = Subscription::query()->where('parent_order_id', $order->parent_id)->first();
	654	+
	655	+ if (!$subscription || !$subscription->isSystem()) {
	656	+ return true;
	657	+ }
	658	+
	659	+ return SystemChargeService::isExhausted($subscription, $order);
	660	+ }
	661	+
626	662	public static function transformTransaction(OrderTransaction $transaction)
627	663	{
628	664	$data = [
629	665	'uuid' => $transaction->uuid,
		@@ -644,13 +680,27 @@
644	680	if ($transaction->order && self::canGenerateReceiptPdf()) {
645	681	$data['receipt_view_url'] = $transaction->order->getReceiptViewUrl();
646	682	}
647	683
	684	+ if ($transaction->order
	685	+ && $transaction->order->type === Status::ORDER_TYPE_RENEWAL
	686	+ && $transaction->status === Status::TRANSACTION_PENDING
	687	+ && self::renewalPayNowAllowed($transaction->order)
	688	+ ) {
	689	+ $data['custom_checkout_url'] = add_query_arg([
	690	+ 'fluent-cart' => 'custom_checkout',
	691	+ 'order_hash' => $transaction->order->uuid,
	692	+ ], home_url('/'));
	693	+ }
	694	+
648	695	return $data;
649	696	}
650	697
651	698	public static function canGenerateReceiptPdf(): bool
652	699	{
653		- return App::isProActive() && defined('FLUENT_PDF');
	700	+ return (bool) apply_filters(
	701	+ 'fluent_cart/pdf/can_generate_receipt',
	702	+ App::isProActive() && defined('FLUENT_PDF')
	703	+ );
654	704	}
655	705
656	706	}