Maikel
dc9e3aa1a0
Merge pull request #6010 from mkllnk/fix-module-declaration
...
Fix module declaration
2020-09-11 09:12:08 +10:00
Maikel Linke
94b903179e
Fix module declaration
...
Running script/prepare_imported_db.rb failed because
Spree::PaymentMethodDistributors couldn't be found. This problem is
described in the Rubocop docs:
https://rubystyle.guide/#namespace-definition
2020-09-10 16:12:17 +10:00
Luis Ramos
6e8fe080cb
Fix easy rubocop issues
2020-09-05 18:39:56 +01:00
Luis Ramos
4931edc67c
Remove code related to promotions, we dont have promotions in OFN
2020-09-05 16:38:37 +01:00
Luis Ramos
51ed9a6b78
Fix comment and point out that it's a fix to a spree issue
2020-09-05 16:38:36 +01:00
Luis Ramos
b629a4f912
Make new specs pass
2020-09-05 16:38:36 +01:00
Luis Ramos
967380c542
Fix easy rubocop issues
2020-09-05 16:38:36 +01:00
Luis Ramos
ff0aa377a1
Run rubocop autocorrect
2020-09-05 16:38:36 +01:00
Luis Ramos
da683e3ecf
Merge decorators with original code from spree_core
2020-09-05 16:38:36 +01:00
Luis Ramos
aa46a4b5da
Bring models related to taxes and adjustments from spree_core
2020-09-05 16:38:36 +01:00
Luis Ramos
d8165aeec1
Merge pull request #5987 from luisramos0/spree_core_without_ctrl_hlpers
...
Depend on version of spree without controller helpers
2020-09-04 17:18:17 +01:00
Luis Ramos
9c0c324835
Add some requires now required as spree does not contain controller helpers
2020-09-04 14:30:17 +01:00
Luis Ramos
d80a44ade0
Merge pull request #5867 from luisramos0/stock
...
[Bye bye Spree] Bring models stock_location and stock_movement from spree_core
2020-09-03 18:35:55 +01:00
Luis Ramos
b36d0bc4f3
Fix easy rubocop isssues
2020-09-01 17:09:22 +01:00
Luis Ramos
5958c2f68c
Rubocop autocorrect
2020-09-01 17:09:22 +01:00
Luis Ramos
13f0a46bc2
Merge decorator with original file from spree
2020-09-01 17:09:22 +01:00
Luis Ramos
b9f7a98c46
Bring image, asset and images_helper from spree_core
2020-09-01 17:09:22 +01:00
Luis Ramos
d87d5d3537
Fix stock_movement and stock_location specs brought from spree_core
...
propagate_all_variants is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
e0ea25b7a3
track_inventory_levels is always true in OFN
2020-09-01 09:42:24 +01:00
Luis Ramos
8f19ad0646
Delete dead code
2020-09-01 09:42:24 +01:00
Luis Ramos
e89eb8f76c
Fix simepl rubocop issues
2020-09-01 09:42:24 +01:00
Luis Ramos
0b053c18af
Merge decoorator with original file from spree
2020-09-01 09:42:24 +01:00
Luis Ramos
d13bd86e4c
Bring stocck movement and stock location from spree
2020-09-01 09:42:24 +01:00
Pau Pérez Fabregat
4984cc9758
Merge branch 'master' into ctry_zone
2020-08-28 09:21:57 +02:00
Pau Pérez Fabregat
2fa8cd54fd
Merge pull request #5769 from Matt-Yorkley/customer-names
...
Customer names in reports
2020-08-27 15:39:47 +02:00
Luis Ramos
5b3e350204
Rename zone.country_list to zone.countries
2020-08-26 23:12:48 +01:00
Luis Ramos
53de04121c
Fix rubocop issue
2020-08-26 23:09:41 +01:00
Luis Ramos
9264badaaf
Merge pull request #5879 from luisramos0/payments
...
[Bye bye Spree] Bring models payment_method, credit_card and gateway from spree_core
2020-08-26 22:09:16 +01:00
Luis Ramos
d6160b5759
Merge pull request #5758 from luisramos0/order_updater
...
Bring Order Updater from spree_core
2020-08-19 20:47:27 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Luis Ramos
49a60374e6
Remove dead method in payment method, it's a scope in OFN and remove unnecessary comments about spree
2020-08-07 14:14:46 +01:00
Luis Ramos
b21a969502
Fix new credit_card_spec
2020-08-07 13:45:25 +01:00
Luis Ramos
d746ae3d9e
Fix easy rubocop issues
2020-08-07 13:28:09 +01:00
Luis Ramos
621e2a3132
Run rubocop autocorrect
2020-08-07 13:16:38 +01:00
Luis Ramos
142bab8c35
Merge decorators with original spree files
2020-08-07 13:13:43 +01:00
Luis Ramos
abaa66cc14
Bring models from spree_core
2020-08-07 13:06:16 +01:00
Luis Ramos
43e64f3555
Delete dead code
2020-08-06 01:41:28 +01:00
Luis Ramos
00ae3a25f7
Fix easy rubocop issues
2020-08-06 01:18:43 +01:00
Luis Ramos
14358256ed
Bring country, zone, state and zone_member from spree together with respective specs
2020-08-06 01:09:35 +01:00
Luis Ramos
f14bb280c1
Merge pull request #5680 from cillian/prevent-blank-open-street-map
...
If no enterprises have been geocoded yet make sure Open Street Map displays correctly
2020-08-05 20:27:40 +01:00
Luis Ramos
327d6c43d9
Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10
...
[Security] Bump devise from 2.2.8 to 3.5.10
2020-08-01 15:55:19 +01:00
Luis Ramos
cc7363d9e7
Merge pull request #5824 from luisramos0/improve_checkout
...
Reset order state to cart in case the stripe SCA authorization step fails
2020-08-01 15:53:41 +01:00
Luis Ramos
86afa6f413
Adapt to devise 3.2 and use after_confirmation callback to send welcome email
2020-07-31 09:05:42 +01:00
Luis Ramos
0f29806198
Adapt code to devise 3.2 where the reset_password_token stored in the db is a encrypted version of the token sent in the email
...
In this particular case, the user confirmations controller is redirecting to the reset password page but it doesnt know what is the raw reset_password_token
So we regenerate the reset password token so that it can know what's the raw value for the redirect
The method User#regenerate_reset_password_token is a proxy to the protected method in Devise::Recoverable
2020-07-31 09:05:42 +01:00
Luis Ramos
a2ae78bde9
Replay commit from spree_auth_devise that upgrades to devise 3
...
fe7941f674
2020-07-31 09:05:42 +01:00
Pau Pérez Fabregat
e9787552c8
Merge pull request #5713 from Matt-Yorkley/taxon-icons
...
Remove taxon icons
2020-07-29 18:43:06 +02:00
Luis Ramos
e99f0dc6b7
Rubocop autocorrect and easy rubocop issues
2020-07-28 23:29:49 +01:00
Luis Ramos
d8a96c9d34
Bring order checkout workflow and some of its specs from spree_core
2020-07-28 23:29:49 +01:00
Cillian O'Ruanaidh
702669e61c
Merge branch 'master' into prevent-blank-open-street-map
2020-07-24 16:00:37 +01:00
Pau Perez
97f551a2dd
Replace literal with AR's 4 #not
2020-07-23 20:24:31 +02:00
