1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Commit Graph

271 Commits

Author SHA1 Message Date
Sylvain
0c51aff748 (feat) OAuth2 scopes are now configurable from the interface
Previously, scopes were supported through OAUTH2_SCOPE since v5.3.1.
BREAKING CHANGE: update your oauth2 provider configuration if you need scopes support
2022-03-22 16:40:09 +01:00
Sylvain
dc8c36029b (doc) fix comment in migration 2022-03-21 12:50:03 +01:00
Sylvain
36d85c0cf7 (bug) unable to delete an administrator who had closed an accounting period 2022-03-16 17:10:27 +01:00
Sylvain
49dd0d2dab (bug) a sentence was not linked to a translation key 2022-03-08 15:48:06 +01:00
Nicolas Florentin
e37cde2f0d removes dead code about OpenAPI (open_api_calls_count_tracings) 2022-02-25 15:39:56 +01:00
Sylvain
e4a0798b8a (bug) statistics not built
for instances with plans created before v4.3.3, the StatisticType.key does not match Plan.duration because of a behavior change in rails framework. (v4.3.3 introduces a framework upgrade)
2022-01-18 14:01:34 +01:00
Sylvain
a38d3e31b1 use explicit payment method for check in paymentSchedules and do not include the payment method in the footprint 2022-01-11 16:15:43 +01:00
Sylvain
5ebc1017d2 save prices duration in db 2021-12-20 15:47:57 +01:00
Sylvain
1a672b0644 stave start date in subscription schedule 2021-10-18 15:19:58 +02:00
Sylvain
315e899540 [WIP] fix tests 2021-10-14 18:20:10 +02:00
Sylvain
0345d22582 delete & disable packs 2021-06-24 17:59:05 +02:00
Sylvain
d54f30e048 WIP: interface to configure packs 2021-06-21 17:39:48 +02:00
Sylvain
7ac60f6ef3 data architecture of prepaid-packs 2021-06-21 14:58:49 +02:00
Sylvain
e1e446ab3f API+ interface to CRUD plan categories 2021-06-08 16:43:43 +02:00
Sylvain
fda942d386 fix invalid footprints after regeneration in migrations 2021-06-07 14:38:47 +02:00
Sylvain
5d7c024056 fix stripe_ids data migration 2021-06-07 14:15:39 +02:00
Sylvain
39fe153267 fix table name in rollback migration 2021-06-07 09:56:03 +02:00
Sylvain
54fe1fea92 migrate invoices marked as paid with stripe 2021-06-03 15:06:24 +02:00
Sylvain
5f4c322fd5 migrate payment schedule items marked as paid with stripe 2021-06-03 15:02:48 +02:00
Sylvain
4e109f7edb retrieve gateway objects with multiple ids 2021-06-03 09:48:21 +02:00
Sylvain
87cd41794e WIP: payzen subscription
TODO: retreive the payzen subscription from PayZen::Item
2021-06-02 20:07:53 +02:00
Sylvain
36e173fb43 test presence of footprint debug data 2021-05-31 12:19:28 +02:00
Sylvain
5f5ec8dbb6 remove references to Invoice.invoiced 2021-05-27 15:58:55 +02:00
Sylvain
16df7f9506 fix data migrations + update test fixtures 2021-05-27 11:31:07 +02:00
Sylvain
6b90e73195 migrate database to object[] to store multiple boughts items 2021-05-25 17:28:35 +02:00
Sylvain
c7a59c8cb7 WIP: refactoring to singularize the booking process
We need to achieve only one process for all booking, not one for subscription, one for reservations, etc.
Moreover we must store one object per invoice_item/payment_schedule_object and stop using Invoice.invoiced or PaymentSchedule.scheduled
2021-05-21 18:25:18 +02:00
Sylvain
358400d69e fix rollback with payzen objects in Db 2021-05-12 16:42:56 +02:00
Sylvain
26dfbef5e1 WIP: refactor models to use payment_gateway_objects 2021-04-21 17:38:06 +02:00
Sylvain
434ec9c205 refactored Invoices to get rid of stripe references 2021-04-20 17:22:53 +02:00
Sylvain
a897d37b2d improved footprint debug process 2021-04-16 16:03:10 +02:00
Sylvain
4ffd357841 WIP: migrate stripe ids in DB 2021-04-16 12:25:48 +02:00
Sylvain
343b2f7d23 refactor code related to archiving 2021-04-16 10:34:02 +02:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
def0778a4d basic inteface to retrieve payment schedules 2021-01-25 17:42:30 +01:00
Sylvain
01a0612a4b fix create invoice for each due date 2021-01-25 14:37:07 +01:00
Sylvain
65277800e2 fix creation subcription on stripe 2020-12-23 16:25:24 +01:00
Sylvain
f661428db2 better error handling in stripe::subscription creation process 2020-12-23 15:29:56 +01:00
Sylvain
40c78974b8 refactoring of reservation:pay_and_save
TODO: debug with tests,
refactor subscription:pay_and_save on the same template
2020-12-16 18:33:43 +01:00
Sylvain
b5504d2342 create stripe subscription with all data 2020-11-12 16:44:55 +01:00
Sylvain
ed5b90cbdc add stp_product_id to all items that can be scheduled 2020-11-12 12:14:51 +01:00
Sylvain
78847bdb4b WIP: create subscription on stripe 2020-11-10 17:02:21 +01:00
Sylvain
45800034c0 link payment_schedule_item with invoice 2020-11-10 13:43:09 +01:00
Sylvain
6be51feeb2 save stp_price_id for each plan 2020-10-27 16:03:20 +01:00
Sylvain
840be2c6c0 renamed RepaymentSchedule to PaymentSchedule 2020-10-27 16:02:41 +01:00
Sylvain
52f3bd956f database structure for payment schedule 2020-10-27 11:32:20 +01:00
Sylvain
7bf06ff23e debug footprints 2020-07-21 19:25:21 +02:00
Sylvain
e644e4894a using unaccent to build project search index + updated doc 2020-06-30 15:58:39 +02:00
Sylvain
06470c1366 upgrade pg_trgm from 1.1 to 1.3 2020-06-29 14:40:21 +02:00
Sylvain
e288f66997 use search index to speed up projects searches 2020-06-23 17:06:59 +02:00
Sylvain
1a6cd356bf WIP: using postgres for full-text search in projects 2020-06-22 16:28:05 +02:00
Sylvain
10825e198c prevent recreate periods in the future 2020-05-11 11:28:09 +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
3319e68526 Auto-adjusts text colors based on the selected theme colors 2020-05-04 13:20:57 +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
5f6c293046 fixes in-context translation + fixes migration 20160704095606 2020-04-08 15:55:08 +02:00
Sylvain
422e3c6236 [bug] migration 20160704095606 cannot run due to GDPR refactoring 2020-04-08 15:00:22 +02:00
Sylvain
a13c3af88c [bug] migration 20160704095606 cannot run due to GDPR refactoring 2020-04-08 14:14:50 +02:00
Sylvain
f2a76732e5 Compatible database with Fab-manager v1, to allow upgrades 2020-04-08 12:58:59 +02:00
Sylvain
df8ff77597 fix migrations for rails 5 + use maildev instead of mailcatcher + fix tests script 2020-03-25 12:35:08 +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
Sylvain
5b46edd748 welcome tour + save completed tours in database 2020-02-18 17:36:45 +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
64764e5498 check version on hub & [ongoing] health endpoint 2020-01-13 17:05:53 +01:00
Sylvain
cca6b14f58 import events asyncronously from icalendar 2019-12-02 15:53:24 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
baf8cfb487 iCalendar server api & db model 2019-11-27 17:05:19 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
1cc1bd23b7 Ability to fully rebuild the projets index in ElasticSearch with rake fablab🇪🇸build_projects_index 2019-10-16 14:37:43 +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
1fa36d4029 renamed avoir_mode to payment_method 2019-09-17 14:48:06 +02:00
Sylvain
224b0d6dee Merge branch 'sca' into dev 2019-09-12 12:53:56 +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
f772bc3509 api endpoint and worker to export accounting data 2019-07-30 11:43:51 +02:00
Sylvain
ca61e4e08e [bug] SubscriptionExpireWorker cannot run due to wrong expiration column in SQL query 2019-07-10 10:52:29 +02:00
Sylvain
f37b4ffca2 [bug] migration 20190523140823 may not run if an admin was deleted 2019-06-17 15:28:54 +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
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
f0c5b0eb09 init StatisticProfileTraining 2019-06-05 16:17:56 +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
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
0df97cffc5 migrate from Invoice.user_id to Invoice.invoicing_profile_id 2019-05-28 16:02:55 +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
940ea3051b chain historyValues with sha256 footprints 2019-03-20 11:01:53 +01:00
Sylvain
ccd63ecfe1 include zip archive into tests + fix: allow multiple runs of test suite 2019-03-18 12:09:54 +01:00
Sylvain
c356f35f29 add operator_id to invoices 2019-03-18 11:11:09 +01:00
Sylvain
e543f1fe3e add watermark to invoices in dev/staging/test environment 2019-02-27 17:44:52 +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
cc124a0dee [ongoing] chain invoice records 2019-02-11 13:57:07 +01:00
Sylvain
a1ba272538 Merge branch 'dev' into host 2019-01-14 13:00:24 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
5b13c59496 list existing closings in close period modal 2019-01-07 16:45:31 +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
8e60545753 extend subscription and offer free days will keep track of previous subscription 2018-12-10 13:24:00 +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
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02: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
e86de06c45 fix revert migrations 2017-02-28 12:25:16 +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
e7d18eac81 update setup instructions to fix non-creation of f_unaccent function 2017-02-16 11:21:43 +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
db8cf69771 [bug #55] unable to run rake db:migrate on first install 2016-12-08 12:09:04 +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
b7737be6f3 fix migration rollback 2016-11-23 11:44:48 +01:00
Sylvain
13f416a101 [sso] save and restore field data mapping 2016-09-15 15:58:21 +02:00
Sylvain
c2533c0590 add custom aggs for machine & trainings stats: available bookings 2016-09-06 17:17:15 +02:00
Sylvain
1fec50accf ability to run custom aggregation with query and append result to query 2016-09-06 14:21:52 +02:00
Sylvain
ea671d03a4 database structure for custom aggregations in statistics 2016-09-05 17:16:23 +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
e281a20ada database migration to event price category 2016-08-30 18:30:21 +02:00
Sylvain
c6a83e98cb [ongoing] db architecture for custom prices reservation 2016-08-25 18:41:33 +02:00
Sylvain
500a466371 full ability to create price categories 2016-08-24 16:21:43 +02:00
Sylvain
6c3dfab0a9 API for price categories management 2016-08-24 12:30:48 +02:00
Sylvain
a6ded12ee9 create/delete coupons on stripe + adjust schema to match stripe requirements 2016-08-08 14:42:17 +02:00
Sylvain
ce31c1412b coupons usages are counted with invoices 2016-08-04 09:45:00 +02:00
Sylvain
3a932e75c0 coupon data model & tests 2016-08-03 17:25:00 +02:00
Sylvain
2afd6ade8a allow user to set his organization on registration 2016-08-02 12:27:45 +02:00
Sylvain
ccc1eaf3a0 database structure for organizations 2016-08-01 17:36:38 +02:00
Sylvain
5f96c9916d [feature] newsletter : ask conscent + export in xlsx 2016-07-28 12:20:51 +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
909c204af5 show invoice download link in wallet transaction debit operator 2016-07-21 16:32:57 +02:00
Peng DU
f2010e752d show pay by wallet in invoice 2016-07-21 16:32:56 +02:00
Peng DU
363fd73bc4 add model WalletTransaction 2016-07-21 16:32:53 +02:00
Peng DU
db8a6e8a32 application can show user wallet 2016-07-21 16:32:53 +02:00
Peng DU
1529e4b14e allow active/disactive a training to show in training lists 2016-07-14 12:18:24 +02:00