Skud
7801a7ec09
Merge branch 'dev' into staff
2013-07-09 10:05:37 +10:00
Skud
ec80b01c7a
cleaning up tests on postgres
...
- still trying to make sure we explicitly use a real member, not just
assume there's one with id = 1
- also it looks like the tests for post activity are passing for obscure
reasons on sqlite when they shouldn't be. this is a known bug
(https://www.pivotaltracker.com/story/show/51280861 ) apparently
invisible to us under sqlite.
2013-07-08 12:18:51 +10:00
Skud
878af07419
gave up on not_staff, shuffling interesting members instead
2013-07-08 11:54:55 +10:00
pozorvlak
f16999c3bd
Merge pull request #246 from Skud/older-photos
...
view/select older flickr photos
2013-07-05 08:52:25 -07:00
Skud
db16ad34f7
view/select older flickr photos
2013-07-05 22:07:55 +10:00
Skud
8bee9fcd1b
use blank instead of != 0 for qty
2013-07-05 21:11:07 +10:00
Skud
902b82a295
display planted_from on planting page
2013-07-05 21:09:21 +10:00
Skud
1689d7fdb1
added planted_from to planting form
2013-07-05 20:57:14 +10:00
Skud
b71ac3decb
added planted_from (eg seed, seedling)
2013-07-05 20:53:11 +10:00
Skud
e4dd0f98e8
Merge pull request #243 from lucymclaughlin/forex_link
...
Forex link
2013-07-04 01:28:40 -07:00
Skud
067fd27837
Merge pull request #238 from pozorvlak/exclude-staff-from-members
...
Exclude staff from list of interesting members
2013-07-03 16:58:13 -07:00
Lucy
778d7a68c3
Fix bug in order total; add conversion link to order show.
...
The old order total method did not account for quantities. The
view test for order totals was not catching this, so we've
strengthened it. We also added a conversion link to the order
summary page and created an additional test to check that orders
with more than one item were generating the correct total.
2013-07-03 14:10:37 +01:00
Lucy
e674a6572e
Added conversion links for recommended prices.
...
The paragraphs were getting a bit verbose so we shortened the link
text as well. Added an additional test to make sure the link is
working here too.
2013-07-03 13:22:07 +01:00
Lucy
5c92bb04d3
Updated the foreign exchange link to use configured currency.
2013-07-03 13:04:43 +01:00
Lucy
67c457dfcd
Modified the foreign exchange link to convert the right price.
...
Changed the forex site to Wolfram Alpha from XE, which allow us
to convert the right number of AUD with one click. Upated tests to
reflect this change.
2013-07-03 12:59:49 +01:00
Lucy
80ed2179e2
Proof of concept for adding a foreign exchange link to the shop.
...
Added a function that returns a link for a foreign exchange site
and showed it on the Shop page. Also included a test to make sure
it works.
2013-07-03 12:50:56 +01:00
Miles Gould
6469ed9418
Delete unused helpers and tests for same.
2013-07-03 11:34:08 +01:00
Lucy
278db17108
Removed redundant logic for free account type in apps/views
...
A couple of pages were testing for an account type and displaying
"Free" if account type was nil. Now that we've ensured every account
has an account type, this is no longer necessary.
2013-07-03 11:15:31 +01:00
Lucy
650f24099d
Added default account type of "Free" in config/applications.rb
2013-07-03 11:04:42 +01:00
Miles Gould
5bcd4c2edd
Use ActiveRecord methods for not_staff join code.
...
- set member.account_type directly in tests, because changes to
member.account.account_type weren't being persisted.
2013-06-26 10:55:19 +01:00
Miles Gould
f6073ab01c
Remove "if account_type" checks in Account.
...
- remove account_type_string method
- simplify paid_until_string.
2013-06-26 10:55:19 +01:00
Miles Gould
0a8aaf0ee6
Create free account type if it doesn't exist; fix tests.
2013-06-26 10:55:19 +01:00
Lucy
6ccf8f397f
Give new users a free account.
2013-06-26 10:55:18 +01:00
Miles Gould
c6eb835771
Tests and sketch implementation of not_staff scope.
...
It doesn't work and we don't yet know why :-(
2013-06-26 10:55:18 +01:00
pozorvlak
5748c0989e
Merge pull request #233 from Skud/planted-at-bug
...
Planted at bug
2013-06-23 07:43:52 -07:00
Skud
a70a19871a
Use github version of twitter-bootstrap-rails to fix firefox new tab problem
2013-06-12 09:07:41 +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
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
pozorvlak
d1ddf9a8d2
Merge pull request #225 from Skud/paypal-purchase
...
We have to actually complete the purchase!
2013-06-06 05:35:13 -07:00
Skud
786bf1547f
We have to actually complete the purchase!
2013-06-06 22:21:07 +10:00
Skud
b85b533afa
updated wording in support/faq
2013-06-06 21:16:46 +10:00
Skud
6cf64694f4
added account status info in various places
2013-06-06 21:07:54 +10:00
Skud
4332628d6f
improved wording on shop homepage
2013-06-06 20:36:35 +10:00
Skud
2901e0cb11
tweaked wording on photos/index
2013-06-06 20:17:32 +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
Miles Gould
6fed41351b
Show community features on logged-in homepage.
...
Don't show interesting members if there are none
2013-06-04 12:38:09 +01:00
Skud
629020237b
Merge branch 'dev' into payments-new
2013-06-04 21:20:24 +10:00
Skud
6c8f2b477f
minor tweakage to admin/order/search
2013-06-04 21:15:29 +10:00
Skud
a5729976c6
Merge pull request #219 from pozorvlak/delete_photos
...
Delete photos
2013-06-04 04:07:39 -07:00
pozorvlak
a5d750f9fd
Merge pull request #217 from Skud/rss-bug
...
Fixed RSS bug where comments were showing up as "edited"
2013-06-04 04:04:42 -07: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
2839d6bf66
Fixed RSS bug where comments were showing up as "edited"
...
Tried many ways to test this (assert_select, response.has_tag, etc), but
couldn't get it to work. Have tested manually and it looks good.
2013-06-04 12:24:53 +10:00
Skud
43798231dd
added crop photos and a new placeholder image
2013-06-04 12:22:31 +10:00
