← All changes | app/Http/Requests/ProductUpdateRequest.php +80 -23 1.6.1 → 1.6.6 View file →

		@@ -2,10 +2,13 @@
2	2
3	3	namespace FluentCart\App\Http\Requests;
4	4
5	5	use FluentCart\App\Helpers\Helper;
	6	+use FluentCart\App\Models\ProductVariation;
6	7	use FluentCart\App\Models\ShippingClass;
	8	+use FluentCart\App\Modules\FluentPlayer\ProductVideoSettings;
7	9	use FluentCart\App\Services\DateTime\DateTime;
	10	+use FluentCart\App\Http\Rules\RequiredWhenRule;
8	11	use FluentCart\Framework\Foundation\RequestGuard;
9	12	use FluentCart\Framework\Support\Arr;
10	13
11	14	class ProductUpdateRequest extends RequestGuard
		@@ -10,22 +13,22 @@
10	13
11	14	class ProductUpdateRequest extends RequestGuard
12	15	{
13	16	/**
14		- * Prepare and normalize the incoming data before validation.
	17	+ * Drop the subscription fields from any variant saved as one-time, so a
	18	+ * product switched back to a single payment does not keep billing settings
	19	+ * the merchant can no longer see.
15	20	*
16		- * This method ensures that each variant in the request payload has the necessary structure
17		- * expected for processing, particularly focusing on the `other_info` attribute.
	21	+ * This does NOT fill missing keys. The block below it — which rebuilt
	22	+ * `other_info` and `fulfillment_type` from defaults, as ProductRequest still
	23	+ * does on create — stays commented out deliberately: on an update the payload
	24	+ * is a partial row, so rebuilding the column from defaults would overwrite a
	25	+ * stored subscription's interval and setup fee on an unrelated edit. Callers
	26	+ * therefore have to send a complete variant row; the editor builds one in
	27	+ * Models/Product/productUpdatePayload.js by merging each change record with
	28	+ * the variation it came from.
18	29	*
19		- * If `other_info` is missing from a variant (common during data migration scenarios),
20		- * this method sets default values to prevent validation or processing errors.
21		- *
22		- * It also ensures that:
23		- * - `fulfillment_type` is consistently applied across all variants, defaulting to 'physical'.
24		- * - `payment_type` is set (defaulting to 'onetime') and injected into `other_info`.
25		- * - `other_info` is populated with a consistent structure containing default billing and setup fee options.
26		- *
27		- * @return array The normalized request data ready for validation.
	30	+ * @return array The request data, with dead subscription fields removed.
28	31	*/
29	32	public function beforeValidation()
30	33	{
31	34	$data = $this->all();
		@@ -255,8 +258,9 @@
255	258	return $this->validateTaxClassId($attribute, $value);
256	259	}],
257	260	'detail.other_info.tax_exempt' => 'nullable|sanitizeText|in:yes,no',
258	261	'detail.other_info.active_editor' => 'nullable|sanitizeText',
	262	+ 'detail.other_info.fluent_player_video' => 'nullable|array',
259	263	'product_terms' => 'nullable|array',
260	264	'product_terms.*' => 'nullable|array',
261	265	'product_terms.*.*' => 'nullable|numeric',
262	266
		@@ -273,16 +277,34 @@
273	277	'variants.*.compare_price' => [
274	278	'nullable',
275	279	'numeric',
276	280	function ($attribute, $value) {
	281	+ // Zero or empty means no compare-at price, which the storefront
	282	+ // also treats as "none" — nothing to compare.
	283	+ if ($value === null || $value === '' || (float) $value <= 0) {
	284	+ return null;
	285	+ }
	286	+
277	287	$index = explode('.', $attribute)[1];
278	288	$itemPrice = $this->get("variants.$index.item_price");
279		- if (empty($itemPrice)) {
280		- $itemPrice = 0;
	289	+
	290	+ // The editor posts only what changed, so a compare-price-only edit
	291	+ // carries no item_price. Falling back to 0 made the comparison
	292	+ // vacuous and the rule passed for any value; read the stored price
	293	+ // for that variation instead, which is what the row is really
	294	+ // being compared against.
	295	+ if ($itemPrice === null || $itemPrice === '') {
	296	+ $variantId = $this->get("variants.$index.id");
	297	+
	298	+ $itemPrice = $variantId
	299	+ ? ProductVariation::query()->where('id', $variantId)->value('item_price')
	300	+ : 0;
281	301	}
282		- if ($value !== null && $value < $itemPrice) {
	302	+
	303	+ if ((float) $value < (float) $itemPrice) {
283	304	return sprintf(__("Compare price must be greater than or equal to item price.", 'fluent-cart'));
284	305	}
	306	+
285	307	return null;
286	308	},
287	309	],
288	310	'variants.*.manage_cost' => 'nullable|sanitizeText|maxLength:10',
		@@ -341,13 +363,43 @@
341	363	}
342	364	return null;
343	365	},
344	366	],
345		- 'variants.*.other_info.repeat_interval' => 'required_if:variants.*.other_info.payment_type,subscription|sanitizeText|maxLength:100',
	367	+ 'variants.*.other_info.repeat_interval' => [
	368	+ RequiredWhenRule::make(
	369	+ 'variants.*.other_info.payment_type',
	370	+ 'subscription',
	371	+ esc_html__('Interval is required.', 'fluent-cart')
	372	+ ),
	373	+ 'sanitizeText',
	374	+ 'maxLength:100',
	375	+ ],
