raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,037 Commits 21 Branches 450 Tags
3760a34b2ba66f6e5bc615af8d41eb861219d97a
Commit Graph

537 Commits

Author SHA1 Message Date
Rob Harrington
9b5bfdeb00 Allowing Order Management Report to filter by multiple payment / shipping methods at once 
Also switched to using id rather than name to filter
 2016-04-02 01:04:09 +11:00
Lynne Davis
f8e3f29d1a More bug fixes. Spec updated to reflect changes 2016-04-02 01:04:09 +11:00
Lynne Davis
d844dc8e1b Bug fixes to Order Cycle Reports 2016-04-02 01:04:09 +11:00
Rohan Mitchell
9645ec727b Refresh products cache when inventory items are changed 2016-03-09 14:07:04 +11:00
Rohan Mitchell
6f29a8b642 Refresh cache when inventory setting product_selection_from_inventory_only is changed 2016-03-09 13:29:33 +11:00
Rohan Mitchell
27d7b3026b Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model 2016-03-09 12:28:09 +11: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
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
186d1c1f26 Revoking ability to create variant overrides via OC permission 2016-03-02 12:10:49 +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
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
59745fbc73 EnterpriseFees can inherit tax_category from product 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
Rohan Mitchell
2abee3fcdd Extract integrity checking to lib class 2016-03-02 11:01:41 +11:00
Rohan Mitchell
21ce7ab30a Fix integrity checker error message, add task to warm products cache 2016-02-26 13:04:55 +11:00
Rohan Mitchell
71862e00a7 Perform products cache refresh when producer property changed or destroyed 2016-02-24 16:11:59 +11:00
Rohan Mitchell
1b62dd06b8 Add products cache integrity checker 2016-02-24 15:05:03 +11:00
Rohan Mitchell
687fb6f0aa Enqueue RefreshProductsCacheJob with lower than default priority 2016-02-24 15:05:03 +11:00
Rohan Mitchell
98961fef74 Trigger cache refresh when producer property changed or destroyed 2016-02-24 15:05:03 +11:00
Rohan Mitchell
8af6866ae4 Refresh products cache when exchange is changed or destroyed 2016-02-24 15:05:03 +11:00
Rohan Mitchell
146797ea61 Generalise method for reuse 2016-02-24 15:05:03 +11:00
Rohan Mitchell
8bd5a36aaf Remove enterprise fee destruction cache callback - responsibility to be handled by dependent models 2016-02-24 15:05:03 +11:00
Rohan Mitchell
a64a501dbb Smarter job queuing: Do not enqueue a RefreshProductsCacheJob if there's already one waiting to run 2016-02-24 15:05:03 +11:00
Rohan Mitchell
fa543fed63 Deal with unset distribution 2016-02-24 15:05:02 +11:00
Rohan Mitchell
235c463849 Hide wrapped exception, too 2016-02-24 15:05:02 +11:00
Rohan Mitchell
ff493c21d4 Log a warning on cache MISS 2016-02-24 15:05:02 +11:00
Rohan Mitchell
d0b7b4ee50 Add CachedProductsRenderer - wraps ProductsRenderer using Rails cache 2016-02-24 15:05:02 +11:00
Rohan Mitchell
3bcd3257a1 Perform refresh of products cache when supplier fee is changed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
fbedff4eca Perform refresh of products cache when distributor fee is changed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
af7e3380d3 Perform refresh of products cache when coordinator fee is changed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
0c65d1ddd8 Trigger products cache refresh when enterprise fee changed or destroyed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
fe41430d1e Rerefesh products cache when an order cycle is changed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
1ec329284c Refresh products cache when a variant override is destroyed 2016-02-24 15:05:02 +11:00
Rohan Mitchell
b7a88fd03b Perform refresh of products cache for variant override change 2016-02-24 15:05:02 +11:00
Rohan Mitchell
5f188650d8 Trigger cache refresh on VariantOverride save/destroy 2016-02-24 15:05:01 +11:00
Rohan Mitchell
c98e44c5a1 Perform refresh of products cache on product change 2016-02-24 15:05:01 +11:00
Rohan Mitchell
0c0c98a0b0 Refresh products cache on product change 2016-02-24 15:05:01 +11:00
Rohan Mitchell
6d39cc39c6 When a variant is destroyed, update product cache 2016-02-24 15:05:01 +11:00
Rohan Mitchell
a0a61b65cb Refresh the appropriate product caches when a variant is changed 2016-02-24 15:05:01 +11:00
Rohan Mitchell
6df8f73bb0 Make method naming more explanatory 2016-02-24 15:05:01 +11:00
Rohan Mitchell
0d5d015d88 Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked. 2016-02-24 15:05:01 +11:00
Maikel Linke
82182d24e7 Merge remote-tracking branch 'origin/master' into discourse-sso 2016-02-19 11:02:59 +11:00
Rob Harrington
521f227f74 Adding sku and on_demand to VariantOverride 2016-01-13 18:49:33 +11:00
Maikel Linke
030f4f63ed SingleSignOn controller with routes and config 2016-01-07 12:58:30 +11:00
Maikel Linke
09086b8dd8 Reference implementation of SSO from Discourse 2016-01-06 15:39:41 +11:00
Rob Harrington
e67e22ee73 Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security 
Conflicts:
	lib/open_food_network/xero_invoices_report.rb
 2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2 Restricting access to orders within Sales Tax Report 
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
 2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e Restricting access to orders within Xero Invoices Report 
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
 2015-12-17 14:21:30 +11:00