luisramos0
|
b325cea6cb
|
Merge branch 'master' into 2-0-stable-Mar6
|
2019-03-06 09:19:53 +00:00 |
|
luisramos0
|
0b1ea1beda
|
Rename VariantOverride.use_producer_settings to VariantOverride.use_producer_stock_settings
|
2019-02-22 09:57:21 +00:00 |
|
luisramos0
|
45e5fed609
|
Improve scope_variant_to_hub code and spec by testing an invalid data state
|
2019-02-21 11:25:01 +00:00 |
|
luisramos0
|
ef786adcfc
|
Make variant_override.stock_overridden? simpler and add comment to explain relationship between count_on_hand and on_demand in a VO
|
2019-02-20 13:07:21 +00:00 |
|
luisramos0
|
75a79717cf
|
Adapt scope_variant_to_hub to new VO rules where on_demand nil is seen as use_producer_settings
|
2019-02-15 14:05:24 +00:00 |
|
luisramos0
|
e28f9a7c84
|
Merge branch 'master' into 2-0-stable-jan-8th
|
2019-01-08 14:29:50 +00:00 |
|
Kristina Lim
|
c873a7b8e3
|
Move stock settings override validation to concern
|
2018-12-09 23:29:36 +08:00 |
|
Kristina Lim
|
34313c94ca
|
Make reset stock settings for VO force limited stock
|
2018-12-09 21:47:05 +08:00 |
|
Kristina Lim
|
83b6973bc2
|
Require compatible VO on_demand and count_on_hand
|
2018-12-07 14:39:36 +08:00 |
|
luisramos0
|
d962358f15
|
Fix rubocop and transpec models/variant_override and its spec
|
2018-11-30 00:43:55 +00:00 |
|
luisramos0
|
0577011f5b
|
Refactor variant override model and its spec: simplify move_stock and remove unused methods
|
2018-11-30 00:22:04 +00:00 |
|
luisramos0
|
6156aca467
|
Delegate stock_location.move to variant, and override it in the variant overrides scope
|
2018-11-29 19:32:52 +00:00 |
|
niko
|
3ae38178a3
|
Move query from variant_overrides_controller to its model scope
|
2018-10-04 02:43:02 +02:00 |
|
Matt-Yorkley
|
a2a65a8900
|
PI inventories and overhaul
|
2018-05-26 19:34:19 +01:00 |
|
Pierre de Lacroix
|
2cd570383f
|
Use localize_number in models
|
2017-12-01 13:37:24 +11:00 |
|
Rob Harrington
|
7bb58342fc
|
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
|
2017-06-23 16:49:08 +10:00 |
|
Rob Harrington
|
b6f4ce373e
|
Preloading variants for VariantOverride.indexed
|
2017-05-18 15:34:22 +10:00 |
|
Rob Harrington
|
348ab81c42
|
Overriding #increment! using variant overrides
|
2017-05-05 14:20:57 +10:00 |
|
Rob Harrington
|
3f8420b0e9
|
Adding tags to variant overrides
|
2016-05-27 16:23:26 +10: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 |
|
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 |
|
Rohan Mitchell
|
5f188650d8
|
Trigger cache refresh on VariantOverride save/destroy
|
2016-02-24 15:05:01 +11:00 |
|
Rob Harrington
|
669642292b
|
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
|
2016-01-15 09:07:51 +11:00 |
|
Steve Pettitt
|
e423e890e0
|
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
|
2016-01-15 09:07:50 +11:00 |
|
Steve Pettitt
|
0ee078e232
|
Added toggle to enable/disable reset stock. Updated specs
|
2016-01-15 09:07:48 +11:00 |
|
Steve Pettitt
|
34c603a9c3
|
Added angular service tests for variant overrides stock reset
|
2016-01-15 09:07:48 +11:00 |
|
Rob Harrington
|
53d97dab08
|
WIP: Adding view and routes for resetting variant_overrides count_on_hand
|
2016-01-15 09:07:48 +11:00 |
|
Rohan Mitchell
|
aa0a031fa0
|
Fetch indexed variant overrides in one go
|
2015-06-18 15:03:24 +10:00 |
|
Rohan Mitchell
|
dd2f6d6430
|
Extract VariantOverride fetching into ScopeVariantToHub#scope
|
2015-06-18 14:45:40 +10:00 |
|
Rohan Mitchell
|
a4d4622521
|
Add VariantOverride.decrement_stock
|
2015-01-12 10:39:23 +11:00 |
|
Rohan Mitchell
|
20f650b472
|
Add VariantOverride.stock_overriden?
|
2015-01-12 09:32:02 +11:00 |
|
Rohan Mitchell
|
f5ee9ba2f3
|
VariantOverride looks up count_on_hand
|
2014-12-18 10:21:07 +11:00 |
|
Rohan Mitchell
|
91c500417b
|
Swap param order
|
2014-12-17 08:55:27 +11:00 |
|
Rohan Mitchell
|
45e709b2cc
|
VariantOverrides require hub and variant
|
2014-12-12 13:33:14 +11:00 |
|
Rohan Mitchell
|
ff28da345d
|
Find variant overrides for some hubs
|
2014-12-12 13:33:12 +11:00 |
|
Rohan Mitchell
|
f9b4c07219
|
Add initial VariantOverride model with price lookup
|
2014-11-21 13:49:09 +11:00 |
|