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
88872b4b49
add spec_helper to customers_controller_spec
2015-06-06 11:49:49 +10:00
Maikel Linke
153360d17b
Let the database delete adjustment metadata
...
GitHub issue #582
We encountered a foreign key violation on adjustment metadata even
though rails should handle that.
Action: order.adjustments.where(originator_type: 'EnterpriseFee').destroy_all
Adjustment: has_one :metadata, class_name: 'AdjustmentMetadata' dependent: :destroy
So we update the foreign key to cause a delete in the database.
2015-06-05 16:10:58 +10:00
Rohan Mitchell
80834a0c27
Merge branch 'master' into ginerr_bugfixes
2015-06-05 15:49:43 +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
252e9be016
Merge branch 'remove-old-bugsnag-notification' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:03 +10:00
Maikel Linke
f324471495
Merge branch 'index_enterprise_permalink' into combined/xero-report_analytics-bugfixes
2015-06-05 14:20:13 +10:00
Maikel Linke
f438a44f26
Merge remote-tracking branch 'origin/analytics' into combined/xero-report_analytics-bugfixes
...
Conflicts:
app/controllers/spree/admin/orders_controller_decorator.rb
2015-06-05 14:19:54 +10:00
Maikel Linke
1b91082c1c
Merge branch 'show-order-without-current-distributor' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:47 +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
41dafce0db
Remove obsolete Bugsnag notification
2015-06-05 13:46:15 +10:00
Maikel Linke
e35b39c7cf
Handle invalid referer URLs
...
Rescues URI::InvalidURIError of URL(request.referer).
2015-06-05 12:43:49 +10:00
Maikel Linke
552bbf221c
Delete obsolete paragraph in registration #595
2015-06-05 11:01:40 +10:00
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
fc7e33d706
Fall back on individual calculations when pre-prepared values are not present
2015-06-04 16:43:19 +10:00
Rohan Mitchell
ef3155a16a
Pull product listing fee calculations out of serializer loop
2015-06-04 16:27:32 +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
486c2f9b42
WIP: Skip EnterpriseFeeApplicator step when computing fees
2015-06-04 12:13:04 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +10:00
Rohan Mitchell
cf0031d9a5
WIP: Optimise enterprise fee calculation
2015-06-04 11:53:09 +10:00
Rohan Mitchell
85d1d67dac
Sort orders as required by spec, fixes intermittent fail
2015-06-04 09:43:36 +10:00
Continuous Integration
a1425c5e07
Auto-merge from CI [skip ci]
2015-06-04 07:22:43 +10:00
Maikel Linke
5d77a48ef3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into show-order-without-current-distributor
2015-06-03 20:36:12 +10:00
Rob Harrington
e93736b123
Ordering managed orders by id to fix spec
2015-06-03 18:16:07 +08:00
Maikel Linke
aea6277b77
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into index_enterprise_permalink
2015-06-03 19:54:29 +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
7c9b4dbc3e
Resolving unmerged section in bulk order management template
2015-06-03 15:33:04 +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
Rohan Mitchell
f1019e9221
Upgrade unicorn
2015-06-03 16:53:46 +10:00
Rohan Mitchell
2c0da5e350
Output parallel spec runtime log -> evenly split spec grouping
2015-06-03 16:38:47 +10:00
Maikel Linke
d2a61dc096
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 16:37:25 +10:00
Rohan Mitchell
0569ef0505
Only record analytics in production. Also record them in admin backend.
2015-06-03 16:36:31 +10:00
Rohan Mitchell
17d123db63
ng-cloak producers page
2015-06-03 16:28:43 +10:00
Rohan Mitchell
4d789b70ed
Merge branch 'products-and-inventory-report' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:12:29 +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
ad4e17b77a
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:10:12 +10:00
Rohan Mitchell
cd8084ae3f
Merge branch 'master' into parallel-tests
...
Conflicts:
script/ci/run_tests.sh
2015-06-03 15:08:15 +10:00
Rohan Mitchell
41b348f594
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:05:51 +10:00
Rohan Mitchell
2b3689fd93
Run CI specs in parallel
2015-06-03 14:29:38 +10:00
Rohan Mitchell
db47c01784
Initial config for parallel spec running
2015-06-03 14:29:38 +10:00
Rohan Mitchell
769a04d2e0
Merge branch 'master' into optimise-shopfront
2015-06-03 13:02:58 +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
Rohan Mitchell
473322c7e6
CI: Add more robust merge-to-master script
2015-06-03 12:25:28 +10:00
