lin-d-hop
e4bd7c4e30
Revert changes that broke existing usage of this report
2020-03-10 10:59:18 +00:00
Luis Ramos
d99cba3b6e
Merge pull request #4709 from mkllnk/4172-js-pluralize
...
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
luisramos0
b0f2e01c70
Delete extra inventory_units that are for some unknown reason connected to shipments of orders to delete but not to orders to delete
2020-02-05 16:30:14 +11:00
Luis Ramos
a8b48a561f
Merge pull request #4733 from lin-d-hop/master
...
Fixing incorrect payment and balance calculation
2020-02-04 18:11:48 +00:00
Luis Ramos
ea75714561
Merge pull request #4635 from luisramos0/main_app_routes
...
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
Maikel Linke
9535c5647f
Make pluralisation code an independent lib
...
I considered moving the code to a service but I think that this code
can be completely independent of the Open Food Network use case. It
would be easy to move to a gem. The downcasing may need reconsidering
for general use.
2020-01-31 09:48:32 +11:00
Maikel Linke
1cce106977
Use our unit name pluralization in Ruby
...
This code will be used for the shop front and reports.
2020-01-31 09:48:32 +11:00
lin-d-hop
baf1ecb436
Fixing incorrect payment and balance calculation
...
Corrections and added specs
2020-01-29 16:06:06 +00:00
Matt-Yorkley
7d36c3b5aa
Make some private methods public in orders_and_fulfillments_report.rb
...
Fixes errors for "call to private method ..."
2020-01-15 13:05:36 +01:00
luisramos0
cbec495620
Fix some rubocop issues in order_and_distributor_report
2019-12-29 19:01:44 +00:00
luisramos0
55eea21bb0
Adapt order_and_distributor_report to the new editable_orders query
2019-12-29 19:01:44 +00:00
luisramos0
a8a6fce385
Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped
2019-12-28 18:45:57 +00:00
luisramos0
0202b59634
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
...
Something makes the query run much slower with these includes
2019-12-10 21:18:17 +00:00
Luis Ramos
6db15a0a20
Merge pull request #4524 from Matt-Yorkley/packing_reports
...
Packing reports performance
2019-12-02 17:32:52 +00:00
luisramos0
1e948735fb
Fix major performance problem by inverting the logic, instead of looking for line_items that are hidden, it looks for line items that are not editable using a merge statement that performs much better
...
Also, remove unnecessary if clause, merge will return an empty relation if no items are found, no need to test for empty.
The test report runs in a little over one minute instead of 8minutes
2019-11-30 22:38:03 +00:00
luisramos0
0ef4247914
Convert Report::LineItems to class and memoize orders so it's only executed once (this improves the report in 3secs for the case I am testing)
2019-11-29 21:51:54 +00:00
Matt-Yorkley
6d1fb63a21
Eager-load option_values on line_item objects instead of variants in packing reports.
2019-11-29 20:16:48 +01:00
Matt-Yorkley
9bcd303f4f
Remove shipping_category N+1 from packing reports
2019-11-29 20:16:48 +01:00
Matt-Yorkley
51177b833e
Remove customer_code N+1 from packing reports
2019-11-29 17:09:12 +01:00
luisramos0
cc3368704a
Fix rubocop issues in reports_controller_decorator and in report line_items
2019-11-29 13:54:30 +00:00
luisramos0
3959f16d65
Switch some more references from Permissions to Permissions::Order
2019-11-29 12:22:50 +00:00
luisramos0
beaa8ffa27
Use more specific selector to avoid ambigous column error
2019-11-29 11:45:22 +00:00
luisramos0
da6d035a1d
Rename some reports permissions to order_permissions
2019-11-29 11:23:17 +00:00
luisramos0
5cb77c443b
Fix rubocop issues
2019-11-29 10:53:40 +00:00
luisramos0
484cdd1e07
Make managed_and_related_enterprises public so they can be used by other permissions classes
2019-11-29 10:49:27 +00:00
luisramos0
89056e13ed
Extract order permissions to a separate class
2019-11-29 10:48:58 +00:00
luisramos0
df0458743b
Replace pluck with select in permissions to avoid extra queries
2019-11-28 23:37:49 +00:00
Matt-Yorkley
cbb3f202ca
Eager-load option_values in OpenFoodNetwork::ScopeVariantsForSearch
2019-11-23 10:58:18 +01:00
Matt-Yorkley
07fe8e8390
Eager-load option_values in various reports
2019-11-23 10:58:18 +01:00
Matt-Yorkley
6e58ffa927
Enable variant option_values to be successfully eager-loaded
2019-11-23 10:58:18 +01:00
Maikel
b54edff4cc
Merge pull request #4470 from luisramos0/oc_perms
...
Improve readability of OC permissions...
2019-11-20 11:38:38 +11:00
Matt-Yorkley
585135d27e
Fix shipping_method querying in customer totals reports
2019-11-18 15:14:10 +00:00
luisramos0
052cc2848f
Make visible_variants_for_incoming_exchanges_from and editable_variants_for_incoming_exchanges_from a bit easier to read
2019-11-18 13:25:38 +00:00
Luis Ramos
471ec2023e
Merge pull request #4426 from Matt-Yorkley/customer_totals
...
Orders and Fulfilment reports
2019-11-14 12:07:16 +00:00
Matt-Yorkley
1a5eea3303
Refactor #all_incoming_editable_variants
2019-11-12 11:59:39 +00:00
Matt-Yorkley
ab30307b1a
Simplify #active_outgoing_variants
2019-11-12 11:59:39 +00:00
Matt-Yorkley
35b68239b0
Tidy up AR query syntax
2019-11-12 11:59:39 +00:00
Matt-Yorkley
9e09a3b379
Memoize #active_outgoing_variants result
2019-11-12 11:59:39 +00:00
Matt-Yorkley
77105e265e
Memoize more repeated queries in #managed_enterprises
2019-11-12 11:59:38 +00:00
Matt-Yorkley
e73f2d682c
Remove N+1 in editable_variants_for_incoming_exchanges
2019-11-12 11:59:13 +00:00
Matt-Yorkley
c2823b3ffe
Memoize #user_manages_coordinator_or result
2019-11-12 11:59:13 +00:00
Matt-Yorkley
c1366fced5
DRY some more variant queries
2019-11-12 11:59:13 +00:00
Matt-Yorkley
2a5403e23f
Clean up "visible and editable" variants
2019-11-12 11:59:13 +00:00
Matt-Yorkley
dc540444a2
Remove pointless code
2019-11-12 11:59:13 +00:00
Matt-Yorkley
ca5ecc4696
Refactor "active outgoing variants"
2019-11-12 11:59:13 +00:00
Matt-Yorkley
5082a133a1
Refactor adjustment fetching into new service and module
2019-11-12 11:57:54 +00:00
Matt-Yorkley
1f8e0ae637
Improve SupplierTotalsByDistributorReport
2019-11-12 11:57:19 +00:00
Matt-Yorkley
24e66b635b
Improve DistributorTotalsBySupplierReport
2019-11-12 11:57:19 +00:00
Matt-Yorkley
891db4b81b
Move methods to helper
2019-11-12 11:57:19 +00:00
Matt-Yorkley
8a57977b44
Increase eager-loading and adjustment calculations
2019-11-12 11:57:19 +00:00
