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
Maikel Linke
552bbf221c
Delete obsolete paragraph in registration #595
2015-06-05 11:01:40 +10:00
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +10:00
Rob Harrington
e93736b123
Ordering managed orders by id to fix spec
2015-06-03 18:16:07 +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
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
Rohan Mitchell
41b348f594
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:05:51 +10:00
Rohan Mitchell
8afffdae9a
Fix error when product does not have a master variant
2015-06-03 12:13:42 +10:00
Rohan Mitchell
22230294ab
Merge branch 'master' into optimise-shopfront
2015-06-03 10:07:42 +10:00
Maikel Linke
2853885f26
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 09:47:37 +10:00
Rohan Mitchell
a22da1ae51
Merge branch 'ng-cloak' into combined/bulk-product-edit-and-ng-cloak
2015-05-29 16:54:01 +10:00
Maikel Linke
159b33e2db
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-29 16:52:18 +10:00
Maikel Linke
0d3cdb9c69
Expand All button to show all variants in BPE
2015-05-29 16:51:55 +10:00
Rohan Mitchell
5c3a59acab
ng-cloak order cycles selector, tabs and shopfront
2015-05-29 16:39:41 +10:00
Rohan Mitchell
50ae331d94
ng-cloak mobile menu
2015-05-29 16:03:16 +10:00
Maikel Linke
fe27b1d446
text changes to the registration wizard
2015-05-29 15:24:17 +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
Rohan Mitchell
e5b3736e86
Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit
2015-05-29 14:36:51 +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
Continuous Integration
dccc9fb479
Auto-merge from CI [skip ci]
2015-05-29 12:44: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
4ce9ea05f0
Merge branch 'master' into require_standard_variant
2015-05-29 10:12:14 +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
Maikel Linke
bf9addfa42
Merge branch 'group-custom-url' into group-pages
2015-05-28 13:27:48 +10:00
Maikel Linke
ff2eed7760
Using permalink in URLs pointing to groups
2015-05-28 11:27:40 +10:00
Maikel Linke
e4f93863fd
Finding unique permalink before validation.
2015-05-28 11:27:40 +10:00
Maikel Linke
aef128f2c9
permalink editable
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
Continuous Integration
a01a53caea
Auto-merge from CI [skip ci]
2015-05-28 11:05:07 +10:00
Rohan Mitchell
3ab7df88e6
Allow serialization of nil enterprise
2015-05-27 16:32:15 +10:00
Rohan Mitchell
31b726613d
Avoid loading enterprise injection data when it's not be needed due to caching
2015-05-27 15:44:01 +10:00
Rohan Mitchell
dd761719ee
Fix undefined Api::IdSerializer error
2015-05-27 15:44:01 +10:00
Rohan Mitchell
1a887df412
Pull taxon computation out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
2c92b5a751
Find all supplied and distributed taxons
2015-05-27 15:44:01 +10:00
Rohan Mitchell
3afd636577
Pull relatives computation out of the serialization loop
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
4a59c85b3e
Inject current hub from AMS rather than RABL
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
ee8db23fd9
Pull shipping method service computations out of the serialization loop
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
f940984ca3
Pull earliest closing time computations out of the serialization loop
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
c5f00d87bd
When loading products for shopfront, load all master variants in one go
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
