25 Commits

Author	SHA1	Message	Date
Brenda Wallace	550848a513	ParenthesesAroundCondition fixup	2017-02-19 16:20:45 +13:00
Brenda Wallace	4f465d808c	We don't need to load the resource again	2016-12-07 23:54:03 +00:00
Shiny	b454132cae	Merge branch 'dev' into bw/useless-assignments	2016-12-01 12:51:13 +13:00
Mackenzie Morgan	9dc02cd3d8	make changes from code review	2016-11-29 12:10:48 -05:00
Mackenzie Morgan	c93fd78aa8	Merge branch 'dev' of gitmaco:Growstuff/growstuff into scopify	2016-11-29 09:58:02 -05:00
Brenda Wallace	07c135eeb5	before_filter is now before_action	2016-11-26 17:20:13 +13:00
Brenda Wallace	62e7c716dd	Removed extra empty blank lines	2016-11-26 12:06:02 +13:00
Mackenzie Morgan	494790bcd4	moving where clauses into scopes to keep that contained in models	2016-10-11 15:28:08 -04:00
Daniel O'Connor	4b4e0cf69a	$ rubocop --only HashSyntax --auto-correct ... 483 files inspected, 2018 offenses detected, 2018 offenses corrected	2016-05-19 15:53:11 -04:00
Taylor Griffin	8a05a959c3	remove depricated method	2015-01-10 15:46:36 +11:00
Yoong Kang Lim	81d1189203	Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in	2014-11-24 22:12:42 +11:00
Skud	2ee11e19e5	removed spurious puts	2013-09-19 10:57:11 +10:00
Skud	e425a3f7f4	added error message if your referral code has invalid chars	2013-09-19 10:57:00 +10:00
Skud	0ce821aacf	added referral_code to order form/checkout code	2013-09-13 13:12:11 +10:00
Skud	786bf1547f	We have to actually complete the purchase!	2013-06-06 22:21:07 +10: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	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	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	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	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	26d16b9d86	only admins can mess with products/orders for now	2013-05-07 21:24:26 +10:00
Skud	245115fd7f	rails g scaffold Order...	2013-05-07 21:14:08 +10:00