Commit Graph

17044 Commits

Author SHA1 Message Date
Arun Kumar Mohan
fd0a7971e9 Fix typo in the PR template 2020-09-15 20:30:23 -05:00
Luis Ramos
6eb43053e9 Merge pull request #5925 from luisramos0/spree_core_user
[Bye bye spree] Bring classes related to users to OFN
2020-09-15 17:13:27 +01:00
Pau Pérez Fabregat
7006b0af4c Merge pull request #6021 from Matt-Yorkley/concerns
Move concern to concerns directory
2020-09-15 17:45:24 +02:00
Pau Pérez Fabregat
27ffe9edb2 Merge pull request #5971 from luisramos0/testing
Remove some old spree test helpers that are not needed
2020-09-15 09:13:20 +02:00
Luis Ramos
0d7b5cd32c Merge pull request #5868 from luisramos0/taxonomies
[Bye bye Spree] Bring models taxon and taxonomy from spree_core
2020-09-14 20:45:04 +01:00
Matt-Yorkley
276fea6942 Fix rubocop offenses 2020-09-14 15:14:16 +01:00
Matt-Yorkley
c45dcad975 Move concern to concerns directory 2020-09-14 13:23:21 +01:00
Luis Ramos
175b78b51f Merge pull request #5827 from jeduardo824/bug/remove-environment-column-when-user-is-not-super-admin
Bug/4592 - Hide Environment column on Payment Methods page when user is not admin
2020-09-11 10:47:10 +01:00
Maikel Linke
e82aa0c89a Update translations 2020-09-11 15:25:52 +10:00
Maikel Linke
8be05e94bd Update release issue template 2020-09-11 15:25:24 +10:00
Maikel
7317347fd6 Merge pull request #6012 from openfoodfoundation/transifex
Transifex
2020-09-11 15:25:04 +10:00
Maikel
c5c542069f Merge pull request #5951 from mkllnk/5785-js-error-reporting
5785 Notify Bugsnag when sending card to Stripe fails during checkout
2020-09-11 15:12:47 +10:00
Maikel
dc9e3aa1a0 Merge pull request #6010 from mkllnk/fix-module-declaration
Fix module declaration
2020-09-11 09:12:08 +10:00
Luis Ramos
a48b57f7a7 Merge pull request #5883 from luisramos0/taxs
[Bye bye Spree] Bring models tax_rate, tax_categories, adjustments and calculator from spree_core
2020-09-10 23:10:26 +01:00
Transifex-Openfoodnetwork
f501d48caa Updating translations for config/locales/fr.yml 2020-09-11 01:54:06 +10:00
Pau Pérez Fabregat
2429b186ce Merge pull request #6008 from openfoodfoundation/dependabot/bundler/ddtrace-0.40.0
Bump ddtrace from 0.39.0 to 0.40.0
2020-09-10 17:10:56 +02:00
Pau Pérez Fabregat
7df2759475 Merge pull request #5907 from Matt-Yorkley/data-cleanup
Data cleanup
2020-09-10 17:06:20 +02:00
Pau Pérez Fabregat
681cb34c48 Merge pull request #6009 from openfoodfoundation/transifex
Transifex
2020-09-10 14:01:49 +02: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
Maikel Linke
59070712d9 Update rubocop todo list 2020-09-10 16:08:18 +10:00
Transifex-Openfoodnetwork
76aebf329e Updating translations for config/locales/ar.yml 2020-09-10 02:13:08 +10:00
dependabot-preview[bot]
b2b5606f2e Bump ddtrace from 0.39.0 to 0.40.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.39.0 to 0.40.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.39.0...v0.40.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-09-09 15:32:14 +00:00
Pau Perez
f890c4a31d Fix LogEntry spec 2020-09-08 14:12:17 +02:00
Pau Pérez Fabregat
b087f8da19 Merge pull request #6001 from openfoodfoundation/transifex
Transifex
2020-09-08 13:19:28 +02:00
Pau Perez
e3c1159c17 Start with 6 months data retention
As discussed in code review.
2020-09-08 12:49:58 +02:00
Pau Perez
14054f0e70 Move retention period to constant
There's no need to reevaluate the date 3 times, potentially leading to
edge cases.
2020-09-08 12:48:30 +02:00
Pau Perez
d525ddfe14 Move missing statements to where + delete_all
And fix the specs
2020-09-08 12:47:42 +02:00
Pau Pérez Fabregat
df0b997258 Use where + delete_all to increase readability
Co-authored-by: Maikel <maikel@email.org.au>
2020-09-08 12:26:47 +02:00
Pau Pérez Fabregat
ffbb0d26a4 Unhardcode class name 2020-09-08 12:26:21 +02:00
Transifex-Openfoodnetwork
3da14233bf Updating translations for config/locales/en_US.yml 2020-09-08 02:55:31 +10:00
Pau Pérez Fabregat
940c067b60 Merge pull request #5992 from openfoodfoundation/transifex
Transifex
2020-09-07 18:46:48 +02:00
Luis Ramos
6e8fe080cb Fix easy rubocop issues 2020-09-05 18:39:56 +01:00
Luis Ramos
5521b4bb04 Remove unused product filters 2020-09-05 16:43:27 +01:00
Luis Ramos
4183dda27e Fix long line 2020-09-05 16:43:27 +01:00
Luis Ramos
fcbb883244 Transpec taxon_spec 2020-09-05 16:43:27 +01:00
Luis Ramos
c35b330d25 Fix taxon_spec 2020-09-05 16:43:27 +01:00
Luis Ramos
57e74a4980 Fix rubocop issues 2020-09-05 16:43:27 +01:00
Luis Ramos
a1b64fe27b Rubocop auto-correct 2020-09-05 16:43:27 +01:00
Luis Ramos
49060892e8 Merge decorators into original files from spree_core 2020-09-05 16:43:27 +01:00
Luis Ramos
9175504bc1 Bring taxon, taxonomy and classification from spree_core 2020-09-05 16:43:27 +01:00
Luis Ramos
8867ec977c Bring missing factory from spree_core and use ofn's calculator 2020-09-05 16:38:37 +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
e96428e7e2 Transpec adjustment_spec 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
Transifex-Openfoodnetwork
61dad61ef7 Updating translations for config/locales/en_GB.yml 2020-09-05 02:37:15 +10:00