← All changes | app/Http/Requests/OrderRequest.php +65 -39 1.6.1 → 1.6.5 View file →

		@@ -3,8 +3,9 @@
3	3	namespace FluentCart\App\Http\Requests;
4	4
5	5	use FluentCart\App\Helpers\Helper;
6	6	use FluentCart\Framework\Foundation\RequestGuard;
	7	+use FluentCart\Framework\Support\Arr;
7	8
8	9	class OrderRequest extends RequestGuard
9	10	{
10	11
		@@ -86,28 +87,57 @@
86	87	'tax_lines.*.tax_amount' => 'nullable|numeric|min:0',
87	88	'tax_lines.*.label' => 'nullable|sanitizeText',
88	89	'tax_lines.*.is_compound'=> 'nullable',
89	90
90		- 'applied_coupon' => 'nullable|array',
91		- "applied_coupon.*.id" => 'nullable|numeric|min:1',
92		- "applied_coupon.*.order_id" => 'nullable|numeric|min:1',
93		- "applied_coupon.*.coupon_id" => 'required|numeric|min:1',
94		- //"applied_coupon.*.title" => 'required|string|max:100',
95		- "applied_coupon.*.code" => 'required|sanitizeText|maxLength:100',
96		- //"applied_coupon.*.status" => 'required|string|max:100',
97		- //"applied_coupon.*.type" => 'required|string|max:100',
98		- "applied_coupon.*.amount" => 'nullable|numeric',
99		- "applied_coupon.*.discounted_amount" => 'required|numeric',
100		- "applied_coupon.*.discount" => 'nullable|numeric',
101		- "applied_coupon.*.stackable" => 'required|numeric',
102		- "applied_coupon.*.priority" => 'nullable|numeric',
103		- "applied_coupon.*.max_uses" => 'nullable|numeric',
104		- "applied_coupon.*.use_count" => 'nullable|numeric',
105		- "applied_coupon.*.max_per_customer" => 'nullable|numeric|min:1',
106		- "applied_coupon.*.min_purchase_amount" => 'nullable|numeric',
107		- "applied_coupon.*.max_discount_amount" => 'nullable|numeric',
108		- "applied_coupon.*.notes" => 'nullable|sanitizeTextArea|maxLength:100',
109		- 'trigger' => 'nullable|string',
	91	+ // `applied_coupon` is the admin order screen handing back, untouched, what
	92	+ // POST coupons/apply returned: a map KEYED BY COUPON CODE whose rows are
	93	+ // CouponServiceAdmin discount data (see ensureCouponExistInDiscountData()),
	94	+ // NOT fct_applied_coupons rows. AdminOrderProcessor::insertAppliedCoupons()
	95	+ // reads the code keys plus `id` and `discount` and builds its insert rows
	96	+ // from the Coupon model, so those two are the whole load-bearing contract;
	97	+ // everything else in the map is display metadata.
	98	+ //
	99	+ // The previous rules described fct_applied_coupons columns (coupon_id, code,
	100	+ // discounted_amount, stackable) that no caller has ever sent. They were inert
	101	+ // while the validator skipped absent wildcard children, and became a hard
	102	+ // 422 on every coupon order once it started materializing them.
	103	+ //
	104	+ // The per-row closure is the backstop, not decoration: whether the wildcard
	105	+ // rules below can fire at all depends on the validator materializing absent
	106	+ // children, so on its own `applied_coupon.*.id => required` is silently
	107	+ // unenforced on older framework builds. insertAppliedCoupons() subscripts
	108	+ // ['id'] unguarded, so an entry without one writes a null coupon_id.
	109	+ 'applied_coupon' => ['nullable', 'array', function ($attribute, $value) {
	110	+ if (!is_array($value)) {
	111	+ return null; // the `array` rule already reports this
	112	+ }
	113	+
	114	+ foreach ($value as $code => $row) {
	115	+ $couponId = is_array($row) ? Arr::get($row, 'id') : null;
	116	+
	117	+ if (!is_numeric($couponId) || (int) $couponId < 1) {
	118	+ return sprintf(
	119	+ /* translators: %1$s: the coupon code the admin applied to the order. */
	120	+ __('The applied coupon "%1$s" is missing its coupon id.', 'fluent-cart'),
	121	+ sanitize_text_field((string) $code)
	122	+ );
	123	+ }
	124	+ }
	125	+
	126	+ return null;
	127	+ }],
	128	+ "applied_coupon.*.id" => 'required|numeric|min:1',
	129	+ // Bounded for the same reason as shipping_total above: sanitize() routes this
	130	+ // through Helper::roundCent(), which throws outside float's exact-integer
	131	+ // range, and a negative coupon discount has no meaning.
	132	+ "applied_coupon.*.discount" => 'required|numeric|min:0|max:9000000000000000',
	133	+ "applied_coupon.*.title" => 'nullable|sanitizeText|maxLength:192',
	134	+ "applied_coupon.*.type" => 'nullable|sanitizeText|maxLength:100',
	135	+ "applied_coupon.*.amount" => 'nullable|numeric',
	136	+ "applied_coupon.*.actual_amount" => 'nullable|numeric',
	137	+ "applied_coupon.*.unit_amount" => 'nullable|numeric',
	138	+ "applied_coupon.*.actual_quantity" => 'nullable|numeric',
	139	+ 'trigger' => 'nullable|string',
110	140	];
111	141	}
112	142
113	143
		@@ -216,27 +246,23 @@
