Sylvain
|
4c8b661750
|
display coupon application result in inline message instead of growl notification
|
2016-11-30 10:17:05 +01:00 |
|
Sylvain
|
10fc7b69e9
|
Ability to display optional information message on event reservation page
|
2016-11-29 16:46:19 +01:00 |
|
Sylvain
|
b75cbc17d7
|
fix training reservation calendar witch shows all trainings slots
|
2016-11-29 15:48:39 +01:00 |
|
Sylvain
|
852437ebf8
|
remove coupon from memory after payment
|
2016-11-29 15:35:54 +01:00 |
|
Sylvain
|
82fa5416ce
|
fix creation of prices with float values
|
2016-11-29 15:23:36 +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
|
3894523eae
|
fix error message about rounding inconsistencies when generating invoices
|
2016-11-29 11:52:11 +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
|
0c05b45d08
|
improved error message on machine reservation w/ stripe payment
|
2016-11-29 09:15:30 +01:00 |
|
Sylvain
|
70a369a2b9
|
display error message on server error when paying by card
|
2016-11-28 16:47:40 +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
|
585d137cfc
|
some automated tests about cash coupons
|
2016-11-28 10:40:02 +01:00 |
|
Sylvain
|
f0e11cf718
|
fix pdf invoice generation with cash coupon
|
2016-11-28 09:57:09 +01:00 |
|
Sylvain
|
3ce41f0c5c
|
[to test] send cash coupon to user by mail
|
2016-11-24 18:17:49 +01:00 |
|
Sylvain
|
ce6877b484
|
success message when applying cash coupon
|
2016-11-24 18:05:16 +01:00 |
|
Sylvain
|
63b0f0c061
|
[to test] compute prices/invoices using cash coupons
|
2016-11-24 17:57:48 +01:00 |
|
Sylvain
|
0a08c4c32d
|
check cash coupons does not exceed cart amount for subscriptions
|
2016-11-24 16:38:22 +01:00 |
|
Sylvain
|
ff11694e05
|
check cash coupons does not exceed cart amount for events
|
2016-11-24 15:01:35 +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
|
3dc5f1a0e4
|
real fix for coupon change slot's original price (reverts cfd92cdc40 )
|
2016-11-24 11:33:45 +01:00 |
|
Sylvain
|
8419efc7f5
|
handle unconfigured twitter's keys
|
2016-11-24 09:38:42 +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
|
cc06bcab85
|
fix cash coupon creation on stripe + store amount in centimes
|
2016-11-23 15:44:59 +01:00 |
|
Sylvain
|
30ab25b5a0
|
normalize ProjectsController code structure
|
2016-11-23 15:01:33 +01:00 |
|
Sylvain
|
cf11f6afcf
|
factorize currency symbol into
|
2016-11-23 14:27:11 +01:00 |
|
Sylvain
|
ad2911529c
|
db model, api and interface for cash coupons
|
2016-11-23 12:43:42 +01:00 |
|
Sylvain
|
52ad1b2c13
|
fix trainings, users, events graphs
|
2016-11-21 11:45:48 +01:00 |
|
Sylvain
|
6c9fdaaf83
|
[bug] fix machine hours stats graph
|
2016-11-21 11:35:56 +01:00 |
|
Sylvain
|
38653d22d1
|
fix events description on the home page
|
2016-11-16 16:55:56 +01:00 |
|
Sylvain
|
d46e6cf9c9
|
[members excel export] invoicing disabled
|
2016-11-16 15:08:24 +01:00 |
|
Sylvain
|
da71ba783c
|
[bug] exports for events reservation always have seats=1 (fixes #54)
|
2016-11-09 15:01:58 +01:00 |
|
Sylvain
|
c04ed51f85
|
[bug] translation conflict
|
2016-11-09 14:35:02 +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
|
9dca65786a
|
fix project step images height bug
|
2016-11-03 11:26:01 +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 |
|
Peng DU
|
84c03a690b
|
add padding for summernote editor modal
|
2016-11-02 11:12:23 +01:00 |
|
Sylvain
|
f9220d44a0
|
fix i_accept_to_receive_information_from_the_fablab in sign-up modal
|
2016-10-26 16:35:10 +02:00 |
|
Sylvain
|
42f7b3c75c
|
add HTML in event description
|
2016-10-26 16:33:21 +02:00 |
|
Sylvain
|
91f70e2c47
|
[bug] statistics graphs not working
|
2016-10-24 09:31:29 +02:00 |
|
Sylvain
|
c500518c28
|
[bug] sharing project or event w/o image on social network render error 500
|
2016-10-11 16:07:34 +02:00 |
|
Sylvain
|
7d54341d98
|
Merge remote-tracking branch 'github/master' into dev
|
2016-10-11 15:37:35 +02: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 |
|