Luis Ramos
e413920335
Move both OptionValueNamer and VariantAndLineItemNaming to app/services/variant_units
2020-09-03 09:11:00 -07:00
Luis Ramos
83ae13d7c7
Extract method to make code easier to read
2020-09-03 09:11:00 -07:00
Luis Ramos
9204687e4d
Fix rubocop issues
2020-09-03 09:11:00 -07:00
Luis Ramos
c6741dda36
Fix rubocop complexity issues by making code easier to read
2020-09-03 09:11:00 -07:00
Andy Brett
55e448897f
use fewer sigfigs for ounces; add spec to option_value_namer
2020-09-03 09:11:00 -07:00
Andy Brett
2fe9f4abc8
style updates for rubocop
2020-09-03 09:11:00 -07:00
Andy Brett
9b9b6ded09
add each scales system in option_value_namer.rb
2020-09-03 09:11:00 -07:00
Andy Brett
e99799bca2
add ounces and round up for lbs
2020-09-03 09:11:00 -07:00
Zee Spencer
f5e300a5de
Presenting a line item or variants options_text uses overriden values
...
This changes how we display the description of weight, but it doesn't
change the `Spree::OptionValue`s that are being created when someone
adds a product to their cart.
This takes us closer by making the UI look more correct; but it feels
odd compared to settiong the `Spree::OptionValue` to the correct
unit on creation.
But on the other hand, that could possibly make things worse for the
shipping calculation bits.
2020-09-03 09:10:59 -07:00
Zee Spencer
ae0b76e610
Support imperial units when scaling the unit value
...
We are pretty sure this is not the correct final implementation, but
we wanted to get some tests failing so we can start to fix them.
2020-09-03 09:10:59 -07:00
Zee Spencer
cb09c935dc
WIP: Products may be created with pounds for their weight unit_converter
...
See: https://community.openfoodnetwork.org/t/hubs-managers-can-choose-the-adapted-weight-and-measure-units-for-their-shops-given-their-own-local-situation/1289/11
We're not entirely sure what needs to be changed in order for this to
accurately work with shipping and other parts of the eCommerce platform.
We are assuming that so long as we canonically store the weight scale
in grams, that the shipping calculation will be able to do what it needs
to. So if we put in values for "oz" as grams, we may not need to do
much else in order to let product(s) be sold by the pound (or ounce).
Next steps appear to be:
- [ ] When looking at an order as a customer, do we want to show pounds
instead of grams? (See: http://localhost:3000/orders/R125684626 )
- [ ] Compile a list of tests that are worth writing (because we have
no confidence that we know what we are supposed to be doing in
order for this feature to be "ready" to be used by people.)
- [ ] Write a test that demonstrates when we create a product with a
variant in pound that the product's shipping weight is correctly
calculated?
- [ ] Do we want to think about i18n?
2020-09-03 09:10:59 -07:00
Matt-Yorkley
28651bbecf
Merge pull request #5941 from luisramos0/no_spree_specs
...
[Bye bye Spree] Make OFN independent of spec helpers under core/lib/testing_support
2020-08-27 17:05:45 +02:00
Pau Pérez Fabregat
2fa8cd54fd
Merge pull request #5769 from Matt-Yorkley/customer-names
...
Customer names in reports
2020-08-27 15:39:47 +02:00
Luis Ramos
5cd40cb19f
Remove dependency to Spree::TestingSupport code
2020-08-22 18:14:53 +01:00
Matt-Yorkley
102df28e97
Extract data masking to service
2020-08-14 20:48:33 +01:00
Matt-Yorkley
9a9538dace
Don't hide customer names if enterprise has enabled :allow_customer_names perference
2020-08-14 20:48:33 +01:00
Maikel Linke
c3e0f45f1a
Remove unused Report class from lib
...
Also removing related unused classes and their specs.
2020-08-14 15:38:10 +10:00
Maikel Linke
0a1947ae34
Remove unused module from lib
...
I was looking for library files that may be used but are not loaded.
I would then add the missing `require` statements. But I found that this
module isn't used any more.
Usage removed in:
310d1b3726
2020-08-14 15:38:10 +10:00
Luis Ramos
e8417b8be6
Remove specs testing filtering of master variants
...
Master variants are not used in the report
2020-07-01 18:13:30 +01:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Luis Ramos
0ba1642bd2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
e574e254db
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:57:12 +01:00
Luis Ramos
fb92745db4
Fix rubocop issues
2020-06-22 12:41:31 +01:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Pau Pérez Fabregat
e02191078d
Merge pull request #5595 from coopdevs/improve-payments-report-performance
...
Remove N+1 fetching payments in report
2020-06-18 12:32:40 +02:00
François Turbelin
9abe41f6cb
Use OrderTaxAdjustmentsFetcher service
2020-06-16 14:01:27 +02:00
Pau Pérez Fabregat
257b311e04
Merge pull request #5158 from openfoodfoundation/3-0-stable
...
Merge 3-0-stable to master
2020-06-15 13:35:58 +02:00
Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Pau Perez
df887b5576
Wrap long line
...
pick e84e0aebee725f3331
2020-06-15 09:25:30 +02:00
Pau Perez
018772bbba
Remove N+1 fetching payments in report
2020-06-12 16:42:40 +02:00
Pau Perez
29246c15fe
Defend from order without billing address
...
This a data integrity issue that needs deeper investigation but while
this happens, our users can still render their reports.
2020-06-12 16:34:23 +02:00
Matt-Yorkley
e725f33318
Defend from an order w/o payments when building table
2020-06-11 12:37:51 +02:00
Cillian O'Ruanaidh
406309c577
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
...
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +01:00
Cillian O'Ruanaidh
d436d18d19
Fix code climate violations in removal of Blockenspiel dependency.
2020-06-05 10:13:06 +01:00
Cillian O'Ruanaidh
d02f64da06
Define bulk coop report summary row and columns with lists of method names instead of Procs.
2020-05-29 11:34:12 +01:00
Cillian O'Ruanaidh
1fba998b9e
Drop Blockenspiel and use :rules/:columns methods instead of :organise/:summary_columns DSL.
...
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3231
2020-05-28 19:04:18 +01:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Luis Ramos
6fcca0197c
Merge pull request #5450 from rmklaus12/5095-ordercycle-amtqty-translations
...
Changed report_header fields for amount and quantity to reflect corre…
2020-05-21 21:21:14 +01:00
Maikel Linke
2d95e9ebc0
List each order only once in report
2020-05-19 10:38:28 +10:00
Robin Klaus
311bbd2aa2
Changed report_header fields for amount and quantity to reflect correct translation to French
2020-05-18 18:41:04 +10:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Matt-Yorkley
ab143ceaed
Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report
...
Change date displayed on sales_tax reports
2020-05-11 09:56:38 +02:00
Luis Ramos
d967d855fc
Merge pull request #5319 from Matt-Yorkley/caching-by-class
...
[Caching] Caching data by class
2020-05-07 11:43:44 +01:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
François Turbelin
6e5cbebf4a
Change date value on order_and_distributor_report
2020-05-05 12:27:17 +02:00
François Turbelin
9cfd7db99d
Change date displayed on sales_tax reports
2020-05-05 12:27:17 +02:00
Rob H
6405c34428
Add order number and date/time to order cycles customer report
2020-04-29 21:20:14 +10:00
Matt-Yorkley
ec581dccb8
Use class-based caching for queries in EnterpriseInjectionData
2020-04-28 15:11:59 +02:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
