6527 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Du Peng	8d414a3172	(feat) admin can set offer for product in cart	2022-09-08 15:10:56 +02:00
Du Peng	85720c31fa	(feat) order items order by created date	2022-09-08 12:13:34 +02:00
Du Peng	75b3295f65	(feat) allow to apply coupon in cart without login	2022-09-07 17:52:23 +02:00
Du Peng	6d2239bc15	(fix) cant pay order with coupon	2022-09-07 17:24:14 +02:00
Du Peng	d98082a2c4	(fix) cart's operator_id has rename to operator_profile_id	2022-09-07 16:57:07 +02:00
Du Peng	79182fb8c1	Merge branch 'product_store-store' into product-store	2022-09-07 15:00:27 +02:00
Sylvain	507420f96c	(i18n) updated translations	2022-09-07 14:02:04 +02:00
Sylvain	9fbd908b56	(dev) Script to download translations from Crowdin	2022-09-07 12:57:02 +02:00
Du Peng	e0e8fc9ec2	(fix) checkout button cant click	2022-09-07 09:59:37 +02:00
Du Peng	79f01d4f78	Merge branch 'product_store-inte' into product_store-store	2022-09-07 09:27:57 +02:00
vincent	874be0bcb6	(wip) user orders dashboard	2022-09-07 09:22:16 +02:00
Du Peng	4387c05200	Merge branch 'product_store' into product_store-store	2022-09-06 20:06:59 +02:00
Du Peng	93be370912	fix confilt	2022-09-06 20:06:01 +02:00
Du Peng	29a84acf2e	Merge branch 'product_store-payment' into product_store-store	2022-09-06 19:22:22 +02:00
Du Peng	fd97d23208	(feat) set order reference after create order	2022-09-06 19:16:29 +02:00
Du Peng	59d2b8c990	(feat) order reference	2022-09-06 19:12:06 +02:00
Du Peng	e86b143c5e	(quality) refactroing find or create service	2022-09-06 18:17:11 +02:00
Sylvain	b52a59fb42	improved comments	2022-09-06 17:01:20 +02:00
Sylvain	a312947a3c	(doc) fix md syntax	2022-09-06 14:34:52 +02:00
Sylvain	03f2b5bdcf	Version 5.4.17	2022-09-06 14:14:05 +02:00
Sylvain	9c5f6088d3	Merge branch 'dev' of github.com:sleede/fab-manager into dev	2022-09-06 14:10:36 +02:00
Sylvain	42f1930145	Merge pull request #397 from sleede/l10n_dev ... New Crowdin updates	2022-09-06 14:09:52 +02:00
Sylvain	7010cfef5e	(doc) updated changelog	2022-09-06 14:09:02 +02:00
Sylvain	96cc7ec436	(bug) openAPI documentation syntax not interpreted	2022-09-06 13:10:05 +02:00
Sylvain	777bb1e5cd	(dev) script to upload i18n files to crowdin	2022-09-06 13:09:44 +02:00
vincent	3a0248ed98	stock	2022-09-06 12:08:19 +02:00
Sylvain	24e1771408	New translations app.shared.en.yml (Zulu)	2022-09-06 12:02:25 +02:00
Sylvain	3a6bd81e85	New translations mails.en.yml (Zulu)	2022-09-06 12:02:21 +02:00
Sylvain	c5a5a1f445	New translations app.admin.en.yml (Zulu)	2022-09-06 12:02:20 +02:00
Sylvain	976f93584a	New translations app.public.en.yml (Zulu)	2022-09-06 12:02:12 +02:00
Sylvain	31c060e8cf	New translations app.logged.en.yml (Zulu)	2022-09-06 12:02:09 +02:00
Sylvain	80825a2113	(bug) unable to build stats ... NoMethodError: undefined method `project_id' for #<Hash> app/services/statistics/concerns/projects_concern.rb:50:in `project_info_stat'	2022-09-05 16:53:56 +02:00
Sylvain	b7af29c1a8	(bug) unable to build stats ... NoMethodError: undefined method `date' for #<Hash> app/services/statistics/builders/projects_builder_service.rb:12:in `block in build'	2022-09-05 16:29:01 +02:00
Sylvain	9a9aaf6889	(bug) unable to build stats ... NoMethodError: undefined method `project_info' for Statistics::FetcherService:Class app/services/statistics/fetcher_service.rb:179:in `block in projects_list'	2022-09-05 15:15:35 +02:00
Sylvain	cbb0e4312f	Merge pull request #395 from sleede/l10n_dev ... New Crowdin updates	2022-09-05 14:29:28 +02:00
Sylvain	fcc4603f7f	New translations en.yml (Portuguese)	2022-09-05 14:25:24 +02:00
Sylvain	44af693deb	New translations en.yml (French)	2022-09-05 14:25:10 +02:00
Sylvain	5524cf5707	(bug) add missing statistic_key ... For 1 year plans, the statistics key was missing in test fixtures	2022-09-05 14:19:38 +02:00
Sylvain	11ed07de63	New translations mails.en.yml (Zulu)	2022-09-05 14:18:31 +02:00
Sylvain	18225e4b6a	New translations en.yml (Zulu)	2022-09-05 14:18:21 +02:00
Sylvain	19a983e314	New translations en.yml (Portuguese)	2022-09-05 14:18:20 +02:00
Sylvain	1647f1c16f	New translations en.yml (Norwegian)	2022-09-05 14:18:19 +02:00
Sylvain	dfcc585e28	New translations en.yml (German)	2022-09-05 14:18:18 +02:00
Sylvain	4eaefe26a2	New translations en.yml (Spanish)	2022-09-05 14:18:17 +02:00
Sylvain	10c31e132a	New translations en.yml (French)	2022-09-05 14:17:59 +02:00
Sylvain	8055de38b8	(bug) the events times are not displayed	2022-09-05 12:21:07 +02:00
Sylvain	5bc1da7cf5	(feat) coupon in reservations export	2022-09-05 11:39:23 +02:00
Sylvain	2d31606081	(security) update moment-timezone to 0.5.35 ... Bump moment-timezone from 0.5.34 to 0.5.35	2022-09-05 10:36:31 +02:00
Sylvain	778956e9f9	(security) CVE-2020-36599	2022-09-05 10:28:45 +02:00
Sylvain	2c1ced5223	Merge pull request #394 from sleede/dependabot/bundler/omniauth-1.9.2 ... Bump omniauth from 1.9.1 to 1.9.2	2022-09-05 10:22:45 +02:00