Maikel
173cf9e536
Merge pull request #6565 from Matt-Yorkley/adjustments-inclusive
...
[Adjustments] Improve inclusive/additional tax recording
2021-02-08 09:38:31 +11:00
Pau Perez
4a5869b60c
Remove ability to toggle mail delivery
...
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
2021-01-25 13:27:44 +01:00
Matt-Yorkley
a328a9bc1b
Use included boolean in tax adjustments
2021-01-23 03:59:32 +00:00
Andy Brett
0e7f4b2f14
Merge pull request #6537 from mkllnk/simplify-mail-config
...
Simplify mail config
2021-01-21 10:59:43 -08:00
Pau Pérez Fabregat
8b01c9c8ba
Merge pull request #6279 from luisramos0/base_controller
...
Merge Spree::BaseController with ApplicationController and merge StoreController with ::BaseController
2021-01-19 15:52:47 +01:00
Luis Ramos
4060e7debf
Replace usages of Spree::BaseController with ApplicationController
2021-01-15 21:59:16 +00:00
Maikel Linke
c922a8fd4c
Fix: Remove unused conditional
...
I forgot to remove this unused conditional in a previous commit. Spree
defaulted to overriding the email config and we never changed that.
2021-01-14 12:05:42 +11:00
Maikel Linke
be229c9002
Simplify email config by removing unused option
...
Spree used to give you more options to configure ActionMailer but our
setup is much simpler. We can remove unused code.
The removed option was never used by OFN and defaulted to true. We don't
need a database migration because the value isn't set in the database.
2021-01-14 12:05:41 +11:00
Matt-Yorkley
ca4de40fa2
Associate all adjustments with an order
...
This change is introduced in the adjustments updates from Spree 2.2 and used heavily in new scopes and methods (not included here).
2021-01-11 17:35:35 +00:00
Arun Kumar Mohan
81b03906f9
Remove /signup routes
2020-12-03 20:43:28 -05:00
Matt-Yorkley
64153c5072
Remove #handle_asyncronously and update to recommended asyncronous devise mail method
2020-11-27 14:00:29 +00:00
Matt-Yorkley
e155b00ab9
Fix undefined constant Spree::Responder
2020-11-27 14:00:28 +00:00
Matt-Yorkley
16cc0afe8f
Replace removed method #retrieve_collector_from_mimes
...
https://apidock.com/rails/v4.1.8/ActionController/MimeResponds/retrieve_collector_from_mimes
2020-11-27 14:00:28 +00:00
Maikel Linke
4b1f5ae060
Avoid loading variant overrides for no reason
2020-11-05 14:31:19 +11:00
Luis Ramos
4b21667974
Move initializers from Spree engine to the OFN application
2020-11-04 12:15:45 +00:00
Luis Ramos
58a476751b
Remove code from the spree engine that is not needed in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
3320a3f0bc
Fix some more rubocop issues
2020-11-04 12:15:45 +00:00
Luis Ramos
4c6708267a
Run rubocop -a
2020-11-04 12:15:45 +00:00
Luis Ramos
2f0d61d54f
Bring Spree engine.rb from spree_core
2020-11-04 12:15:45 +00:00
Luis Ramos
f6195f1159
Remove duplicate_extra logic from ProductDuplicator
2020-11-04 12:15:23 +00:00
Luis Ramos
503c17f896
Move Spree::ProductDuplicator to Spree::Core namespace
2020-11-04 12:15:23 +00:00
Luis Ramos
ba16de6627
Move product duplicator to lib/spree/core, it's where spree_core is currently loading it from
2020-11-04 12:15:23 +00:00
Luis Ramos
ca1373a366
Fix Style/RescueStandardError and Style/RegexpLiteral
2020-10-30 16:50:37 +00:00
Luis Ramos
032075c04a
Merge pull request #6119 from arku/chore/fire-event-removal
...
Remove fire_event method usage
2020-10-21 21:21:35 +01:00
Matt-Yorkley
f5ce0d501d
Merge pull request #5870 from luisramos0/prefs
...
[Bye bye Spree] Bring models app_configuration and preference from spree_core
2020-10-20 21:12:54 +02:00
Arun Kumar Mohan
b0fa1464f8
Remove fire_event method usage
2020-10-18 20:36:38 -05:00
Luis Ramos
1b4e19b32d
Remore preferences not used in OFN
2020-09-23 22:16:56 +01:00
Luis Ramos
739917ca46
Add require for spree responder
2020-09-17 13:58:45 +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
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
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
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
Pau Perez
be3a10b2b1
Fix some easy rubocop issues
2020-07-28 19:01:14 +02:00
Luis Ramos
001d40d691
Move require_login_then_redirect_to to the only place where it is called
...
This fixes a class loading issue where orders controllers was getting a undefined method require_login_then_redirect_to
2020-07-17 14:35:42 +01:00
Luis Ramos
3599cb2047
Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
...
It adapts the method in ControllerHelpers::Auth to also use the after_login mechanism.
Ideally we would remove one of the two after_login mechanisms after_login and spree_user_return_to but they might still be in use.
2020-07-15 14:54:53 +01:00
Luis Ramos
bf3150ddc8
Delete spree_user_signup which is from spree promotions code that we dont use
2020-07-15 14:53:35 +01:00
Luis Ramos
1666ffb191
Remove try_spree_current_user
...
This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
2020-07-15 14:53:35 +01:00
Luis Ramos
046c5f6585
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
97f00153ad
Bring controller_helpers/ssl.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
643a82c73c
Fix easy rubocop issues, some early returns make the indentation changes
2020-07-15 14:53:08 +01:00
Luis Ramos
a3ea4b757d
Merge decorator into the class brought from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
1167a1a9bb
Bring ControllerHelpers respond_with from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
20f610fbee
Merge controller_helpers/order with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
d5744572f7
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
23ff9d6fbb
Bring controller_helpers/order to OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
10849504c3
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2452202e92
Move lib/spree/core/controller_helpers/common.rb from spree
2020-07-15 14:53:08 +01:00