216	246	"tax_lines.*.is_compound"=> function ($value) {
217	247	return (bool) $value;
218	248	},
219	249
220		- "applied_coupon.*.id" => 'intval',
221		- "applied_coupon.*.order_id" => 'intval',
222		- "applied_coupon.*.coupon_id" => 'intval',
223		- "applied_coupon.*.title" => 'sanitize_text_field',
224		- "applied_coupon.*.discount" => 'intval',
225		- "applied_coupon.*.code" => 'sanitize_text_field',
226		- "applied_coupon.*.status" => 'sanitize_text_field',
227		- "applied_coupon.*.type" => 'sanitize_text_field',
228		- "applied_coupon.*.amount" => 'intval',
229		- "applied_coupon.*.discounted_amount" => 'intval',
230		- "applied_coupon.*.stackable" => 'intval',
231		- "applied_coupon.*.priority" => 'intval',
232		- "applied_coupon.*.max_uses" => 'intval',
233		- "applied_coupon.*.use_count" => 'intval',
234		- "applied_coupon.*.max_per_customer" => 'intval',
235		- "applied_coupon.*.min_purchase_amount" => 'intval',
236		- "applied_coupon.*.max_discount_amount" => 'intval',
237		- "applied_coupon.*.notes" => 'sanitize_text_field',
238		- 'trigger' => 'sanitize_text_field',
	250	+ // Mirrors rules(): the coupons/apply discount-data shape, keyed by coupon code.
	251	+ "applied_coupon.*.id" => 'intval',
	252	+ // Already cents (CouponServiceAdmin rounds the distributed discount to two
	253	+ // decimals in cents) — normalize the float artifact without scaling. A bare
	254	+ // intval() here truncates, so a 9.99 discount would persist a cent short.
	255	+ "applied_coupon.*.discount" => function ($value) {
	256	+ return Helper::roundCent($value);
	257	+ },
	258	+ "applied_coupon.*.title" => 'sanitize_text_field',
	259	+ "applied_coupon.*.type" => 'sanitize_text_field',
	260	+ "applied_coupon.*.amount" => 'intval',
	261	+ "applied_coupon.*.actual_amount" => 'floatval',
	262	+ "applied_coupon.*.unit_amount" => 'intval',
	263	+ "applied_coupon.*.actual_quantity" => 'intval',
	264	+ 'trigger' => 'sanitize_text_field',
239	265	];
240	266
241	267	}
242	268	}