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
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
3846d16822
Add methods to load fees for a number of variants in one go
2015-06-04 16:22:06 +10:00
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +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
fee854a3f8
Merge branch 'master' into redesign
2015-05-29 17:37:18 +10:00
Rohan Mitchell
e3085d9224
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
2015-05-29 17:36:56 +10:00
Rohan Mitchell
3dbc2e0382
Merge branch 'master' into folklabs-producer-emails
2015-05-29 17:36:11 +10:00
Rohan Mitchell
6f513fee77
Merge branch 'master' into redesign
2015-05-29 15:20:21 +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
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Maikel Linke
e4f93863fd
Finding unique permalink before validation.
2015-05-28 11:27:40 +10:00
Maikel Linke
19448a182e
Add permalink field to enterprise groups
2015-05-28 11:27:39 +10:00
Rohan Mitchell
7f43dbf9bb
Fix further intermittent failures in permissions spec
2015-05-28 10:58:12 +10:00
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +10:00
Rohan Mitchell
ccf1e2951c
Fix intermittent failure in permissions spec
2015-05-28 10:45:47 +10:00
Rohan Mitchell
75f1f673ad
Update spec for EnterpriseSerializer
2015-05-27 16:26:31 +10:00
Rohan Mitchell
e74390a013
Remove controller specs for @active_distributors, now set via helper
2015-05-27 16:26:08 +10:00
Rohan Mitchell
41bc67e2d8
Add benchmark for product serialisation
2015-05-27 15:44:02 +10:00
Rohan Mitchell
e1b4c3b1e4
Add benchmarking test for inject_enterprises
2015-05-27 15:44:02 +10:00
Rohan Mitchell
2c92b5a751
Find all supplied and distributed taxons
2015-05-27 15:44:01 +10:00
Rohan Mitchell
cf79b90044
Load relatives of all enterprises in one go
2015-05-27 15:44:01 +10:00
Rohan Mitchell
704955a185
Load active distributors where they're needed rather than in most controllers
2015-05-27 15:44:01 +10:00
Rohan Mitchell
f0e909c92b
Look up the shipping services (pickup, delivery) that different hubs provide
2015-05-27 15:44:01 +10:00
Rohan Mitchell
769edbe9d5
Find the earliest closing times for each distributor in an active order cycle
2015-05-27 15:44:01 +10:00
Rohan Mitchell
99cb09c6f7
When loading products for shopfront, load all variants in one go
2015-05-27 15:44:01 +10:00
Paul Mackay
baaa192967
#275 : Code cleanup.
2015-05-24 10:44:39 +01:00
