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
Luis Ramos
96839a03aa
Move lib/spree/core/controller_helpers.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
4ee30d7cac
Remove spree.root route and respective controller. Also move
...
unauthorized route to main app.
This route is no longer used in OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
7e75581da6
Merge class brought from spree with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
c8dd841c48
Fix some rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2ea026ea31
Bring controller helper auth from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
03bb1f053a
Fix easy rubocop issues
2020-07-11 16:43:42 +01:00
Luis Ramos
2e3702550d
Bring a number of files from spree_core needed in OFN
2020-07-11 16:09:13 +01:00
Luis Ramos
56b83b6bb5
Fix easy rubocop issues
2020-07-11 15:56:08 +01:00
Luis Ramos
58da11fde7
Bring Environment Calculators and Environment Extension from spree_core
2020-07-11 15:43:20 +01:00
Luis Ramos
758bb17142
Fix some easy rubocop issues and add some exceptions to to manual todo list
2020-07-02 21:24:15 +01:00
Luis Ramos
1b28592f58
Now that the stock code is on out side we can clean up!
...
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
luisramos0
a8a6fce385
Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped
2019-12-28 18:45:57 +00:00
luisramos0
e897eb0439
Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers
...
We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route
2019-07-08 13:59:26 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Luis Ramos
3e4f92fe92
Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix
2018-10-16 17:33:33 +01:00
luisramos0
4380ff7bd7
Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4)
2018-10-12 23:09:36 +01:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
Kristina Lim
f9533f8fb8
Refactor redirecting back after requiring login
2018-09-06 19:46:17 +10:00
Pau Perez
daf12d1300
Revert "Refactor Order#current_order argument"
...
This reverts commit ae935202be
2018-06-05 18:42:41 +02:00
Hugo Daniel
abe5d3596c
Refactor Order#current_order argument
2018-04-17 16:10:41 +02:00
Rohan Mitchell
3135ef6b7f
Reinstate explicit class name Spree::Calculator on calculated_adjustments association
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rohan Mitchell
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
2016-11-04 09:39:17 +11:00
Rohan Mitchell
04a714426f
Integrate from Spree fork: Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7cc2bc4fde
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
2015-06-18 13:11:11 +10:00
Rohan Mitchell
20bde803c8
Display overridden prices when products are in the cart
2015-01-12 14:58:35 +11:00
Rohan Mitchell
5fac29d2ed
Do not merge current and incomplete orders when logging in - fixes #20
2013-08-14 10:44:02 +10:00
Rohan Mitchell
02b524bfce
Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle
2013-04-05 15:00:42 +11:00
