raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,833 Commits 18 Branches 451 Tags
5f4aed92d81114df87516be076b5162f9511e4e8
Commit Graph

115 Commits

Author SHA1 Message Date
Mohamed ABDELLANI
788093c7cf implement variant duplication 2022-10-25 11:23:35 +01:00
Mohamed ABDELLANI
f44228eef7 extract variant duplication logic into a separated function 2022-10-25 11:23:35 +01:00
Matt-Yorkley
c0ee72319f Remove dead code: Product#variants? 
This only makes sense in the context of Products which only have "master" variants, and we removed that option a while back.

Remove #variants? check from ProductStock concern
 2022-10-19 16:30:12 +11:00
Philipp Winkler
bf53a02270 Add api key toggle view checkbox 2022-08-07 09:48:49 +02:00
Maikel Linke
bea080a9b1 Remove Paperclip 
It has been replaced by Active Storage.
 2022-06-01 17:16:55 +10:00
Maikel Linke
b7efa1b018 Replace Paperclip on Spree::Image 2022-06-01 17:16:55 +10:00
Matt-Yorkley
8a18a4de66 Clear up redirecting logic and path building 2022-01-29 10:08:51 +00:00
Matt-Yorkley
1953a2ef6a Don't require stringex 2022-01-15 12:31:43 +00:00
Maikel Linke
207cc8908a Remove useless assignments 
Rubocop highlighted this. The todo list actually contains these files
but somehow the cop still runs and reports these as violations.
 2021-12-10 09:26:57 +11:00
Maikel
c3076f0316 Merge pull request #8447 from Matt-Yorkley/keyword-args-deprecation 
Fix keyword args deprecations
 2021-11-17 17:09:15 +11:00
Matt-Yorkley
d0f572b051 Remove dead code: session[:guest_token] 
This `session[:guest_token]` doesn't seem to ever be assigned anywhere in the codebase, and it doesn't seem to be read at any point either..? There are some various places where `current_order.token` is used and `session[:access_token]` is used, but not this.

As far as I can tell: it was part of an old version of Spree and related to the spree_auth_devise gem (which we no longer use).
 2021-11-14 12:02:07 +00:00
Matt-Yorkley
0d8d4db41f Fix keyword args deprecations 
/home/runner/work/openfoodnetwork/openfoodnetwork/lib/spree/core/delegate_belongs_to.rb:75: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call

/home/runner/work/openfoodnetwork/openfoodnetwork/lib/spree/i18n.rb:20: warning: Using the last argument as keyword parameters is deprecated; maybe ** should be added to the call
 2021-11-11 14:16:37 +00:00
Matt-Yorkley
5725989343 Fix deprecated syntax in old controller helper 
This syntax for rendering a file isn't valid in Rails 6.x...
 2021-07-31 13:11:10 +01:00
Matt-Yorkley
2d69810c5d Convert CalculatedAdjustments into a proper Concern and remove class_eval 2021-07-24 21:28:13 +01:00
Andy Brett
334b9b520a removed deprecated calls to force_ssl; rely on config.force_ssl 2021-06-24 11:58:33 -07:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Matt-Yorkley
2de442f44d Move taxing of enterprise fees to TaxRate 2021-06-06 20:16:03 +01:00
Matt-Yorkley
8c9733d8da Remove included tax check from CalculatedAdjustments 
This is handled in TaxRate now.
 2021-06-06 20:16:03 +01:00
Andy Brett
d197b81351 Merge pull request #7606 from luisramos0/deprecation 
[Rails 6.1] Fix deprecation warning in rails 6.0
 2021-06-04 07:42:50 -07:00
Matt-Yorkley
7d38bec26d Remove Spree::Config[:allow_ssl_in_development_and_test] 
Unconditionally disables forced https-redirects in dev and test
 2021-06-03 20:52:09 +01:00
Matt-Yorkley
6377736f43 Allow :site_url to be picked up from ENV vars 2021-05-24 14:58:53 +01:00
Luis Ramos
d308e20871 Fix deprecation warning in rails 6.0 
Warning: Class level methods will no longer inherit scoping from create in Rails 6.1
 2021-05-10 21:03:24 +01:00
Andy Brett
6f20a23d47 Merge pull request #7436 from coopdevs/remove-duplicate-method 
Replace duplicate #unauthorized method with module inclusion
 2021-04-25 11:26:12 -07:00
Pau Perez
e5eb68dffc Replace duplicate method with module inclusion 
No reason to risk diverging their implementations. They are exact
copies.

Likewise, there's no need to have to I18n keys with almost the same
content.
 2021-04-23 12:03:11 +02:00
Matt-Yorkley
6dc23804a1 Merge pull request #7425 from mkllnk/application-record 
Add ApplicationRecord for customisations of models
 2021-04-21 23:18:03 +02:00
Andy Brett
aca19edd3b Merge pull request #7421 from andrewpbrett/rails-5-2-prep-2 
Prepare for Rails 5.2
 2021-04-19 11:32:21 -07:00
Maikel Linke
5c0cdce597 Confine Permalinks patch to application 
We were also patching ActiveRecord::Relation for the `#find_by_param`
methods but we are not using those any more. They were deprecated a
while ago. We now use `find_by(permalink: ...)`.
 2021-04-15 15:59:03 +10:00
Maikel Linke
1893313c40 Confine DelegateBelongsTo patch to our app 2021-04-15 15:59:03 +10:00
Matt-Yorkley
6f8ade52eb Persist last_ip_address when loading current_order 
Leaving the object with unpersisted changes breaks order locking with this error (in various places):

RuntimeError:
        Locking a record with unpersisted changes is not supported. Use `save` to persist the changes, or `reload` to discard them explicitly.
 2021-04-14 09:14:58 -07:00
Matt-Yorkley
e323d016a2 Simplify arguments of #create_adjustment method 2021-04-14 12:01:21 +01:00
Matt-Yorkley
7d3288ca53 Remove #to_package calls on shipment calculations 2021-04-04 19:19:06 +01:00
Matt-Yorkley
fcb8145a6c Bring in changes to Adjustment#update! and CalculatedAdjustments#update_adjustment 2021-03-30 16:39:40 +01:00
Matt-Yorkley
5840b0e33c Adapt adjustment interface for payment's adjustment being singular 
Payments only have one adjustment, all other adjustable objects have adjustments (plural).
 2021-03-23 18:19:37 +00:00
Andy Brett
afa7269f48 Merge branch 'master' into render_plain 2021-03-18 10:53:13 -07:00
Matt-Yorkley
237075dd47 Replace deprecated before_filter syntax 2021-03-17 15:15:26 +00:00
Luis Ramos
cb8fd2131e Use body: nil instead of deprecated nothing: 
Ideally we would be using render head status but it's issuing quite a lot of double render problems, we can improve later
 2021-03-16 23:13:58 +00:00
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