346	376	'variants.*.other_info.billing_summary' => 'nullable|sanitizeTextArea|maxLength:255',
347		- 'variants.*.other_info.manage_setup_fee' => 'required_if:variants.*.other_info.payment_type,subscription|sanitizeText|maxLength:100',
348		- 'variants.*.other_info.signup_fee' => 'required_if:variants.*.other_info.manage_setup_fee,yes',
349		- 'variants.*.other_info.signup_fee_name' => 'required_if:variants.*.other_info.manage_setup_fee,yes|sanitizeText|maxLength:100',
	377	+ 'variants.*.other_info.manage_setup_fee' => [
	378	+ RequiredWhenRule::make(
	379	+ 'variants.*.other_info.payment_type',
	380	+ 'subscription',
	381	+ esc_html__('Setup Fee option is required.', 'fluent-cart')
	382	+ ),
	383	+ 'sanitizeText',
	384	+ 'maxLength:100',
	385	+ ],
	386	+ 'variants.*.other_info.signup_fee' => [
	387	+ RequiredWhenRule::make(
	388	+ 'variants.*.other_info.manage_setup_fee',
	389	+ 'yes',
	390	+ esc_html__('Setup Fee Amount is required.', 'fluent-cart')
	391	+ ),
	392	+ ],
	393	+ 'variants.*.other_info.signup_fee_name' => [
	394	+ RequiredWhenRule::make(
	395	+ 'variants.*.other_info.manage_setup_fee',
	396	+ 'yes',
	397	+ esc_html__('Setup Fee Name is required.', 'fluent-cart')
	398	+ ),
	399	+ 'sanitizeText',
	400	+ 'maxLength:100',
	401	+ ],
350	402	];
351	403	$rules = array_merge($rules, $variantsOtherInfoRules);
352	404
353	405	}
		@@ -406,11 +458,8 @@
406	458	'variants.*.item_cost.required_if' => esc_html__('Item cost is required.', 'fluent-cart'),
407	459	'variants.*.other_info.description.max' => esc_html__('Description may not be greater than 255 characters.', 'fluent-cart'),
408	460	'variants.*.other_info.payment_type.required' => esc_html__('Payment Type is required.', 'fluent-cart'),
409	461	'variants.*.other_info.times.required_if' => esc_html__('Times is required.', 'fluent-cart'),
410		- 'variants.*.other_info.repeat_interval.required_if' => esc_html__('Interval is required.', 'fluent-cart'),
411		- 'variants.*.other_info.signup_fee.required_if' => esc_html__('Setup Fee Amount is required.', 'fluent-cart'),
412		- 'variants.*.other_info.signup_fee_name.required_if' => esc_html__('Setup Fee Name is required.', 'fluent-cart'),
413	462	];
414	463
415	464	$messages = array_merge($messages, $otherInfoMessages);
416	465	}
		@@ -473,8 +522,11 @@
473	522	'detail.other_info.shipping_class' => 'intval',
474	523	'detail.other_info.tax_class' => 'intval',
475	524	'detail.other_info.tax_exempt' => 'sanitize_text_field',
476	525	'detail.other_info.active_editor' => 'sanitize_text_field',
	526	+ 'detail.other_info.fluent_player_video' => function ($value) {
	527	+ return ProductVideoSettings::sanitize($value);
	528	+ },
477	529	];
478	530
479	531	foreach ($detailFieldMap as $field => $sanitizer) {
480	532	if (Arr::has($data, $field)) {
		@@ -522,9 +574,14 @@
522	574	"variants.$index.serial_index" => 'intval',
523	575	"variants.$index.downloadable" => 'sanitize_text_field',
524	576	"variants.$index.fulfillment_type" => 'sanitize_text_field',
525	577	"variants.$index.sku" => function ($value) {
526		- return empty($value) ? null : sanitize_text_field($value);
	578	+ // empty() treats the string "0" as empty too, which would silently
	579	+ // convert a legitimate sku of "0" to NULL — sku is a textual
	580	+ // identifier (VARCHAR), not a numeric flag. Match the explicit
	581	+ // '' / null check ProductResource::update() already uses for the
	582	+ // same reason when it clears a sku.
	583	+ return ($value === '' || $value === null) ? null : sanitize_text_field($value);
527	584	},
528	585	];
529	586
530	587	foreach ($variantFieldMap as $field => $sanitizer) {