raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,745 Commits 20 Branches 451 Tags
bfaefa4dc941f2465dfbb4a092ef2b132ded53bf
Commit Graph

2797 Commits

Author SHA1 Message Date
Lynne Davis
bfaefa4dc9 Updating Bill Calculator to include a minimum billable turnover. Shopfronts are not charged if their tunrover is under the minimum billable. 2016-03-17 11:15:06 +00:00
Maikel
4adf332480 Auto-merged master into uk/trial-length on deployment. 2016-03-16 22:42:50 +11:00
Lynne Davis
a4efd3d44c Adding configurable Shop Trial Length in business model 2016-03-16 11:35:31 +00:00
Maikel Linke
c1647ccd2c Set public enterprise.email_address at registration 
Sets the public email address to the given email address as well as the
internal enterprise.email (notification email address).

The field is not mandatory any more since enterprise.email is populated
from the owner's email address if no value was given.
 2016-03-04 17:50:04 +11:00
Maikel Linke
6300f87987 Use have_no_selector in VO spec 2016-03-04 10:23:13 +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
186d1c1f26 Revoking ability to create variant overrides via OC permission 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
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
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
f06d909c23 WIP: Adding infrastructure to show/hide variants + overrides using inventory items 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
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
7cb64e8804 Merge remote-tracking branch 'origin/master' into groups 2016-03-02 11:12:33 +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
Maikel Linke
098d313163 Using should syntax in payment method spec 2016-02-24 16:33:31 +11:00
Maikel Linke
a7e3b2d9df Update enterprise email tests 2016-02-24 16:21:18 +11:00
Rohan Mitchell
977ff7b35d Fix compatibility issues with new version of select2 2016-02-24 11:26:37 +11:00
Rohan Mitchell
48b02db70d Order cycles are undated unless they have both open and close dates defined 2016-02-05 09:27:25 +11:00
Rohan Mitchell
533124fe91 Display receival instructions when editing order cycle 2016-01-29 12:17:20 +11:00
Maikel
eeb31f65c3 Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment. 2016-01-15 16:15:09 +11:00
Rob Harrington
9979e31220 Final tidy up after rebasing default_inventory and ng-vo onto origin/master 
Fixes a few VO feature specs and a few interface tweaks
 2016-01-15 09:07:51 +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
Rob Harrington
4103ed0ba7 Combining variant override controller specs 2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41 Variant Overrides Index: User can manually reset inheritance 2016-01-15 09:07:51 +11:00
Rob Harrington
607a66b6c6 WIP: Fixing a few broken VO specs 2016-01-15 09:07:50 +11:00
Steve Pettitt
a3f7ff19b0 Add new VO fields to shopping spec 2016-01-15 09:07:50 +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
25454d3e97 Added new fields to fix VO deletion feature specs 2016-01-15 09:07:49 +11:00
Steve Pettitt
75127f2a63 Fix feature specs for VO reset 2016-01-15 09:07:49 +11:00
Rob Harrington
94785d4157 Fixing authorization for VariantOverridesController#bulk_reset 2016-01-15 09:07:49 +11:00
Steve Pettitt
5a62098b95 Cleaning up and attempt to add feature spec 2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232 Added toggle to enable/disable reset stock. Updated specs 2016-01-15 09:07:48 +11:00
Steve Pettitt
2921958788 Variant override controller spec added 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
Rob Harrington
3b7700131c Specify controller specs as such 2016-01-15 09:07:47 +11:00
Rob Harrington
cc4dc068ab Adding variant SKU field to BPE 2016-01-13 18:49:34 +11:00