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
98beebd697
fixed bug with non-int prices
...
now if you choose to pay 33.33 it doesn't round to 33.00
also removed PUT and DELETE actions from order items
(we don't want them for now, can reinstate later if/when we do.)
2013-05-22 11:51:38 +10:00
Skud
257db239fd
remove unneeded edit/new actions from order_item
2013-05-22 11:25:48 +10:00
Skud
89069b4bd2
don't allow multiple order items per order
2013-05-22 11:22:10 +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
4515167f90
Merge pull request #203 from Skud/crop-hierarchy
...
added crop hierarchy basics
2013-05-19 20:31:19 -07:00
Skud
dad64d41fb
show account status/upgrade button in various places
2013-05-20 12:57:35 +10:00
Skud
d601396741
moved the update_order method from product to member
2013-05-20 11:35:10 +10:00
Skud
1b9b1875b8
Merge pull request #205 from pozorvlak/km_miles
...
Fix "km miles of" typo.
2013-05-19 18:16:08 -07:00
Skud
c644753a9b
Call update_account when you complete an order.
...
Also had to tweak product.update_account to actually save the account!
2013-05-18 11:32:14 +10:00
Skud
7c2fc52009
added update_account method to order
2013-05-18 11:26:29 +10:00
Skud
75e2913203
added method to update paid acct details after product purchase
2013-05-18 11:16:45 +10:00
Skud
fac1b9cc01
added is_paid? method to member
2013-05-18 11:02:14 +10:00
Skud
3aaf344951
rename account details to just account
2013-05-18 10:50:36 +10:00
Skud
865a1c7050
validate paid_months (must be integer)
2013-05-18 10:50:17 +10:00
Skud
8b7f8faae6
added account type and paid months columns to product
2013-05-18 10:27:08 +10:00
Skud
4aae4a7c85
only admin can read/manage account types
2013-05-18 09:50:55 +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
d49ba175e9
deleting spurious model file left over from old work
2013-05-17 15:40:59 +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
7551b7b0d4
added order completion (very basic for now)
2013-05-17 11:28:04 +10:00
Skud
0e6e2b975d
added ability to delete current order
2013-05-17 10:53:16 +10:00
Miles Gould
6b487ab1f6
Escaped_Markdown HAML filter, for use in RSS.
...
I tried to do this using Haml::Filters::Markdown so it would be
independent of our Markdown renderer, but I couldn't get
Haml::Filters::Markdown.render to work programmatically - whatever I
did, it returned its input unchanged. So I hardcoded a dependence on
bluecloth.
2013-05-16 15:08:50 +01:00
Miles Gould
bf9521b98b
Fix "km miles of" typo.
2013-05-16 13:25:14 +01:00
Skud
65431ed41f
some improvements to the HAML RSS
2013-05-16 21:39:17 +10:00
Skud
739e7cfd48
Merge branch 'dev' into rss-markdown
2013-05-16 21:14:44 +10:00
Skud
4dca148cbf
only let them order one thing (for now)
2013-05-16 20:58:43 +10:00
Skud
a5e022790d
added shop link to header
2013-05-16 17:42:15 +10:00
Skud
c13ae183ec
order things direct from the /shop page
2013-05-16 00:24:51 +10:00
Skud
af399311b2
validate order_item.price must be > product.min_price
2013-05-15 23:17:05 +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
2955ca1559
delete order items if order is deleted
2013-05-15 15:51:51 +10:00
Skud
8a35f3401b
removed unwanted methods from orders
2013-05-15 14:33:40 +10:00
Skud
a047f60af3
added cancan rules for order items
2013-05-15 14:15:08 +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
