rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Code Issues Releases Activity
3,404 Commits 15 Branches 273 Tags 82 MiB
45800034c0
Commit Graph

367 Commits

Author SHA1 Message Date
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
04f17d44d8 handle sca in js frontend 2019-09-10 12:46:02 +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
510533e080 handle 2nd confirmation on server + display confirmation modal on the client 2019-09-05 17:17:51 +02:00
Sylvain
12447698f8 collect card details on the client & create a paymentIntent on the server 2019-09-05 16:17:02 +02:00
Sylvain
a0961314a4 [ongoing] upgrade stripe gem & api version to allow SCA 2019-09-05 11:03:22 +02:00
Sylvain
e32825675c [ongoing] fixing accounting export service 2019-07-31 16:52:11 +02:00
Sylvain
12d8c65fa2 async generation of export and download cached csv using hidden iframe 2019-07-31 15:47:02 +02:00
Sylvain
fa6a54a422 export notifications 2019-07-31 12:37:31 +02:00
Sylvain
a7f68b59dd connect the export modal to the api 2019-07-31 12:00:52 +02:00
Sylvain
f772bc3509 api endpoint and worker to export accounting data 2019-07-30 11:43:51 +02:00
Sylvain
f3c433883d [bug] canceled reservation are not removed from statistics (fix #133) 2019-06-13 16:29:12 +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
cfd33c3a52 migrate projects to statistic_profile 2019-06-06 16:34:53 +02:00
Sylvain
fe2a6f7120 migrate trainings to statistic_profile and adjust code 2019-06-06 12:00:21 +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
bd796bc588 fix SubscriptionsController - all tests passing 2019-06-05 07:58:49 +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
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
ffbca98276 [ongoing] fix api to use the invoicing_profile 2019-05-28 16:49:36 +02:00
Sylvain
dd4b6e2cb1 [ongoing] abuses management interface 2019-05-09 18:27:19 +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
3b3e1af822 improved coupon filtering to allow pagination while filtering 2019-04-08 11:00:00 +02:00
Sylvain
44479b5597 allow filtering coupons list 2019-04-04 18:00:19 +02:00
Sylvain
9f8d24ec4f paginate list of coupons 2019-04-04 17:28:29 +02:00
Sylvain
7a317b7e45 [bug] unable to add a file attachment to an event 2019-03-28 11:30:25 +01:00
Sylvain
c356f35f29 add operator_id to invoices 2019-03-18 11:11:09 +01:00
Sylvain
279a958e46 download accounting period archive through interface 2019-02-25 17:22:54 +01:00
Sylvain
6e274afe3b accounting archive: insert code checksum and previous archive checksum 2019-01-31 12:19:50 +01:00
Sylvain
da672ea8b6 Merge branch 'dev' into host 2019-01-21 16:34:06 +01:00
Sylvain
da4c9cf26f [bug] invalid translation of title in new partner modal + refactored plans controller 2019-01-21 16:27:59 +01:00
Sylvain
75eaf4d4d0 improved member autocompletion with multiple words + refactored members controller 2019-01-21 15:17:56 +01:00
Sylvain
62410da9e1 add test for member autocomplete 2019-01-21 11:49:35 +01:00
Sylvain
80aab9f17c fixed: create event with custom price 2019-01-21 11:26:42 +01:00
Sylvain
c4b3c1eab5 [bug] unable to search in user autocomplete 2019-01-21 09:42:51 +01:00
Sylvain
65892684a8 fixed availabilities controller 2019-01-17 16:55:25 +01:00
Sylvain
5a09453ac2 refactored availabilities controller 2019-01-17 16:26:03 +01:00
Sylvain
da25e16c50 refactored events controller 2019-01-17 09:53:28 +01:00
Sylvain
0cd841da33 rubocop api controllers 
TODO:
 - events controller
 - availabilies controller
 - members controller
 - plans controller
 2019-01-16 16:28:25 +01:00
Sylvain
c6cf86fa5c rubocop api controllers 2019-01-16 13:07:19 +01:00
Sylvain
eb69822ce0 Merge branch 'dev' into host 2019-01-14 15:00:55 +01:00
Sylvain
77797db2f1 display VAT rates history 2019-01-14 15:00:33 +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
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
dafeb668e0 Merge branch 'dev' into us78 2019-01-09 12:07:47 +01:00
Sylvain
56829190d6 refactored invoices controller 2019-01-09 12:07:31 +01:00
Sylvain
ccff40b226 handle dates default values and limits in close period modal 2019-01-08 11:19:07 +01:00
Sylvain
12c25389fa Merge branch 'dev' into us78 2019-01-08 09:56:22 +01:00
Sylvain
d4cddc92fb code comments 2019-01-08 09:56:07 +01:00
Sylvain
d8c8e4f72f set default dates in close modal pickers 2019-01-07 17:21:32 +01:00
Sylvain
5b13c59496 list existing closings in close period modal 2019-01-07 16:45:31 +01:00
Sylvain
d89f9e9301 close an accounting period from interface to db through api 2019-01-07 15:33:09 +01:00
Sylvain
b1b5edbfb4 Merge branch 'dev' into us78 2019-01-07 12:48:47 +01:00
Sylvain
4ab0b52294 rubocop controllers 2019-01-07 12:48:22 +01:00
Sylvain
4af3e19cd0 accounting periods API 2019-01-07 12:47:53 +01:00
Sylvain
9d831ef44a rubocop code style 2018-12-27 14:55:55 +01:00
Sylvain
96e980e7b2 removed dead code + improved test suite 2018-12-27 14:53:11 +01:00
Sylvain
10e3d4c3e4 fix update setting from client 2018-12-27 14:15:58 +01:00
Sylvain
ed65976c41 [ongoing] save settings history 2018-12-17 16:02:02 +01:00
Sylvain
d01a93e0f0 [ongoing] members tests 2018-12-12 17:24:31 +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
0aa75488fa store and retrieve app version in package.json 2018-11-21 11:42:04 +01:00
Sylvain
6e56ac4286 javascript fixes 2018-11-21 11:32:50 +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
77e218aa7e fix test suite 
- update VCR cassettes
- fix test fixtures to allow pass test suite at the end of the week
 2017-12-14 16:40:01 +01:00
Sylvain
a5b718d981 fix tests with invoices 2017-12-14 15:52:34 +01:00
Sylvain
0b3192c3ab [bug] subscription refund generate PDF with wrong dates 2017-12-13 13:16:32 +01:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev 
also: align translations and mark missings
 2017-11-20 11:43:40 +01:00
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
c5f0501df2 enable/disable group 2017-10-05 16:48:18 +02:00
Sylvain
26d79e5b12 disable a plan 2017-10-04 18:56:39 +02:00
Sylvain
f874748f74 [bug] fix events monitoring pagination 2017-09-25 15:48:21 +02:00
siteswapjuggler
3e2e5f5972 cancelled event management on front page 
Cancelled event (nb_total_places = -1) are not prompted anymore on the
homepage >> no need to push them to the final user.

They are still display in the event module for continuity
 2017-09-24 18:17:40 +02:00
Sylvain
f5e2a44dcf [bug] in public calendar, availabilities are not shown to visitors 2017-09-07 11:44:50 +02:00
Sylvain
57228f4eec hide slots in members calendars if locked 2017-09-06 17:10:10 +02:00
Sylvain
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02:00
Sylvain
3d4260a3f7 [bug] unable to delete standard group 2017-08-30 14:57:06 +02:00
Sylvain
cf6afb817d [feature] configuration of max visibility for reservations 2017-08-24 18:34:18 +02:00
Sylvain
eb4f97000d [bug] admin cannot see all space availabilities 2017-08-24 16:53:27 +02:00
Peng DU
2cc8096236 fix bug: cant get list of training reservation 2017-03-28 19:45:36 +02: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
f208caf5b0 fix change space reservation when many users on the slot does not change the good user 2017-03-01 14:47:59 +01:00
Sylvain
d450301934 [to test] space reservations 2017-02-28 18:13:38 +01:00
Sylvain
4a9fb5855f filter spaces in client calendar 2017-02-28 17:17:43 +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
a0e7e7951f [ongoing] display spaces in public calendar 2017-02-28 11:59:48 +01:00
Sylvain
b5a0b43689 fix manage reservations 2017-02-27 16:43:39 +01:00
Sylvain
6a132948af fixed slots display in space reservation calendar 2017-02-27 16:35:41 +01:00
Sylvain
847a0ba140 display correct slot status in space reservation calendar 2017-02-27 16:15:27 +01:00
Sylvain
af5f3c777d fix space slot status in API 2017-02-27 13:48:35 +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
c12366c9f1 [bug] unable to see reserved trainings for admin in booking calendar 2017-02-22 17:29:35 +01:00
Sylvain
11619dc6c5 remove reference to machine in cart directive code 2017-02-21 16:41:53 +01:00
Sylvain
5a41424579 fixed & improved js routing 2017-02-21 15:41:45 +01:00
Sylvain
23b9851218 allow enable/disable spaces -> disabled by default 2017-02-15 15:41:25 +01:00
Sylvain
d463d4dd5a display spaces in admin calendar 2017-02-15 13:18:03 +01:00
Sylvain
d8acd4c86f fix ui issues on space creation/deletion 2017-02-14 12:51:30 +01:00
Sylvain
da95e6e0d8 space creation interface 2017-02-14 11:28:07 +01:00
Sylvain
05d4b7b3c5 spaces api 2017-02-13 16:10:12 +01:00
Sylvain
c479502dd0 [bug] too many unread notifications cause system memory overflow 2017-01-05 15:06:54 +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
9bfaaaccd9 improved numerous notifications display 2016-12-19 17:08:11 +01:00
Sylvain
102eecdc8a ability to send again auth migration code 2016-12-15 14:16:24 +01:00
Sylvain
76c1412177 Merge branch 'wallet_avoir' into dev 2016-12-13 15:33:56 +01:00
Sylvain
85ee73f0e0 ability to edit coupon expiration 2016-12-13 12:01:54 +01:00
Sylvain
b44089a33d interface & api to build avoir for a wallet credit 2016-12-12 14:20:26 +01:00
Sylvain
4c8b661750 display coupon application result in inline message instead of growl notification 2016-11-30 10:17:05 +01:00
Sylvain
b75cbc17d7 fix training reservation calendar witch shows all trainings slots 2016-11-29 15:48:39 +01:00
Sylvain
82fa5416ce fix creation of prices with float values 2016-11-29 15:23:36 +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
ff11694e05 check cash coupons does not exceed cart amount for events 2016-11-24 15:01:35 +01:00
Sylvain
04e10c8bb6 check cash coupons does not exceed cart amount for trainings & machines 2016-11-24 13:58:41 +01:00
Sylvain
8419efc7f5 handle unconfigured twitter's keys 2016-11-24 09:38:42 +01:00
Sylvain
c13f640e81 remove rails find_by_* helpers 2016-11-23 16:30:19 +01:00
Sylvain
cc06bcab85 fix cash coupon creation on stripe + store amount in centimes 2016-11-23 15:44:59 +01:00
Sylvain
ad2911529c db model, api and interface for cash coupons 2016-11-23 12:43:42 +01:00
Sylvain
52ad1b2c13 fix trainings, users, events graphs 2016-11-21 11:45:48 +01:00
Sylvain
da71ba783c [bug] exports for events reservation always have seats=1 (fixes #54) 2016-11-09 15:01:58 +01:00
Peng DU
ba5e5752a4 allow add more picture for project step 2016-11-02 14:58:06 +01:00
Sylvain
e48bb88f1f use slug in traning show url 2016-09-27 16:00:22 +02: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
972a5e0a89 fix bug: admin cant pay a plan with code promo by wallet 2016-09-22 18:04:13 +02:00
Sylvain
6401b321ef [feature] display fab-manager's version, when logged as admin 2016-09-22 16:46:14 +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
Sylvain
3c277428bf [SSO] field data mapping transformation on data reception 2016-09-15 17:10:41 +02:00
Sylvain
13f416a101 [sso] save and restore field data mapping 2016-09-15 15:58:21 +02:00