Skud
491e97c997
connected seeds into other parts of the site
2013-07-15 23:29:14 +10:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud
7801a7ec09
Merge branch 'dev' into staff
2013-07-09 10:05:37 +10:00
Skud
878af07419
gave up on not_staff, shuffling interesting members instead
2013-07-08 11:54:55 +10:00
Skud
db16ad34f7
view/select older flickr photos
2013-07-05 22:07:55 +10:00
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
903f0c808c
cache recent_posts and recent_plantings partials
2013-06-07 17:52:31 +10:00
Skud
786bf1547f
We have to actually complete the purchase!
2013-06-06 22:21:07 +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
6c8f2b477f
minor tweakage to admin/order/search
2013-06-04 21:15:29 +10: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
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
Miles Gould
e072883bb9
Connect plantings to 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
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
b60790c8ad
record paypal token/payer id on completion, for reference
2013-05-29 13:41:34 +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
c7c2a94078
pass validation errors through controller
2013-05-28 14:14:59 +10:00
Skud
dd556d8638
Merge branch 'dev' into payments-new
2013-05-28 14:07:53 +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
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
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
3aaf344951
rename account details to just account
2013-05-18 10:50:36 +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
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
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
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
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
Skud
c7efe512aa
Merge pull request #193 from pozorvlak/replylink
...
Replylink
2013-05-13 17:45:39 -07:00
