Luis Ramos
ff8a81cee7
Remove includes already present in parent ApplicationController
2021-01-15 21:59:16 +00:00
Luis Ramos
0eab1b2339
Merge Spree::BaseController with ApplicationController
2021-01-15 21:59:16 +00:00
Matt-Yorkley
c0c7c6ec78
Update checkout helper summing and add test coverage
2021-01-15 17:29:21 +00:00
Matt-Yorkley
5593da2928
Delete dead code #update_hooks
...
These hooks allow Spree core to be modified by other gems and apps without changing Spree code. We don't use it. #YAGNI
2021-01-15 16:49:45 +00:00
Andy Brett
f179214920
Merge pull request #6677 from Matt-Yorkley/remove-debugging
...
Remove debugging code from spec
2021-01-15 08:30:00 -08:00
Matt-Yorkley
1eb08ba31c
Define basic models in migration
2021-01-15 16:17:18 +00:00
Transifex-Openfoodnetwork
8f8f430e87
Updating translations for config/locales/en_CA.yml
2021-01-16 02:04:42 +11:00
Transifex-Openfoodnetwork
6be14dfb29
Updating translations for config/locales/fr_CA.yml
2021-01-16 01:58:02 +11:00
Matt-Yorkley
8cc4c6a63f
Introduce soft-deprecation strategy when modifying tax rates
...
If an admin changes the amount on a tax rate, and that rate has been used by adjustments in the past, we need to soft-delete and clone it to preserve the data integrity of previous adjustments that were created using that rate.
2021-01-15 13:38:03 +00:00
Matt-Yorkley
c870af8981
Remove debugging output.
2021-01-15 13:21:03 +00:00
Transifex-Openfoodnetwork
c132a5351f
Updating translations for config/locales/it.yml
2021-01-15 23:46:42 +11:00
Transifex-Openfoodnetwork
dc76f161a3
Updating translations for config/locales/es.yml
2021-01-15 23:42:27 +11:00
Transifex-Openfoodnetwork
26e817818f
Updating translations for config/locales/ca.yml
2021-01-15 23:34:40 +11:00
Pau Pérez Fabregat
5129611cff
Merge pull request #6668 from luisramos0/disable_cache_instrumentation
...
[Rails 5] Make app startup in rails 5 and update Gemfile_next.lock
2021-01-15 13:15:07 +01:00
Pau Pérez Fabregat
f240402c43
Merge pull request #6654 from Matt-Yorkley/update-without-callbacks
...
Remove #update_attributes_without_callbacks
2021-01-15 12:24:42 +01:00
Cillian O'Ruanaidh
79668e06a7
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-15 10:24:50 +00:00
Cillian O'Ruanaidh
110d692ffa
Include the 'Ready for' time for the order cycle in the Notify Producers Email
...
This is so people can distinguish which order cycle the email is referring to. Fixes #6371
2021-01-15 09:24:05 +00:00
dependabot[bot]
8e4e276995
Bump paypal-sdk-merchant from 1.106.1 to 1.117.2
...
Bumps [paypal-sdk-merchant](https://github.com/paypal/merchant-sdk-ruby ) from 1.106.1 to 1.117.2.
- [Release notes](https://github.com/paypal/merchant-sdk-ruby/releases )
- [Changelog](https://github.com/paypal/merchant-sdk-ruby/blob/master/ChangeLog.txt )
- [Commits](https://github.com/paypal/merchant-sdk-ruby/compare/v1.106.1...v1.117.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-01-15 05:49:20 +00:00
Andy Brett
9639c2af57
Update all locales with the latest Transifex translations
2021-01-14 17:24:42 -08:00
Andy Brett
cd383189c9
Merge pull request #6667 from openfoodfoundation/transifex
...
Transifex
2021-01-14 17:11:20 -08:00
Luis Ramos
209e2f20c5
Add rails 5 version for js template helpers
2021-01-15 00:23:37 +00:00
Luis Ramos
bc2d966e5f
Remove commented code
2021-01-15 00:22:20 +00:00
Luis Ramos
874da929d3
Disable db2fog in rails 5, it doesnt work, we need to find an alternative for rails 5
2021-01-15 00:21:28 +00:00
Luis Ramos
02a1116fff
Remove cache intrumentation
...
It doesnt work in rails 5 and apparently it was introduced to debug already deleted products cache in staging
See this commit that introduced it 10a79d5a65
2021-01-14 23:45:05 +00:00
Luis Ramos
d06c1fa665
Update Gemfile_next.lock
2021-01-14 23:44:09 +00:00
Maikel
d16bfbad93
Merge pull request #6662 from luisramos0/action_dispatch
...
First rails 5 upgrade PR with dual boot: remove action_dispatch/request if on rails 5 so we can boot the app in rails 5
2021-01-15 10:17:05 +11:00
Maikel
52b417877a
Merge pull request #6660 from openfoodfoundation/dependabot/bundler/webmock-3.11.1
...
Bump webmock from 3.11.0 to 3.11.1
2021-01-15 09:52:10 +11:00
Andy Brett
7ca81f45d0
Merge pull request #6641 from Matt-Yorkley/shipping-method-soft-deletion
...
Ensure ShippingMethod is correctly using soft-deletion
2021-01-14 11:53:19 -08:00
Transifex-Openfoodnetwork
3610827869
Updating translations for config/locales/en_GB.yml
2021-01-15 06:42:28 +11:00
Transifex-Openfoodnetwork
a0ee8cb1b3
Updating translations for config/locales/en_FR.yml
2021-01-15 06:01:40 +11:00
Andy Brett
18dcbbd892
Merge pull request #6613 from Matt-Yorkley/variant-override-serialization
...
Don't serialize all variant override objects where they are not needed
2021-01-14 10:59:11 -08:00
Transifex-Openfoodnetwork
577be5f70b
Updating translations for config/locales/fr.yml
2021-01-15 05:57:20 +11:00
Andy Brett
81ea71af94
Merge pull request #6652 from jibees/6651-remove-trailing-asterisk-on-non-mandatory-field
...
remove asterisk on 'display as' field unit value for a product
2021-01-14 10:09:15 -08:00
Pau Pérez Fabregat
929ae82e00
Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal
...
Bye Bye Spree Paypal
2021-01-14 18:16:44 +01:00
Pau Pérez Fabregat
9689fe2edf
Merge pull request #6384 from andrewpbrett/fix-product-descriptions
...
correctly display '&' and ' ' in product descriptions
2021-01-14 17:00:16 +01:00
Luis Ramos
82b2777cb3
Remove action_dispatch/request if on rails 5 so we can boot the app in rails 5
2021-01-14 09:48:59 +00:00
Luis Ramos
fd0bba19a7
Adapt enterprises code and specs to new namespace Sets::EnterpriseSet
2021-01-14 09:41:07 +00:00
Luis Ramos
ed0441dc41
Fix a few more rubocop issues
2021-01-14 09:41:07 +00:00
Luis Ramos
19b12092a0
Fix rubocop issues and adapt exceptions file
2021-01-14 09:41:07 +00:00
Luis Ramos
5d6d7f7ad0
Adapt enterprise fees code and specs to new namespace of Sets::EnterpriseFeeSet
2021-01-14 09:41:07 +00:00
Luis Ramos
96a351ad0e
Adapt usage of Sets to their new location
2021-01-14 09:41:07 +00:00
Luis Ramos
187b4a1fc2
Add Sets namespace to each set file
2021-01-14 09:41:07 +00:00
Luis Ramos
8e65d29b02
Move sets to specific services namespace
2021-01-14 09:41:07 +00:00
Pau Pérez Fabregat
9db4f9be15
Merge pull request #6634 from Matt-Yorkley/jobs-cleanup
...
Jobs cleanup
2021-01-14 10:08:15 +01:00
Pau Pérez Fabregat
85e932274d
Merge pull request #6442 from luisramos0/rails5-dualboot
...
Rails 5 upgrade with dualboot
2021-01-14 10:00:54 +01:00
Maikel
168958311a
Merge pull request #6656 from Matt-Yorkley/payment-identifier
...
Fix payment identifier generation
2021-01-14 17:34:38 +11:00
Maikel
fbda1fffd7
Merge pull request #6653 from Matt-Yorkley/dead-code-available-payment
...
Dead code: #has_available_payment
2021-01-14 17:33:07 +11:00
Maikel
50472d18e0
Merge pull request #6642 from coopdevs/doc-customer-serializer
...
Doc customer serializer
2021-01-14 17:28:34 +11:00
Maikel
14842f52fc
Merge pull request #6633 from Matt-Yorkley/inverse-of
...
Adding inverse_of
2021-01-14 17:25:51 +11:00
dependabot[bot]
3cee999032
Bump webmock from 3.11.0 to 3.11.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.11.0...v3.11.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-01-14 05:42:02 +00:00
