Sylvain
|
fdcec06345
|
CVE-2019-16892 + #49
- updated rubyzip to fix a security issue
- updated axlsx and file writing method as a possible fix for #49
|
2019-10-21 16:11:49 +02:00 |
|
Sylvain
|
bc36b78719
|
[bug] public calendar won't show anything if the current date range include a reserved space availability (#151)
|
2019-10-14 10:38:13 +02:00 |
|
Sylvain
|
7dbfbc4868
|
fix typo
|
2019-10-07 17:12:49 +02:00 |
|
Sylvain
|
38847844fb
|
display label on all rows in accounting export
|
2019-10-07 14:02:47 +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
|
2cc7fb0e44
|
accounting export: display lable on all lignes
|
2019-10-02 10:25:06 +02:00 |
|
Sylvain
|
29d6a1daa4
|
Merge branch 'uvsq' into dev
|
2019-10-01 14:32:58 +02:00 |
|
Sylvain
|
a7a929ddbc
|
integration unit test for imports + fixed import result colors in UI + fixed test fixtures
|
2019-10-01 14:32:30 +02:00 |
|
Sylvain
|
193e81e711
|
Merge branch 'uvsq' into dev
|
2019-09-30 15:34:21 +02:00 |
|
Sylvain
|
ba3161589c
|
update users through CSV import
|
2019-09-30 12:19:33 +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
|
8eda1e673f
|
Merge remote-tracking branch 'origin/hotfixes' into dev
|
2019-09-24 14:43:14 +02:00 |
|
Sylvain
|
588010ac0b
|
[feature] Optional reCaptcha checkbox in sign-up form
|
2019-09-23 17:46:46 +02:00 |
|
Nicolas Florentin
|
22d4d3a78a
|
method date_range, test on all_day was never truthy
|
2019-09-20 15:03:49 +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
|
c76563f22f
|
wallet label in accounting export
|
2019-09-19 11:25:12 +02:00 |
|
Sylvain
|
f81a2e4343
|
wallet credit in accounting export
|
2019-09-19 11:10:26 +02:00 |
|
Sylvain
|
c905d3fbc5
|
use correct VAT infos in accounting export
|
2019-09-18 17:25:53 +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
|
276a99c068
|
improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled
|
2019-09-18 13:28:53 +02:00 |
|
Sylvain
|
46c3497c85
|
ventilate coupon codes on items
|
2019-09-17 17:39:05 +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
|
f06bdaaf21
|
provide additional settings to export api
|
2019-09-16 16:31:16 +02:00 |
|
Sylvain
|
02d28e0b8c
|
improved accounting codes settings page (1 click saves all) + improved export file name
|
2019-09-16 14:39:47 +02:00 |
|
Sylvain
|
224b0d6dee
|
Merge branch 'sca' into dev
|
2019-09-12 12:53:56 +02:00 |
|
Sylvain
|
52afb6ef07
|
[bug] extend a current subscription for a member, does not reset his credits
|
2019-09-12 11:37:03 +02:00 |
|
Nicolas Florentin
|
3c486e4b93
|
[Bug] unable to create the first user because role member was missing
|
2019-09-11 17:11:43 +02:00 |
|
Sylvain
|
f60d19fa27
|
allow reservations & subscriptions at price of zero
|
2019-09-11 11:51:04 +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 |
|
Nicolas Florentin
|
f1958a300b
|
[Bug] unable to create the first user because role member was missing
|
2019-09-09 14:34:00 +02:00 |
|
Sylvain
|
bebb3354fb
|
[bug] (#140) VAT rate is erronous in invoices
|
2019-08-14 10:56:30 +02:00 |
|
Sylvain
|
92d79bc9c7
|
[bug] (#140) VAT rate is erronous in invoices
|
2019-08-14 10:54:23 +02:00 |
|
Sylvain
|
13d3197069
|
prevent existance of unwanted separators + truncate labels
|
2019-08-01 14:58:10 +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
|
acacd9a19e
|
fixed accounting codes interface + fixed csv generation
|
2019-08-01 10:24:34 +02:00 |
|
Sylvain
|
26c98394ac
|
fixed export service
|
2019-08-01 09:49:09 +02:00 |
|
Sylvain
|
e32825675c
|
[ongoing] fixing accounting export service
|
2019-07-31 16:52:11 +02:00 |
|
Sylvain
|
a9ea4057f3
|
interface to customize accounting codes and labels
|
2019-07-30 16:06:35 +02:00 |
|
Sylvain
|
82ad69d386
|
handle avoirs
|
2019-07-30 10:27:47 +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
|
5e8697de18
|
fix invoices list API
|
2019-07-29 12:19:54 +02:00 |
|
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 |
|