← All changes | app/Http/Requests/OrderRequest.php +102 -43 1.3.20 → 1.6.5 View file →

		@@ -1,9 +1,11 @@
1	1	<?php
2	2
3	3	namespace FluentCart\App\Http\Requests;
4	4
	5	+use FluentCart\App\Helpers\Helper;
5	6	use FluentCart\Framework\Foundation\RequestGuard;
	7	+use FluentCart\Framework\Support\Arr;
6	8
7	9	class OrderRequest extends RequestGuard
8	10	{
9	11
		@@ -25,9 +27,13 @@
25	27	'discount_tax' => 'numeric',
26	28	'manual_discount_total' => 'numeric',
27	29	'coupon_discount_total' => 'numeric',
28	30	'shipping_tax' => 'numeric',
29		- 'shipping_total' => 'numeric',
	31	+ // min/max close the silent-corruption window: 1e19 passes `numeric`
	32	+ // but wraps to a negative BIGINT through a float-to-int cast, and a
	33	+ // negative shipping charge has no meaning. The bound matches the
	34	+ // Helper::roundCent() guard (float's exact-integer range).
	35	+ 'shipping_total' => 'numeric|min:0|max:9000000000000000',
30	36	'tax_total' => 'numeric',
31	37	'total_amount' => 'numeric',
32	38	'rate' => 'numeric',
33	39	'note' => 'nullable|sanitizeTextArea|maxLength:5000',
		@@ -73,30 +79,65 @@
73	79	"shipping.*.type" => 'nullable|sanitizeText|maxLength:100',
74	80	"shipping.*.rate_name" => 'nullable|sanitizeText|maxLength:100',
75	81	"shipping.*.custom_price" => 'nullable|numeric',
76	82
77		- 'deletedItems' => 'nullable|array',
	83	+ 'deletedItems' => 'nullable|array',
	84	+ 'tax_behavior' => 'nullable|numeric|min:0',
	85	+ 'tax_lines' => 'nullable|array',
	86	+ 'tax_lines.*.rate_id' => 'nullable|numeric|min:0',
	87	+ 'tax_lines.*.tax_amount' => 'nullable|numeric|min:0',
	88	+ 'tax_lines.*.label' => 'nullable|sanitizeText',
	89	+ 'tax_lines.*.is_compound'=> 'nullable',
78	90
79		- 'applied_coupon' => 'nullable|array',
80		- "applied_coupon.*.id" => 'nullable|numeric|min:1',
81		- "applied_coupon.*.order_id" => 'nullable|numeric|min:1',
82		- "applied_coupon.*.coupon_id" => 'required|numeric|min:1',
83		- //"applied_coupon.*.title" => 'required|string|max:100',
84		- "applied_coupon.*.code" => 'required|sanitizeText|maxLength:100',
85		- //"applied_coupon.*.status" => 'required|string|max:100',
86		- //"applied_coupon.*.type" => 'required|string|max:100',
87		- "applied_coupon.*.amount" => 'nullable|numeric',
88		- "applied_coupon.*.discounted_amount" => 'required|numeric',
89		- "applied_coupon.*.discount" => 'nullable|numeric',
90		- "applied_coupon.*.stackable" => 'required|numeric',
91		- "applied_coupon.*.priority" => 'nullable|numeric',
92		- "applied_coupon.*.max_uses" => 'nullable|numeric',
93		- "applied_coupon.*.use_count" => 'nullable|numeric',
94		- "applied_coupon.*.max_per_customer" => 'nullable|numeric|min:1',
95		- "applied_coupon.*.min_purchase_amount" => 'nullable|numeric',
96		- "applied_coupon.*.max_discount_amount" => 'nullable|numeric',
97		- "applied_coupon.*.notes" => 'nullable|sanitizeTextArea|maxLength:100',
98		- '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',
99	140	];
100	141	}
101	142
102	143
		@@ -132,10 +173,21 @@
132	173	'discount_tax' => 'floatval',
133	174	'manual_discount_total' => 'floatval',
134	175	'coupon_discount_total' => 'floatval',
135	176	'shipping_tax' => 'floatval',
136		- 'shipping_total' => 'floatval',
	177	+ // Cents column: normalize at the boundary so every consumer of this request
	178	+ // receives a whole-cent int. floatval alone let a client-computed 19.99 * 100
	179	+ // arrive as 1998.9999999999998, which any later int cast would truncate.
	180	+ //
	181	+ // Wrapped in a closure, NOT passed as [Helper::class, 'roundCent']: an array
	182	+ // value in this map is a LIST of callbacks, iterated one by one
	183	+ // (vendor/wpfluent/framework/src/WPFluent/Support/Sanitizer.php:456-464), so the
	184	+ // array-callable form would try to call Helper() as a function.
	185	+ 'shipping_total' => function ($value) {
	186	+ return Helper::roundCent($value);
	187	+ },
137	188	'tax_total' => 'floatval',
	189	+ 'tax_behavior' => 'intval',
138	190	'total_amount' => 'floatval',
139	191	'rate' => 'sanitize_text_field',
140	192	'note' => 'sanitize_text_field',
141	193	'uuid' => 'sanitize_text_field',
		@@ -164,9 +216,11 @@
164	216	"order_items.*.total" => 'floatval',
165	217	"order_items.*.line_total" => 'floatval',
166	218	"order_items.*.cart_index" => 'intval',
167	219	"order_items.*.rate" => 'floatval',
168		- "order_items.*.line_meta" => 'sanitize_text_field',
	220	+ "order_items.*.line_meta" => function ($value) {
	221	+ return is_array($value) ? $value : [];
	222	+ },
169	223	"order_items.*.other_info" => function ($value) {
170	224	return is_array($value) ? $value : [];
171	225	},
172	226
		@@ -182,28 +236,33 @@
182	236
183	237	"deletedItems" => function ($value) {
184	238	return is_array($value) ? $value : [];
185	239	},
	240	+ "tax_lines" => function ($value) {
	241	+ return is_array($value) ? $value : [];
	242	+ },
	243	+ "tax_lines.*.rate_id" => 'intval',
	244	+ "tax_lines.*.tax_amount" => 'intval',
	245	+ "tax_lines.*.label" => 'sanitize_text_field',
	246	+ "tax_lines.*.is_compound"=> function ($value) {
	247	+ return (bool) $value;
	248	+ },
186	249
187		- "applied_coupon.*.id" => 'intval',
188		- "applied_coupon.*.order_id" => 'intval',
189		- "applied_coupon.*.coupon_id" => 'intval',
190		- "applied_coupon.*.title" => 'sanitize_text_field',
191		- "applied_coupon.*.discount" => 'intval',
192		- "applied_coupon.*.code" => 'sanitize_text_field',
193		- "applied_coupon.*.status" => 'sanitize_text_field',
194		- "applied_coupon.*.type" => 'sanitize_text_field',
195		- "applied_coupon.*.amount" => 'intval',
196		- "applied_coupon.*.discounted_amount" => 'intval',
197		- "applied_coupon.*.stackable" => 'intval',
198		- "applied_coupon.*.priority" => 'intval',
199		- "applied_coupon.*.max_uses" => 'intval',
200		- "applied_coupon.*.use_count" => 'intval',
201		- "applied_coupon.*.max_per_customer" => 'intval',
202		- "applied_coupon.*.min_purchase_amount" => 'intval',
203		- "applied_coupon.*.max_discount_amount" => 'intval',
204		- "applied_coupon.*.notes" => 'sanitize_text_field',
205		- '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',
206	265	];
207	266
208	267	}
209	268	}