1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Commit Graph

140 Commits

Author SHA1 Message Date
Sylvain
0714878bca [bug] unable to generate a refund 2019-07-29 12:07:22 +02:00
Sylvain
12fcfee71e [bug] unable to export reservations or subscriptions to excel 2019-07-10 12:25:08 +02:00
Sylvain
38d3ddd48a [bug] export members list to excel is broken 2019-07-10 11:27:45 +02:00
Sylvain
5cd977b4dd ruby syntax + may fix #132? 2019-06-13 16:53:36 +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
37b9e3da60 link statistic profile to invoices 2019-06-11 10:02:48 +02:00
Sylvain
818d1357a9 save user cration date in statistic_profile 2019-06-06 16:54:09 +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
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
7ed97ef35a link wallet & its transactions to invoicingprofile 2019-06-03 16:00:09 +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
26b901ebb5 [bug#131] Availabilities export report an erroneous number of reservations for machine availabilities 2019-05-07 12:24:51 +02:00
Sylvain
4dfe02bebf improved ruby syntax to match coding rules in some services 2019-04-25 15:09:37 +02:00
Sylvain
403e3a5562 enhance code quality for statistic service 2019-04-16 11:57:36 +02:00
Sylvain
c356f35f29 add operator_id to invoices 2019-03-18 11:11:09 +01:00
Sylvain
ae7a939cba Merge branch 'dev' into host 2019-03-11 12:48:14 +01:00
Sylvain
20e91ede4e Limit members search to 50 results to speed up queries 2019-03-11 12:47:46 +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
55ae979213 Merge branch 'dev' into host 2019-01-30 10:04:12 +01:00
Sylvain
6e89df045d [bug] some reservation slots are not shown on the user calendars (#127) 2019-01-29 11:29:14 +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
80aab9f17c fixed: create event with custom price 2019-01-21 11:26:42 +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
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
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
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
407c18075c [bug] event catgories not correct in statistics 2018-07-12 12:48:50 +02:00
Sylvain
f66ca9165e migrate es api: statistics 2018-06-08 12:27:11 +02:00
Sylvain
504fe49964 export machines availabilities 2017-03-02 12:34:28 +01:00
Sylvain
4d09ed37a3 export machines availabilities 2017-03-02 12:34:16 +01:00
Sylvain
cf9181770b export space statistics 2017-03-01 12:56:11 +01:00
Sylvain
05bf899393 delete old space stats when regenerating 2017-03-01 11:58:11 +01:00
Sylvain
d450301934 [to test] space reservations 2017-02-28 18:13:38 +01:00
Sylvain
43f78ff0e0 fix credits usage in space reservation 2017-02-27 17:38:15 +01:00
Sylvain
8e86c4b212 [ongoing] spaces reservation calendar 2017-02-23 17:45:55 +01:00
Sylvain
4f3c5e963c [bug] change plan price lost stats 2017-01-09 10:54:30 +01:00
Sylvain
e656b7d784 [bug] regenerate statistics does not remove all previous values 2017-01-04 14:46:43 +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
3cdbecf74a add invoice item to refund invoices for wallet credit 2016-12-13 15:05:40 +01:00
Sylvain
b44089a33d interface & api to build avoir for a wallet credit 2016-12-12 14:20:26 +01:00
Sylvain
a9e593a840 fix statistics generation with cash coupon 2016-11-29 14:57:43 +01:00
Sylvain
6c933857f4 fix statistics generation with cash coupon 2016-11-29 14:57:21 +01:00
Sylvain
1ebab285f3 fix statistic generation with cash coupons 2016-11-29 12:07:22 +01:00
Sylvain
585d137cfc some automated tests about cash coupons 2016-11-28 10:40:02 +01:00
Sylvain
63b0f0c061 [to test] compute prices/invoices using cash coupons 2016-11-24 17:57:48 +01:00
Sylvain
3dc5f1a0e4 real fix for coupon change slot's original price (reverts cfd92cdc40) 2016-11-24 11:33:45 +01:00
Sylvain
0cb0ff3a06 [ongoing] using cash coupon in reservation logic 2016-11-23 17:17:34 +01:00
Sylvain
4c9879768b fix statistic generation for events with custom prices 2016-08-30 17:03:05 +02:00
Sylvain
d47a5aea5f statistics generation for event with custom prices 2016-08-29 16:44:07 +02:00
Sylvain
396d7b4df7 include coupons discounts in statistics CA 2016-08-16 10:29:08 +02:00
Sylvain
af94b62ff1 add organization infos to members xlsx export 2016-08-02 15:28:24 +02:00
Sylvain
a2066d8c09 [feature]async generation of users exports 2016-07-27 17:00:06 +02:00
Sylvain
4d2f46ca95 [feature] Async statistics export to XLSX
- fix tests due to removal of event_categories
- rake task for generating statistics
2016-07-27 11:28:54 +02:00
Sylvain
32d239f723 [Bug #28] Event type disappear when editing the event 2016-07-25 16:16:25 +02:00
Peng DU
9ba8e46450 refactroing wallet service, credit/debit in transaction of db, if have an error we rollback all 2016-07-21 16:32:57 +02:00
Peng DU
31d5c6d3b3 pay totalement/partialement reservation by wallet 2016-07-21 16:32:54 +02:00
Peng DU
fc7eaaab94 add notification and alert when user wallet credit 2016-07-21 16:32:54 +02:00
Peng DU
d0956bb0aa show wallet transactions of user 2016-07-21 16:32:54 +02:00
Sylvain
e930e04ed6 add age&theme filters to statistics 2016-06-30 12:48:46 +02:00
Peng DU
1383483a54 dont compute member list if not complete 2016-06-22 17:28:04 +02:00
Nicolas Florentin
ed478f95c7 UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox 2016-04-20 11:24:28 +02:00
Nicolas Florentin
b46ee9177c adds comments to service UsersCredits::Manager 2016-04-08 11:26:31 +02:00
Nicolas Florentin
d22574dae4 UsersCredits::Manager is more strict about arguments that have to be passed 2016-04-08 11:11:42 +02:00
Nicolas Florentin
aee8146040 users_credits/manager service: initializing service, you can pass a plan to simulate that user have that plan 2016-04-08 10:33:50 +02:00
Nicolas Florentin
8c3f2d2862 implements a service to handle subscription extension after reservation, comes with tests 2016-04-07 17:55:36 +02:00
Nicolas Florentin
02b56ed6a7 users_credits/manager service, handle the case if user does not have a plan 2016-04-07 16:01:31 +02:00
Nicolas Florentin
823b4c5e1d updates users_credits module and manager and adds tests 2016-04-07 12:57:08 +02:00
Nicolas Florentin
28fcd121b4 renames service of users credits manager 2016-04-06 18:26:02 +02:00
Nicolas Florentin
44fcb2e089 draft a service to handle users credits 2016-04-06 18:24:26 +02:00
cyril
d1450f65f6 release 2.0 rc 2016-03-23 18:39:41 +01:00
cyril
68eab24fa1 init depot fabmanager 2015-05-05 03:10:25 +02:00