mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-29 04:02:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
832 Commits 54 Branches 76 Tags
75e29132030f2e60b50d76900a7f75c1ee61de97
Commit Graph

832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
daa46d7acb seed account types; require name too 2013-05-18 09:49:00 +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
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
Skud
561dc837a7 modify seeds.rb to use integer prices 2013-05-17 10:28:55 +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
afb4e21adc Merge branch 'dev' of https://github.com/Growstuff/growstuff into payments-new 2013-05-15 22:02:16 +10:00
Skud
c2ef94de8a Merge pull request #204 from pozorvlak/quiet_rake 
Stop Rake from telling us every spec it's about to run.
 2013-05-15 05:01:19 -07:00
Miles Gould
bc400a1483 Stop Rake from telling us every spec it's about to run. 
As per
https://github.com/rspec/rspec-core/issues/266#issuecomment-1866898
 2013-05-15 12:58:41 +01: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
8626702544 Fixed type for member_id (should be integer) 2013-05-15 15:51:20 +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
Skud
4b91e12b2b Merge pull request #201 from IAMRYO/garden_name 
Garden name
 2013-05-13 17:39:08 -07:00
Ryan Clark
95a2007683 fix up existing gardens with blank names. 2013-05-13 17:36:37 -07:00
Ryan Clark
5d03ffdf87 Added validation for garden names. 2013-05-13 17:28:37 -07:00
Ryan Clark
ee136666d5 Replace name validation with before_filter and add rake tast for empty names. Replace validation testing with before_filter tests. 2013-05-09 13:06:29 -07:00
pozorvlak
42b5f387d2 Merge pull request #199 from Skud/cropwrangling 
Make life easier for crop wranglers
 2013-05-09 07:04:10 -07:00
pozorvlak
507074d9dd Merge pull request #200 from attlebish/plantingredirect 
Redirect to Garden after deleting planting
 2013-05-09 07:01:17 -07:00
Lilly
14021a4fae Redirect to Garden after deleting planting 2013-05-09 13:39:31 +10:00
Ryan Clark
6ddfeb8f41 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-05-08 20:23:20 -07:00
Skud
536cf21e3e make it easier to wrangle scientific names 2013-05-09 11:39:22 +10:00
Ryan Clark
1348a2a492 Add validation for name in garden model with test. 2013-05-08 13:15:09 -07:00
pozorvlak
8daefa7b5e Merge pull request #197 from Skud/empty_subjects 
fixed linebreak causing syntax error
 2013-05-08 03:33:40 -07:00
Skud
d4e5f0e32a fixed linebreak causing syntax error 2013-05-08 20:23:55 +10:00
pozorvlak
6df9d8b09a Merge pull request #194 from Skud/empty_subjects 
*crosses fingers*
 2013-05-08 03:21:57 -07:00
Skud
2563787dc7 added Member.current_order method 2013-05-08 15:41:39 +10:00
Skud
ddfafa032a added completed_at field to Order 2013-05-08 15:11:20 +10:00
Skud
85a121c739 only let signed in members buy stuff 2013-05-08 15:05:55 +10:00
Skud
5c96bf1541 added basic index page for shop 2013-05-08 15:05:38 +10:00