Luis Ramos
e177ba5e29
Merge pull request #5977 from openfoodfoundation/transifex
...
Transifex
2020-09-03 13:19:33 +01:00
Transifex-Openfoodnetwork
d3f48bf684
Updating translations for config/locales/nb.yml
2020-09-03 22:16:04 +10:00
Transifex-Openfoodnetwork
63a6ceede3
Updating translations for config/locales/en_NZ.yml
2020-09-03 19:57:50 +10:00
François Turbelin
52d82d0a96
Use not found instead of 404 for spec descriptions
2020-09-03 00:59:21 +02:00
François Turbelin
d11d67561f
Remove extra delegation in serializers
2020-09-03 00:58:54 +02:00
François Turbelin
d2c147109d
Use Persons instead of People
2020-09-03 00:56:42 +02:00
Luis Ramos
185c246a83
Merge pull request #5965 from coopdevs/ignore-pyenv-file
...
Gitignore pyenv's Python version file
2020-09-02 23:50:42 +01:00
François Turbelin
b60c1c9003
Dry current_enterprise emtod with enterprise_id_param_name
2020-09-03 00:50:23 +02:00
Luis Ramos
83361255aa
Merge pull request #5969 from luisramos0/fungi
...
Replace beef with fungi in sample data 🐮
2020-09-02 23:47:43 +01:00
Luis Ramos
f28241cc5e
Merge duplicate Spree::User#superadmin? into existing Spree::admin?
2020-09-02 22:41:42 +01:00
Luis Ramos
ebf4175662
MErge user class extensions into the User class
2020-09-02 22:41:39 +01:00
Luis Ramos
737fc699ed
Fix rubocop issues
2020-09-02 22:40:46 +01:00
Luis Ramos
caf61e3a7e
Run rubocop -a
2020-09-02 22:40:28 +01:00
Luis Ramos
dfa00a770a
Bring user and ability related files from spree_core
2020-09-02 22:37:27 +01:00
François Turbelin
59fb2abc5d
Fix inheritance issue with specs on Semaphore
2020-09-02 23:08:47 +02:00
François Turbelin
6508897e3d
Introduce current_enterprise with memoization
2020-09-02 22:28:12 +02:00
François Turbelin
1baba5b61c
Introduce current_user with memoization
2020-09-02 22:18:56 +02:00
François Turbelin
4f2b7094d0
Use before_action instead of before_filter
2020-09-02 21:48:13 +02:00
Luis Ramos
b4759ff869
Merge pull request #5869 from luisramos0/images
...
[Bye bye Spree] Bring models image and asset from spree_core
2020-09-02 19:44:40 +01:00
Transifex-Openfoodnetwork
5bc0eca493
Updating translations for config/locales/en_FR.yml
2020-09-02 23:08:34 +10:00
Transifex-Openfoodnetwork
f6eb05a6f1
Updating translations for config/locales/fr.yml
2020-09-02 23:07:46 +10:00
Maikel Linke
cd940bd140
Rewrite error message for failed credit card sending
2020-09-02 15:22:23 +10:00
Maikel Linke
09f0035bbd
Add required plural form to locale
...
Transifex complained:
> Key 'spree.activerecord.models.spree/payment' has the wrong number of plurals
While our application may not need that translation, Transifex won't
accept the source file and our updates were broken.
2020-09-02 15:06:15 +10:00
Luis Ramos
2cb6124b7a
Use existing product factory, the custom product is not needed here
2020-09-01 17:13:07 +01:00
Luis Ramos
653b71dbd4
Remove duplicated spec
2020-09-01 17:10:51 +01:00
Luis Ramos
b36d0bc4f3
Fix easy rubocop isssues
2020-09-01 17:09:22 +01:00
Luis Ramos
b2cf414fb8
Use exiting translation
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
Transifex-Openfoodnetwork
a65bd8edac
Updating translations for config/locales/en_US.yml
2020-09-02 01:28:57 +10:00
Luis Ramos
ea053552b9
Merge pull request #5938 from cillian/bulk-coop-report-filter-fixes
...
Fix the bulk coop report date and distributor filters.
2020-09-01 16:21:31 +01:00
Luis Ramos
52fb3c92f0
Merge pull request #5954 from romale/patch-10
...
Missing translation key en.credit_owed and en.new_adjustment
2020-09-01 16:21:22 +01:00
Luis Ramos
ffac38d934
Remove option to enter state_name for countries without states
...
Thisis not supported in OFN
2020-09-01 16:06:49 +01:00
Luis Ramos
5716ea8611
Fix rubocop issue
2020-09-01 15:55:46 +01:00
Luis Ramos
88d90a37e8
Run transpec
2020-09-01 15:53:18 +01:00
Luis Ramos
ed114f4c4c
Fix rubocop issues
2020-09-01 15:52:36 +01:00
Luis Ramos
ffa0d202be
Add states api endpoint to support existing code on the customer details page when user changes country
2020-09-01 15:46:22 +01:00
Luis Ramos
41d797489d
Make onchange code simpler
2020-09-01 14:52:18 +01:00
Luis Ramos
46623242f7
Make use_billing checkbox work again, missign js code from spree
2020-09-01 14:28:45 +01:00
Luis Ramos
1a39a55009
Fix problem of converting from erb to haml
2020-09-01 14:09:06 +01:00
Luis Ramos
56fb09c006
Remove unused class
2020-09-01 14:03:20 +01:00
Luis Ramos
e4dee8a2fb
Replace hash rockets
2020-09-01 13:57:57 +01:00
Luis Ramos
04f9c5ec5e
Convert address form from erb to haml
2020-09-01 13:53:19 +01:00
Luis Ramos
8c322c1a0f
Move shared address_form partial to the only place where it is used, order customer_details
2020-09-01 13:49:17 +01:00
Luis Ramos
5e49e03477
Merge pull request #5964 from coopdevs/fix-flaky-product-update-spec
...
Check taxon's attribute instead of object identity
2020-09-01 12:06:02 +01:00
Luis Ramos
b35d579f64
Bring stock_movement factory from spree_core
2020-09-01 10:20:51 +01:00
Luis Ramos
3198bbd3cb
Bring required factory from spree_core
2020-09-01 10:17:45 +01:00
Luis Ramos
865a4b3063
Fix base helper spec
2020-09-01 09:46:41 +01:00
Luis Ramos
b413f856a5
Clarify that it's a Spree issue number
2020-09-01 09:46:41 +01:00
