| @@ -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,10 @@ | ||
| 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.reviews_enabled' => 'nullable|sanitizeText|in:yes,no', | |
| 263 | + 'detail.other_info.fluent_player_video' => 'nullable|array', | |
| 259 | 264 | 'product_terms' => 'nullable|array', |
| 260 | 265 | 'product_terms.*' => 'nullable|array', |
| 261 | 266 | 'product_terms.*.*' => 'nullable|numeric', |
| 262 | 267 | |
| @@ -273,16 +278,34 @@ | ||
| 273 | 278 | 'variants.*.compare_price' => [ |
| 274 | 279 | 'nullable', |
| 275 | 280 | 'numeric', |
| 276 | 281 | function ($attribute, $value) { |
| 282 | + // Zero or empty means no compare-at price, which the storefront | |
| 283 | + // also treats as "none" — nothing to compare. | |
| 284 | + if ($value === null || $value === '' || (float) $value <= 0) { | |
| 285 | + return null; | |
| 286 | + } | |
| 287 | + | |
| 277 | 288 | $index = explode('.', $attribute)[1]; |
| 278 | 289 | $itemPrice = $this->get("variants.$index.item_price"); |
| 279 | - if (empty($itemPrice)) { | |
| 280 | - $itemPrice = 0; | |
| 290 | + | |
| 291 | + // The editor posts only what changed, so a compare-price-only edit | |
| 292 | + // carries no item_price. Falling back to 0 made the comparison | |
| 293 | + // vacuous and the rule passed for any value; read the stored price | |
| 294 | + // for that variation instead, which is what the row is really | |
| 295 | + // being compared against. | |
| 296 | + if ($itemPrice === null || $itemPrice === '') { | |
| 297 | + $variantId = $this->get("variants.$index.id"); | |
| 298 | + | |
| 299 | + $itemPrice = $variantId | |
| 300 | + ? ProductVariation::query()->where('id', $variantId)->value('item_price') | |
| 301 | + : 0; | |
| 281 | 302 | } |
| 282 | - if ($value !== null && $value < $itemPrice) { | |
| 303 | + | |
| 304 | + if ((float) $value < (float) $itemPrice) { | |
| 283 | 305 | return sprintf(__("Compare price must be greater than or equal to item price.", 'fluent-cart')); |
| 284 | 306 | } |
| 307 | + | |
| 285 | 308 | return null; |
| 286 | 309 | }, |
| 287 | 310 | ], |
| 288 | 311 | 'variants.*.manage_cost' => 'nullable|sanitizeText|maxLength:10', |
| @@ -341,13 +364,43 @@ | ||
| 341 | 364 | } |
| 342 | 365 | return null; |
| 343 | 366 | }, |
| 344 | 367 | ], |
| 345 | - 'variants.*.other_info.repeat_interval' => 'required_if:variants.*.other_info.payment_type,subscription|sanitizeText|maxLength:100', | |
| 368 | + 'variants.*.other_info.repeat_interval' => [ | |
| 369 | + RequiredWhenRule::make( | |
| 370 | + 'variants.*.other_info.payment_type', | |
| 371 | + 'subscription', | |
| 372 | + esc_html__('Interval is required.', 'fluent-cart') | |
| 373 | + ), | |
| 374 | + 'sanitizeText', | |
| 375 | + 'maxLength:100', | |
| 376 | + ], | |
| 346 | 377 | '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', | |
| 378 | + 'variants.*.other_info.manage_setup_fee' => [ | |
| 379 | + RequiredWhenRule::make( | |
| 380 | + 'variants.*.other_info.payment_type', | |
| 381 | + 'subscription', | |
| 382 | + esc_html__('Setup Fee option is required.', 'fluent-cart') | |
| 383 | + ), | |
| 384 | + 'sanitizeText', | |
| 385 | + 'maxLength:100', | |
| 386 | + ], | |
| 387 | + 'variants.*.other_info.signup_fee' => [ | |
| 388 | + RequiredWhenRule::make( | |
| 389 | + 'variants.*.other_info.manage_setup_fee', | |
| 390 | + 'yes', | |
| 391 | + esc_html__('Setup Fee Amount is required.', 'fluent-cart') | |
| 392 | + ), | |
| 393 | + ], | |
| 394 | + 'variants.*.other_info.signup_fee_name' => [ | |
| 395 | + RequiredWhenRule::make( | |
| 396 | + 'variants.*.other_info.manage_setup_fee', | |
| 397 | + 'yes', | |
| 398 | + esc_html__('Setup Fee Name is required.', 'fluent-cart') | |
| 399 | + ), | |
| 400 | + 'sanitizeText', | |
| 401 | + 'maxLength:100', | |
| 402 | + ], | |
| 350 | 403 | ]; |
| 351 | 404 | $rules = array_merge($rules, $variantsOtherInfoRules); |
| 352 | 405 | |
| 353 | 406 | } |
| @@ -406,11 +459,8 @@ | ||
| 406 | 459 | 'variants.*.item_cost.required_if' => esc_html__('Item cost is required.', 'fluent-cart'), |
| 407 | 460 | 'variants.*.other_info.description.max' => esc_html__('Description may not be greater than 255 characters.', 'fluent-cart'), |
| 408 | 461 | 'variants.*.other_info.payment_type.required' => esc_html__('Payment Type is required.', 'fluent-cart'), |
| 409 | 462 | '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 | 463 | ]; |
| 414 | 464 | |
| 415 | 465 | $messages = array_merge($messages, $otherInfoMessages); |
| 416 | 466 | } |
| @@ -473,8 +523,12 @@ | ||
| 473 | 523 | 'detail.other_info.shipping_class' => 'intval', |
| 474 | 524 | 'detail.other_info.tax_class' => 'intval', |
| 475 | 525 | 'detail.other_info.tax_exempt' => 'sanitize_text_field', |
| 476 | 526 | 'detail.other_info.active_editor' => 'sanitize_text_field', |
| 527 | + 'detail.other_info.reviews_enabled' => 'sanitize_text_field', | |
| 528 | + 'detail.other_info.fluent_player_video' => function ($value) { | |
| 529 | + return ProductVideoSettings::sanitize($value); | |
| 530 | + }, | |
| 477 | 531 | ]; |
| 478 | 532 | |
| 479 | 533 | foreach ($detailFieldMap as $field => $sanitizer) { |
| 480 | 534 | if (Arr::has($data, $field)) { |
| @@ -522,9 +576,14 @@ | ||
| 522 | 576 | "variants.$index.serial_index" => 'intval', |
| 523 | 577 | "variants.$index.downloadable" => 'sanitize_text_field', |
| 524 | 578 | "variants.$index.fulfillment_type" => 'sanitize_text_field', |
| 525 | 579 | "variants.$index.sku" => function ($value) { |
| 526 | - return empty($value) ? null : sanitize_text_field($value); | |
| 580 | + // empty() treats the string "0" as empty too, which would silently | |
| 581 | + // convert a legitimate sku of "0" to NULL — sku is a textual | |
| 582 | + // identifier (VARCHAR), not a numeric flag. Match the explicit | |
| 583 | + // '' / null check ProductResource::update() already uses for the | |
| 584 | + // same reason when it clears a sku. | |
| 585 | + return ($value === '' || $value === null) ? null : sanitize_text_field($value); | |
| 527 | 586 | }, |
| 528 | 587 | ]; |
| 529 | 588 | |
| 530 | 589 | foreach ($variantFieldMap as $field => $sanitizer) { |
