Rohan Mitchell 63ec0d7dcf Merge branch 'master' into folklabs-producer-emails

2015-05-05 11:48:31 +10:00

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Merge branch 'master' into folklabs-producer-emails

2015-05-05 11:48:31 +10:00

features

Revert "Display header for Xero invoices report"

2015-05-01 14:55:26 +10:00

helpers

Add helper to display total tax on an order

2015-04-17 13:39:09 +10:00

javascripts

Updating product model specs to reflect changes to properties

2015-04-23 15:37:41 +10:00

jobs

Convention

2015-04-29 15:56:27 +10:00

lib

Fix OrderCycleFormApplicator specs

2015-04-29 15:00:22 +10:00

mailers

Only include complete orders in producer mailer report

2015-04-29 15:43:50 +10:00

models

Merge branch 'master' into folklabs-producer-emails

2015-05-05 11:48:31 +10:00

requests

Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue

2014-11-01 12:11:50 +11:00

serializers

Moving spree namespaced serializers into admin

2015-04-22 21:02:06 +10:00

support

Add save_and_open spec helper method to open HTML emails in the browser

2015-04-17 13:40:08 +10:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Fix specs for receival_time / instructions

2015-05-01 10:08:24 +10:00

spec_helper.rb

Allow more time for phantomjs, required by first admin spec where assets are compiled

2015-04-17 15:46:51 +10:00