Commit Graph

2432 Commits

Author SHA1 Message Date
Skud
2a301d352b Reverted uniqueness limits for photo/planting association
It seems this interacts badly with the default_scope on postgres (but
    not on sqlite3).  Error message from the logs:

2013-06-01T02:21:05.312099+00:00 app[web.1]: ActiveRecord::StatementInvalid (PG::Error: ERROR:  for SELECT DISTINCT, ORDER BY expressions must appear in select list
2013-06-01T02:21:05.312099+00:00 app[web.1]: LINE 1: ...photo_id" = 2 AND "plantings"."id" = 181 ORDER BY created_at...
2013-06-01T02:21:05.312099+00:00 app[web.1]:   app/controllers/photos_controller.rb:59:in `create'
2013-06-01T02:21:05.312099+00:00 app[web.1]:                                                              ^
2013-06-01T02:21:05.312099+00:00 app[web.1]: : SELECT  DISTINCT 1 AS one FROM "plantings" INNER JOIN "photos_plantings" ON "plantings"."id" = "photos_plantings"."planting_id" WHERE "photos_plantings"."photo_id" = 2 AND "plantings"."id" = 181 ORDER BY created_at desc LIMIT 1):

For now, we'll just have to rely on the controller (which adds the
association) to keep things unique.
2013-06-01 12:25:43 +10:00
Skud
6ecbf749eb Avoid duplicate photos on plantings (or vice versa)
Strictly speaking this doesn't prevent you adding them if you really
try, but the validation for that was beyond what I could figure out (the
docs don't help, and all SO/blog posts are outdated and didn't
work).

However, if you do somehow manage to add dups, you will never see them
again thanks to the :uniq => true in the model.  That's good enough for
me.
2013-06-01 12:07:17 +10:00
Skud
c63eb64565 photo and planting owners must match 2013-05-31 23:35:07 +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
e072883bb9 Connect plantings to photos. 2013-05-31 13:10:54 +01:00
Miles Gould
c734f62189 Plantings HABTM photos. 2013-05-31 13:10:54 +01:00
Miles Gould
44a236d90d Display all photos on index page. 2013-05-31 12:05:09 +01:00
Miles Gould
b2916e28f3 Don't recreate photos, but update metadata. 2013-05-31 11:48:24 +01:00
Miles Gould
b1b24c4323 Delete unused photos_helper. 2013-05-31 11:28:59 +01:00
Miles Gould
20eeec43ca Merge branch 'dev' into photos
Conflicts:
	db/schema.rb
2013-05-31 11:24:19 +01:00
Skud
08c3ec7dec Vendored the activemerchant gem to help with testing
We needed a bogus paypal gateway as per
http://infotrope.net/2013/05/31/testing-paypal-express-with-activemerchants-bogusgateway-and-how-to-make-it-work/

Tests now pass usefully.
2013-05-31 12:15:23 +10:00
Skud
cbca8c19a5 added admin controller and index view 2013-05-31 10:23:06 +10:00
Skud
7a1eaeffee added admin controller and index view 2013-05-29 14:37:42 +10:00
Skud
89b62e18df Roughly got Paypal working, after much messing around.
Still need more tests for the orders_controller, and to store the token
when it's returned.
2013-05-28 16:37:44 +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
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
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
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
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
669b4234f9 Marked failing order_item test as pending
These are failing because we set CanCan to not allow these actions.  We
might want to delete them entirely, actually, but I'm not quite sure
yet, so for now I'm just marking as pending.
2013-05-17 15:36:02 +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
2d3b594ae1 Test for expanded-markdown rendering. 2013-05-16 18:24:22 +01:00
Miles Gould
d5c781a97f Tests for Haml::Filters::EscapedMarkdown. 2013-05-16 18:00:00 +01: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
c13ae183ec order things direct from the /shop page 2013-05-16 00:24:51 +10:00