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

7245 Commits

Author SHA1 Message Date
Sylvain
b9030d8f8d Merge branch '2-0-rc1' into dev 2016-04-11 17:17:47 +02:00
Sylvain
fb2aee7cc5 [bug] fix VAT row and HT total row on invoices 2016-04-11 17:17:33 +02:00
Sylvain
31ee151809 reproductible tests for invoice generation 2016-04-11 15:31:25 +02:00
Sylvain
01ca290582 Merge branch 'dev' 2016-04-11 11:41:46 +02:00
Sylvain
aa3b3dd631 Merge branch '2-0-rc1' into dev 2016-04-11 11:41:38 +02:00
Sylvain
1f8f54d64f mails translations in english 2016-04-11 11:32:32 +02:00
Sylvain
5f2d134a17 mails translations in english 2016-04-11 11:32:26 +02:00
Sylvain
f003c0fb22 mails translations in english 2016-04-11 11:32:05 +02:00
Sylvain
5c7d52a6f3 mails translations in english 2016-04-11 11:31:32 +02:00
Sylvain
1d36ffce17 add infos about Postgre config for tests 2016-04-11 09:38:09 +02:00
Sylvain
9102501969 fix typo in readme 2016-04-11 09:06:04 +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
b46ee9177c adds comments to service UsersCredits::Manager 2016-04-08 11:26:31 +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
d22574dae4 UsersCredits::Manager is more strict about arguments that have to be passed 2016-04-08 11:11:42 +02:00
Nicolas Florentin
dbe8d42663 adds byebug to gemfile for group test 2016-04-08 11:10:36 +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
74e2d170bf adds integration test for reservations for user with invoicing disabled 2016-04-08 10:02:45 +02:00
cyril
fe9847a518 update Dockerfile + env.example 2016-04-08 06:02:09 +02:00
Nicolas Florentin
9bfd5e0362 removes block from Sidekiq::Testing setup in test_helper unless tests don't pass anymore 2016-04-07 18:05:23 +02:00
Nicolas Florentin
a5067ff466 Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests 2016-04-07 17:57:59 +02:00
Nicolas Florentin
7649e953e4 refacto subscription extension with first training using a service 2016-04-07 17:57:48 +02:00
Nicolas Florentin
7a523a1cf8 adds reservation integration test to test subscription extension when plan is_rolling true 2016-04-07 17:56:54 +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
Sylvain
e0dca6c744 [ongoing] renew subscription test 2016-04-07 17:46:23 +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
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
2ab8d04a68 adds comment to model invoice_item 2016-04-07 16:00:12 +02:00
Nicolas Florentin
6004dd409c Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests 2016-04-07 12:57:15 +02:00
Nicolas Florentin
823b4c5e1d updates users_credits module and manager and adds tests 2016-04-07 12:57:08 +02:00
Sylvain
b72609c072 test and validation from plan group 2016-04-07 12:28:25 +02:00
Nicolas Florentin
28fcd121b4 renames service of users credits manager 2016-04-06 18:26:02 +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
44fcb2e089 draft a service to handle users credits 2016-04-06 18:24:26 +02:00
Nicolas Florentin
f12646aaf9 adds integration tests for reservation 2016-04-06 18:23:32 +02:00
Sylvain
2a4ff82a15 test admin create subscription 2016-04-06 18:17:33 +02:00
Sylvain
6027fb5f38 Merge branch 'hotfix' into tests 2016-04-06 17:47:10 +02:00
Sylvain
456e2c42b4 Merge branch 'hotfix' into 2-0-rc1 2016-04-06 17:46:57 +02:00
Sylvain
929e756b10 [bug] fix incorrect VAT rate on invoices 2016-04-06 17:46:24 +02:00
Sylvain
c2cb497283 Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests 2016-04-06 17:10:25 +02:00
Sylvain
5ed9090df8 completed subscription test for user 2016-04-06 17:10:15 +02:00
Nicolas Florentin
f334f76ef8 improves stripe_card_token test helper 2016-04-06 16:26:45 +02:00
Sylvain
2e2f25ce47 fix D3 date format for test 2016-04-06 16:01:59 +02:00
Sylvain
43f076191c using VCR in subscription test 2016-04-06 15:57:27 +02:00
Sylvain
1e39c53d0d configure secrets for tests 2016-04-06 15:55:56 +02:00
Sylvain
02febd458a Merge branch 'tests' of git.sleede.com:projets/fab-manager into tests 2016-04-06 15:23:20 +02:00
Sylvain
baa692dfb9 fix subscription test 2016-04-06 15:23:13 +02:00
Nicolas Florentin
2cd1127a09 updates tests to use test helpers 2016-04-06 15:22:32 +02:00