Skud
2ecbd8315d
bugfix: don't say 'not yet set' in planting form
...
PT: https://www.pivotaltracker.com/story/show/51457917
Maco found this. The problem was that if you had a blank planting date,
and then re-edited the planting, it would say "not yet set" in the form
field, then die when it later tried to convert that to a date.
I replaced Miles's planted_at_string stuff in the model with a simpler
parse_date method in the application helper.
2013-06-11 16:08:02 +10:00
Skud
df60a7c4dc
display recommended price on product admin pages
2013-06-07 11:36:03 +10:00
Skud
cb3e0fb526
added optional recommended price to products
2013-06-07 09:53:40 +10:00
Skud
8046790bc7
converted product description to text (not string)
2013-06-07 09:16:18 +10:00
Skud
4c2971f670
oops, fixed broken test for checkout button
2013-06-06 21:19:24 +10:00
Skud
6cf64694f4
added account status info in various places
2013-06-06 21:07:54 +10:00
Miles Gould
cebd6e05ac
Merge branch 'dev' into logged-out
...
Conflicts:
spec/views/home/index_spec.rb
2013-06-04 13:54:49 +01:00
Miles Gould
a0c91ee884
Changes to homepage
...
- only show interesting members if logged out
- don't show your recent posts/plantings
- change limits on posts/plantings for better visual balance.
2013-06-04 12:59:37 +01:00
Skud
629020237b
Merge branch 'dev' into payments-new
2013-06-04 21:20:24 +10:00
Miles Gould
a5d14321b5
Merge branch 'dev' into delete_photos
...
Conflicts:
spec/models/planting_spec.rb
2013-06-04 11:45:44 +01:00
Skud
39d1a74745
misc tidying up
2013-06-04 20:27:56 +10:00
Skud
89a5a777e6
Merge branch 'dev' into payments-new
...
Conflicts:
.gitignore
app/models/ability.rb
app/models/member.rb
db/schema.rb
2013-06-04 19:42:00 +10:00
Skud
a3d0f15fd5
Delete photo from photos/show page
2013-06-04 13:02:29 +10:00
Skud
43798231dd
added crop photos and a new placeholder image
2013-06-04 12:22:31 +10:00
Skud
cab7348a35
show plantings on photo page
2013-05-31 23:13:47 +10:00
Skud
d635d58bf1
show photos on planting page
2013-05-31 22:56:32 +10:00
Miles Gould
44a236d90d
Display all photos on index page.
2013-05-31 12:05:09 +01:00
Miles Gould
20eeec43ca
Merge branch 'dev' into photos
...
Conflicts:
db/schema.rb
2013-05-31 11:24:19 +01:00
Skud
cbca8c19a5
added admin controller and index view
2013-05-31 10:23:06 +10:00
Skud
dd556d8638
Merge branch 'dev' into payments-new
2013-05-28 14:07:53 +10:00
Skud
5b2fe1b415
Merge branch 'dev' of https://github.com/Growstuff/growstuff into comments-rss
...
Conflicts:
db/schema.rb
2013-05-24 14:57:17 +10:00
Skud
18b92b133b
Added titles to comment items in RSS
2013-05-24 14:43:45 +10:00
Skud
e17dcf8671
Reordered comments: they are now DESC by default
...
Added scope "post_order" to order them ASC for display on post page.
Also tweaked post/comment views a bit.
2013-05-24 14:36:58 +10:00
Skud
425a2b03fd
Added RSS feed for comments on a single post
2013-05-24 13:43:06 +10:00
Skud
0d3588535e
Added RSS feed for all comments
2013-05-24 13:29:17 +10:00
Skud
57f8575ab9
removed unwanted @recent_comments, replaced w pagination
2013-05-24 12:54:57 +10:00
Craig Read
9437e65763
Replaced plantings RSS with HAML
...
Removed the redundant @recent_plantings variable and added pagination
2013-05-24 12:43:51 +10:00
Craig Read
d563f0ceae
Converting crops RSS to HAML
...
Added spec for crops RSS
Removed redundant @new_crops instance variable (not needed as we now
have pagination).
2013-05-24 12:22:41 +10:00
Craig Read
9c2fed461d
Removed redundant @recent_posts instance variable
...
Not required, as we have pagination by default
2013-05-24 12:05:47 +10:00
Craig Read
bc03a5c488
Converted Posts RSS to HAML
2013-05-24 11:58:40 +10:00
Skud
257db239fd
remove unneeded edit/new actions from order_item
2013-05-22 11:25:48 +10:00
Skud
f955d14149
Don't display shop if they already have a paid account
...
This works fine in reality, but we can't figure out how to write tests
for it. For some reason the @member object, which passes a test for
is_paid?, doesn't get recognised as such when it's passed through to the
view itself. Help?
2013-05-22 10:57:20 +10:00
Skud
f138c99846
Merge branch 'dev' into payments-new
...
Conflicts:
db/schema.rb
2013-05-22 10:21:43 +10:00
Skud
dad64d41fb
show account status/upgrade button in various places
2013-05-20 12:57:35 +10:00
Skud
3aaf344951
rename account details to just account
2013-05-18 10:50:36 +10:00
Skud
8b7f8faae6
added account type and paid months columns to product
2013-05-18 10:27:08 +10:00
Skud
871229ed2b
account details: there can only be one
...
Set up a validation to make sure there's only ever one account_detail
attached to a member. This broke a bunch of tests, and means you
basically can't use a factory to generate account details. Instead, to
test account details, create a member and then look at their account
details.
2013-05-18 09:33:26 +10:00
Skud
c595b2181d
added account_types, fixed a bunch of tests
2013-05-17 16:07:46 +10:00
Skud
df5ee9cf4b
give each member an account_detail entry
2013-05-17 15:28:22 +10:00
Skud
0157229936
added account_details table, set up abilities
...
also tweaked some order/order_item related abilities
2013-05-17 13:05:46 +10:00
Skud
0e6e2b975d
added ability to delete current order
2013-05-17 10:53:16 +10:00
Miles Gould
2d3b594ae1
Test for expanded-markdown rendering.
2013-05-16 18:24:22 +01:00
Skud
739e7cfd48
Merge branch 'dev' into rss-markdown
2013-05-16 21:14:44 +10:00
Skud
c13ae183ec
order things direct from the /shop page
2013-05-16 00:24:51 +10:00
Skud
abcba35a71
Converted prices to integers/cents to avoid floating point trouble
2013-05-15 23:09:35 +10:00
Skud
c96876feeb
prettify order display
2013-05-15 21:26:01 +10:00
Skud
3e1202cd62
prettify display of orders
2013-05-15 15:52:10 +10:00
Skud
8a35f3401b
removed unwanted methods from orders
2013-05-15 14:33:40 +10:00
Skud
7d74203735
rails g scaffold OrderItem...
2013-05-15 13:47:16 +10:00
Skud
1d54a63f5d
Merge branch 'dev' into payments-new
2013-05-15 11:37:16 +10:00
