rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity
6,386 Commits 15 Branches 273 Tags 82 MiB
b52a59fb42
Commit Graph

732 Commits

Author SHA1 Message Date
Sylvain
45013be950 configure default_host & default_protocol from env 
reverts 478a6c40 (partially) & b2434864
 2020-06-02 18:29:24 +02:00
Sylvain
9a0f36c245 configure disqus_shortname from the UI 2020-06-01 18:31:43 +02:00
Sylvain
478a6c409d define default_protocol & default_host from the UI + fix email_from + various minor fixes 2020-06-01 17:32:32 +02:00
Sylvain
0617e4cd26 configure default_mail_from from the UI 2020-06-01 12:15:16 +02:00
Sylvain
434c211ccf configure the features tour display mode from the UI 2020-05-27 18:49:53 +02:00
Sylvain
0d211e2e31 configure google recaptcha from UI 2020-05-27 16:35:30 +02:00
Sylvain
c3846e7080 configure twitter analytics from the UI 2020-05-27 15:39:39 +02:00
Sylvain
628a0f3bc3 configure facebook_app_id from the UI 2020-05-27 12:29:51 +02:00
Sylvain
2d628d8826 disable the invoicing module from the UI config panel 2020-05-26 18:07:07 +02:00
Sylvain
537743a740 configure the plans module from the admin UI 2020-05-26 15:39:28 +02:00
Sylvain
6cc6bba7ce refactored app to gather spaces module status from the settings 2020-05-26 13:59:40 +02:00
Sylvain
fd93093f0d UI to configure the spaces module 2020-05-26 10:53:49 +02:00
Sylvain
acefc325f6 configure events_in_calendar form the UI panel 2020-05-25 17:36:53 +02:00
Sylvain
ba4c39ca99 use slot duration from the db setting 2020-05-25 12:55:01 +02:00
Sylvain
a63340188b configure default slot duration from settings panel 2020-05-25 12:55:01 +02:00
Sylvain
ddce7f516a configuration of book concurrent slots through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
419605e551 configuration of google analytics tracking ID through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
13bcd9a1f8 use phoneRequired from settings instead of env 2020-05-25 12:54:19 +02:00
Sylvain
f80eb230ca refactored code to use Setting.get 2020-05-25 12:54:19 +02:00
Sylvain
654d4b1cb4 setting: phone_required 2020-05-25 12:54:19 +02:00
Sylvain
18e2b032ae fix import users from csv 2020-05-19 11:45:51 +02:00
Sylvain
2b95c043e3 Removed dependency to has_secure_token to fix warnings about already initialized constant 2020-05-18 17:45:01 +02:00
Sylvain
fdc2f60ff5 [bug] when a new account is created through the sign-up modal, the role is not reported in the StatisticProfile (#196) 
Also: if a member was deleted the /api/members/mapping will raise an error
 2020-05-18 16:23:53 +02:00
Sylvain
14c8cbbf57 typos 2020-05-11 17:17:37 +02:00
Sylvain
9f8fb1a95c fix tests + fix price.compute flor slots 2020-05-11 13:52:27 +02:00
Sylvain
1fdea63828 correct some errors due to Price.compute refactoring 2020-05-11 10:56:23 +02:00
Sylvain
06502cde33 [bug] accounting periods totals are wrong for periods closed after 2019-08-01 2020-05-11 10:10:52 +02:00
Sylvain
be23cf27c3 use Price.compute to generate invoice items 2020-05-06 12:43:47 +02:00
Sylvain
19de8ca319 fix: manager can offer slot to other users 2020-05-06 09:58:15 +02:00
Sylvain
e6f8a34aa4 [ongoing] compute per based on a hourly rate 2020-05-05 17:56:47 +02:00
Sylvain
34935cbc35 decrease higher limit for black text on primary color 2020-05-05 16:20:44 +02:00
Sylvain
2d8df2c1cd Ability to promote a user to a higher role (member > manager > admin) 2020-05-05 11:28:04 +02:00
Sylvain
06a5bff084 [ongoing] change user role 2020-05-04 18:32:25 +02:00
Sylvain
3319e68526 Auto-adjusts text colors based on the selected theme colors 2020-05-04 13:20:57 +02:00
Sylvain
29e7ac2f08 [bug] background image of the profile is not shown and wrong menu hover color 2020-05-04 12:10:13 +02:00
Sylvain
7640704568 fix payment method on invoices operated by a manager 2020-05-04 11:36:06 +02:00
Sylvain
6aa7ba89e8 manager's notifications 2020-04-29 15:34:30 +02:00
Sylvain
35ce577651 [bug] subscription page shows the groups without any active plans 
[bug] cart price inconsistently updated after a subscription
[feature] plans page for managers
 2020-04-29 10:57:32 +02:00
Sylvain
3e177b5177 managers events views 2020-04-28 12:48:03 +02:00
Sylvain
2da644ecd5 [bug] unable to delete an unreserved event 2020-04-28 10:05:28 +02:00
Sylvain
3624bee057 {bug] unable to create events or trainings that are not multiples of SLOT_DURATION 2020-04-28 09:45:12 +02:00
Sylvain
570672c5db [bug] unable to change group if the previous was deactivated 2020-04-28 09:21:33 +02:00
Sylvain
69c8d7c678 manager can change existing reservations 2020-04-27 12:58:55 +02:00
Sylvain
5312c13d3f [manager] manage agenda + book machines for himself&others 2020-04-27 12:12:29 +02:00
Sylvain
c30ae8179e fix groups and tags in manager creation + helpers to get users w/ role partner|manager 2020-04-22 10:46:46 +02:00
Sylvain
ff75a96ecc Ability to define, per availability, a custom duration for the reservation slots 2020-04-15 18:08:02 +02:00
Sylvain
de9c224a92 improved version check 
- use referer from client when available
- save uuid returned by hub
- send uuid to hub on version check
- check the version on each startup to prevent wrong sync
- also: do not save a setting on API update if it has not changed
 2020-04-07 17:53:19 +02:00
Sylvain
3917d6042c [bug] no statistics for subscriptions (#196) 
+ [bug] issing translation for subscriptions statistics > duration
 2020-04-01 17:25:55 +02:00
Sylvain
f9e18ca580 removed dependency to discoutinued protected_attributes + fixed auth_provider 2020-03-30 16:17:32 +02:00
Sylvain
02c1014412 class documentation 2020-03-30 11:33:12 +02:00
Sylvain
d33c6c0d30 documented all models until StatisticField + fixes halting callback chains via returning false + improved some code 2020-03-25 17:45:53 +01:00
Sylvain
68b8827499 removed unused PlanImage 2020-03-25 16:49:13 +01:00
Sylvain
6b66d601e1 inherit models from ApplicationRecord 2020-03-25 12:35:09 +01:00
Sylvain
df8ff77597 fix migrations for rails 5 + use maildev instead of mailcatcher + fix tests script 2020-03-25 12:35:08 +01:00
Du Peng
9ca9425ef4 update to rails 5.0.7.2 2020-03-25 12:35:07 +01:00
Sylvain
0b341af1ed [bug] unable to create new availabilities if SLOT_DURATION is not defined 2020-03-11 11:31:06 +01:00
Sylvain
978c44f55f fix an issue: shift in subscription end date when over DST 2020-03-04 11:43:12 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
d833f6d812 harmonize Fab-manager trademark syntax 2020-02-26 10:19:43 +01:00
Du Peng
096a658bac add a validator to check reservation's slot is or not restrict for subscriptions 2020-02-11 13:22:20 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Sylvain
656a603d6c customize home page css 2020-01-27 17:10:29 +01:00
Sylvain
37c90b1d54 ruby syntax 2020-01-22 14:34:45 +01:00
Sylvain
b85c7ac00b admin set its customized html template for the home page & can reset it to factory value 2020-01-22 11:53:40 +01:00
Sylvain
15ab3c1305 Ability to customize the title of the link to the about page 2020-01-21 16:16:12 +01:00
Du Peng
fe387cbe3c Merge branch 'twitter' into dev 2020-01-15 12:40:01 +01:00
Du Peng
db29673a4c remove twitter api for get latest tweet 2020-01-15 12:34:51 +01:00
Sylvain
059096c2dd privacy option for fab-analytics 2020-01-15 10:46:04 +01:00
Sylvain
bb48a13f83 health endpoint & automated version check 2020-01-14 14:33:00 +01:00
Sylvain
64764e5498 check version on hub & [ongoing] health endpoint 2020-01-13 17:05:53 +01:00
Sylvain
1c4f144b8d Merge branch 'members-filters' into dev 2020-01-07 10:44:55 +01:00
Sylvain
f778ee9016 fix syntax + add missing translations 2020-01-07 10:44:29 +01:00
Sylvain
b6ee4e92a4 change falsy value + updated changelog 2020-01-07 10:34:12 +01:00
Nicolas Florentin
62c979cfc0 members filters, translations for other languages are still needed 2019-12-20 15:47:42 +01:00
Nicolas Florentin
0a3a6d034a env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in 2019-12-18 16:02:47 +01:00
Sylvain
6aa3c0caeb Notify all admins on the creation of a refund invoice 2019-12-09 11:55:31 +01:00
Sylvain
60755a2c2a Merge remote-tracking branch 'origin/fix-time-now' into dev 2019-12-03 15:51:22 +01:00
Sylvain
11e74c6859 Merge branch 'ics' into dev 2019-12-03 15:30:28 +01:00
Sylvain
64fe68b2b0 icalendar source sync: create/update/delete ical events 2019-12-03 12:16:07 +01:00
Sylvain
122ff54cd8 fix colors in ics imports 2019-12-03 10:17:29 +01:00
Sylvain
22be9f6a08 display external calendars list in public calendar + pull availabilities 2019-12-02 16:49:20 +01:00
Sylvain
cca6b14f58 import events asyncronously from icalendar 2019-12-02 15:53:24 +01:00
Nicolas Florentin
db41e846dd uses DateTime#current instead of Time.now in tests 2019-12-02 15:29:05 +01:00
Nicolas Florentin
b17bcfde86 comment model slot.rb 2019-12-02 12:39:20 +01:00
Nicolas Florentin
6ff6c71060 rm dead code Slot#can_be_modified? 2019-12-02 12:32:52 +01:00
Nicolas Florentin
77cf8c8218 replaces almost all Time.now by DateTime.current 2019-12-02 11:57:25 +01:00
Sylvain
baf8cfb487 iCalendar server api & db model 2019-11-27 17:05:19 +01:00
Sylvain
48b811d2b5 Added freeCAD files as default allowed extensions 
also: refactored some ruby code
 2019-11-25 16:12:23 +01:00
Sylvain
1182822d8b show correct seats nb in canceled reservation 2019-11-25 10:45:54 +01:00
Sylvain
bbd613f2a5 compute right nb of free seats for event reservation 
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
 2019-11-25 10:30:12 +01:00
Sylvain
cabe2e5604 update free places after cancel event reservation 2019-11-20 17:06:42 +01:00
Sylvain
b725a5a071 Merge branch 'cancel' into dev 2019-11-20 10:27:56 +01:00
Sylvain
ad928bd4e6 ability to set phone number optional or required 
also: show stars on required fields in new admin form
 2019-11-19 11:44:32 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
e8930924e4 [bug] do not display each days in invoices for multiple days event reservation 2019-10-16 16:11:37 +02:00
Sylvain
19a125bd67 [bug] accounting export: on subscription + reservation invoice, the subscription item is exported twice 2019-10-07 12:08:08 +02:00
Sylvain
193e81e711 Merge branch 'uvsq' into dev 2019-09-30 15:34:21 +02:00
Sylvain
0d3cc0fe40 [feature] Ability to disable invoices generation and interfaces 2019-09-30 15:29:20 +02:00
Sylvain
ff5de97c92 import new users from CSV and view results in app 
TODO:
 - update users though CSV
 2019-09-26 17:05:57 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
a532efd198 upload csv file to the server through the API and save it on the disk 2019-09-24 17:42:50 +02:00
Sylvain
ede53ad761 [feature] Ability to set project's CAO attachement maximum upload size 2019-09-24 16:40:38 +02:00
Sylvain
8eda1e673f Merge remote-tracking branch 'origin/hotfixes' into dev 2019-09-24 14:43:14 +02:00
Sylvain
f75633e64e [bug] create a plan does not set its name 2019-09-24 11:41:07 +02:00
Nicolas Florentin
401df4cb77 delay_for does not exist anymore in sidekiq 5 2019-09-20 15:01:27 +02:00
Sylvain
de1cc2013a [bug] after disabling a group, its associated plans are hidden from the interface 
+ validate server-side that there's no more user in the group to disable
 2019-09-19 15:34:21 +02:00
Sylvain
a7dc3b2431 factorized invoice reference & order number code 2019-09-19 14:59:22 +02:00
Sylvain
2d6f5c3e81 wallet client line in accounting export + factorized accountingExportService 2019-09-19 13:57:33 +02:00
Sylvain
7d26932f6c configure accounting codes & labels for wallet clients and other means clients 2019-09-19 11:51:14 +02:00
Sylvain
cd2c8488c2 Compute the VAT per item in each invoices, instead of globally 2019-09-18 17:14:59 +02:00
Sylvain
02c7cb801f factorized footprint computation 2019-09-18 15:09:14 +02:00
Sylvain
30e7ce8377 [bug] invoices with total = 0, are marked as paid on site even if paid by card 2019-09-17 15:16:11 +02:00
Sylvain
1fa36d4029 renamed avoir_mode to payment_method 2019-09-17 14:48:06 +02:00
Sylvain
3348539fdf export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros) 2019-09-17 12:35:34 +02:00
Sylvain
224b0d6dee Merge branch 'sca' into dev 2019-09-12 12:53:56 +02:00
Sylvain
78e6392f60 do not display invoice update logs in test mode + updated reservations fixtures w/o stp_invoice_id column + helper script to run tests 2019-09-11 14:29:35 +02:00
Sylvain
3320ee103b Log changes in Invoices or InvoiceItems records for better handling of accounting certification issues 2019-09-11 12:22:14 +02:00
Sylvain
f60d19fa27 allow reservations & subscriptions at price of zero 2019-09-11 11:51:04 +02:00
Sylvain
75f483a7a6 compute subscription price server-side for payments 2019-09-11 10:31:22 +02:00
Sylvain
ac0489a496 [bug] wallet usage is noted on subscription invoices even if wallet was not used + use payment confirm API for subscriptions only (sca) 2019-09-10 17:57:46 +02:00
Sylvain
4d0ac9b3ca using stp_payment_intent_id instead of stp_invoice_id on new invoices 2019-09-10 16:45:45 +02:00
Sylvain
a96050a2e9 refactor payment process for sca 2019-09-10 11:46:14 +02:00
Sylvain
e9e27663cd quick coding rules checking with rubocop 2019-09-09 18:04:31 +02:00
Nicolas Florentin
e94cf46fa4 ongoing work on sca stripe 2019-09-09 17:37:54 +02:00
Sylvain
61c1d09ac8 [bug] use vat history while regenerating invoices 2019-08-01 11:29:45 +02:00
Sylvain
38ab06840e consider vat history in accounting export + [bug] use vat history while regenerating invoices 2019-08-01 11:26:40 +02:00
Sylvain
a9ea4057f3 interface to customize accounting codes and labels 2019-07-30 16:06:35 +02:00
Sylvain
f772bc3509 api endpoint and worker to export accounting data 2019-07-30 11:43:51 +02:00
Sylvain
ab295f064d service to export invoices into a given period to CSV lines for an accounting sofware 2019-07-29 17:51:53 +02:00
Sylvain
a778b1063a enhance ruby syntax 2019-07-29 12:17:57 +02:00
Sylvain
b77fde2506 [bug] OpenlabWorker is crashing with message undefined method profile for StatisticProfile 2019-07-10 10:58:51 +02:00
Sylvain
b0b2e8d3a9 use an async worker to notify users about policy update 2019-06-17 10:01:59 +02:00
Sylvain
f3c433883d [bug] canceled reservation are not removed from statistics (fix #133) 2019-06-13 16:29:12 +02:00
Sylvain
249e59bb2a get user consent about cookies 2019-06-13 11:28:55 +02:00
Sylvain
a53c6e80e7 move invoice->operator to invoicing_profile + minor fixes to handle user deletion 2019-06-12 12:22:38 +02:00
Sylvain
86ded2b8d2 [ongoing] fixes for invoices pdf files 2019-06-11 16:56:11 +02:00
Sylvain
37b9e3da60 link statistic profile to invoices 2019-06-11 10:02:48 +02:00
Sylvain
cfd33c3a52 migrate projects to statistic_profile 2019-06-06 16:34:53 +02:00
Sylvain
35da65b686 change statistic_service to use statistic_profile + use raw sql in migrations 2019-06-06 13:58:49 +02:00
Sylvain
fe2a6f7120 migrate trainings to statistic_profile and adjust code 2019-06-06 12:00:21 +02:00
Sylvain
0a5e373730 models linking 2019-06-05 16:21:39 +02:00
Sylvain
f0c5b0eb09 init StatisticProfileTraining 2019-06-05 16:17:56 +02:00
Sylvain
6f87873b2c fix init member group when created from signup modal 2019-06-05 16:09:11 +02:00
Sylvain
17fbd6b465 multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription 2019-06-05 12:11:51 +02:00
Sylvain
4c033614ae [ongoing] migrate subscriptions & reservations to statistic_profile 2019-06-04 16:50:23 +02:00
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
42e73e4315 [ongoing] statistic profile 2019-06-03 17:25:04 +02:00
Sylvain
9ef2f142bd link HistoryValue to InvoicingProfile + improved invoices tests 2019-06-03 16:51:43 +02:00
Sylvain
7ed97ef35a link wallet & its transactions to invoicingprofile 2019-06-03 16:00:09 +02:00
Sylvain
6011f27268 finish moving organization & address to invoiving profile: fix create & edit user 2019-06-03 12:06:01 +02:00
Sylvain
a211ad39ff moving organization & address to invoicingProfile + refactored doc about postgre 2019-05-29 14:28:14 +02:00
Sylvain
142e07f3c9 update code to use invoicingprofile 2019-05-29 12:01:24 +02:00
Sylvain
ffbca98276 [ongoing] fix api to use the invoicing_profile 2019-05-28 16:49:36 +02:00
Sylvain
3945b760b5 [ongoing] attach invoices to invoicingProfile instead of user 2019-05-27 13:03:44 +02:00
Sylvain
5231e464fe fix invoicingProfile schema + migration script 2019-05-27 13:00:05 +02:00
Sylvain
70bc3d5732 put invoicing data into separate table 2019-05-27 13:00:05 +02:00
Sylvain
0c51f25f7f Merge branch 'hotfix' into dev 2019-05-27 12:50:19 +02:00
Sylvain
5d32756928 [bug] updating a setting does not chain new values 2019-05-27 11:21:29 +02:00
Sylvain
6f2483a51f [bug] when generating an Avoir at a previous date, the resulting checksum may be invalid 2019-05-27 11:11:21 +02:00
Sylvain
3394413747 fixed syntax 2019-05-07 15:56:23 +02:00
Sylvain
26b901ebb5 [bug#131] Availabilities export report an erroneous number of reservations for machine availabilities 2019-05-07 12:24:51 +02:00
Sylvain
162a56250a notify users after privacy policy update + hide undefined content 2019-04-25 11:40:26 +02:00
Sylvain
531e298b14 [bug] updating a setting does not chain new values 2019-04-23 13:04:50 +02:00
Sylvain
c0c9b2a980 privacy policy: fixed admin view after update + display last update date 2019-04-23 12:58:01 +02:00
Sylvain
7a2fc7c42e [ongoing] save as draft or publish 2019-04-18 15:57:56 +02:00
Sylvain
8fae8b104d admin interface to customize privacy policy page 2019-04-18 12:30:00 +02:00
Sylvain
936495e596 [bug] when paying reservation with wallet, the invoice footprint is not correctly updated 2019-04-08 17:04:53 +02:00
Sylvain
3b3e1af822 improved coupon filtering to allow pagination while filtering 2019-04-08 11:00:00 +02:00
Sylvain
c786ba6edb notify user about archiving 2019-04-04 11:37:23 +02:00
Sylvain
21a5f5591a [ongoing] generate achives async 2019-04-03 17:57:21 +02:00
Sylvain
4be597ba9d fixed ruby style 2019-04-03 17:33:43 +02:00
Sylvain
8a6ff0c093 prevent closing a period not in the past 2019-04-03 17:27:25 +02:00
Sylvain
9e39a0517c [bug] vat rat in archives may be wrong 2019-04-03 16:56:47 +02:00
Sylvain
722d5d36e7 check server-side that periods match length requirements + explain requirements to user before closing 2019-04-03 13:04:19 +02:00
Sylvain
7cdacb3164 print date in archive 2019-04-01 13:36:45 +02:00
Sylvain
7a317b7e45 [bug] unable to add a file attachment to an event 2019-03-28 11:30:25 +01:00
Sylvain
2ac0336adb Merge branch 'dev' into host 2019-03-25 16:17:23 +01:00
Sylvain
5cdaa014ef [security] updated devise + updated rails 2019-03-25 14:57:48 +01:00
Sylvain
8530a6f655 superadmin + fixed free space notification 2019-03-20 16:49:38 +01:00
Sylvain
940ea3051b chain historyValues with sha256 footprints 2019-03-20 11:01:53 +01:00
Sylvain
7b0824a4a3 notify admins when no accounting period closed for 1 year 2019-03-18 14:33:30 +01:00
Sylvain
c356f35f29 add operator_id to invoices 2019-03-18 11:11:09 +01:00
Sylvain
b439c643cb zip archives, include checksum, chained zips 2019-03-13 17:48:35 +01:00
Sylvain
9fcb4277cd Merge branch 'dev' into host 2019-03-13 16:49:11 +01:00
Sylvain
402be18bdf model documentation 2019-03-13 16:49:03 +01:00
Sylvain
857b1cebba fix accounting period checksum + improved period validation 2019-03-12 15:26:17 +01:00
Sylvain
4f418cc3fb compute total without taxes + fix close period date pickers + improved archived % number format 2019-03-12 13:36:10 +01:00
Sylvain
b9e427a9fc include VAT in archives 2019-03-12 12:15:14 +01:00
Sylvain
4e7a62bc2b [ongoing] close period for max 1 year + force contiguous periods + fix totals 2019-03-12 09:14:20 +01:00
Sylvain
2a32bc4752 date the archives 2019-03-11 16:25:51 +01:00
Sylvain
b940ae0327 display complete info set on accounting archives 2019-03-11 16:11:49 +01:00
Sylvain
811d7288e7 fix chain_record methods 2019-03-11 13:49:16 +01:00
Sylvain
e543f1fe3e add watermark to invoices in dev/staging/test environment 2019-02-27 17:44:52 +01:00
Sylvain
9854a4b965 prevent memory saturation with periodic checks 2019-02-26 15:18:19 +01:00
Sylvain
1c8e82df14 added free disk space notification to oss release to prevent collision 2019-02-26 11:13:57 +01:00
Sylvain
8f210bb713 Merge branch 'dev' into host 2019-02-26 10:45:34 +01:00
Sylvain
1b97c39645 refactored notificationcenter to accept meta_data 2019-02-26 10:45:12 +01:00
Sylvain
f11f629bcf compute, secure and archive period total and cumulative total of each accounting period 2019-02-25 14:51:19 +01:00
Sylvain
cf23fae73c Merge branch 'dev' into host 2019-02-14 16:35:38 +01:00
Sylvain
9f765009a8 [bug] unable to create oauth2 sso 
[bug] application failed when sso activated
[bug] missing translations in oauth2 forms
 2019-02-14 12:25:37 +01:00
Sylvain
06f2c3626c refactored rake tasks 2019-02-13 12:59:28 +01:00
Sylvain
ffe5516d10 prevent closing an accounting period if any checksum error in period 2019-02-12 17:38:44 +01:00
Sylvain
9f4d026f30 fix last archive infos in closed accounting period 2019-02-12 16:19:11 +01:00
Sylvain
2ba3890325 display records integrity status 2019-02-12 16:00:36 +01:00
Sylvain
f9364b3872 chains invoice and invoiceItem records. save them in archives 2019-02-12 14:45:21 +01:00
Sylvain
cc124a0dee [ongoing] chain invoice records 2019-02-11 13:57:07 +01:00
Sylvain
6e274afe3b accounting archive: insert code checksum and previous archive checksum 2019-01-31 12:19:50 +01:00
Sylvain
55ae979213 Merge branch 'dev' into host 2019-01-30 10:04:12 +01:00
Sylvain
a528fc3766 infos about deprecated notification 2019-01-30 10:03:53 +01:00
Sylvain
da672ea8b6 Merge branch 'dev' into host 2019-01-21 16:34:06 +01:00
Sylvain
d2c4773ac9 [bug] unable to delete an admin who has changed a setting 2019-01-16 17:09:27 +01:00
Sylvain
526b9aab0c [bug] unable to create/edit plan of 12 months/53 weeks 2019-01-16 12:10:07 +01:00
Sylvain
27f3296719 rubocop coupon 2019-01-16 11:07:09 +01:00
Sylvain
a1ba272538 Merge branch 'dev' into host 2019-01-14 13:00:24 +01:00
Sylvain
f6e236aeb5 refactored roles methods to match ruby conventions 2019-01-14 12:57:31 +01:00
Sylvain
0927336956 fixed reservation after removing disable_invoicing + updated vcr cassettes 2019-01-14 12:45:17 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
1db5e76bc9 tests on accounting periods + force reload periods when opening periods/avoir modal 2019-01-10 15:12:22 +01:00
Sylvain
b42d1614fd export to flat json files closed periods 2019-01-10 10:52:29 +01:00
Sylvain
35638d611b validates invoice&avoir creation to prevent any creation in closed period 2019-01-09 16:54:09 +01:00
Sylvain
5e8172af35 Merge branch 'dev' into us78 2019-01-09 16:28:36 +01:00
Sylvain
5ab0333176 rubocop invoice & avoir 2019-01-09 16:28:23 +01:00
Sylvain
9fac706da8 validates accounting periods on creation + prevent refunding on closed periods (client only) 2019-01-08 17:32:45 +01:00
Sylvain
0a684c8e13 rails DB model for accounting periods 2019-01-07 12:29:52 +01:00
Sylvain
688b57e537 fixed data migration for settings -> history_values 2018-12-18 10:21:35 +01:00
Sylvain
ed65976c41 [ongoing] save settings history 2018-12-17 16:02:02 +01:00
Sylvain
811b7193f7 improved & fixed test suite 2018-12-12 13:49:14 +01:00
Sylvain
f2eaf4e4e1 improved tests and bug fixes 2018-12-11 17:27:25 +01:00
Sylvain
ad69b647f7 fix reservation + subscription 2018-12-11 15:07:32 +01:00
Sylvain
7822ab4572 [ongoing] fix reservation processes 2018-12-10 17:20:23 +01:00
Sylvain
8e60545753 extend subscription and offer free days will keep track of previous subscription 2018-12-10 13:24:00 +01:00
Sylvain
bef3118649 [ongoing] refactor user.subscriptions to save history 
TODO: - refactor subscription.save_with_payment (stripe)
- offer free days
- extend the subscription
- renew a subscription
- buy subscription + reservation
 2018-12-06 18:26:01 +01:00
Sylvain
6794b12555 force gawk during elastic upgrade & rubocop 2018-12-03 15:10:04 +01:00
Sylvain
ffbe3e0b4a updated procedure to setup development env, using docker 2018-11-26 15:14:43 +01:00
Sylvain
56a56565ae [bug] create transverse plan: do not create one for the admins group 2018-11-26 11:33:48 +01:00
Sylvain
1e3066f6f4 Ability to parametrize machines order on the booking page 2018-09-18 15:30:54 +02:00
Sylvain
1b33f3c865 display the machine reservation user name to other members 2018-07-24 12:24:51 +02:00
Sylvain
afc6ef40d2 fixed User.to_json 2018-07-24 11:19:30 +02:00
Sylvain
9af1e5c658 fixed User.to_json 2018-07-24 11:13:05 +02:00
Sylvain
a7cc1711aa Merge branch 'elastic5' into dev 2018-07-12 12:50:52 +02:00
Sylvain
7afe62522f refactor User.as_json to use jbuilder template 2018-07-04 14:05:44 +02:00
Sylvain
d69007c6c9 [ongoing] migrate es api 2018-06-05 12:30:08 +02:00
Sylvain
1aad974782 Ensure elasticSearch indices are started with green status on new installations 2018-04-04 14:05:48 +02:00
Sylvain
72634162c6 [bug] unable to create training credit 2017-12-21 11:49:51 +01:00
Sylvain
0b3192c3ab [bug] subscription refund generate PDF with wrong dates 2017-12-13 13:16:32 +01:00
Sylvain
02baf9097e hide disabled machine in admin pricing zone + prevent creating negative credits 2017-10-11 14:48:03 +02:00
Sylvain
57228f4eec hide slots in members calendars if locked 2017-09-06 17:10:10 +02:00
Sylvain
82511aa781 [feature] prevent creation of irregular yearly plans 2017-09-05 17:01:09 +02:00
Sylvain
31cdc5c695 [bug] reccursive events have difference with requested time when crossing DST (#77) 2017-09-04 16:50:07 +02:00
Sylvain
112b174e5f [bug] invalid time for reccurent events after Daylight Saving Time change 2017-08-31 17:32:04 +02:00
Sylvain
cf6afb817d [feature] configuration of max visibility for reservations 2017-08-24 18:34:18 +02:00
Peng DU
2ff47f3204 add task Id: 3713, reference: 1706002/VL, stripe id: in_1ASRQy2sOmf47Nz9Xpxtw46A, invoice total: 30.0, stripe invoice total: 80.0, date: 2017-06-08 16:16:26 +0200 
Id: 3716, reference: 1706005/VL, stripe id: in_1ASRye2sOmf47Nz9utkjPDve, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:51:15 +0200
Id: 3717, reference: 1706006/VL, stripe id: in_1ASS1X2sOmf47Nz93Xn2UxVh, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:54:14 +0200
Id: 3718, reference: 1706007/VL, stripe id: in_1ASSBI2sOmf47Nz9Ol0gEEfC, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 17:04:19 +0200 allow find the invoices incoherent
 2017-06-09 11:08:08 +02:00
Peng DU
c6fedf3f20 Merge branch 'fix_issus_77' into dev 2017-06-08 19:40:30 +02:00
Peng DU
eca141f902 fix bug #77: reservation amount total isnt equal stripe invoice amount that be paid by client 2017-06-08 19:38:19 +02:00
Sylvain
b403f86187 [bug] price init for new groups & delete group 2017-05-15 15:25:27 +02:00
Sylvain
ff8e804750 Merge branch 'week' into dev 2017-03-21 15:51:52 +01:00
Sylvain
f4187d0b4b [bug] news plans statistics are not shown 2017-03-21 15:47:25 +01:00
Sylvain
5abc85ae0a [feature] weekly plans 2017-03-21 13:06:02 +01:00
Sylvain
38ce1b23b7 fix duplicates SLOT_DURATION declarations 2017-03-13 10:21:41 +01:00
Sylvain
796f0a87ae ability to remove an unused custom price for an event (#61) 2017-03-02 18:36:54 +01:00
Sylvain
504fe49964 export machines availabilities 2017-03-02 12:34:28 +01:00
Sylvain
b9dcf5a512 [bug] delete event with custom price (#61) 2017-03-01 17:09:37 +01:00
Sylvain
2e094a501f init spaces prices on plan creation 2017-03-01 16:45:05 +01:00
Sylvain
d450301934 [to test] space reservations 2017-02-28 18:13:38 +01:00
Sylvain
c936b283f7 display spaces status in client calendar 2017-02-28 16:51:56 +01:00
Sylvain
0e94f8c3d4 Redo "change DB model to allow many_to_many relationship between Slot and Reservation" 
This reverts commit 4cbfbdc4e0.
 2017-02-28 13:23:31 +01:00
Sylvain
4cbfbdc4e0 Revert "change DB model to allow many_to_many relationship between Slot and Reservation" 
This reverts commit 03d922e214.
 2017-02-28 12:36:50 +01:00
Sylvain
4703350de5 fix pay with stripe and coupon 2017-02-28 10:18:02 +01:00
Sylvain
43f78ff0e0 fix credits usage in space reservation 2017-02-27 17:38:15 +01:00
Sylvain
847a0ba140 display correct slot status in space reservation calendar 2017-02-27 16:15:27 +01:00
Sylvain
03d922e214 change DB model to allow many_to_many relationship between Slot and Reservation 2017-02-27 13:15:31 +01:00
Sylvain
8e86c4b212 [ongoing] spaces reservation calendar 2017-02-23 17:45:55 +01:00
Sylvain
afd1cb4ce7 [bug] unable to delete admin 2017-02-21 10:36:00 +01:00
Sylvain
d463d4dd5a display spaces in admin calendar 2017-02-15 13:18:03 +01:00
Sylvain
30454c4262 manage space info message + refactor settings translations mapping 2017-02-15 09:48:27 +01:00
Sylvain
da95e6e0d8 space creation interface 2017-02-14 11:28:07 +01:00
Sylvain
46fbcc06f3 add attachment & characteristics to spaces 2017-02-13 15:53:12 +01:00
Sylvain
560bb46383 space db model 2017-02-13 14:38:28 +01:00
Sylvain
4f3c5e963c [bug] change plan price lost stats 2017-01-09 10:54:30 +01:00
Sylvain
ce7b737163 possible workaround for orphan InvoiceWorkers created with nil parameter 
Moreover, a log was added on job creation, to help debugging if this does not fix the issue
 2017-01-04 14:48:32 +01:00
Sylvain
8119f54e4c Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type 2017-01-03 17:07:23 +01:00
Sylvain
9edf723373 [bug] wrong statistics about hours available for reservation 2017-01-03 13:35:36 +01:00
Sylvain
5b7e8474d4 asterisk on group select in member form 2017-01-03 12:07:16 +01:00
Sylvain
d5c5e36965 [bug] compute age of users born on 29/02, lead to app crash on non-leap years 2017-01-03 11:24:14 +01:00
Sylvain
85ee73f0e0 ability to edit coupon expiration 2016-12-13 12:01:54 +01:00
Sylvain
10fc7b69e9 Ability to display optional information message on event reservation page 2016-11-29 16:46:19 +01:00
Sylvain
a9e593a840 fix statistics generation with cash coupon 2016-11-29 14:57:43 +01:00
Peng DU
f487133825 fix bug: user cant debit his wallet when admin pay a plan for this user with invoice disabled 2016-11-29 11:39:41 +01:00
Sylvain
5a4eaefc02 fix cash coupon usage when paying by stripe 2016-11-29 11:12:58 +01:00
Sylvain
42a8d40b37 fix partial refund of invoices with cash coupons 2016-11-28 16:34:39 +01:00
Sylvain
aa7748f8eb Merge branch 'cash' into dev 2016-11-28 12:05:18 +01:00
Sylvain
63b0f0c061 [to test] compute prices/invoices using cash coupons 2016-11-24 17:57:48 +01:00
Peng DU
63a3bcf19a Fix a bug: invoice of reservation show payment by debit card when user pay with wallet 2016-11-24 14:09:34 +01:00
Sylvain
04e10c8bb6 check cash coupons does not exceed cart amount for trainings & machines 2016-11-24 13:58:41 +01:00
Sylvain
0cb0ff3a06 [ongoing] using cash coupon in reservation logic 2016-11-23 17:17:34 +01:00
Sylvain
c13f640e81 remove rails find_by_* helpers 2016-11-23 16:30:19 +01:00
Sylvain
ad2911529c db model, api and interface for cash coupons 2016-11-23 12:43:42 +01:00
Sylvain
73e4439036 front-end modifications to cancel a booked event 2016-11-09 17:07:48 +01:00
Sylvain
2dcd980be3 [bug] recurrent events doesn't have the configured theme and age range 2016-11-09 13:12:30 +01:00
Peng DU
99cca406d5 fix bug: event date period dant show correct in invoice 2016-11-03 12:17:19 +01:00
Peng DU
f1b749d5f2 Image max size is configutable, size by default is 2 megabytes 2016-11-02 15:36:22 +01:00
Peng DU
ba5e5752a4 allow add more picture for project step 2016-11-02 14:58:06 +01:00
Kenneth Lim
18bc37749b
locale: informations --> information 
Not sure if this helps but information does not require an `s`. :)

Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
 2016-10-07 17:11:58 +08:00
Sylvain
36524d4cd9 display list of allowed extensions in project's CAD attachments 2016-09-27 14:08:04 +02:00
Sylvain
a1fd69f309 auth provider safe destroy 2016-09-26 12:41:59 +02:00
Peng DU
fc9aeb00a2 remove edit wallet reference from facture 2016-09-23 12:52:43 +02:00
Peng DU
972a5e0a89 fix bug: admin cant pay a plan with code promo by wallet 2016-09-22 18:04:13 +02:00
Peng DU
270b279ffb user can use a code promo for pay le plan by wallet and carte visa 2016-09-21 16:19:04 +02:00
Peng DU
afb026bdc9 clear invoice_item of wallet/group if payment has a error 2016-09-20 17:42:30 +02:00
Peng DU
802e239d5b calcul total price of reservation with coupon when use wallet 2016-09-20 16:54:23 +02:00
Sylvain
50543b8d09 [sso] give informations about the expected data in sso mapping 2016-09-14 16:41:45 +02:00
Sylvain
336158c5ad [SSO] fix re-mapping of avatar, address and organization 2016-09-12 12:10:46 +02:00
Sylvain
d233297469 check coupon code server side + integration test for wrong copon 2016-09-08 15:19:12 +02:00
Sylvain
d99d090814 remove duplicate in mime types 2016-09-07 16:30:14 +02:00
Sylvain
19e89cce3d [feature] validate project attachement by mime type 2016-09-07 15:44:19 +02:00
Sylvain
53dd54b175 working custom aggs w/ result tidy in stats query 2016-09-06 16:32:41 +02:00
Sylvain
ea671d03a4 database structure for custom aggregations in statistics 2016-09-05 17:16:23 +02:00
Sylvain
701b913eb1 [ongoing] elastic data structure for storing availabilities info 2016-09-05 15:15:31 +02:00
Sylvain
c3505c1419 fix coupon discount if reservation+subscription when pay by stripe 2016-09-01 11:36:51 +02:00
Sylvain
87104a6b97 remove unused recuced_amount from event + allow to rollback migrations + openAPI will display custom prices for events 2016-08-31 11:58:37 +02:00
Sylvain
4f41aa6554 event custom prices: various fixes and removed artifacts 2016-08-30 13:07:47 +02:00
Sylvain
d8e467d261 fix coupon usage with on-site payment 2016-08-30 09:47:03 +02:00
Sylvain
cd038a8550 custom price on all occurrences with recursive event creation 2016-08-30 09:37:05 +02:00
Sylvain
06d65c785a reserve event with custom prices 2016-08-29 15:43:47 +02:00
Sylvain
12eadb8ceb interface for booking event custom prices 2016-08-29 11:09:36 +02:00
Sylvain
c6a83e98cb [ongoing] db architecture for custom prices reservation 2016-08-25 18:41:33 +02:00
Sylvain
05b010b83f fix ability to edit custom prices 2016-08-25 14:13:30 +02:00
Sylvain
7dc359e4ee associate custom price categories to an event 2016-08-25 13:16:47 +02:00
Sylvain
77db2b2326 ability to edit price category 2016-08-24 16:52:37 +02:00
Sylvain
6c3dfab0a9 API for price categories management 2016-08-24 12:30:48 +02:00
Sylvain
cc1d6e4f21 [not tested] send reminder notification every hours for upcoming reservations 2016-08-17 17:39:12 +02:00
Sylvain
26aed7a1b5 ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message 2016-08-17 12:49:52 +02:00
Sylvain
1799ab9bf5 fix error message 2016-08-17 09:54:31 +02:00
Sylvain
8aa5d5e4f5 allow dashes in coupon codes 2016-08-17 09:53:58 +02:00
Sylvain
428b2db0ea send a coupon to a user 2016-08-16 18:12:13 +02:00
Sylvain
396d7b4df7 include coupons discounts in statistics CA 2016-08-16 10:29:08 +02:00
Sylvain
ba559d87fb use coupon in plan subscription 2016-08-11 18:17:28 +02:00
Sylvain
1e0d809db9 handle coupon in refunds 2016-08-11 13:44:42 +02:00
Sylvain
4be571e6d2 fix coupon usage with stripe 2016-08-10 17:37:17 +02:00
Sylvain
6e1dfda8f5 show coupon details in invoice 2016-08-10 16:33:26 +02:00
Sylvain
6a87467f7c rebase coupon usage on code instead of id (more secure) 2016-08-10 15:34:47 +02:00
Sylvain
def5384a38 validation of validity_per_user on coupon usage 2016-08-10 11:08:01 +02:00
Sylvain
a679bc1638 compute price including coupon discount 2016-08-09 16:36:14 +02:00
Sylvain
d1c1a614a9 i18n coupon directive 2016-08-09 10:22:01 +02:00
Sylvain
c23b6fa3e0 fix coupons test 2016-08-08 15:43:02 +02:00
Sylvain
e2ea64cf9c coupon edition + refactored coupon status 2016-08-08 15:21:33 +02:00
Sylvain
a6ded12ee9 create/delete coupons on stripe + adjust schema to match stripe requirements 2016-08-08 14:42:17 +02:00
Sylvain
35b324e108 coupon safe destroy 2016-08-08 12:25:27 +02:00
Sylvain
7c434db09a interface to create new coupons 2016-08-04 18:13:19 +02:00
Sylvain
ce31c1412b coupons usages are counted with invoices 2016-08-04 09:45:00 +02:00