Rohan Mitchell
d9f4a92648
Do not use with_products_require_tax_category in around filters - Spree::Config has caching which isn't shared between contexts
2015-06-24 14:52:17 +10:00
Rohan Mitchell
bc11140a40
Make config reset for all tests more robust. Add cache isolation for parallel specs.
2015-06-24 14:02:45 +10:00
Rohan Mitchell
7a36e92592
Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes_optimise-shopfront
2015-06-24 10:09:35 +10:00
Rohan Mitchell
2d79177bb5
When a registering an enterprise with a non-unique name, display an error message.
2015-06-24 10:08:34 +10:00
Rohan Mitchell
f51a9679f2
Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:34:41 +10:00
Rohan Mitchell
89a571d497
Fix spec coupled to variant overrides
2015-06-18 16:05:35 +10:00
Rohan Mitchell
ff4ee16f06
Fix currency issues, changed logo path
2015-06-18 15:38:46 +10:00
Rohan Mitchell
aa0a031fa0
Fetch indexed variant overrides in one go
2015-06-18 15:03:24 +10:00
Rohan Mitchell
dd2f6d6430
Extract VariantOverride fetching into ScopeVariantToHub#scope
2015-06-18 14:45:40 +10:00
Rohan Mitchell
7cc2bc4fde
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
2015-06-18 13:11:11 +10:00
Rohan Mitchell
6ed9a2620c
Use indexed_fees_for for product price
2015-06-18 13:07:52 +10:00
Rohan Mitchell
c5526c78d9
Make enterprise name unique
2015-06-17 15:01:46 +10:00
Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Rohan Mitchell
387021929e
Merge branch 'master' into rob-github-fixes
2015-06-16 15:05:01 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rob Harrington
30af5d4278
Enterprise relatives include self where appropriate for serialized injection data
2015-06-15 19:45:29 +08:00
Maikel Linke
de1971072e
update relationship js spec
2015-06-12 17:09:04 +10:00
Rob Harrington
795b2700b4
Merge branch 'master' into enterprise-index-revamp
2015-06-12 12:47:58 +08:00
Rohan Mitchell
2b763271a7
Merge branch 'master' into optimise-shopfront
2015-06-12 12:15:20 +10:00
Rohan Mitchell
4f311543ae
Merge branch 'master' into enterprise-index-revamp
2015-06-12 10:26:11 +10:00
Rob Harrington
eed27ceb31
Shipping Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:50 +08:00
Rob Harrington
77432ffc41
Payment Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:37 +08:00
Rob Harrington
5d2b36c667
Enterprise Fee feature specs work with new enteprise user enterprise index
2015-06-12 03:10:14 +08:00
Rob Harrington
efca4dde10
Fixing enterprises feature spec
2015-06-12 01:49:39 +08:00
Rob Harrington
d0b7550629
Removing screenshot from spec
2015-06-12 01:49:39 +08:00
Rob Harrington
6f975593fe
Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users
2015-06-12 01:49:39 +08:00
Rob Harrington
64ed80f845
Enterprise index action load enterprise_set for super admin
2015-06-12 01:49:39 +08:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rob Harrington
1cd6866879
Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job
2015-06-12 01:49:37 +08:00
Rob Harrington
1c1f82f4ee
Using events to update index row text on save, adding alert icons for enterprises without producer or package selected
2015-06-12 01:49:37 +08:00
Rob Harrington
e575b0e490
Switching enterprise index to its own dedicated serializer, so we can spit out ownership
2015-06-12 01:49:37 +08:00
Rob Harrington
a90cd0f8e0
Owners can update sells on enterprises they own
2015-06-12 01:49:36 +08:00
Rob Harrington
6b35e993bd
WIP: More work on panel content, styling and data submission logic
2015-06-12 01:49:36 +08:00
Rob Harrington
a586a52c23
Shortcutting around existing Enterprise service, so that we can use it for something more useful
2015-06-12 01:49:36 +08:00
Rob Harrington
c441c8c6cb
Columns service holds a column count and notifies rootscope when it changes
2015-06-12 01:49:35 +08:00
Rob Harrington
0c36738472
Adding basic generalised panel row infrastructure to indexUtils
2015-06-12 01:49:35 +08:00
Rob Harrington
02d3d34826
Adding basic angular infrastructure for enterprises
2015-06-12 01:49:34 +08:00
Rob Harrington
c311bcdca7
Overriding enterprises index action to use AMS for json requests, and prevent collection loading for html requests
2015-06-12 01:49:33 +08:00
Rohan Mitchell
ecbf3c8fa7
Ensure we start with consistent config settings
2015-06-11 16:16:36 +10:00
Rohan Mitchell
bfeb63c8d7
Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec
2015-06-11 14:16:18 +10:00
Rohan Mitchell
075e9edbf6
Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:27 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
7412e92665
Merge branch 'master' into optimise-shopfront
2015-06-10 16:39:02 +10:00
Rohan Mitchell
ee01113fe1
Fix duplicate factory value spec error
2015-06-10 15:31:53 +10:00
Maikel Linke
6c0238deac
scoping down large request spec
2015-06-10 13:50:55 +10:00
Maikel Linke
f88f42283a
Session stored in ActiveRecored instead of Cookies
...
The cookie store is not big enough in some cases. In order to solve a
CookieOverflow error and maybe track down the underlying issue this
patch uses the database instead of cookies to store session data.
2015-06-10 13:49:24 +10:00
Maikel Linke
d6c630dad9
add spec_helper to customers_controller_spec
2015-06-05 14:25:45 +10:00
Maikel Linke
7461009c3b
Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:58 +10:00
Maikel Linke
ffa960b02e
Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:24 +10:00
Maikel Linke
e35b39c7cf
Handle invalid referer URLs
...
Rescues URI::InvalidURIError of URL(request.referer).
2015-06-05 12:43:49 +10:00
