raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-10 03:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,508 Commits 18 Branches 455 Tags
ccfb83d2cd0a78f4bbd2cb2e9423948246eaa950
Commit Graph

1707 Commits

Author SHA1 Message Date
Matt-Yorkley
93601ca556 Extract #remove_transient_data from TruncateData 2020-08-15 11:19:24 +01:00
Matt-Yorkley
102df28e97 Extract data masking to service 2020-08-14 20:48:33 +01:00
Matt-Yorkley
9a9538dace Don't hide customer names if enterprise has enabled :allow_customer_names perference 2020-08-14 20:48:33 +01: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
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
fe0c04b650 Complete renaming of AdvanceOrderService to OrderWorkflow 2020-07-29 12:24:18 +10:00
Pau Perez
be3a10b2b1 Fix some easy rubocop issues 2020-07-28 19:01:14 +02:00
Luis Ramos
6cc91d457e Merge pull request #5796 from coopdevs/remove-conlicting-spree-route 
Remove conflicting and duplicate route
 2020-07-23 14:29:12 +01:00
Pau Perez
9be199a6cc Remove conflicting and duplicate route 
This Spree route conflicts with the one we define:

```
get "/login", to: redirect("/#/login")
```

for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.

The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
 2020-07-21 13:27:06 +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
2c65cea911 Fix easy rubocop issues 2020-07-11 15:41:26 +01:00
Luis Ramos
95698fac37 Bring responder from spree_core 2020-07-11 15:41:26 +01:00
Luis Ramos
50e6ce92b3 Fix easy rubocop issues 2020-07-11 15:41:26 +01:00
Luis Ramos
cd8355ea66 Bring money.rb from spree 2020-07-11 15:41:26 +01:00
Luis Ramos
12a5a266fd Fix easy rubocop issues 2020-07-11 15:41:26 +01:00
Luis Ramos
efeda61e40 Bring i18n.rb from spree 2020-07-11 15:41:26 +01:00
Luis Ramos
38c5a9e105 Remove coupon applicator, it's not used in ofn 2020-07-11 15:41:26 +01:00
Luis Ramos
89e5221dc5 Fix easy rubocop issues 2020-07-11 15:41:26 +01:00
Luis Ramos
c75341838e Bring core.rb from spree_core 2020-07-11 15:41:26 +01:00
Luis Ramos
84d7538b1b Bring i18n code from spree 2020-07-11 15:41:26 +01:00
Luis Ramos
5e8438c446 Move all calculators outside the spree namespace 2020-07-07 17:26:23 +01:00
Luis Ramos
761871c90e Merge pull request #5715 from luisramos0/ship_method 
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
 2020-07-06 19:15:50 +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
Luis Ramos
e8417b8be6 Remove specs testing filtering of master variants 
Master variants are not used in the report
 2020-07-01 18:13:30 +01:00