Andy Brett
c618ba3b2c
style fixes
2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318
add drop down list for unit preference
2020-09-07 13:26:09 -07:00
Andy Brett
adb29a9c8f
add preferred_unit to weight shipping calculator
2020-09-07 08:41:48 -07:00
Andy Brett
5793f0103d
Revert "Add a per-pound calculator and a spec for it"
...
This reverts commit e8eadcbf39
2020-09-07 07:50:59 -07:00
Andy Brett
e8eadcbf39
Add a per-pound calculator and a spec for it
2020-09-06 09:03:06 -07:00
Luis Ramos
6e8fe080cb
Fix easy rubocop issues
2020-09-05 18:39:56 +01:00
Luis Ramos
5521b4bb04
Remove unused product filters
2020-09-05 16:43:27 +01:00
Luis Ramos
4183dda27e
Fix long line
2020-09-05 16:43:27 +01:00
Luis Ramos
57e74a4980
Fix rubocop issues
2020-09-05 16:43:27 +01:00
Luis Ramos
a1b64fe27b
Rubocop auto-correct
2020-09-05 16:43:27 +01:00
Luis Ramos
49060892e8
Merge decorators into original files from spree_core
2020-09-05 16:43:27 +01:00
Luis Ramos
9175504bc1
Bring taxon, taxonomy and classification from spree_core
2020-09-05 16:43:27 +01:00
Luis Ramos
4931edc67c
Remove code related to promotions, we dont have promotions in OFN
2020-09-05 16:38:37 +01:00
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
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
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
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
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
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
Luis Ramos
0b053c18af
Merge decoorator with original file from spree
2020-09-01 09:42:24 +01:00
Luis Ramos
d13bd86e4c
Bring stocck movement and stock location from spree
2020-09-01 09:42:24 +01:00
Luis Ramos
208be3ede6
Fix rubocop issues
2020-08-31 20:00:08 +01:00
Luis Ramos
66587ccc00
Allow user to remove terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
1a734aacf8
Allow user to upload terms and conditions PDF file to an enterprise
2020-08-31 17:40:34 +01:00
Pau Pérez Fabregat
4984cc9758
Merge branch 'master' into ctry_zone
2020-08-28 09:21:57 +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
5b3e350204
Rename zone.country_list to zone.countries
2020-08-26 23:12:48 +01:00
