Pau Pérez Fabregat
043e175fa1
Merge pull request #5952 from openfoodfoundation/transifex
...
Transifex
2020-08-27 13:51:31 +02:00
Pau Pérez Fabregat
a1b4c7fdf2
Merge pull request #5923 from openfoodfoundation/dependabot/bundler/jwt-2.2.2
...
Bump jwt from 2.2.1 to 2.2.2
2020-08-27 13:50:44 +02:00
Pau Perez
6e3cfe9c54
Improve StripeAccountsController#connect spec
...
We are manually testing this while this is already covering the
connection of a Stripe account to an OFN instance. This makes it a bit
more comprehensive.
2020-08-27 13:43:54 +02:00
romale
8583ac5573
Update en.yml
2020-08-27 14:38:10 +03:00
Pau Pérez Fabregat
300e12371a
Merge pull request #5918 from luisramos0/stripe_disabled
...
Do not add stripe JS code to layout if stripe is disabled at instance level
2020-08-27 13:27:40 +02:00
romale
8f59b048f3
Update en.yml
2020-08-27 13:53:13 +03:00
Transifex-Openfoodnetwork
8290acfd91
Updating translations for config/locales/es.yml
2020-08-27 18:15:46 +10:00
Transifex-Openfoodnetwork
a8bfedd847
Updating translations for config/locales/ca.yml
2020-08-27 18:15:32 +10:00
Pau Pérez Fabregat
6f33ae586e
Merge pull request #5943 from luisramos0/spree_factories
...
[Bye bye Spree] Make OFN independent of all spree spec factories
2020-08-27 08:54:20 +02:00
Maikel
da1569abda
Merge pull request #5914 from romale/patch-8
...
Missing translation key 'listing_reports'
2020-08-27 11:02:40 +10:00
Maikel
7ce9a3f988
Merge pull request #5894 from julesemmac/places-error
...
adding required argument to resolve Places error
2020-08-27 11:01:19 +10:00
Maikel
7a0b036edd
Merge pull request #5899 from andrewpbrett/dashboard-link
...
Update dashboard link to point to enterprise shop
2020-08-27 10:53:43 +10:00
Maikel
d81ed36eef
Merge pull request #5892 from arku/fix/price-i18n
...
Fix price translation in Bulk Order Management
2020-08-27 10:31:38 +10: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
23c86a1937
Replace select2_search usages with faster targetted_select2_search and remove select2_search and dependent code
2020-08-26 23:06:25 +01:00
Luis Ramos
fb88cfedcf
Remove unused helpers
2020-08-26 22:49:52 +01:00
Luis Ramos
94d1d5f3ae
Run rubocop -a on spec/factories
2020-08-26 22:18:40 +01:00
Luis Ramos
f9aac02e13
Run rubocop -a
2020-08-26 22:16:02 +01:00
Luis Ramos
274cdefa26
Remove commented code
2020-08-26 22:14:24 +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
Pau Pérez Fabregat
152eb11913
Merge pull request #5940 from openfoodfoundation/transifex
...
Transifex
2020-08-26 09:12:58 +02:00
Pau Pérez Fabregat
0421d23e7b
Merge pull request #5851 from cillian/osm-tile-provider-updates
...
Open Street Map tile provider updates
2020-08-25 10:51:55 +02:00
Transifex-Openfoodnetwork
5ce51a4abb
Updating translations for config/locales/nb.yml
2020-08-25 18:23:24 +10:00
Transifex-Openfoodnetwork
1c7ce9997a
Updating translations for config/locales/es.yml
2020-08-25 18:21:19 +10:00
Transifex-Openfoodnetwork
489665f3f9
Updating translations for config/locales/ca.yml
2020-08-25 18:21:04 +10:00
Maikel
cad79d74c8
Merge pull request #5696 from jeduardo824/enhancement/5210-action-buttons-on-all-tabs
...
Enhancement/5210 - Add Actions dropdown menu to all pages of Order Details menu
2020-08-25 15:39:50 +10:00
Transifex-Openfoodnetwork
f9e29c5aa7
Updating translations for config/locales/ar.yml
2020-08-25 07:24:29 +10:00
romale
ad9d9afd6a
Update en.yml
2020-08-24 17:51:06 +03:00
Luis Ramos
41d67d8b2e
Fix estimator spec
2020-08-23 18:07:01 +01:00
Luis Ramos
5568fd5826
Fix problem in order factory
...
We dont need the global zone
2020-08-23 17:40:54 +01:00
Luis Ramos
f6277416ce
Simplify stock location factory and fix related issues in several factories
2020-08-23 17:34:02 +01:00
Luis Ramos
4de4cc642d
Fix stock location factory
2020-08-23 17:34:02 +01:00
Luis Ramos
cd22361d13
Fix shipping category factory
2020-08-23 17:34:02 +01:00
Luis Ramos
1ddda92f4d
Move factories from generic factories file to their respective factory file
2020-08-23 14:55:45 +01:00
Luis Ramos
4048957e2e
Bring the final batch of factories from spree_core
2020-08-23 14:51:15 +01:00
Luis Ramos
2abbfad18c
Remove the need to import both :role and :state factory to OFN
2020-08-23 14:47:30 +01:00
Luis Ramos
292199441a
Fix problem with shipment's stock location creation
2020-08-23 14:35:59 +01:00
Luis Ramos
f56fa0b7a5
Bring calculator factories from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
a432bbf789
Fix problem with shipping method's shipping category creation
2020-08-23 14:35:59 +01:00
Luis Ramos
6d9250c014
Bring tax category factory from spree_core and fix a problem with the stock location of the product factory
2020-08-23 14:35:59 +01:00
Luis Ramos
6d05de742e
Fix problem with product shipping category factory
2020-08-23 14:35:59 +01:00
Luis Ramos
aa00756f9c
Bring product factory from spree_core and merge with modification
2020-08-23 14:35:59 +01:00
Luis Ramos
ee65b4ba27
Bring taxon and taxonomy factories from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
e2a865476d
Bring adjustment factory from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
9e7e63cc94
Bring line_item factory from spree_core
2020-08-23 14:35:59 +01:00
Luis Ramos
4dd1a52f8e
Bring random_email and random description from spree_core factories
2020-08-23 14:35:59 +01:00
Luis Ramos
f6f6d9b46f
Bring variant factory from spree_core and merge with modification
2020-08-23 14:35:59 +01:00
Luis Ramos
204e3979d9
Bring user factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
Luis Ramos
ad8c41e0ad
Bring shipping_method factory from spree_core and merge with modification
2020-08-23 14:35:58 +01:00
