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
|
fcbb883244
|
Transpec taxon_spec
|
2020-09-05 16:43:27 +01:00 |
|
Luis Ramos
|
c35b330d25
|
Fix taxon_spec
|
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
|
8867ec977c
|
Bring missing factory from spree_core and use ofn's calculator
|
2020-09-05 16:38:37 +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
|
e96428e7e2
|
Transpec adjustment_spec
|
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 |
|
Transifex-Openfoodnetwork
|
61dad61ef7
|
Updating translations for config/locales/en_GB.yml
|
2020-09-05 02:37:15 +10:00 |
|
Luis Ramos
|
60e241b2c8
|
Merge pull request #5984 from openfoodfoundation/transifex
Transifex
v3.2.6
|
2020-09-04 17:19:37 +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 |
|
Pau Pérez Fabregat
|
c7bcd61755
|
Merge pull request #5990 from coopdevs/dont-require-overrides
Do not require view overrides
|
2020-09-04 17:20:04 +02: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
|
874cb78809
|
Depend on version of spree without controller helpers, which are already on OFN side. This way we avoid conflicts
|
2020-09-04 12:48:22 +01:00 |
|
Eduardo
|
71876ca23a
|
change spec to use new authentication helper and user factory
|
2020-09-04 08:48:16 -03:00 |
|
Eduardo
|
07e5f8ed8d
|
fix typo on title of specs
|
2020-09-04 08:45:58 -03:00 |
|
Eduardo
|
11684dae65
|
hide environment on payment methods when user is not admin
|
2020-09-04 08:45:57 -03:00 |
|
Pau Perez
|
4499bc7313
|
Do not require view overrides
View overrides were removed long ago, so no need to require an empty
list.
The next step will be class decorators.
|
2020-09-04 13:27:38 +02: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 |
|
dependabot-preview[bot]
|
cb61c83688
|
Bump stripe from 5.22.0 to 5.25.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.22.0 to 5.25.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.22.0...v5.25.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2020-09-03 17:49:28 +00: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 |
|
Transifex-Openfoodnetwork
|
42d90465b1
|
Updating translations for config/locales/fr_CA.yml
|
2020-09-04 03:21:50 +10:00 |
|
Transifex-Openfoodnetwork
|
457dfdd18a
|
Updating translations for config/locales/en_CA.yml
|
2020-09-04 03:13:22 +10:00 |
|
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
|
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 |
|