Rob Harrington
f902474591
Relevant DiscountOrder tag rules are applied to orders on update
2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b
Tag Rules can be deleted
2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf
Enterprise users can create tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f
First cut at an interface for updating tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
3aea387b9a
First iteration of a model for tag rules
2016-04-01 19:44:17 +11:00
Maikel Linke
3d31a37dd3
Remove unused method Enterprise::find_near
2016-03-31 15:00:22 +11:00
Maikel Linke
17f168ed06
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances
...
Applied code conventions.
Conflicts:
config/locales/en.yml
2016-03-30 13:30:44 +11:00
Maikel Linke
de35940341
Apply coding standards
2016-03-30 09:45:45 +11:00
stveep
5a6caa294e
Revert to Arel query and separate filtering
2016-03-28 20:13:30 +01:00
Maikel
d51cfccd7e
Auto-merged master into i18n-hackathon on deployment.
2016-03-23 10:09:36 +11:00
Maikel
ca0c677d46
Auto-merged master into uk/account-balances on deployment.
2016-03-19 07:16:41 +11:00
Rohan Mitchell
16741598fd
Merge branch 'master' into products-caching
...
Conflicts:
spec/features/admin/variant_overrides_spec.rb
2016-03-18 09:59:56 +11:00
Maikel Linke
6eb6a01339
Filter incomplete payments on database level
...
Using explicit `LEFT OUTER JOIN ... ON ...` to query only completed
payments for the order overview of consumers.
They were filtered in Ruby before.
2016-03-16 11:12:09 +11:00
Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Steve Pettitt
e1fdd3a210
Apply style guide
2016-03-11 21:59:22 +00:00
Maikel Linke
2a3b3b6dd2
Merge remote-tracking branch 'origin/master' into i18n-hackathon
...
Conflicts:
app/assets/javascripts/admin/enterprise_fees.js
app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
app/views/admin/shared/_columns_dropdown.html.haml
app/views/admin/variant_overrides/_header.html.haml
app/views/admin/variant_overrides/_products.html.haml
spec/features/admin/bulk_order_management_spec.rb
spec/features/admin/variant_overrides_spec.rb
2016-03-11 15:38:28 +11:00
Steve Pettitt
b324207121
Merge current master
2016-03-10 21:48:13 +00:00
Steve Pettitt
fe3c0b8d29
Move data processing to model, add payment method preload
2016-03-10 21:42:42 +00:00
Maikel Linke
02cbad2697
Remove duplicate lines from merging
2016-03-09 18:49:35 +11:00
Maikel
f2c8ea9722
Auto-merged master into uk/account-balances on deployment.
2016-03-09 14:43:05 +11:00
Maikel Linke
b6406b54b4
Apply code style
2016-03-09 14:40:04 +11:00
Maikel Linke
f1cc3a7b0d
Apply code style following Rubocop
2016-03-09 14:32:41 +11:00
Rohan Mitchell
9645ec727b
Refresh products cache when inventory items are changed
2016-03-09 14:07:04 +11:00
Rohan Mitchell
6f29a8b642
Refresh cache when inventory setting product_selection_from_inventory_only is changed
2016-03-09 13:29:33 +11:00
Rohan Mitchell
27d7b3026b
Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model
2016-03-09 12:28:09 +11:00
Rohan Mitchell
422061f137
Merge branch 'master' into products-caching
...
Conflicts:
app/controllers/shop_controller.rb
app/models/enterprise_fee.rb
app/models/order_cycle.rb
app/models/variant_override.rb
db/schema.rb
lib/open_food_network/products_renderer.rb
spec/lib/open_food_network/products_renderer_spec.rb
2016-03-03 09:42:52 +11:00
Maikel Linke
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +11:00
Rob Harrington
4bf27982f4
Applying variant override permissions when they are added or removed
...
Also remove variant overrides with revoked permissions from the default scope
2016-03-02 12:10:49 +11:00
Rob Harrington
186d1c1f26
Revoking ability to create variant overrides via OC permission
2016-03-02 12:10:49 +11:00
Rob Harrington
b2657ddc72
Adding data migration to populate inventories of enterprises that are already using variant overrides
2016-03-02 12:10:49 +11:00
Rob Harrington
1d83809866
Bugfix: Spree::Variant#not_hidden_for scope was broken
...
Was getting confused by presence of inventory items for other enterprises when none existed for a given variant/enterprise combo
2016-03-02 12:10:22 +11:00
Rob Harrington
f280b96215
Hiding a variant from inventory prevents it being available on the shopfront
...
User preferences around inventory-only product selection immediately affect the shopfront
2016-03-02 12:10:22 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb
Adding global config to allow shop users to only select from inventory variants in OC interface
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
095b420997
WIP: Adding InventoryItem model for managing contents of inventories
2016-03-02 12:10:22 +11:00
Rob Harrington
59745fbc73
EnterpriseFees can inherit tax_category from product
2016-03-02 11:56:46 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rob Harrington
137003c671
Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false
2016-03-02 11:56:46 +11:00
Rohan Mitchell
8928e461d4
Refresh cache when option type changed
2016-02-26 09:59:16 +11:00
Nicolas Blanc
4621f625a0
new validation6 02/25/2016
2016-02-25 12:36:21 +00:00
Rohan Mitchell
b5204a4820
Refresh cache when option value changed or destroyed
2016-02-25 11:08:53 +11:00
Steve Pettitt
b84f49a1c3
Satisfy style police
2016-02-24 20:39:26 +00:00
Maikel Linke
a7e3b2d9df
Update enterprise email tests
2016-02-24 16:21:18 +11:00
Rohan Mitchell
71862e00a7
Perform products cache refresh when producer property changed or destroyed
2016-02-24 16:11:59 +11:00
Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Rohan Mitchell
98961fef74
Trigger cache refresh when producer property changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
8b070fddbb
Refresh products cache when exchange fee is changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
8af6866ae4
Refresh products cache when exchange is changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
8bd5a36aaf
Remove enterprise fee destruction cache callback - responsibility to be handled by dependent models
2016-02-24 15:05:03 +11:00
