raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 21 Branches 450 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

59 Commits

Author SHA1 Message Date
luisramos0
1681e8a572 Remove unused auth config 2019-07-08 14:06:01 +01:00
luisramos0
10e123a9c4 Move spree/authentication_helpers injection from spree initializers directly to the application_controller 
Also, switch from using send to public_send making rubocop happier
 2019-07-08 13:11:57 +01:00
luisramos0
17448699f9 Bring devise initializer from spree_auth_devise and fix spree initializer details 2019-07-05 22:45:59 +01:00
Matt-Yorkley
099914be40 Use OFN logo in admin area 2019-05-27 02:20:04 +01:00
luisramos0
85cf4fa3e6 Merge branch 'master' into 2-0-stable-May2 2019-05-02 11:27:53 +01:00
Matt-Yorkley
732d0f7cf4 Don't use s3 for images unless images bucket has been provisioned. 
Sets the "use_s3" (for images) option based on presence of `s3_images_bucket` from ofn-install instead of presence of s3 keys, for instances that use s3 for backups but not for images.
 2019-04-30 17:06:42 +01:00
luisramos0
8f39a18ca3 Merge branch 'master' into 2-0-stable-Apr15 2019-04-15 11:46:31 +01:00
Matt-Yorkley
7373fff190 Define default s3_protocol as 'https' 2019-04-10 19:23:16 +01:00
Matt-Yorkley
4912a9e258 Ensure ENV vars in applications.yml actually update stored Spree::Config preferences 2019-04-10 19:10:31 +01:00
Maikel Linke
9044bf60b9 Workaround Rails inheritance bug in Spree::Gateway 
Due to a bug in ActiveRecord we need to load the tagging code in Gateway which
should have inherited it from its parent PaymentMethod.
We have to call it before loading the PaymentMethod decorator because the
tagging code won't load twice within the inheritance chain.

https://github.com/openfoodfoundation/openfoodnetwork/issues/3121
 2019-02-13 14:47:44 +11:00
Matt-Yorkley
edbfd64a44 Set the Spree.user_class explicitly in spree initializer 2018-11-08 00:04:04 +00:00
luisramos0
90d7b7f4a0 Merge branch 'master' into 2-0-stable-oct-25 2018-10-25 14:28:58 +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
Matt-Yorkley
3e39f3e749 Disable logout on password change 2018-10-08 23:06:54 +01:00
Pau Perez
a0d2ec5666 Enable OFN's custom OrderUpdater 2018-07-25 13:51:01 +02:00
Pau Perez
776b5a23f6 Skip methods that distributor can't use in Package 
This ensures that Spree's shipping methods take into account the ones
the order's distributor uses.

This reimplements what `#available_to_order_with_distributor_check?`
used to do and it doesn't work with Spree 2.0.4.
 2018-05-02 13:58:25 +02:00
Hugo Daniel
e6b58c6db4 Remove ssl deprecated configuration 2018-04-17 16:10:40 +02:00
Pau Perez
52533fc04c Rely on Spree's default value for requires_auth 2017-12-20 17:25:23 +11:00
Pau Perez
c646eb3939 Disable api auth as there is no Spree api key set 
Although Spree::Api::Config[:requires_authentication] is set to false by
default for some unknown reason if not done explicitly Spree still
returns it as false.

This amends the change done in a87c89c83d,
which introduced the bug. As there is no Spree api key set the auth
fails when getting taxons.
 2017-12-20 17:25:23 +11:00
Enrico Stano
5a2c3f5c5c Set Spree configuration related to locales before the promo environment gets initialized 2017-09-08 23:55:50 +10:00
enricostano
23585e6ea8 Initialize custom calculators using Spree API 
Freely inspired by https://github.com/coopdevs/spree/blob/2-0-stable/core/lib/spree/core/engine.rb#L78
 2017-09-08 23:55:49 +10:00
