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
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
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +10:00
Rob Harrington
3855ae1337
Fixing bug on OC interface that prevented hubs from pulling their own products through
2015-06-03 16:18:44 +08:00
Rob Harrington
359328a96e
Producers and distributors lists include self where appropriate
2015-06-03 16:18:44 +08:00
Rob Harrington
dbd81e60a1
Fixing customer index feature spec, only checking shop when something has been selected
2015-06-03 16:18:09 +08:00
Rob Harrington
09160c8ea6
Fixing customers controller spec
2015-06-03 15:23:55 +08:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Maikel Linke
d2a61dc096
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 16:37:25 +10:00
Maikel Linke
7302963605
inventory report: filter was broken because filter_to_order_cycle returned nil
...
[skip ci]
2015-06-03 15:11:32 +10:00
Rohan Mitchell
36dc0d5ccd
Do not run performance specs in CI
2015-06-03 13:00:07 +10:00
Rohan Mitchell
b3878b126b
Decouple generic injection spec from EnterpriseSerializer
2015-06-03 12:53:46 +10:00
Rohan Mitchell
c6f6c11a43
Add wait between clicks to fix race condition
2015-06-03 12:51:15 +10:00
Maikel Linke
4b6222bbe2
Updating spec using new button label
2015-06-03 12:08:47 +10:00
Rohan Mitchell
22230294ab
Merge branch 'master' into optimise-shopfront
2015-06-03 10:07:42 +10:00
Rohan Mitchell
952353da8c
Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2015-05-29 15:08:30 +10:00
Continuous Integration
c14de4e97f
Auto-merge from CI [skip ci]
2015-05-29 14:29:23 +10:00
Rohan Mitchell
d478cc1f69
Serialize taxons and relatives in expected format
2015-05-29 14:03:44 +10:00
Rohan Mitchell
3f4f8afacd
EnterpriseRelationship.relatives does not show duplicates
2015-05-29 12:19:38 +10:00
Rohan Mitchell
69c54e1d70
Only load activated relatives for EnterpriseInjectionData
2015-05-29 12:08:21 +10:00
Rohan Mitchell
cdbf02ca20
EnterpriseRelationship.relatives can find activated enterprises only
2015-05-29 12:07:43 +10:00
Rohan Mitchell
835b56b222
Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb
2015-05-29 09:44:57 +10:00
Rohan Mitchell
7486daa2a3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
spec/lib/open_food_network/permissions_spec.rb
spec/lib/open_food_network/products_and_inventory_report_spec.rb
spec/models/enterprise_spec.rb
2015-05-28 15:08:13 +10:00
