raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,764 Commits 19 Branches 453 Tags
f2c8ea9722543af4a47df0a9dfd8b961ed45841c
Commit Graph

6764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9ce5c45799 Update gem nokogiri to 1.6.7.2 
Previous versions had security vulnerabilities. See:
http://rubysec.com/advisories/CVE-2015-5312/
 2016-03-09 14:34:25 +11:00
Maikel Linke
f1cc3a7b0d Apply code style following Rubocop 2016-03-09 14:32:41 +11:00
Maikel Linke
d925c2aefc Translate Spree payment, shipment and order states 
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.

- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.

- Removed `humanize` call from order serializer and added translation
scopes to accounts page.

- Test OrderSerializer for untranslated attributes

- Require spec helper in serializer specs
 2016-03-09 14:29:54 +11: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
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
Maikel Linke
1770cbb6bf Display footer_email in confirmation emails correctly 
A bug introduced in a9c37c162e caused the
creation of confirmation emails for shops to fail. The email template
got fixed now and the email address from the database is displayed if
present.
 2016-02-26 16:09:14 +11:00
Steve Pettitt
b84f49a1c3 Satisfy style police 2016-02-24 20:39:26 +00:00
Steve Pettitt
8e88cd6255 Localise dates 2016-02-24 20:33:37 +00:00
Steve Pettitt
c07fefde1a Change non-js translations to be done in rails 2016-02-24 20:23:13 +00:00
Rohan Mitchell
6193bb896b Sanitize input for ofnTaxonAutocomplete and userSelect directives 2016-02-24 11:26:38 +11:00
Rohan Mitchell
4314bfb99c Fix karma fail due to file load order change 2016-02-24 11:26:38 +11:00
Rohan Mitchell
ae03170984 Sanitize input for ofn-select2 2016-02-24 11:26:38 +11:00
Rohan Mitchell
977ff7b35d Fix compatibility issues with new version of select2 2016-02-24 11:26:37 +11:00
Rohan Mitchell
1e288e5f14 Further styling for select2 after upgrade 2016-02-24 11:26:37 +11:00
Rohan Mitchell
9747b0cf96 Upgrade select2-rails 2016-02-24 11:26:37 +11:00
Rohan Mitchell
258e84fc0a Replace with-tip with ofn-with-tip: misc 2016-02-24 11:26:37 +11:00
Rohan Mitchell
17cda86dfa Replace with-tip with ofn-with-tip: enterprise groups 2016-02-24 11:26:37 +11:00
Rohan Mitchell
bdd6d3ba6b Replace with-tip with ofn-with-tip: business model configuration 2016-02-24 11:26:37 +11:00
Rohan Mitchell
d699f8321a Replace with-tip with ofn-with-tip: dashboard 2016-02-24 11:26:37 +11:00