Commit Graph

3604 Commits

Author SHA1 Message Date
kikito
e2d88e30fd i18n for investments 2016-06-03 18:51:00 +02:00
kikito
be6d7a1d39 Adds views and helpers for investments 2016-06-03 18:50:49 +02:00
kikito
7051333028 Adds actions to application_controller and investments_controller 2016-06-03 18:50:28 +02:00
kikito
c6c3e22a40 Adds methods for investments in models 2016-06-03 18:44:34 +02:00
kikito
d57a6c510f Activates budget setting in dev_seeds 2016-06-03 18:31:05 +02:00
kikito
9f3b99f0a6 Allows blocks in has_orders concern 2016-06-03 18:30:47 +02:00
kikito
fa6f34bf5c Adds basic Budget controller / views 2016-05-31 19:26:56 +02:00
kikito
0427395f32 Adds missing currency symbol to dev_seeds 2016-05-31 18:58:50 +02:00
kikito
56f5983dc4 Adds budget dev_seeds 2016-05-31 12:53:11 +02:00
Juanjo Bazán
65e007ef85 Merge pull request #1135 from consul/budget-permissions
Budget permissions
2016-05-30 14:36:47 +02:00
kikito
7005faabe6 adds admin permissions for investments 2016-05-30 14:13:36 +02:00
kikito
2a82e9e33a Redoes the common balloting permissions 2016-05-30 14:01:47 +02:00
kikito
13f43d8b67 Adds valuator investment abilities 2016-05-30 13:55:12 +02:00
kikito
daa8783b02 Adds common Investment abilities 2016-05-30 13:53:30 +02:00
Juanjo Bazán
6646ce56e5 Merge pull request #1134 from consul/more-budget-model-specs
More budget model specs
2016-05-27 17:43:51 +02:00
kikito
bb7f82a72f Fixes hidden bug when calculating amount_available 2016-05-27 15:12:54 +02:00
kikito
b6e47bc14a Adds missing scope to investments 2016-05-27 15:12:39 +02:00
kikito
4dd293f487 Adds a ballot spec for amount_available 2016-05-27 15:11:58 +02:00
kikito
a0b6e99f09 adds specs for budged model 2016-05-27 13:02:48 +02:00
Juanjo Bazán
f5a32617cb Merge pull request #1129 from consul/budget-model-specs
Budget model specs
2016-05-24 18:11:11 +02:00
kikito
11a5140cf0 Implements missing specs & removes deprecated ones 2016-05-24 17:40:07 +02:00
kikito
3e39272b3b Fixes implementation of amount_available moving it to the ballot 2016-05-24 17:39:49 +02:00
kikito
dc686f1bf7 Adds price to budget factory 2016-05-24 17:39:15 +02:00
kikito
2409cccd8f Adds budget.price and ballot.heading_id 2016-05-24 17:38:41 +02:00
kikito
9876583c1a deactivates test 2016-05-24 15:31:23 +02:00
kikito
fc35522467 uses a string in the factories 2016-05-24 14:36:45 +02:00
kikito
673cfc8249 Implements some basic budget investment specs 2016-05-24 14:36:45 +02:00
kikito
d663e4c594 Adds/improves factories 2016-05-24 14:34:04 +02:00
kikito
d4d16d3006 Adds responsible_name migration for investments 2016-05-24 14:34:04 +02:00
kikito
60cf683a0b Adds valuator_assignments 2016-05-24 14:34:04 +02:00
kikito
20108639cb migrates 2016-05-24 14:34:04 +02:00
kikito
fdc8636e12 Adds simple Budget specs 2016-05-24 14:33:30 +02:00
kikito
cf0b7a53b0 Adds missing budget_id to investments 2016-05-24 14:33:30 +02:00
Enrique García
10625532d0 Merge pull request #1126 from consul/ballot-model-specs
Ballot model specs
2016-05-24 14:12:42 +02:00
Juanjo Bazán
57642075a7 adds ballot model spec 2016-05-24 13:04:12 +02:00
Juanjo Bazán
1cae255555 changes sps to investments in ballot relation 2016-05-24 13:04:12 +02:00
Juanjo Bazán
282553543f removes forum and delegated votes from investments 2016-05-24 13:04:12 +02:00
Juanjo Bazán
c48059594b removes belongs_to :heading relation from ballot 2016-05-24 13:04:12 +02:00
Juanjo Bazán
1eec6f10a5 Merge pull request #1131 from consul/budget-fix
Uses strings instead of classes to prevent error when doing rake db:setup
2016-05-24 12:50:07 +02:00
kikito
0fd04be499 Uses strings instead of classes to prevent error when doing rake db:setup 2016-05-24 12:39:20 +02:00
Juanjo Bazán
a679123326 adds factories for Budget classes 2016-05-23 14:48:39 +02:00
Enrique García
23649e7478 Merge pull request #1125 from consul/investments_tweaks
Removes Investment-1:N-Heading relation
2016-05-23 14:31:26 +02:00
Juanjo Bazán
da769d8746 investment can not have many headings 2016-05-23 13:57:36 +02:00
Juanjo Bazán
183034abb4 Merge branch 'master' into budget 2016-05-23 12:23:58 +02:00
Juanjo Bazán
15178c7ff1 Merge pull request #1123 from consul/budget-headings
Budget headings
2016-05-23 11:51:44 +02:00
Juanjo Bazán
956c539e09 updates dependencies 2016-05-21 22:22:00 +02:00
kikito
ccffcf60b3 Replaces geozones by headings in the models 2016-05-20 14:06:50 +02:00
kikito
f1b8ba0457 Adds headings via migrations 2016-05-20 14:06:32 +02:00
kikito
9d195609f9 Adds models 2016-05-20 12:41:48 +02:00
kikito
06f48b6fdd Includes description in Sanitizable 2016-05-20 12:41:26 +02:00