Commit Graph

14886 Commits

Author SHA1 Message Date
Luis Ramos
51ed9a6b78 Fix comment and point out that it's a fix to a spree issue 2020-09-05 16:38:36 +01:00
Luis Ramos
b629a4f912 Make new specs pass 2020-09-05 16:38:36 +01:00
Luis Ramos
967380c542 Fix easy rubocop issues 2020-09-05 16:38:36 +01:00
Luis Ramos
ff0aa377a1 Run rubocop autocorrect 2020-09-05 16:38:36 +01:00
Luis Ramos
da683e3ecf Merge decorators with original code from spree_core 2020-09-05 16:38:36 +01:00
Luis Ramos
aa46a4b5da Bring models related to taxes and adjustments from spree_core 2020-09-05 16:38:36 +01:00
Luis Ramos
d8165aeec1 Merge pull request #5987 from luisramos0/spree_core_without_ctrl_hlpers
Depend on version of spree without controller helpers
2020-09-04 17:18:17 +01:00
Luis Ramos
9c0c324835 Add some requires now required as spree does not contain controller helpers 2020-09-04 14:30:17 +01:00
Eduardo
11684dae65 hide environment on payment methods when user is not admin 2020-09-04 08:45:57 -03:00
Luis Ramos
e44efd3db2 Change test of attachment from present? to file? 2020-09-04 10:06:41 +01:00
Luis Ramos
4fe24da3ec Merge pull request #5748 from mbudm/issue/5072
Add redirect to shop on order cycle change
2020-09-04 10:03:07 +01:00
Luis Ramos
d80a44ade0 Merge pull request #5867 from luisramos0/stock
[Bye bye Spree] Bring models stock_location and stock_movement from spree_core
2020-09-03 18:35:55 +01:00
Luis Ramos
e413920335 Move both OptionValueNamer and VariantAndLineItemNaming to app/services/variant_units 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
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
e5e7e12a32 green tests for sorted scales 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
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
f28241cc5e Merge duplicate Spree::User#superadmin? into existing Spree::admin? 2020-09-02 22:41:42 +01:00
Luis Ramos
ebf4175662 MErge user class extensions into the User class 2020-09-02 22:41:39 +01:00
Luis Ramos
737fc699ed Fix rubocop issues 2020-09-02 22:40:46 +01:00
Luis Ramos
caf61e3a7e Run rubocop -a 2020-09-02 22:40:28 +01:00
Luis Ramos
dfa00a770a Bring user and ability related files from spree_core 2020-09-02 22:37:27 +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
Luis Ramos
ffac38d934 Remove option to enter state_name for countries without states
Thisis not supported in OFN
2020-09-01 16:06:49 +01:00
Luis Ramos
5716ea8611 Fix rubocop issue 2020-09-01 15:55:46 +01:00
Luis Ramos
ed114f4c4c Fix rubocop issues 2020-09-01 15:52:36 +01:00
Luis Ramos
ffa0d202be Add states api endpoint to support existing code on the customer details page when user changes country 2020-09-01 15:46:22 +01:00
Luis Ramos
41d797489d Make onchange code simpler 2020-09-01 14:52:18 +01:00
Luis Ramos
46623242f7 Make use_billing checkbox work again, missign js code from spree 2020-09-01 14:28:45 +01:00
Luis Ramos
1a39a55009 Fix problem of converting from erb to haml 2020-09-01 14:09:06 +01:00
Luis Ramos
56fb09c006 Remove unused class 2020-09-01 14:03:20 +01:00
Luis Ramos
e4dee8a2fb Replace hash rockets 2020-09-01 13:57:57 +01:00
Luis Ramos
04f9c5ec5e Convert address form from erb to haml 2020-09-01 13:53:19 +01:00
Luis Ramos
8c322c1a0f Move shared address_form partial to the only place where it is used, order customer_details 2020-09-01 13:49:17 +01:00
Luis Ramos
b413f856a5 Clarify that it's a Spree issue number 2020-09-01 09:46:41 +01:00
Luis Ramos
2f93a06dd5 Run rubocop -a on files brought from spree_core 2020-09-01 09:46:41 +01:00
Luis Ramos
c151195e3a Merge decorator with original class and delete dead code 2020-09-01 09:46:41 +01:00
Luis Ramos
7ec00cf40a Bring base files from spree_core 2020-09-01 09:45:11 +01:00
Luis Ramos
d87d5d3537 Fix stock_movement and stock_location specs brought from spree_core
propagate_all_variants is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
e0ea25b7a3 track_inventory_levels is always true in OFN 2020-09-01 09:42:24 +01:00
Luis Ramos
8f19ad0646 Delete dead code 2020-09-01 09:42:24 +01:00
Luis Ramos
e89eb8f76c Fix simepl rubocop issues 2020-09-01 09:42:24 +01:00