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
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
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rohan Mitchell
6dea3fa19d
Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:32 +10:00
Rohan Mitchell
d79129880e
Put lock around adjustment clear/re-create to avoid race condition resulting in duplicate fees
2015-06-10 17:02:30 +10:00
Rohan Mitchell
7412e92665
Merge branch 'master' into optimise-shopfront
2015-06-10 16:39:02 +10:00
Maikel Linke
3c38c8e504
Merge branch 'adjustment-metadata-deletion' into combined/session-store_adjustment-metadata_uglifier
...
Conflicts:
db/schema.rb
2015-06-10 13:56:36 +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
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
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
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +10: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
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
Rohan Mitchell
2c92b5a751
Find all supplied and distributed taxons
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
Maikel Linke
5a43ed2046
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-22 18:17:20 +10:00
Rob Harrington
e931f4b31f
Merge branch 'master' into require_standard_variant
2015-05-22 12:22:54 +10:00
Rob Harrington
d43df86201
Moving conditional logic into ensure_standard_variant
2015-05-22 12:20:31 +10:00
Maikel Linke
e6b6303f5e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-21 18:03:11 +10:00
Rob Harrington
903ed7e507
Merge branch 'master' into variable_weights
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
app/views/spree/api/line_items/bulk_show.v1.rabl
spec/features/admin/bulk_order_management_spec.rb
2015-05-21 17:31:33 +10:00
Maikel Linke
73884d4f01
BPE: Display notice about variant overrides
2015-05-21 13:01:28 +10:00
Maikel Linke
0a0bb67277
No SKU for cloned products. Community topic 175
2015-05-20 14:05:14 +10:00
Rob Harrington
fc55a000b8
Adding managed controller action which uses new order serializer to render json
2015-05-20 11:48:13 +10:00
Rohan Mitchell
f1899a7558
Merge branch 'master' into xero-report
2015-05-15 16:57:11 +10:00
Rohan Mitchell
0dcd8eb8cc
Find adjustments with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
ca1d88d8b1
Find line items with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
924492ec5b
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
2015-05-15 10:37:34 +10:00
Rob Harrington
34f5cfb6b5
Completed orders require a customer, add association logic
2015-05-13 12:44:38 +10:00
Rob Harrington
2afd501af3
Wiring up update action for customers controller
2015-05-13 12:44:34 +10:00
Rob Harrington
37ff61d663
Adding basic routing to display customer index page
2015-05-13 12:44:32 +10:00
Rohan Mitchell
3520127c41
Fix infinite job loop
2015-05-13 11:06:42 +10:00
Lynne Davis
521834bd76
Populate the line item unit value, when line_item created and update old data in migration
2015-05-09 19:10:55 +01:00
Lynne Davis
2a991ad130
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-05-09 19:10:55 +01:00
Continuous Integration
df14c10608
Auto-merge from CI [skip ci]
2015-05-08 13:45:56 +10:00
Rohan Mitchell
1531c476e3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
2015-05-08 13:45:31 +10:00
Rohan Mitchell
d9404d3332
Merge branch 'master' into single-order-patches
2015-05-06 17:29:23 +10:00
Maikel Linke
11acb3ba59
Allow to remove adjustments
...
Managers of an order cycle and the distributor of an order are allowed
to remove an adjustment from the order.
2015-05-01 15:59:46 +10:00
Rohan Mitchell
e91de69d5a
Merge branch 'master' into pin-refunds
2015-05-01 14:58:19 +10:00
Maikel Linke
e6e063670c
Allow managers to remove line items from order
...
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
2015-05-01 14:49:34 +10:00
Maikel Linke
af78859db6
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-30 17:18:02 +10:00
Rohan Mitchell
b498c28632
Payments can be refunded
2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2
Pin payments can't void or credit, but they can refund
2015-04-30 15:49:48 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
