Merge branch 'dev' into 5522-loggable-deadlock

2023-04-12 15:33:23 +00:00 · 2023-04-12 15:33:23 +00:00 · 7e1d6f4339
parent 53bd6cd729 736d0375f6
commit 7e1d6f4339
2 changed files with 4 additions and 1 deletions
--- a/modules/item/back/methods/fixed-price/specs/editFixedPrice.spec.js
+++ b/modules/item/back/methods/fixed-price/specs/editFixedPrice.spec.js
@ -50,7 +50,7 @@ describe('Item editFixedPrice()', () => {

            await models.FixedPrice.editFixedPrice(ctx, field, newValue, null, filter, options);

-            const [result] = await models.FixedPrice.filter(ctx, null, options);
+            const [result] = await models.FixedPrice.filter(ctx, filter, options);

            expect(result[field]).toEqual(newValue);

--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@ -20,6 +20,9 @@
        },
 		"created": {
 			"type": "date"
+		},
+		"isChecked": {
+			"type": "boolean"
 		}
 	},
 	"relations": {