raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lynne Davis
ff935af18b Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight. 2015-04-04 19:20:56 +01:00
Lynne Davis
ffd850c761 Adding specs for variable weight adjustment via builk order management 2015-04-04 19:20:41 +01:00
Lynne Davis
bf44a1c862 Update DB schema to store updatable weight on items sold 2015-04-04 19:20:27 +01:00
Rob Harrington
d28fc7e42d Hubs can see incoming exchanges of producers who have given them P-OC or whose variants they are actively distributing 2015-04-03 14:58:01 +11:00
Rob Harrington
a10de68430 only load permissions once in serializer 2015-04-02 15:55:03 +11:00
Rob Harrington
3b9824171a Adding with_order_cycles_as_supplier_outer scope to Enterprise 2015-04-02 15:53:32 +11:00
Rob Harrington
5d7659aa3c Fixing product spec, using have_select2 instead of have_field 2015-04-02 14:36:19 +11:00
Rob Harrington
1e1d52cc47 Adding 'selected' option to have_select2 matcher 2015-04-02 14:35:39 +11:00
Rob Harrington
76648b97b0 Update spec, properties must exist for enterprise users before they can be assigned 2015-04-02 14:15:00 +11:00
Rob Harrington
5020eb4e32 And again: override redirect to index page when editing properties from edit page 2015-04-02 14:14:16 +11:00
Rob Harrington
cb376602f2 Override redirect to index page when editing properties from edit page 2015-04-02 14:03:51 +11:00
Rob Harrington
3aa5f6e023 Adding properties tab to admin enterprise edit form 2015-04-02 11:30:32 +11:00
Rob Harrington
8926e3765e Replace free text with with select dropdown for product property names when not super admin 2015-04-02 08:57:15 +11:00
Rob Harrington
5b235f356e Replace free text with with select dropdown for property names when not super admin 2015-04-02 08:56:36 +11:00
Rob Harrington
8ed6653dc4 Ignoring any new product properties submitted by a non-admin user 2015-04-02 08:55:20 +11:00
Rob Harrington
ca1a5b5f8d Ignoring any new producer properties submitted by the user 2015-04-02 08:54:35 +11:00
Rob Harrington
8d95ba2c69 Display full name of variant on order cycle edit form 2015-04-01 15:46:19 +11:00
Rob Harrington
94a88278a9 Ignore the unit_to_display when it is wholly contained within display_name or vice versa 2015-04-01 15:46:11 +11:00
Rob Harrington
588e036c1d Adding SKU to customer totals report 2015-04-01 14:45:23 +11:00
Rob Harrington
aa7ddbcba4 Renaming Dist. column to Admin & Handling 2015-04-01 14:38:15 +11:00
Rob Harrington
54af6886c2 Line items with a quantity of zero return price_with_adjustments of 0.0 2015-04-01 12:34:22 +11:00
Rob Harrington
d49dd62124 Replace unused bugsnag notification with one to test for line items with a quantity of zero 2015-04-01 11:38:06 +11:00
Paul Mackay
d4cf44a6dd Use COUNTRY_CODE instead of COUNTRY in application.yml. 2015-03-29 17:06:05 +01:00
Rob Harrington
6e77a5eebc Using the correct method name duh 2015-03-27 16:47:12 +11:00
Rob Harrington
2d5118290b Fixing broken order cycle feature specs 2015-03-27 16:19:52 +11:00
Rob Harrington
74b7feda53 coordinator of a simple order cycle has permission to add their own variants to outgoing exchanges 2015-03-27 16:16:13 +11:00
Rob Harrington
f5bacf71b7 Permissions for OrderCycleFormApplicator are determined internally 2015-03-27 16:16:13 +11:00
Rob Harrington
3817ef202c Enterprises in simple OC create controller only load after OC initialises 2015-03-27 16:16:12 +11:00
Rob Harrington
aa170ef5f6 Order cycle simple create controller uses 'new' method on OC service to initialise 2015-03-27 16:16:12 +11:00
Rob Harrington
4d14acb64d Don't send non-attributes of js order_cycle object to server 2015-03-27 16:16:12 +11:00
Rob Harrington
43d2eb4d22 Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs 2015-03-27 16:16:12 +11:00
Rob Harrington
887579ecb8 Use managed_by scope on Enterprise instead of user.enterprises 2015-03-27 16:16:12 +11:00
Rob Harrington
9430999540 Filtering exchange variants, for outgoing exchange variant count 2015-03-27 16:16:12 +11:00
Rob Harrington
193a061c44 Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions 2015-03-27 16:16:11 +11:00
Rob Harrington
540ac845da Fixing broken js spec 2015-03-27 16:16:11 +11:00
Rob Harrington
5e015f0611 Rename visibleVariants filter to visibleProductVariants 2015-03-27 16:16:11 +11:00
Rob Harrington
681dada5df Simple OC form loads coordinator into JS 2015-03-27 16:16:11 +11:00
Rob Harrington
99bd6244ed Filtering the list of variants visible within each exchange based on permissions 2015-03-27 16:16:11 +11:00
Rob Harrington
63e345f819 Exchange serializer cuts down list of variants visible to the current user, based on permissions 2015-03-27 16:16:11 +11:00
Rob Harrington
524645aff4 Replacing visible_variants_for(exchange) with more general methods for determining visbility based on the enterprises involced and the current order cyclegs 2015-03-27 16:16:11 +11:00
Rob Harrington
d115ef5f7e Scoping old generalised order cycle helper methods to a specific order cycle 2015-03-27 16:16:10 +11:00
Rob Harrington
35b27fcfd2 Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for 2015-03-27 16:16:10 +11:00
Rob Harrington
b747f61eb1 P-OC permissions don't apply when determining which enterprises are loaded for order cycle interface 2015-03-27 16:16:10 +11:00
Rob Harrington
45f6042d3d Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator 2015-03-27 16:16:10 +11:00
Rob Harrington
a1aa9512a8 Fixing angular order_cycle controller spec 2015-03-27 16:16:10 +11:00
Rob Harrington
7e24e6743e enterprises_for is now order_cycle_enterprises_for, and can be passed an order_cycle or a coordinator (for new order_cycles) 2015-03-27 16:16:09 +11:00
Rob Harrington
c9f343f680 Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle) 2015-03-27 16:15:28 +11:00
Rob Harrington
d8c4e292c8 Adding method for determining variant override hubs 2015-03-27 16:09:45 +11:00
Rob Harrington
81765de7a7 Building a permission method to determine which enterprises are visible to the user for a given OC 2015-03-27 16:07:38 +11:00
Rob Harrington
4dff3fe79c Removing unused distributable action from products api 2015-03-27 16:07:38 +11:00