Luis Ramos
fb88cfedcf
Remove unused helpers
2020-08-26 22:49:52 +01:00
Luis Ramos
b227c78aeb
Fix rubocop issues
2020-08-22 18:14:53 +01:00
Luis Ramos
a44d0f7af6
Add WebHelper where necessary
2020-08-22 18:14:53 +01:00
Luis Ramos
41a7e26fcd
Remove unused helper
2020-08-22 18:14:53 +01:00
Luis Ramos
5cd40cb19f
Remove dependency to Spree::TestingSupport code
2020-08-22 18:14:53 +01:00
Luis Ramos
907afe3131
Remove dependency to BarAbility from spree_core
2020-08-22 18:14:53 +01:00
Luis Ramos
261269bd57
Bring core/lib/spree/testing_support/i18n from spree_core to ofn as i18n_translations_checker
2020-08-22 18:14:53 +01:00
Luis Ramos
d0c07b931a
Bring Spree::TestingSupport::Preferences from spree_core to ofn as PreferencesHelper
2020-08-22 16:50:12 +01:00
Luis Ramos
b6adef38e5
Remove unused auth helpers
2020-08-22 16:50:12 +01:00
Luis Ramos
0ca4d0842a
Remove capybara_ext from spree and bring its helpers that are required in ofn
2020-08-22 16:50:12 +01:00
Luis Ramos
9fd8613107
Update all locales with the latest Transifex translations
2020-08-21 14:56:26 +01:00
Luis Ramos
bea8c2035f
Merge pull request #5909 from openfoodfoundation/transifex
...
Transifex
2020-08-21 14:54:49 +01:00
Luis Ramos
e616e32bbc
Merge pull request #5931 from Matt-Yorkley/customer-totals-fees
...
Customer totals fee calculations
2020-08-21 14:09:00 +01:00
Luis Ramos
19b5a004dd
Merge pull request #5877 from Matt-Yorkley/bugsnagger
...
BugsnagJS checkout errors
2020-08-21 14:01:48 +01:00
Luis Ramos
4a5a6a2242
Merge pull request #5906 from Matt-Yorkley/checkout_flash_errors
...
Fix flash error issues in checkout requests
2020-08-21 13:03:30 +01:00
Luis Ramos
d1b60e3778
Merge pull request #5905 from mkllnk/lost-decorators
...
Load previously lost decorator code and don't delete orders
2020-08-21 12:34:37 +01:00
Maikel
31fe8850b5
Merge pull request #5913 from openfoodfoundation/luisramos0-patch-1
...
Remove spree upgrade section from the PR template ❤️
2020-08-21 16:35:09 +10:00
Maikel
0309a20cb1
Merge pull request #5904 from Matt-Yorkley/favicon
...
Fix broken favicon path
2020-08-21 14:05:00 +10:00
Matt-Yorkley
9d772dbcc9
Merge pull request #5935 from luisramos0/fix_build
...
Fix master build - fix mail interceptor spec
2020-08-20 18:15:37 +02:00
Luis Ramos
0abcbc7b8f
Fix specs in mail interceptor spec
...
This was due to an incompatibility between two recent PRs: 5763 and
5733. PR 5733 did not take into account 5763 (the confirm email method was removed) and so the specs introduced
were broken.
2020-08-20 12:52:54 +01:00
Matt-Yorkley
3badaa07d2
Fix adjustment calculations; only "eligible" adjustments should be regarded as applied to an order.
...
When an order is submitted and the payment fails, the failed payment's adjustments (payment fees) are set to `eligible: false` to indicate they do not apply. These should not be counted as being included in an order's adjustments.
2020-08-19 22:50:37 +01:00
Matt-Yorkley
977ab26b00
Add failing spec for payment fee calculation in customer totals report
2020-08-19 22:50:35 +01:00
Luis Ramos
d6160b5759
Merge pull request #5758 from luisramos0/order_updater
...
Bring Order Updater from spree_core
2020-08-19 20:47:27 +01:00
Luis Ramos
40d4ed2c95
Merge pull request #5733 from luisramos0/base_ctrl
...
Move lib/spree to OFN
2020-08-19 18:35:17 +01:00
Luis Ramos
72f5b1b251
Revert "Remove unreachable order recovery code"
...
This reverts commit 355c5f5c55
2020-08-19 17:36:36 +01:00
Luis Ramos
eb2d8e65ed
Merge pull request #5910 from Matt-Yorkley/silky-mooth-sidebar-scrolling-for-danni
...
Add scrolling animate on sidebar hide
2020-08-19 11:47:39 +01:00
Maikel Linke
355c5f5c55
Remove unreachable order recovery code
...
Every page load creates a cart order if none is present. So when a user
logs in, they always have an order stored in their session. And
therefore, we never got to recover an old order.
We could have fixed the code to restore old orders. But as far as I can
tell, order recovery hasn't been working for years and I couldn't find
any issue requesting this feature.
If we wanted to implement order recovery, it should probably be designed
more carefully and included in the `current_order` method.
2020-08-19 12:06:58 +10:00
Maikel Linke
bb3f958dd2
Remove redundant includes
2020-08-19 10:37:18 +10:00
Luis Ramos
b367d4328e
Remove spree upgrade section from the PR template ❤️
2020-08-17 18:28:23 +01:00
Matt-Yorkley
ed346b3b54
Add scrolling animate on sidebar hide
2020-08-17 13:41:06 +01:00
Matt-Yorkley
290120d015
Fix broken favicon path
...
Ensures the non-fingerprinted version of the favicon will be used directly from `/public/favicon.ico`. Needed after recent changes to the Rails asset pipeline.
2020-08-17 11:59:22 +01:00
Matt-Yorkley
0fd163602d
Rename method for clarity
2020-08-17 11:17:42 +01:00
Transifex-Openfoodnetwork
4c3a3d5d1a
Updating translations for config/locales/en_GB.yml
2020-08-17 18:19:09 +10:00
Luis Ramos
9771fd7f13
Merge pull request #5902 from openfoodfoundation/dependabot/bundler/bugsnag-6.16.0
...
Bump bugsnag from 6.15.0 to 6.16.0
2020-08-16 16:19:36 +01:00
Luis Ramos
6a61bf7656
Merge pull request #5898 from mkllnk/remove-diffy
...
Remove unused dependency diffy
2020-08-16 16:04:42 +01:00
Luis Ramos
9754d8d754
Merge pull request #5616 from openfoodfoundation/dependabot/bundler/paper_trail-7.1.3
...
Bump paper_trail from 5.2.3 to 7.1.3
2020-08-15 21:53:33 +01:00
Matt-Yorkley
ce5bcaaa20
Explicitly notify Bugsnag on checkout failure
2020-08-14 18:06:30 +01:00
Matt-Yorkley
de22ad0000
Fix flash error issues in checkout requests
2020-08-14 12:41:56 +01:00
Maikel Linke
23706ec1d6
Load our version of the Spree environment
...
We didn't actually change any logic in our version of the Spree
environment file but if we do that in the future, we want to be sure
that it takes effect. Our file was ignored and not loaded before.
2020-08-14 15:38:10 +10:00
Maikel Linke
c3e0f45f1a
Remove unused Report class from lib
...
Also removing related unused classes and their specs.
2020-08-14 15:38:10 +10:00
Maikel Linke
0a1947ae34
Remove unused module from lib
...
I was looking for library files that may be used but are not loaded.
I would then add the missing `require` statements. But I found that this
module isn't used any more.
Usage removed in:
310d1b3726
2020-08-14 15:38:10 +10:00
Maikel Linke
b79c568b08
Load our spree overrides instead of the originals
...
We changed some of Spree's logic and want to use that. And once we
remove the spree_core gem, we need to load those files before using
them.
2020-08-14 15:38:00 +10:00
Maikel Linke
e8139d3948
Keep old incomplete (cart) orders
...
We used to delete old cart orders so that they wouldn't re-appear after
a successful checkout of another order. Keeping them ensures that we
don't remove an order that is still used by another device. It also
makes sure that we keep references of failed payments.
2020-08-14 10:02:48 +10:00
Maikel Linke
5761014205
Restore Spree customisations for controllers
2020-08-13 16:59:15 +10:00
Maikel Linke
90bf4f312b
Document and spec current controller behaviour
...
When we imported and merged Spree's controller modules with our
decorators, Rails started using Spree's original code again.
This was first included in v3.2.0 and deployed on 28 July 2020.
2020-08-13 16:59:15 +10:00
Maikel Linke
63a9765fea
Update rubocop todo lists
2020-08-13 16:33:47 +10:00
dependabot-preview[bot]
5c6cb4840e
Bump bugsnag from 6.15.0 to 6.16.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.15.0 to 6.16.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.15.0...v6.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-13 01:56:14 +00:00
Maikel Linke
271d1ec103
Update translations from Transifex
2020-08-13 10:52:55 +10:00
Maikel
2271a57ffe
Merge pull request #5880 from openfoodfoundation/transifex
...
Transifex
2020-08-13 10:35:00 +10:00
Transifex-Openfoodnetwork
95e048b37f
Updating translations for config/locales/en_CA.yml
2020-08-13 02:50:37 +10:00
