7396 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	524540cbad	Merge branch 'product-store_dev' into dev	2022-11-08 10:22:40 +01:00
Du Peng	ef6bc6c046	Merge branch 'product-store' into product-store_dev	2022-11-07 18:58:22 +01:00
Du Peng	76a3a5c37c	Merge branch 'product-store_dev' into product-store	2022-11-07 18:55:55 +01:00
Du Peng	46ef0170b9	(test) add admin pay order test	2022-11-07 18:52:43 +01:00
Du Peng	ac2de3d22e	(bug) admin cannot pay order by card	2022-11-07 18:51:49 +01:00
Du Peng	42be9ae3e7	(bug) fix cant set payment_method if admin pay a reservation himself in invoice	2022-11-07 16:04:53 +01:00
Sylvain	a8e6b846ca	(i18n) updated translations	2022-11-07 15:34:56 +01:00
Sylvain	35656229ad	(bug) should not change group of subscriber	2022-11-07 15:14:33 +01:00
Sylvain	a8623487fd	(bug) admin shop for himself ... Crash if there was no offered product when the admin select himself in the list	2022-11-07 11:56:35 +01:00
Sylvain	d3d285dfbe	(bug) configuring price does not edit the right prices	2022-11-07 11:40:36 +01:00
Sylvain	7c7ec0aa4c	(feature) admin can buy product for himself	2022-11-04 12:18:04 +01:00
Sylvain	60580a2bae	(bug) no plan for the user's group	2022-11-04 09:58:32 +01:00
Sylvain	c9c9ed9a02	(feature) auto validate admins	2022-11-04 09:46:17 +01:00
Sylvain	1f97393a12	(bug) invalid VAT rate	2022-11-04 08:12:13 +01:00
Du Peng	c1f8540833	(bug) update product sku translate	2022-11-03 10:42:17 +01:00
Du Peng	c6ec062530	(bug) update product sku translate	2022-11-03 10:41:19 +01:00
Sylvain	83fb4f11ff	(bug) switch display is broken	2022-11-03 10:07:14 +01:00
Sylvain	20e50bda13	(bug) fix file/image input components	2022-11-03 09:26:21 +01:00
Sylvain	a97e08b43b	(quality) refactored upload components	2022-10-28 14:59:52 +02:00
Sylvain	74f826eef7	(merge) Merge branch 'product-store' into product-store_dev	2022-10-28 14:32:11 +02:00
Sylvain	9f3cbc46a3	(quality) refactor selectOption	2022-10-28 14:30:41 +02:00
Sylvain	46e042fd38	(bug) test on invoice items was not idempotent	2022-10-28 10:25:10 +02:00
Sylvain	d9eee1aa3f	(bug) user cannot see past availabilities	2022-10-28 10:25:10 +02:00
Du Peng	65ded9d847	Merge branch 'product-store' into product-store_dev	2022-10-27 18:08:15 +02:00
Sylvain	71d5abdedb	(bug) invalid coupon amount in PDF invoices	2022-10-27 16:45:38 +02:00
Sylvain	a3190115ab	(bug) invoice rounding error using coupons	2022-10-27 16:04:21 +02:00
vincent	47d6f2e165	(i18n) Add missing translation	2022-10-27 09:55:15 +02:00
vincent	feb191ca70	(ui) Fix image bg and list items border	2022-10-27 08:52:21 +02:00
Sylvain	fc2b52c2ca	(bug) invalid accounting export for store orders	2022-10-26 14:32:19 +02:00
Du Peng	6d448e0af2	(merge) merge dev and product-store	2022-10-26 09:37:31 +02:00
Du Peng	a9f0969f92	Merge branch 'product-store_test' into product-store	2022-10-25 19:11:44 +02:00
Du Peng	f771a829ab	(test) add test on store	2022-10-25 19:10:14 +02:00
Sylvain	0c785aae06	(feat) default image for machines	2022-10-25 17:08:32 +02:00
Sylvain	fcbee960a7	(bug) reload store on category url change	2022-10-25 14:50:09 +02:00
Sylvain	c9901a89e1	(test) test admin reserves for himself	2022-10-25 14:31:31 +02:00
Sylvain	744b811b62	(feat) remove admins group: allow admins to reserve	2022-10-25 11:57:26 +02:00
Sylvain	abea5006b2	(bug) fix test failing between 10:00 and 11:00	2022-10-25 10:53:56 +02:00
Sylvain	45129e3e37	(quality) linted code about payment schedules	2022-10-25 10:52:33 +02:00
Sylvain	f9f60cba17	(wip) allow admin to reserve for himself	2022-10-24 17:39:16 +02:00
Sylvain	d4613cdbcc	(quality) refactored EventService to match rubocop rules	2022-10-24 15:56:04 +02:00
Du Peng	0fddd22df8	(bug) admin cannot filter product availble in store	2022-10-24 12:34:20 +02:00
Sylvain	6eddadac69	(doc) updated deployment instructions	2022-10-24 12:14:10 +02:00
Sylvain	873752172d	(bug) no statistics on trainings and spaces reservations	2022-10-24 12:12:49 +02:00
vincent	b3d9c6b3bf	(i18n) update	2022-10-24 12:10:42 +02:00
Sylvain	fdac8168ef	(quality) refactored SingleSignOnConcern to match rubocop rules	2022-10-24 11:43:30 +02:00
Sylvain	e5fc418ecf	Merge branch 'fix/sso-admin-group-id' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/sso-admin-group-id	2022-10-24 10:53:06 +02:00
Sylvain	9623852b21	(doc) updated changelog	2022-10-24 10:52:26 +02:00
Sylvain	ffd4b6b3ba	(security) updated nokogiri to 1.13.9	2022-10-24 10:50:54 +02:00
Sylvain	af0bd6b8ba	Merge pull request #407 from sleede/dependabot/bundler/nokogiri-1.13.9 ... Bump nokogiri from 1.13.8 to 1.13.9	2022-10-24 10:24:22 +02:00
Sylvain	2ba760cc00	(bug) portuguese time formatting (#405)	2022-10-24 10:20:49 +02:00