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 |
|