raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-25 01:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,662 Commits 17 Branches 454 Tags
a494fb274ea5fdf2d2002eae6ee5fe2a2ebe545b
Commit Graph

9662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
bc2223fb8e Fix intermittent spec fails: currency inconsistencies on CI and retry on VOs 2016-03-04 10:15:57 +11:00
Maikel Linke
b5d4f8b781 Merge remote-tracking branch 'origin/master' into groups 2016-03-04 09:36:46 +11:00
Steve Pettitt
939356ef26 Update spec with nulls 2016-03-03 07:18:49 +00:00
Steve Pettitt
4966290f87 Check missing lat/long instead of zero 2016-03-03 06:41:59 +00: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
Rohan Mitchell
7e6d544180 Do not serialize product count_on_hand - reduce coupling between variant create and products JSON 2016-03-03 09:33:32 +11:00
Steve Pettitt
c1d068aeb9 Add/modify karma specs 2016-03-02 20:07:39 +00:00
Steve Pettitt
6a2319e16d Remove producers without lat + long from map 2016-03-02 19:08:57 +00:00
Rob Harrington
0d65838e5d Adding a second migration to auto-add variants to inventories 
(I stuffed up the first one, oops)
v1.5.0 		2016-03-02 17:09:39 +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
465649475d Revoke ability to overide variants based on shared management/ownership (ie. only explicit permissions) 2016-03-02 12:10:49 +11:00
Rob Harrington
aff346071f Automatically selecting a hub on inventory page when it is the only option 2016-03-02 12:10:49 +11:00
Rob Harrington
3f466e86b6 Renaming 'Override Variant Details' permission to 'Add Products To Inventory' 
Style changes to make enterprise relationships page more useable
 2016-03-02 12:10:49 +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
8e1b4e299c Adding column 'permission_revoked_at' to VOs 
And a migration to flag any VOs which should not be permitted, update previous migration so that new enterprise relationships don't try to revoke variant overrides
 2016-03-02 12:10:49 +11:00
Rob Harrington
51d77d5781 Adding migration to explicitly grant VO permission where it is currently implicitly granted via managers/owners 
In preparation for removing implicitly granted permissions
 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
e00fe824ac Updating text for inventory only product selection setting for enterprises 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
4de0a5c220 Renaming 'Variant Overrides' index page to 'Inventory' 2016-03-02 12:10:22 +11:00
Rob Harrington
ed40ebace6 Existing Exchange Variants must be explicitly set to true by form data to remain in an exchange when an order cycle is updated 2016-03-02 12:10:22 +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
6ee4e4190e New product count for inventory takes permissions into account 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
Rohan Mitchell
e16ca82e76 Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked. 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
f288c09380 Moving inventory settings to their own section within the enterprise edit form 2016-03-02 12:10:22 +11:00
Rob Harrington
488daed8f3 Translating variant overrides / inventory page 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
28b143da73 WIP: Splitting Variant overrides into views 2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522 WIP: Adding Loading flash to variant overrides page 2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68 WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited 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
a66582a8fb WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model 2016-03-02 11:56:46 +11:00
Rob Harrington
0bd9dc7af0 Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising 2016-03-02 11:56:46 +11:00
Rob Harrington
69ee1a98a7 EnterpriseFeeCalculator return empty list when retrieving applicators without distributor or order_cycle being present 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
4a7a40425a Fix problems in rake file 2016-03-02 11:38:42 +11:00
Maikel
81ec3fef60 Auto-merged master into products-caching on deployment. 2016-03-02 11:12:40 +11:00
Maikel Linke
7cb64e8804 Merge remote-tracking branch 'origin/master' into groups 2016-03-02 11:12:33 +11:00
Maikel Linke
39708d773d Merge branch 'transifex' into groups 
Just to keep master up-to-date.
 2016-03-02 11:11:43 +11:00
Rohan Mitchell
ec55af5b8a Display products cache integrity checker results on cache settings admin page 2016-03-02 11:05:03 +11:00
Rohan Mitchell
2abee3fcdd Extract integrity checking to lib class 2016-03-02 11:01:41 +11:00
Maikel Linke
23a1c2a772 Remove scroll bar from enterprise modal description 
Multiple scroll bars within a modal were confusing. The inner scroll bar
for the long enterprise description got removed. The general modal
scroll bar persists.

Fix #806 Full profile modal about section copy display improvement
 2016-03-02 10:42:40 +11:00
Rohan Mitchell
f394cf559c Fix integrity checker rake task name 2016-03-02 08:49:36 +11:00
elf Pavlik
54ecdb670d fixed failing i18n test in variant overrides 2016-02-28 19:58:16 +00:00
elf Pavlik
68db9b9926 fixing faling tests 2016-02-28 19:58:03 +00:00