Commit Graph

25 Commits

Author SHA1 Message Date
Rohan Mitchell
3982b2a690 Merge branch 'new-spree'
Conflicts:
	Gemfile.lock
2013-02-20 15:24:27 +11:00
Rohan Mitchell
8903c13c84 Bugsnag uses SSL, notify on staging as well as production 2013-02-20 10:09:43 +11:00
Rob H
d7c2bdfe22 Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3) 2013-02-14 12:12:19 +11:00
Rohan Mitchell
98143ffe5b Add calculator to EnterpriseFee, test passes for listing enterprise fees 2012-11-16 16:07:40 +11:00
Rohan Mitchell
4fc7295b97 Use S3 configuration from environment vars instead of s3.yml 2012-10-19 16:40:18 +11:00
Rohan Mitchell
8c7a02ec10 Fix image uploads with CMS 2012-10-18 11:13:40 +11:00
Rohan Mitchell
9fbcd8c01b Display CMS pages with Spree's layout 2012-10-12 10:21:21 +11:00
Rohan Mitchell
28fc16ac66 Create links between Spree and CMS admin sections 2012-10-11 12:50:59 +11:00
Rohan Mitchell
a31c5bbe46 Authorise CMS via Spree login 2012-10-11 10:50:36 +11:00
Rohan Mitchell
b35fb618f3 Add base install of Comfortable Mexican Sofa 2012-10-11 10:50:36 +11:00
Rohan Mitchell
a013854d2d Change logo to Eaterprises, update link colour to match 2012-09-14 11:25:36 +10:00
Rohan Mitchell
a6c2490597 Enable auto-capture for spree_paypal_express 2012-08-02 15:45:31 +10:00
Rohan Mitchell
7d5c158021 Install Bugsnag 2012-08-02 10:32:33 +10:00
Andrew Spinks
8f5b5e7ae4 allow shipping instructions to be provided. 2012-07-11 23:33:03 +10:00
Rohan Mitchell
ebb624bdc3 Reload application files, routes and factories each spork run 2012-06-24 09:10:25 +10:00
Rohan Mitchell
412eb4365e Provide searching by supplier or distributor via spree searcher class 2012-06-20 17:44:58 +10:00
Rohan Mitchell
1207062f7c Filter products by distributor 2012-06-20 14:20:07 +10:00
Rohan Mitchell
44e33b2b69 Add default simple_form configuration, locales, scaffold 2012-06-19 10:29:26 +10:00
Andrew Spinks
3361d29146 fix defaulting of country to australia so that it doesn't stop db:reset from working. 2012-06-09 11:23:07 +10:00
Andrew Spinks
7ea0f73398 begin adding suppliers 2012-04-22 14:51:24 +10:00
Andrew Spinks
c3f7a7fd2c fix default country and state selection. 2012-04-22 12:45:05 +10:00
Andrew Spinks
f7372a80c2 add distributor to checkout 2012-04-09 09:56:37 +10:00
Andrew Spinks
e93c1decde Change checkout zone so that Austrlia is the default country selected in checkout. 2012-03-31 16:37:29 +11:00
Andrew Spinks
cd1938a74e spree install. 2012-03-27 11:06:49 +11:00
Andrew Spinks
b6ca20beee new rails 3.1.4 app 2012-03-27 10:10:26 +11:00