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 |
|
Sylvain
|
d5c5e36965
|
[bug] compute age of users born on 29/02, lead to app crash on non-leap years
|
2017-01-03 11:24:14 +01:00 |
|
Sylvain
|
85ee73f0e0
|
ability to edit coupon expiration
|
2016-12-13 12:01:54 +01:00 |
|
Sylvain
|
10fc7b69e9
|
Ability to display optional information message on event reservation page
|
2016-11-29 16:46:19 +01:00 |
|
Sylvain
|
a9e593a840
|
fix statistics generation with cash coupon
|
2016-11-29 14:57:43 +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
|
5a4eaefc02
|
fix cash coupon usage when paying by stripe
|
2016-11-29 11:12:58 +01:00 |
|
Sylvain
|
42a8d40b37
|
fix partial refund of invoices with cash coupons
|
2016-11-28 16:34:39 +01:00 |
|
Sylvain
|
aa7748f8eb
|
Merge branch 'cash' into dev
|
2016-11-28 12:05:18 +01:00 |
|
Sylvain
|
63b0f0c061
|
[to test] compute prices/invoices using cash coupons
|
2016-11-24 17:57:48 +01:00 |
|
Peng DU
|
63a3bcf19a
|
Fix a bug: invoice of reservation show payment by debit card when user pay with wallet
|
2016-11-24 14:09:34 +01:00 |
|
Sylvain
|
04e10c8bb6
|
check cash coupons does not exceed cart amount for trainings & machines
|
2016-11-24 13:58:41 +01:00 |
|
Sylvain
|
0cb0ff3a06
|
[ongoing] using cash coupon in reservation logic
|
2016-11-23 17:17:34 +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
|
73e4439036
|
front-end modifications to cancel a booked event
|
2016-11-09 17:07:48 +01:00 |
|
Sylvain
|
2dcd980be3
|
[bug] recurrent events doesn't have the configured theme and age range
|
2016-11-09 13:12:30 +01:00 |
|
Peng DU
|
99cca406d5
|
fix bug: event date period dant show correct in invoice
|
2016-11-03 12:17:19 +01:00 |
|
Peng DU
|
f1b749d5f2
|
Image max size is configutable, size by default is 2 megabytes
|
2016-11-02 15:36:22 +01:00 |
|
Peng DU
|
ba5e5752a4
|
allow add more picture for project step
|
2016-11-02 14:58:06 +01:00 |
|
Kenneth Lim
|
18bc37749b
|
locale: informations --> information
Not sure if this helps but information does not require an `s`. :)
Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
|
2016-10-07 17:11:58 +08: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
|
fc9aeb00a2
|
remove edit wallet reference from facture
|
2016-09-23 12:52:43 +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 |
|
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 |
|
Peng DU
|
afb026bdc9
|
clear invoice_item of wallet/group if payment has a error
|
2016-09-20 17:42:30 +02:00 |
|
Peng DU
|
802e239d5b
|
calcul total price of reservation with coupon when use wallet
|
2016-09-20 16:54:23 +02:00 |
|
Sylvain
|
50543b8d09
|
[sso] give informations about the expected data in sso mapping
|
2016-09-14 16:41:45 +02:00 |
|
Sylvain
|
336158c5ad
|
[SSO] fix re-mapping of avatar, address and organization
|
2016-09-12 12:10:46 +02:00 |
|
Sylvain
|
d233297469
|
check coupon code server side + integration test for wrong copon
|
2016-09-08 15:19:12 +02:00 |
|
Sylvain
|
d99d090814
|
remove duplicate in mime types
|
2016-09-07 16:30:14 +02:00 |
|
Sylvain
|
19e89cce3d
|
[feature] validate project attachement by mime type
|
2016-09-07 15:44:19 +02:00 |
|
Sylvain
|
53dd54b175
|
working custom aggs w/ result tidy in stats query
|
2016-09-06 16:32:41 +02:00 |
|
Sylvain
|
ea671d03a4
|
database structure for custom aggregations in statistics
|
2016-09-05 17:16:23 +02:00 |
|
Sylvain
|
701b913eb1
|
[ongoing] elastic data structure for storing availabilities info
|
2016-09-05 15:15:31 +02:00 |
|
Sylvain
|
c3505c1419
|
fix coupon discount if reservation+subscription when pay by stripe
|
2016-09-01 11:36:51 +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
|
4f41aa6554
|
event custom prices: various fixes and removed artifacts
|
2016-08-30 13:07:47 +02:00 |
|
Sylvain
|
d8e467d261
|
fix coupon usage with on-site payment
|
2016-08-30 09:47:03 +02:00 |
|
Sylvain
|
cd038a8550
|
custom price on all occurrences with recursive event creation
|
2016-08-30 09:37:05 +02:00 |
|
Sylvain
|
06d65c785a
|
reserve event with custom prices
|
2016-08-29 15:43:47 +02:00 |
|
Sylvain
|
12eadb8ceb
|
interface for booking event custom prices
|
2016-08-29 11:09:36 +02:00 |
|
Sylvain
|
c6a83e98cb
|
[ongoing] db architecture for custom prices reservation
|
2016-08-25 18:41:33 +02:00 |
|
Sylvain
|
05b010b83f
|
fix ability to edit custom prices
|
2016-08-25 14:13:30 +02:00 |
|
Sylvain
|
7dc359e4ee
|
associate custom price categories to an event
|
2016-08-25 13:16:47 +02:00 |
|
Sylvain
|
77db2b2326
|
ability to edit price category
|
2016-08-24 16:52:37 +02:00 |
|
Sylvain
|
6c3dfab0a9
|
API for price categories management
|
2016-08-24 12:30:48 +02:00 |
|
Sylvain
|
cc1d6e4f21
|
[not tested] send reminder notification every hours for upcoming reservations
|
2016-08-17 17:39:12 +02:00 |
|
Sylvain
|
26aed7a1b5
|
ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message
|
2016-08-17 12:49:52 +02:00 |
|
Sylvain
|
1799ab9bf5
|
fix error message
|
2016-08-17 09:54:31 +02:00 |
|
Sylvain
|
8aa5d5e4f5
|
allow dashes in coupon codes
|
2016-08-17 09:53:58 +02:00 |
|
Sylvain
|
428b2db0ea
|
send a coupon to a user
|
2016-08-16 18:12:13 +02:00 |
|
Sylvain
|
396d7b4df7
|
include coupons discounts in statistics CA
|
2016-08-16 10:29:08 +02:00 |
|
Sylvain
|
ba559d87fb
|
use coupon in plan subscription
|
2016-08-11 18:17:28 +02:00 |
|
Sylvain
|
1e0d809db9
|
handle coupon in refunds
|
2016-08-11 13:44:42 +02:00 |
|
Sylvain
|
4be571e6d2
|
fix coupon usage with stripe
|
2016-08-10 17:37:17 +02:00 |
|
Sylvain
|
6e1dfda8f5
|
show coupon details in invoice
|
2016-08-10 16:33:26 +02:00 |
|
Sylvain
|
6a87467f7c
|
rebase coupon usage on code instead of id (more secure)
|
2016-08-10 15:34:47 +02:00 |
|
Sylvain
|
def5384a38
|
validation of validity_per_user on coupon usage
|
2016-08-10 11:08:01 +02:00 |
|
Sylvain
|
a679bc1638
|
compute price including coupon discount
|
2016-08-09 16:36:14 +02:00 |
|
Sylvain
|
d1c1a614a9
|
i18n coupon directive
|
2016-08-09 10:22:01 +02:00 |
|
Sylvain
|
c23b6fa3e0
|
fix coupons test
|
2016-08-08 15:43:02 +02:00 |
|
Sylvain
|
e2ea64cf9c
|
coupon edition + refactored coupon status
|
2016-08-08 15:21:33 +02:00 |
|
Sylvain
|
a6ded12ee9
|
create/delete coupons on stripe + adjust schema to match stripe requirements
|
2016-08-08 14:42:17 +02:00 |
|
Sylvain
|
35b324e108
|
coupon safe destroy
|
2016-08-08 12:25:27 +02:00 |
|
Sylvain
|
7c434db09a
|
interface to create new coupons
|
2016-08-04 18:13:19 +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
|
c9a7c599c0
|
notify admin about organization registration & organization server validation
|
2016-08-02 18:06:07 +02:00 |
|
Sylvain
|
33358c2fb5
|
ability to edit organization in profile & ablity to link its params from an sso
|
2016-08-02 15:11:26 +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
|
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
|
7650ec5a5a
|
fix bug: dont get plan object in compute amount of wallet in reservation
|
2016-07-21 16:32:57 +02:00 |
|
Peng DU
|
909c204af5
|
show invoice download link in wallet transaction debit operator
|
2016-07-21 16:32:57 +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
|
50ba15b5bf
|
fix bug: dont update wallet amount if invoice disable, cant update wallet amount when user only subscribe subscription
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
f2010e752d
|
show pay by wallet in invoice
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
773c1adf4a
|
edit invoice reference
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
2c49285740
|
avoir by wallet
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
38fafb7a70
|
wallet credit amount can be a float
|
2016-07-21 16:32:55 +02:00 |
|
Peng DU
|
2dbc026db1
|
pay subscription by wallet
|
2016-07-21 16:32:55 +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
|
1dab903054
|
refactoring wallet amount to concern
|
2016-07-21 16:32:54 +02:00 |
|
Peng DU
|
9116e8c04a
|
wallet transaction type must be credit/debit
|
2016-07-21 16:32:54 +02:00 |
|
Peng DU
|
b22bae1d8f
|
wallet amount convert auto to float
|
2016-07-21 16:32:54 +02:00 |
|
Peng DU
|
cac9e16c17
|
cant debit/credit a negative
|
2016-07-21 16:32:53 +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
|
70d623f65a
|
filter calendar by machine/formation/event or disponible
|
2016-07-14 18:36:52 +02:00 |
|
Peng DU
|
49ee5011c1
|
show availability with reservation state
|
2016-07-14 12:20:02 +02:00 |
|
Peng DU
|
e9c1584968
|
availability public api
|
2016-07-14 12:20:02 +02:00 |
|
Sylvain
|
6839e8db38
|
Merge branch 'events' into dev
Conflicts:
CHANGELOG.md
config/locales/app.shared.en.yml
config/locales/app.shared.fr.yml
|
2016-07-13 18:32:30 +02:00 |
|
Sylvain
|
90142ae3bb
|
Merge branch 'training' into dev
|
2016-07-13 18:15:14 +02:00 |
|
Sylvain
|
e930e04ed6
|
add age&theme filters to statistics
|
2016-06-30 12:48:46 +02:00 |
|
Sylvain
|
e36df94f0f
|
server-side protection against deleting used filters
|
2016-06-30 11:39:56 +02:00 |
|
Sylvain
|
c8b42f1b7f
|
add slugs to event filters + add categories into statistics + prevent remove linked elements in front
|
2016-06-30 11:24:57 +02:00 |
|
Sylvain
|
812d7a3c05
|
server-side protection against last category deletion
|
2016-06-30 09:57:40 +02:00 |
|
Sylvain
|
eb7ee6300e
|
remove associations with events on filter deletion
|
2016-06-29 17:26:41 +02:00 |
|
Sylvain
|
cbbd697d38
|
age_range & theme for event model
|
2016-06-28 15:56:37 +02:00 |
|
Sylvain
|
875e513f1c
|
Merge remote-tracking branch 'origin/open-api' into dev
|
2016-06-27 16:31:50 +02:00 |
|
Peng DU
|
df8dbfae8c
|
fix conflt of changelog
|
2016-06-27 12:42:57 +02:00 |
|
Peng DU
|
702e35650f
|
event cache
|
2016-06-24 18:26:11 +02:00 |
|
Peng DU
|
60f504c660
|
event categoriy is required
|
2016-06-22 18:56:45 +02:00 |
|
Peng DU
|
4dff74827b
|
optimise machine/training availabilities query
|
2016-06-22 12:54:12 +02:00 |
|
Sylvain
|
1a8d2db53c
|
[feature][UI][profile banner] set default picture
|
2016-05-18 16:53:10 +02:00 |
|
Sylvain
|
a66b314e7b
|
[feature] background picture of profile banner customization
|
2016-05-18 16:15:54 +02:00 |
|
Sylvain
|
0061c3dca6
|
reorganize profile header zone
|
2016-05-17 16:41:32 +02:00 |
|
Sylvain
|
93edd6eaa8
|
[ongoing] UI refactoring of public profile
|
2016-05-16 18:20:22 +02:00 |
|
Nicolas Florentin
|
7f032526cb
|
implements open_api various endpoints
|
2016-05-04 18:17:50 +02:00 |
|
Nicolas Florentin
|
92b3471032
|
creates models open_api client and calls_count_tracing, adds worker to trace calls count
|
2016-05-04 11:48:14 +02:00 |
|
Nicolas Florentin
|
1a446bf646
|
frontend openlab search view, ctrl, services
|
2016-04-22 18:17:55 +02:00 |
|
Nicolas Florentin
|
5ee27da51e
|
index updated_at, created_at, published_at datetimes
|
2016-04-21 18:19:55 +02:00 |
|
Nicolas Florentin
|
ec203a8ef8
|
adds minimal validation to projects
|
2016-04-21 17:10:50 +02:00 |
|
Nicolas Florentin
|
f65bb95575
|
almost finishes synchro with openlab system
|
2016-04-21 11:42:43 +02:00 |
|
Nicolas Florentin
|
711b18f6cd
|
initial commit
|
2016-04-20 18:13:36 +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 |
|
Sylvain
|
d880a8f0f4
|
fix unable to reserve Event
|
2016-04-13 18:21:01 +02:00 |
|
Sylvain
|
eb2bc54cec
|
Merge branch '2-0-rc1' into tests
|
2016-04-13 14:03:28 +02:00 |
|
Sylvain
|
a0397a2c15
|
[bug taiga#25] allow event update if changing ng_places
|
2016-04-13 13:37:05 +02:00 |
|
Sylvain
|
e1567ba7c5
|
[bug taiga#25] allow event update if removing nb places
|
2016-04-13 13:05:16 +02:00 |
|
Sylvain
|
11b43afc9a
|
[bug taiga#25] allow event update if no places nb was set
|
2016-04-13 12:09:00 +02:00 |
|
Sylvain
|
ef72d07a9e
|
[bug taiga#21] undefined method[] on notify_admin_profile_complete
|
2016-04-12 14:18:07 +02:00 |
|
Nicolas Florentin
|
1344e09f96
|
adds comments to model reservation
|
2016-04-08 16:59:09 +02:00 |
|
Nicolas Florentin
|
fa64fd7a2e
|
remove useless method
|
2016-04-08 16:58:46 +02:00 |
|
Nicolas Florentin
|
d104403af0
|
little fix Reservation#generate_invoice_items take into account that plan can be purchased at the same time when reserving machine
|
2016-04-08 11:17:52 +02:00 |
|
Nicolas Florentin
|
c78e010888
|
refacto method generate_invoice_items using UsersCredits::Manager service
|
2016-04-08 11:12:03 +02:00 |
|
Nicolas Florentin
|
7649e953e4
|
refacto subscription extension with first training using a service
|
2016-04-07 17:57:48 +02:00 |
|
Nicolas Florentin
|
7748d601f8
|
uses users_credits/manager service in models reservation and subscription, and adds integration tests
|
2016-04-07 16:02:09 +02:00 |
|
Nicolas Florentin
|
2ab8d04a68
|
adds comment to model invoice_item
|
2016-04-07 16:00:12 +02:00 |
|
Sylvain
|
b72609c072
|
test and validation from plan group
|
2016-04-07 12:28:25 +02:00 |
|
Nicolas Florentin
|
752f40a951
|
Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests
|
2016-04-06 18:24:51 +02:00 |
|
Nicolas Florentin
|
f12646aaf9
|
adds integration tests for reservation
|
2016-04-06 18:23:32 +02:00 |
|
Sylvain
|
6027fb5f38
|
Merge branch 'hotfix' into tests
|
2016-04-06 17:47:10 +02:00 |
|
Sylvain
|
929e756b10
|
[bug] fix incorrect VAT rate on invoices
|
2016-04-06 17:46:24 +02:00 |
|
Sylvain
|
150e58d47f
|
test invalid abuse
|
2016-04-06 14:58:53 +02:00 |
|
Nicolas Florentin
|
3e112c13eb
|
removes model and migrations relative to old model machines_pricings
|
2016-04-05 10:52:29 +02:00 |
|
Nicolas Florentin
|
5d38f1e3a5
|
does not validate length of availability if start_at or end_at are blank and already missing
|
2016-04-05 09:57:09 +02:00 |
|
Nicolas Florentin
|
fafec2153c
|
setup test environment and add the first test
|
2016-04-04 17:42:45 +02:00 |
|
Sylvain
|
32d5184164
|
[fix taiga#15] empty workshop attachment not added
|
2016-03-31 14:02:16 +02:00 |
|
Sylvain
|
232bdbd102
|
bug fixes
- [bug] credits not reset on new plan subscription
- [bug] admin notification (user merged his account) never sent
|
2016-03-30 15:37:33 +02:00 |
|
Sylvain
|
8a53ae2d2c
|
fix invoice attachement name
|
2016-03-29 18:02:40 +02:00 |
|
cyril
|
d1450f65f6
|
release 2.0 rc
|
2016-03-23 18:39:41 +01:00 |
|
Nicolas Florentin
|
4686a8c843
|
rejects project cao file if all blank
|
2015-05-18 10:16:21 +02:00 |
|
cyril
|
369be9dd63
|
fixed delete machine error
|
2015-05-08 13:31:58 +02:00 |
|
cyril
|
68eab24fa1
|
init depot fabmanager
|
2015-05-05 03:10:25 +02:00 |
|