Luis Ramos
c6741dda36
Fix rubocop complexity issues by making code easier to read
2020-09-03 09:11:00 -07:00
Andy Brett
55f9fef2c3
denote that weight is in grams on the bulk order management page
2020-09-03 09:11:00 -07:00
Andy Brett
4bc3101f4d
Add specs for shipping weight calculations using lbs and oz
2020-09-03 09:11:00 -07:00
Andy Brett
404d7bbc43
add test for options_text using g/lb
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
d7a8873ee9
return empty string for unitName if no scale matches
2020-09-03 09:11:00 -07:00
Andy Brett
a2993652c1
get only compatible scales in option_value_namer.js.coffee
2020-09-03 09:11:00 -07:00
Andy Brett
08e6e5a459
add compatibleUnitScales function and spec
2020-09-03 09:11:00 -07:00
Andy Brett
0018ef6eb4
refactor variant_unit_manager.coffee and add systems to scales
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
e5e7e12a32
green tests for sorted scales
2020-09-03 09:11:00 -07:00
Andy Brett
2f216039ac
update variantunitmanager test expectation
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
Luis Ramos
8256a20aea
Update all locales with the latest Transifex translations
2020-09-03 13:27:16 +01:00
Luis Ramos
07e17d7931
Merge pull request #5979 from mkllnk/fix-locale-for-transifex
...
Add required plural form to locale
2020-09-03 13:21:13 +01:00
Luis Ramos
e177ba5e29
Merge pull request #5977 from openfoodfoundation/transifex
...
Transifex
2020-09-03 13:19:33 +01:00
Transifex-Openfoodnetwork
d3f48bf684
Updating translations for config/locales/nb.yml
2020-09-03 22:16:04 +10:00
Transifex-Openfoodnetwork
63a6ceede3
Updating translations for config/locales/en_NZ.yml
2020-09-03 19:57:50 +10:00
Luis Ramos
185c246a83
Merge pull request #5965 from coopdevs/ignore-pyenv-file
...
Gitignore pyenv's Python version file
2020-09-02 23:50:42 +01:00
Luis Ramos
83361255aa
Merge pull request #5969 from luisramos0/fungi
...
Replace beef with fungi in sample data 🐮
2020-09-02 23:47:43 +01:00
Luis Ramos
b4759ff869
Merge pull request #5869 from luisramos0/images
...
[Bye bye Spree] Bring models image and asset from spree_core
2020-09-02 19:44:40 +01:00
Transifex-Openfoodnetwork
5bc0eca493
Updating translations for config/locales/en_FR.yml
2020-09-02 23:08:34 +10:00
Transifex-Openfoodnetwork
f6eb05a6f1
Updating translations for config/locales/fr.yml
2020-09-02 23:07:46 +10:00
Maikel Linke
09f0035bbd
Add required plural form to locale
...
Transifex complained:
> Key 'spree.activerecord.models.spree/payment' has the wrong number of plurals
While our application may not need that translation, Transifex won't
accept the source file and our updates were broken.
2020-09-02 15:06:15 +10:00
Luis Ramos
2cb6124b7a
Use existing product factory, the custom product is not needed here
2020-09-01 17:13:07 +01:00
Luis Ramos
653b71dbd4
Remove duplicated spec
2020-09-01 17:10:51 +01:00
Luis Ramos
b36d0bc4f3
Fix easy rubocop isssues
2020-09-01 17:09:22 +01:00
Luis Ramos
b2cf414fb8
Use exiting translation
2020-09-01 17:09:22 +01:00
Luis Ramos
5958c2f68c
Rubocop autocorrect
2020-09-01 17:09:22 +01:00
Luis Ramos
13f0a46bc2
Merge decorator with original file from spree
2020-09-01 17:09:22 +01:00
Luis Ramos
b9f7a98c46
Bring image, asset and images_helper from spree_core
2020-09-01 17:09:22 +01:00
Transifex-Openfoodnetwork
a65bd8edac
Updating translations for config/locales/en_US.yml
2020-09-02 01:28:57 +10:00
Luis Ramos
ea053552b9
Merge pull request #5938 from cillian/bulk-coop-report-filter-fixes
...
Fix the bulk coop report date and distributor filters.
2020-09-01 16:21:31 +01:00
Luis Ramos
52fb3c92f0
Merge pull request #5954 from romale/patch-10
...
Missing translation key en.credit_owed and en.new_adjustment
2020-09-01 16:21:22 +01:00
Luis Ramos
5e49e03477
Merge pull request #5964 from coopdevs/fix-flaky-product-update-spec
...
Check taxon's attribute instead of object identity
2020-09-01 12:06:02 +01:00
Pau Pérez Fabregat
c56962b949
Merge pull request #5966 from openfoodfoundation/dependabot/bundler/bugsnag-6.17.0
...
Bump bugsnag from 6.16.0 to 6.17.0
2020-09-01 09:55:11 +02:00
Luis Ramos
3df5a0644f
Make sample data vegetarian
2020-08-31 10:57:07 +01:00
Pau Perez
6bb37a3942
Check taxon's attribute instead of object identity
...
We don't care about the Ruby object instance but the actual DB record it
represents.
2020-08-31 11:05:12 +02:00
Maikel
a029a86f0d
Merge pull request #5893 from arku/chore/resend-button-removal
...
Remove resend button on the orders edit page
2020-08-31 11:18:05 +10:00
Luis Ramos
c9758b8b0b
Merge pull request #5957 from coopdevs/improve-stripe-connection-spec
...
Improve StripeAccountsController#connect spec
2020-08-30 22:02:22 +01:00
Arun Kumar Mohan
bf07da6267
Fix the order resend message translation
2020-08-29 20:47:28 -05:00
Arun Kumar Mohan
bb9ab57699
Remove resend button on the orders edit page
2020-08-29 20:47:28 -05:00
dependabot-preview[bot]
7e274868fa
Bump bugsnag from 6.16.0 to 6.17.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.16.0 to 6.17.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.16.0...v6.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-28 15:16:12 +00:00
Pau Pérez Fabregat
7cb49ac9a8
Merge pull request #5866 from luisramos0/ctry_zone
...
[Bye bye Spree] Bring models country, zone and zone_member from spree_core
2020-08-28 13:23:59 +02:00
Cillian O'Ruanaidh
9efee1b0be
In bulk coop report service spec just check array has the same elements but don't check the order.
...
The #table_items methos seems to return line items in different order sometimes making this test a bit flaky. The test passed on Semaphore previously and is passing in development. I don't think the order matters so using :match_array instead of :eq.
2020-08-28 12:20:47 +01:00
Pau Perez
defb6e4fa4
Update all locales with the latest Transifex translations
2020-08-28 13:19:39 +02:00
