Commit Graph

62 Commits

Author SHA1 Message Date
Rohan Mitchell
e20e4950bb Install db2fog for S3 database backups 2013-04-29 11:31:01 +10:00
Rohan Mitchell
953fe22d4c Add new feature for rich text distributor info for enterprises 2013-04-26 12:27:15 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
0da57f1d6c Remove spree_heroku - S3 support is now built into Spree 2013-04-23 07:32:23 +10:00
Rohan Mitchell
7bee04e5f6 Update selenium-webdriver, test with eaterprises deployment settings by default 2013-04-22 16:48:49 +10:00
Rohan Mitchell
3dd4e074fc Split spree variable changes into per-feature files, add an eaterprises feature for default layout 2013-04-22 16:12:50 +10:00
Rohan Mitchell
a4bdea4d5c Add chili feature for local organics 2013-04-22 10:29:05 +10:00
Rohan Mitchell
cbef31f619 Install chili for feature toggles 2013-04-22 10:24:17 +10:00
Rohan Mitchell
3e2d31d432 spree-last-address repo deleted - use mirror
Conflicts:

	Gemfile
	Gemfile.lock
2013-04-19 09:27:40 +10:00
Rohan Mitchell
4ce7525748 Configure newrelic for performance monitoring 2013-04-19 09:20:59 +10:00
Rohan Mitchell
7cc1c97c53 Upgrade spree to 1.1.6beta 2013-02-12 09:18:50 +11:00
Rohan Mitchell
ccfe6bc0b3 Update bugsnag 2013-02-12 09:11:38 +11:00
Rohan Mitchell
f2f3bbd3ed Merge branch 'order-cycles-exchange-products'
Conflicts:
	Gemfile.lock
2013-01-22 10:40:56 +11:00
Rohan Mitchell
487247f6e7 Upgrade selenium-webdriver, fixes testing in new firefox 2013-01-18 09:35:29 +11:00
Rohan Mitchell
05c9a189c8 Merge branch 'email-changes' 2013-01-17 16:09:25 +11:00
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00
Rohan Mitchell
c7d3b9ee1a Upgrade to Rails 3.2.11 2013-01-10 09:34:52 +11:00
Rob H
9c9431ca7f Install Letter Opener for development environment 2012-12-07 14:31:23 +11:00
Rohan Mitchell
63ba5d13a3 Add representative, output enterprise fees as JSON 2012-11-21 14:58:29 +11:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
2012-11-01 11:02:02 +11:00
Rohan Mitchell
1b89331aa4 Update capybara and selenium-webdriver for compatibility with firefox 16 2012-10-31 17:09:26 +11:00
Rohan Mitchell
f03d9b66f0 Update spree_paypal_express to fail gracefully when setting address 2012-10-31 15:17:05 +11:00
Rohan Mitchell
03610c93de Upgrade capybara and selenium-webdriver for compatibility with Firefox 16 2012-10-28 12:28:55 +11:00
Rohan Mitchell
51850be83e Update spree_paypal_express to handle blank states from paypal 2012-10-24 16:19:53 +11:00
Rohan Mitchell
32db258db0 Use spree_heroku with support for staging env 2012-10-24 13:11:40 +11:00
Rohan Mitchell
8c7a02ec10 Fix image uploads with CMS 2012-10-18 11:13:40 +11:00
Rohan Mitchell
f4f250675c Use eaterprises spree_paypal_express with Bugsnag notification of paypal gateway errors 2012-10-18 10:30:35 +11:00
Rohan Mitchell
394a269df2 Update Spree, fixes paypal password blanking bug. Update spree_paypal_express, fixes nil state error on checkout. 2012-10-18 10:17:52 +11:00
Rohan Mitchell
41dcc85ad1 Update version of spree_paypal_express for debugging 2012-10-17 15:26:06 +11:00
Rohan Mitchell
9be9d75cb5 Update version of spree_paypal_express for debugging 2012-10-17 15:10:04 +11:00
Rohan Mitchell
11483a77e8 Update bugsnag and spree_paypal_express for paypal error debugging 2012-10-17 08:42:33 +11:00
Rohan Mitchell
642f58551c Use spree_paypal_express from RohanM with debugging for nil state from paypal address error 2012-10-16 10:34:11 +11:00
Rohan Mitchell
b35fb618f3 Add base install of Comfortable Mexican Sofa 2012-10-11 10:50:36 +11:00
Rohan Mitchell
2bce9df25a Track 1-1-stable on spree git, fixes order quantity change bug 2012-09-21 15:55:51 +10:00
Rohan Mitchell
479c49752c Update spree_paypal_express, hopefully fixing 'Validation failed: State can't be blank' error 2012-09-21 15:32:19 +10:00
Rohan Mitchell
593f3887c8 Switch pry for pry-debugger 2012-09-21 12:29:06 +10:00
Rohan Mitchell
3794c00856 Upgrade Rails to 3.2.8 and Spree to 1.1.3 2012-09-14 10:20:52 +10:00
Rohan Mitchell
356ae40c7b Display product descriptions as HTML in checkout 2012-09-13 13:05:12 +10:00
Rohan Mitchell
7d5c158021 Install Bugsnag 2012-08-02 10:32:33 +10:00
Rohan Mitchell
5e04032797 Explicitly specify Spree 1.1.1, fix test regression in OrdersController 2012-07-23 18:48:30 +10:00
Andrew Spinks
7e9a84087e cleaning up order report 2012-07-19 22:48:42 +10:00
Rohan Mitchell
9afa566be5 Add spree_last_address extension, which retrieves a customer's address when they order a second time so they don't need to retype it 2012-07-01 11:44:18 +10:00
Rohan Mitchell
82dd485e01 Install spree_paypal_express gem 2012-06-29 14:40:20 +10:00
Rohan Mitchell
4911a06c9d Display current distributor in main nav bar 2012-06-22 11:46:40 +10:00
Rohan Mitchell
f962db4288 Convert factories from machinist to factory girl 2012-06-19 13:54:34 +10:00
Rohan Mitchell
13569b5263 Switch to patched version of simple_form, which fixes collection_check_boxes when used within form_for block 2012-06-19 10:27:09 +10:00
Rohan Mitchell
eb095baf64 Installed spork 2012-06-19 07:08:27 +10:00
Rohan Mitchell
3d0f6a43b4 Add pry to Gemfile 2012-06-18 19:41:00 +10:00
Rohan Mitchell
d704f3aa68 Enable therubyracer JS env, reqd on linux 2012-06-18 16:58:06 +10:00
Andrew Spinks
1288760839 Added first working acceptance spec for supplier. 2012-06-09 14:41:09 +10:00