enricostano
a87c89c83d Require authentication for API endpoints 
Authentication and authorization layers (cancan) should not be mixed
c594d6111b
 2017-09-08 23:55:49 +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
Rob Harrington
b2e14711ac Gateway providers inherit from decorated Gateway and PaymentMethod classes in production 
Achieved by requiring payment method and gateway decorators in Spree initializer
 2016-08-31 12:43:22 +10:00
Maikel Linke
e4f855b64a Display calculator in payment method edit form 2016-05-25 14:56:52 +10:00
Paul Mackay
d4cf44a6dd Use COUNTRY_CODE instead of COUNTRY in application.yml. 2015-03-29 17:06:05 +01:00
Paul Mackay
af9a7a2ed4 #443: Support currency configuration. Fix LOCALE variable name. 2015-03-24 15:34:45 +00:00
Rohan Mitchell
1e5e009735 Spree init works when database has not been created, remove duplicate FK from db/schema.rb 2015-03-12 11:29:01 +11:00
Maikel Linke
ff4bd449a2 Setting default_country_id by application.yml 
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.

This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
 2015-02-26 16:29:46 +11:00
Rafael Schouten
8395dbb3e9 Merge branch 'master' into config 
Conflicts:
	.gitignore
	Gemfile
 2014-10-25 15:29:53 +11:00
Rafael Schouten
b647f9382f revert included file 2014-10-01 17:11:00 +10:00
Rafael Schouten
dee869a273 move checks and links in sidebars 2014-09-26 17:58:00 +10:00
Rob Harrington
1a86206e1f Fixing super annoying server reload bug 2014-09-24 13:01:40 +10:00
Rafael Schouten
9448e1cbe4 add figaro env config 2014-09-16 00:13:43 +10:00
Rohan Mitchell
a26450d173 Remove unused spree searcher class - causing intermittent test failures 2014-07-31 14:58:18 +10:00
Will Marshall
87cef4edcc Reverting previous commit 2013-12-19 12:29:21 +11:00
Will Marshall
aaa2999ee1 Dropping our override of ActionMailer 2013-12-19 11:58:21 +11:00
Will Marshall
987ba1a81a Adding a monkeypatch to spree to always allow SSL 2013-12-04 14:08:08 +11:00
Rohan Mitchell
6161114750 Standardise on Australia having ID 12, as staging and prod servers do 2013-10-30 10:34:29 +11:00
Rohan Mitchell
763dab9efc Fix country init for Jenkins 2013-10-23 10:41:50 +11:00
Rohan Mitchell
101510f2f4 Fix error when setting up a fresh db 2013-10-23 09:25:26 +11:00
Rohan Mitchell
89f93cae77 Rename namespaced includes from open_food_web to open_food_network 2013-10-18 17:43:18 +11:00
Rohan Mitchell
57f7d489ff Rename OpenFoodWeb namespace to OpenFoodNetwork 2013-10-18 17:29:55 +11:00
Rohan Mitchell
0b0c8253c1 Provide a hardcoded country code for CI (Jenkins), where countries are not pre-loaded 2013-10-11 14:13:24 +11:00
Rohan Mitchell
ba31e5d9fb Remove hardcoded ID for Australia 2013-10-11 12:52:49 +11:00
Rohan Mitchell
ed067be530 Do not set site name and logo URLs in initializer, so that they can be set through admin interface 2013-06-04 08:43:35 +10:00
Rohan Mitchell
98143ffe5b Add calculator to EnterpriseFee, test passes for listing enterprise fees 2012-11-16 16:07:40 +11:00
Rohan Mitchell
a013854d2d Change logo to Eaterprises, update link colour to match 2012-09-14 11:25:36 +10:00
Rohan Mitchell
a6c2490597 Enable auto-capture for spree_paypal_express 2012-08-02 15:45:31 +10:00
Andrew Spinks
8f5b5e7ae4 allow shipping instructions to be provided. 2012-07-11 23:33:03 +10:00