Maikel Linke
271d1ec103
Update translations from Transifex
2020-08-13 10:52:55 +10:00
Maikel
2271a57ffe
Merge pull request #5880 from openfoodfoundation/transifex
...
Transifex
2020-08-13 10:35:00 +10:00
Transifex-Openfoodnetwork
95e048b37f
Updating translations for config/locales/en_CA.yml
2020-08-13 02:50:37 +10:00
Maikel
a8207128df
Merge pull request #5889 from Matt-Yorkley/suppress-selenium-warings
...
Suppress Selenium warnings in test log output.
2020-08-12 11:29:30 +10:00
Transifex-Openfoodnetwork
47bde1e77c
Updating translations for config/locales/tr.yml
2020-08-12 00:50:03 +10:00
Matt-Yorkley
0edeb82c32
Update spec/spec_helper.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-08-11 14:02:49 +02:00
Transifex-Openfoodnetwork
acf984699e
Updating translations for config/locales/en_US.yml
2020-08-11 12:02:26 +10:00
Pau Pérez Fabregat
70e2fb759c
Merge pull request #5751 from luisramos0/subs_jobs
...
Add rescue statements with bugsnag alerts to subs jobs
2020-08-10 12:50:54 +02:00
Matt-Yorkley
74252e9d13
Suppress Selenium warnings in test log output.
2020-08-09 14:02:07 +01:00
Luis Ramos
78fbac8ff2
Merge pull request #5882 from coopdevs/fix-doc-ocd
...
Fix docs OCD in Gemfile
2020-08-07 16:38:40 +01:00
Pau Perez
4e22787386
Fix docs OCD in Gemfile
...
@luisramos0 and I can't cope with reading TWO and seeing THREE items listed.
2020-08-07 17:20:14 +02:00
Transifex-Openfoodnetwork
f6c85af4da
Updating translations for config/locales/fr.yml
2020-08-08 00:21:32 +10:00
Matt-Yorkley
3a2802f5aa
Merge pull request #5871 from coopdevs/fix-paypal-ssl-error
...
Point better_spree_paypal_express to its latest commit
2020-08-07 11:43:52 +02:00
Matt-Yorkley
766b7449d8
Update all locales with the latest Transifex translations
2020-08-07 10:00:21 +01:00
Matt-Yorkley
2caa559869
Merge pull request #5860 from openfoodfoundation/transifex
...
Transifex
2020-08-07 10:58:25 +02:00
Luis Ramos
04feccaef3
Merge pull request #5863 from romale/patch-7
...
Missing translation key 'item', 'qty'
2020-08-07 09:22:34 +01:00
Pau Pérez Fabregat
dfc31b9338
Merge pull request #5864 from openfoodfoundation/dependabot/bundler/ddtrace-0.39.0
...
Bump ddtrace from 0.38.0 to 0.39.0
2020-08-07 08:22:17 +02:00
Pau Perez
2ccb7c3eb0
Point spree_paypal_express to its latest commit
...
This brings in the fix for the intermittent PayPal connection failures
due to SSL verification failed. Checkout that gem's commit for details.
2020-08-07 08:18:24 +02:00
Transifex-Openfoodnetwork
f92d05656c
Updating translations for config/locales/en_FR.yml
2020-08-06 17:17:36 +10:00
Transifex-Openfoodnetwork
1e2c092b70
Updating translations for config/locales/fr.yml
2020-08-06 17:14:33 +10:00
dependabot-preview[bot]
6e626447d0
Bump ddtrace from 0.38.0 to 0.39.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.38.0 to 0.39.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.38.0...v0.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-05 23:48:20 +00: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
f093656c6b
Merge pull request #5763 from luisramos0/mailers
...
Bring Mailers from Spree and make order shipped email translatable
2020-08-05 18:09:12 +01:00
romale
dd86e00913
Update en.yml
2020-08-05 18:17:14 +03:00
Transifex-Openfoodnetwork
b2309f8673
Updating translations for config/locales/en_FR.yml
2020-08-06 00:21:16 +10:00
Transifex-Openfoodnetwork
5404efcbce
Updating translations for config/locales/fr.yml
2020-08-06 00:21:09 +10:00
Luis Ramos
d8acf90240
Merge pull request #5770 from openfoodfoundation/revert-5601-enhancement/5454-links-to-shops-in-new-tabs
...
Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
2020-08-05 11:51:48 +01:00
Luis Ramos
6cc296926c
Merge pull request #5847 from rmklaus12/5579-missing-translation-subscriptions
...
5579 missing translation subscriptions
2020-08-05 11:29:34 +01:00
Pau Pérez Fabregat
6e1dd78e9f
Merge pull request #5828 from luisramos0/ent_user
...
Clean up AuthenticationWorkflow spec helper
2020-08-04 12:07:54 +02:00
Pau Perez
6e39ab779c
Make RSpec infer the file type from its location
...
Apparently, although we tend to add the type of spec file some RSpec
methods are not working without it. We're getting:
```
NoMethodError:
undefined method `helper' for RSpec::ExampleGroups::SpreeSharedOrderDetailsHtmlHaml:Class
```
```
NameError:
undefined local variable or method `controller' for #<RSpec::ExampleGroups::SpreeAdminUsersController::AuthorizeAdmin:0x00007fa8b32addf8>
# ./spec/controllers/spree/admin/users_controller_spec.rb:10:in `block (3 levels) in <top (required)>'
```
It needs more investigation but another day.
2020-08-04 11:24:49 +02:00
Transifex-Openfoodnetwork
8792ec1de3
Updating translations for config/locales/es.yml
2020-08-04 18:14:45 +10:00
Transifex-Openfoodnetwork
b91f1578c9
Updating translations for config/locales/ca.yml
2020-08-04 18:14:27 +10:00
Pau Pérez Fabregat
9b91c490cb
Merge pull request #5859 from openfoodfoundation/transifex
...
Transifex
2020-08-04 10:13:37 +02:00
Transifex-Openfoodnetwork
e8ba44f958
Updating translations for config/locales/en_FR.yml
2020-08-04 17:27:10 +10:00
Transifex-Openfoodnetwork
800ac0cabf
Updating translations for config/locales/fr.yml
2020-08-04 17:26:53 +10:00
Pau Perez
9ef59f440b
Remove commented out includes
2020-08-04 08:50:14 +02:00
Pau Perez
61c14cb61d
Remove unneeded RSpec config block
...
Spec files individually include the module and we specify the type of
spec in each RSpec's describe so none of this settings are needed. They
are just Spree's legacy I bet.
2020-08-04 08:48:08 +02:00
Pau Pérez Fabregat
467fa7e566
Merge pull request #5856 from openfoodfoundation/transifex
...
Transifex
2020-08-04 08:37:32 +02:00
Pau Pérez Fabregat
ef48187332
Merge pull request #5745 from openfoodfoundation/dependabot/bundler/rswag-2.3.1
...
Bump rswag from 2.2.0 to 2.3.1
2020-08-04 08:00:32 +02:00
Luis Ramos
425901fa7a
Add some paragraphs and breaklines to the tempalte that used to be text and is now html
...
This template needs to be revisited, this is just a quick fix
2020-08-03 16:43:11 +01:00
Luis Ramos
6e57e1ad56
Fix conflict between unused Spree::CheckoutHelper in spree_core and the required ::CheckoutHelper in OFN
...
The OFN checkoutHelper was not being included and instead the Spree::CheckoutHelper, that doesnt have the necessary helpers, was used
2020-08-03 16:25:18 +01:00
Luis Ramos
6b4a518371
Merge pull request #5845 from romale/patch-6
...
Missing translation key for "height", "width", "depth"
2020-08-03 16:02:20 +01:00
Cillian O'Ruanaidh
e6ab2ae753
Remove unused positiveAngles and negativeAngles arrays from map centre calculator service.
...
I forgot to remove these when I was refactoring this earlier.
2020-08-03 15:12:40 +01:00
Transifex-Openfoodnetwork
c97fc45109
Updating translations for config/locales/nb.yml
2020-08-03 22:53:31 +10:00
Transifex-Openfoodnetwork
1d44d463e7
Updating translations for config/locales/tr.yml
2020-08-03 22:48:36 +10:00
Luis Ramos
13b72154fa
Merge pull request #5852 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.6
...
Bump activerecord-import from 1.0.5 to 1.0.6
2020-08-03 11:54:00 +01:00
dependabot-preview[bot]
619e13ccba
Bump rswag from 2.2.0 to 2.3.1
...
Bumps [rswag](https://github.com/rswag/rswag ) from 2.2.0 to 2.3.1.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.2.0...2.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-03 08:32:45 +00:00
Pau Pérez Fabregat
bc66c10a52
Merge pull request #5848 from openfoodfoundation/transifex
...
Transifex
2020-08-03 09:59:12 +02:00
Pau Pérez Fabregat
06e77372be
Merge pull request #5842 from openfoodfoundation/dependabot/bundler/bugsnag-6.15.0
...
Bump bugsnag from 6.14.0 to 6.15.0
2020-08-03 09:58:52 +02:00
dependabot-preview[bot]
e615674541
Bump bugsnag from 6.14.0 to 6.15.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.14.0 to 6.15.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.14.0...v6.15.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-01 14:57:18 +00: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
dependabot-preview[bot]
ff82a1b73f
Bump activerecord-import from 1.0.5 to 1.0.6
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.5...v1.0.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-08-01 07:31:53 +00:00
Luis Ramos
b025d5a600
Merge pull request #5822 from luisramos0/improve_ocs_perf
...
Performance improvement of the outgoing products page when editing OCs
2020-07-31 16:07:16 +01:00
Luis Ramos
2aa6c70dc6
Remove select from relation
...
This relation is only used above for a call to empty? so we don't need to worry about the select part of the query, specially not introducing an expensive DISTINCT
2020-07-31 09:26:04 +01:00
Luis Ramos
d052a7b796
Verify the user is confirmed before returning a reset password token
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-07-31 09:14:07 +01:00
Transifex-Openfoodnetwork
9d1e12da68
Updating translations for config/locales/en_FR.yml
2020-07-31 18:11:19 +10:00
Transifex-Openfoodnetwork
aae0a6533a
Updating translations for config/locales/fr.yml
2020-07-31 18:10:57 +10:00
Luis Ramos
7c498a573c
Make shopfront redirect work when logging out by storing it outside session data
2020-07-31 09:05:42 +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
ca9898839a
Confirm! is deprecated and only redirects to confirm now in devise 3.5
2020-07-31 09:05:42 +01:00
Luis Ramos
f31d790714
Add auth spec to cover case where user tries to reset password before confirming their 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
c0f9f8c8bf
Remove comment refering to old spree upgrade
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
Luis Ramos
26ca374a76
Adpat user mailer to devise v3
2020-07-31 09:05:42 +01:00
Luis Ramos
40e065eada
Add gem for Devise::TokenAuthenticatable and configure it
2020-07-31 09:05:42 +01:00
dependabot-preview[bot]
f7ee6ce6c5
[Security] Bump devise from 2.2.8 to 3.5.10
...
Bumps [devise](https://github.com/plataformatec/devise ) from 2.2.8 to 3.5.10. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/devise/releases )
- [Changelog](https://github.com/plataformatec/devise/blob/v3.5.10/CHANGELOG.md )
- [Commits](https://github.com/plataformatec/devise/compare/v2.2.8...v3.5.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-31 09:05:42 +01:00
Luis Ramos
85e9819c3b
Make more translation keys use lazy look ups
2020-07-31 09:00:48 +01:00
Transifex-Openfoodnetwork
1ea06763f8
Updating translations for config/locales/es.yml
2020-07-31 17:00:19 +10:00
Transifex-Openfoodnetwork
5064769717
Updating translations for config/locales/ca.yml
2020-07-31 16:59:55 +10:00
Robin Klaus
581a246b4f
Added translation key for subscriptions heading
2020-07-31 16:29:04 +10:00
Maikel Linke
bee7990c60
Update translations
2020-07-31 15:58:04 +10:00
romale
27404872de
Missing translation key for "height", "width", "depth"
...
When edit product in path admin/products/PRODUCT_NAME/varians/NN/edit
2020-07-31 00:20:55 +03:00
Luis Ramos
1e9b11d209
Merge pull request #5807 from romale/patch-5
...
Add Russian to list of momentJS locales
2020-07-30 19:01:38 +01:00
Luis Ramos
df465cf45b
Merge pull request #5698 from rmklaus12/5575-backofficepay-missing-translation
...
Added translation key to locale/en.yml for backoffice admin payment
2020-07-30 19:01:11 +01:00
Luis Ramos
f524560624
Merge pull request #5800 from romale/patch-4
...
Missing translation key for "permalink" and "shipping_categories"
2020-07-30 18:00:45 +01:00
Luis Ramos
7af47df570
Merge pull request #5843 from andrewpbrett/master
...
Update Docker instructions to recommend creating your own fork
2020-07-30 17:57:33 +01:00
Luis Ramos
354b76205e
Merge pull request #5839 from openfoodfoundation/dependabot/bundler/oj-3.10.8
...
Bump oj from 3.10.7 to 3.10.8
2020-07-30 17:54:12 +01:00
Luis Ramos
fbc7eea1a5
Merge pull request #5811 from jttyeung/master
...
Fix #5730 content header overlap with long product names
2020-07-30 17:53:09 +01:00
Luis Ramos
0359d103b2
Improve code comments on dodgy and/but critical checkout process method
2020-07-30 17:18:34 +01:00
Luis Ramos
1400b3667b
Merge pull request #5788 from romale/patch-2
...
Missing translation key for shipping_method and new_order
2020-07-30 16:54:07 +01:00
Luis Ramos
e739c5185e
Add specs to verify that Spree::Core::Gateway exceptions are handled correctly
2020-07-29 23:56:52 +01:00
Luis Ramos
2136eecd09
Avoid reloading the payment every time, so that in-memory data is not wiped out
...
When checkout fails and the payment states dont match (inside the if), in-memory data of the failed payment can be lost but updating the payment state is the fundamental part here so that further checkout attempts work. We may improve this update statement so that all the data of the failed payment is persisted
2020-07-29 22:50:30 +01:00
Luis Ramos
9e9e0d0bd8
Remove rescue_from and just add the rescue to the edit action, the update action has a different logic where there is a generic rescue StandardError after the GatewayError rescue
2020-07-29 22:50:25 +01:00
Luis Ramos
da4abf6617
Add a comment to explain the necessity of the first rescue in the update action
2020-07-29 22:50:20 +01:00
Luis Ramos
ad00971ca8
Improve readability and add bugsnag error (now in the checkout_failed method) when checkout_fails while handling stripe redirect
2020-07-29 22:50:18 +01:00
Andy Brett
54cb479fa1
Update Docker instructions to mention the recommendation to create one's own fork
2020-07-29 13:04:34 -07: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
bea472623d
Merge pull request #5834 from openfoodfoundation/dependabot/bundler/unicorn-5.6.0
...
Bump unicorn from 5.5.5 to 5.6.0
2020-07-29 14:33:04 +01:00
Pau Perez
84178c637e
Add missing momentjs languages to back-office
2020-07-29 13:02:46 +02:00
Pau Perez
9bf58a8258
Add missing Catalan, Arabic & Turkish for momentjs
2020-07-29 12:53:34 +02:00
Pau Perez
c923edd3bb
Replace hardcoded URL with path helper
2020-07-29 11:36:49 +02:00
Pau Pérez Fabregat
bcaa308ac8
Merge pull request #5825 from openfoodfoundation/transifex
...
Transifex
2020-07-29 11:20:56 +02:00
Maikel Linke
fe0c04b650
Complete renaming of AdvanceOrderService to OrderWorkflow
2020-07-29 12:24:18 +10:00
Robin Klaus
4375a34ef8
Updated message to Paypal payments cannot be captured in the Backoffice
2020-07-29 10:18:25 +10:00
Luis Ramos
07005594ff
Move payments persistence code to order workflow service
2020-07-28 23:56:43 +01:00
Luis Ramos
ac5882e3e6
Refactor OrderWorkflow
2020-07-28 23:55:36 +01:00
Luis Ramos
9cbcf14485
Move shipping method id setting code to OrderWorkflow service
2020-07-28 23:50:47 +01:00
Luis Ramos
c3f99050fd
Move advance_order_state from checkout_controller to OrderWorkflow service
2020-07-28 23:43:07 +01:00
Luis Ramos
26eee4631f
Rename AdvanceOrderService to OrderWorkflow
2020-07-28 23:40:49 +01:00
Luis Ramos
734fce5ce7
Add code to persist payments after failed payments. The state machine
...
rollbacks the transactions, with this we keep record of what went wrong.
2020-07-28 23:29:49 +01:00
Luis Ramos
e80337a458
Transpec checkout_spec
2020-07-28 23:29:49 +01:00
Luis Ramos
51de5269dc
Fix specs in checkout_spec
2020-07-28 23:29:49 +01: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
dependabot-preview[bot]
555a74c9e6
Bump oj from 3.10.7 to 3.10.8
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.7 to 3.10.8.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.7...v3.10.8 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-28 21:10:22 +00:00
Luis Ramos
275a864e51
Merge pull request #5815 from coopdevs/eager-load-option-values-line-items
...
Eager load spree_option_values_line_items
2020-07-28 17:21:02 +01:00
Luis Ramos
61453968dd
Merge pull request #5833 from luisramos0/pend_payments
...
Add unit tests for order.charge_shipping_and_payment_fees!
2020-07-28 17:18:57 +01:00
Transifex-Openfoodnetwork
8263e2e373
Updating translations for config/locales/es.yml
2020-07-29 00:39:21 +10:00
Transifex-Openfoodnetwork
aff8933d25
Updating translations for config/locales/ca.yml
2020-07-29 00:36:57 +10:00
Pau Pérez Fabregat
d4570240ae
Merge pull request #5826 from openfoodfoundation/luisramos0-patch-1
...
Update GETTING_STARTED.md
2020-07-28 15:59:38 +02:00
dependabot-preview[bot]
d0a7f8e1af
Bump unicorn from 5.5.5 to 5.6.0
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.5 to 5.6.0.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-27 23:44:40 +00:00
Luis Ramos
d673f278ce
Add unit test to order.charge_shipping_and_payment_fees!
2020-07-27 21:27:23 +01:00
Luis Ramos
a002ec1894
Simplify login_as_admin by using existing factory admin_user
2020-07-27 16:02:59 +01:00
Luis Ramos
ecc58cedd9
Fix navigation problem in spec
2020-07-27 16:02:59 +01:00
Luis Ramos
27ace50eb7
Fix general settings path in specs
2020-07-27 16:02:57 +01:00
Luis Ramos
4df81f0864
Remove unnecesasary and now broken require statement from spec and fix rubocop todo files
2020-07-27 15:32:35 +01:00
Luis Ramos
95a9ca7775
Remove redundant method, login_as is the name of the test helper in warden
2020-07-27 15:32:35 +01:00
Luis Ramos
d6a5ad70a8
Adapt specs in order mgmt engine to new authentication helper
2020-07-27 15:32:35 +01:00
Luis Ramos
a2ebc614d9
Rename AuthenticationWorkflow to AuthenticationHelper
2020-07-27 15:32:35 +01:00
Luis Ramos
10b07aabd9
Rename quick_login_as to login_as
2020-07-27 15:32:35 +01:00
Luis Ramos
5738ec0542
Rename login_to_admin_and_visit to login_as_admin_and_visit
2020-07-27 15:32:34 +01:00
Luis Ramos
c6bb756531
Rename quick_login_as_admin to login_as_admin and also re-use login_to_admin_and_visit when applicable
2020-07-27 15:31:23 +01:00
Luis Ramos
8b04e45ea5
Create login_to_admin_and_visit to avoid loading the admin dashboard unnecessarily
...
This commit removes 19 unnecessary page loads of the admin dashboard
2020-07-27 15:31:11 +01:00
Luis Ramos
f1a3814c0d
Rename login_as_enterprise_user to a more specific name controller_login_as_enterprise_user
2020-07-27 14:44:25 +01:00
Luis Ramos
8e84754f35
Rename login_as_admin to a more specific name controller_login_as_admin
2020-07-27 14:44:25 +01:00
Luis Ramos
81710a2704
Remove now dead create_enterprise_user, the user factory should be used instead
2020-07-27 14:44:25 +01:00
Luis Ramos
1af4bf6994
Replace usage of create_enterprise_user with :user factory
2020-07-27 14:44:23 +01:00
Luis Ramos
3217b3ba86
Delete dead commented code
2020-07-27 12:28:53 +01:00
Luis Ramos
16b9c8c814
Replace usage of create_enterprise_user with :user factory
2020-07-27 12:28:33 +01:00
Transifex-Openfoodnetwork
79aadf5c86
Updating translations for config/locales/tr.yml
2020-07-27 03:23:28 +10:00
Luis Ramos
ec0d06af54
Reuse update_failed method as the code needed is exactly the same
2020-07-25 19:39:46 +01:00
Luis Ramos
b23b707b5d
Notify bugsnag and execute post checkout actions (reset to cart state) whenever there's a payment gateway exceeption raised
2020-07-25 19:39:46 +01:00
Luis Ramos
1bf946d124
Reused code in checkout controller, the reponse for the case when there is a stripe exception anywhere is the same as when the update action fails
2020-07-25 19:39:46 +01:00
Luis Ramos
5266d95910
Move method closer to related/similar methods
2020-07-25 19:39:46 +01:00
Luis Ramos
df22ad46d6
Update GETTING_STARTED.md
...
Clarify users landing on this page that they should use ofn-install for server deployments.
2020-07-25 14:53:35 +01:00
Transifex-Openfoodnetwork
227892b629
Updating translations for config/locales/en_FR.yml
2020-07-25 23:36:58 +10:00
Transifex-Openfoodnetwork
ffc98c63fa
Updating translations for config/locales/fr.yml
2020-07-25 23:36:48 +10:00
Luis Ramos
add7bb489f
Update all locales with the latest Transifex translations
2020-07-25 13:13:35 +01:00
Cillian O'Ruanaidh
702669e61c
Merge branch 'master' into prevent-blank-open-street-map
2020-07-24 16:00:37 +01:00
Cillian O'Ruanaidh
cc317bc8c9
Move the :initialLatitude and :initialLongitude methods from the OpenStreetMap service to the MapCenterCalculator service.
2020-07-24 16:00:30 +01:00
Luis Ramos
752d9e9bb8
Merge pull request #5806 from openfoodfoundation/bring-in-payment-model
...
Bring in payment model
2020-07-24 14:52:20 +01:00
Luis Ramos
d93c1684b9
Merge pull request #5780 from coopdevs/handle-credit-validation-errors
...
Handle credit validation errors
2020-07-24 14:49:52 +01:00
Luis Ramos
603991996f
Merge pull request #5799 from luisramos0/calcs_bug
...
Add migration to fix calculator preferences
2020-07-24 14:22:55 +01:00
Luis Ramos
32d45f6fe5
Merge pull request #5747 from mbudm/issue/5434
...
Make keyboard UI close on iOS when done searching
2020-07-24 13:25:39 +01:00
Luis Ramos
8f4395a6ea
We need to clear Rails cache after updating preferences so that the app picks the new values immediately
2020-07-24 13:17:43 +01:00
Luis Ramos
1b31b727c7
Add migration to fix calculator preferences
2020-07-24 13:17:43 +01:00
Pau Perez
97f551a2dd
Replace literal with AR's 4 #not
2020-07-23 20:24:31 +02:00
Pau Perez
357037e429
Recalculate adjustments when invalidating payments
...
Switching from `#invalidate` to `#update_column` skipped both
validations and callbacks and thus, `#ensure_correct_adjustments` was no
longer called for older payments.
2020-07-23 20:24:31 +02:00
Pau Perez
e6943ce554
Fix simple Rubocop issues
2020-07-23 20:24:31 +02:00
Pau Perez
4d9fbb68d6
Add missing attribute to skip source validation
2020-07-23 20:24:31 +02:00
Pau Perez
813459ee38
Clarify method documentation
2020-07-23 20:24:31 +02:00
Pau Perez
c0f72f89f2
Handle #refund! as we do with #credit!
2020-07-23 20:24:31 +02:00
Pau Perez
0f0a704147
Skip source validation when applying credit
...
The original payment may not be valid because its credit card may be
expired. Stripe gives this as a valid scenario returning a success and
we should do too.
When creating the credit payment we end up validating all sources in
a chain as follows.
```
Payment being persisted -> source payment -> original credit card.
```
The source payment was valid when created (It would not be persisted
otherwise) but its source card may now be expired, and that's legit.
There was also an issue with the `#invalidate_old_payments` callback. It
was causing the original payment to be validated again and thus the
credit payment failed to be persisted due to the original credit card
being expired. Switching this callback to use `#update_column` skips
validations and so we don't validate the source payment. We only care
about the state there, so it should be fine.
2020-07-23 20:24:31 +02:00
Pau Perez
f2b28a198d
Replace before_validation with custom validation
...
No reason to use a callback when custom validation methods can be
defined.
2020-07-23 20:24:31 +02:00
Pau Perez
f2fd426c4a
Fix old Spree specs
...
Given the importance of this code, it doesn't bring me much confidence.
Apparently, this specs where using a non-existent state by mistake and
this went unnoticed because the payment creation was failing silently in
payment/processing.rb.
This unearthed the fact that our `#ensure_correct_adjustment` needs the
order to be persisted to succeed.
2020-07-23 20:24:31 +02:00
Pau Perez
1c026479f5
Replace spec's syntax to RSpec 3
2020-07-23 20:24:31 +02:00
Pau Perez
73b1b1f172
DRY specs and fix rubocop failures
2020-07-23 20:24:31 +02:00
Pau Perez
59da07de66
Handle all errors when dealing with payment event
...
This basically catches ActiveRecord::RecordInvalid caused by an invalid
credit record, for instance, but also other situations we haven't
forseen.
2020-07-23 20:24:31 +02:00
Pau Perez
26ed601996
Test the payment controller handles GatewayError
...
After that, we can TDD a second one that also handles validation errors.
2020-07-23 20:24:31 +02:00
Pau Perez
6ca6938df4
Merge branch 'master' into bring-in-payment-model
...
* master: (91 commits)
Bump ddtrace from 0.37.0 to 0.38.0
Add spec to cover SQL query issue with OCs where the only products from the coordinator inventory are renderer
Remove unnecessary order statement, the relation will only be used for counting products
Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it.
Make OC advanced settings work by permitting the extra parameter
Remove conflicting and duplicate route
Bump bugsnag from 6.13.1 to 6.14.0
Make charges update method update the first pending payment
Move require_login_then_redirect_to to the only place where it is called
Make broken spec fail reliably and set it pending
Updating translations for config/locales/en_GB.yml
Update all locales with the latest Transifex translations
Doc defensive coding needed by pin payments
Make method a little simple by extracting method
Simplify spec, the 2 minutes wait is not necessary anylonger
Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
Move unauthorized view to HomeController only, all other calls to unauthorized will go through Auth which will redirect to the home controller IF the user is logged in or to login if user is not logged in
Adapt specs to the move of unauthorized route from the spree routes to the main app routes
Delete spree_user_signup which is from spree promotions code that we dont use
Remove try_spree_current_user
...
2020-07-23 20:20:43 +02:00
Joanne Yeung
abc132d3db
Remove trailing whitespace
2020-07-23 09:37:10 -06:00
Joanne Yeung
b16f486dcc
Address missing semi-colon
2020-07-23 09:25:56 -06:00
Luis Ramos
6cc91d457e
Merge pull request #5796 from coopdevs/remove-conlicting-spree-route
...
Remove conflicting and duplicate route
2020-07-23 14:29:12 +01:00
Luis Ramos
438aef1e7a
Merge pull request #5798 from luisramos0/payment_fees_master
...
Make charges update method update the first pending payment
2020-07-23 14:23:03 +01:00
Pau Perez
c8b738cbd5
Eager load spree_option_values_line_items
...
For the BulkCoop report to speed up. We move from an output like
```
web_1 | CACHE (0.3ms) SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 4]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 6]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 8]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 5]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 7]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 4]]
web_1 | CACHE (0.0ms) SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc [["line_item_id", 5]]
web_1 | Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (158.5ms)
web_1 | Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (187.3ms)
```
to
```
web_1 | CACHE (0.0ms) SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1 | CACHE (0.0ms) SELECT "spree_option_types".* FROM "spree_option_types" WHERE "spree_option_types"."id" = $1 ORDER BY spree_option_types.position LIMIT 1 [["id", 1]]
web_1 | Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (101.1ms)
web_1 | Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (107.9ms)
```
2020-07-23 12:34:39 +02:00
Joanne Yeung
6419036a26
Fix content header overlap with long product names
2020-07-22 15:53:44 -06:00
Luis Ramos
3dc9548fb3
Merge pull request #5775 from luisramos0/oc_inv_bug
...
Make OC advanced settings work by permitting the extra parameter and make the OC edit page work with that option activated
2020-07-22 22:23:28 +01:00
romale
daa3f00302
Update all.js.coffee
2020-07-22 20:30:21 +03:00
romale
77c920daab
Update all.js
2020-07-22 20:29:15 +03:00
Pau Pérez Fabregat
d3296dd5ee
Merge pull request #5801 from openfoodfoundation/dependabot/bundler/ddtrace-0.38.0
...
Bump ddtrace from 0.37.0 to 0.38.0
2020-07-22 17:42:15 +02:00
dependabot-preview[bot]
48efb42b1a
Bump ddtrace from 0.37.0 to 0.38.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.37.0 to 0.38.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.37.0...v0.38.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-21 21:27:14 +00:00
Luis Ramos
e445fc33a1
Add spec to cover SQL query issue with OCs where the only products from the coordinator inventory are renderer
2020-07-21 20:48:16 +01:00
Luis Ramos
aadbc9ed5d
Remove unnecessary order statement, the relation will only be used for counting products
2020-07-21 19:44:43 +01:00
Luis Ramos
9b5875a7d1
Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it.
2020-07-21 19:44:43 +01:00
Luis Ramos
7ba8c5ace1
Make OC advanced settings work by permitting the extra parameter
2020-07-21 19:44:41 +01:00
Luis Ramos
8d7b383b72
Merge pull request #5794 from openfoodfoundation/dependabot/bundler/bugsnag-6.14.0
...
Bump bugsnag from 6.13.1 to 6.14.0
2020-07-21 17:58:30 +01:00
romale
4d6920bd92
Missing translation key for "permalink" and "shipping_categories"
...
When edit product in path admin/products/PRODUCT_NAME/edit
2020-07-21 18:49:24 +03:00
Pau Pérez Fabregat
426c536750
Merge pull request #5677 from luisramos0/remove_spree_root_path
...
Bring ControllerHelpers from Spree and remove spree root path
2020-07-21 16:15:21 +02:00
Pau Perez
9be199a6cc
Remove conflicting and duplicate route
...
This Spree route conflicts with the one we define:
```
get "/login", to: redirect("/#/login")
```
for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.
The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
2020-07-21 13:27:06 +02:00
dependabot-preview[bot]
bb178c71b2
Bump bugsnag from 6.13.1 to 6.14.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.13.1 to 6.14.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.13.1...v6.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-20 23:35:34 +00:00
Luis Ramos
21227d7482
Make charges update method update the first pending payment
...
Updating the first overall payment could select a failed payment and ignore the pending payment that is about to be processed
2020-07-20 18:23:06 +01:00
Robin Klaus
d43a3ac65e
Added translation key to locale/en.yml for backoffice admin payment and added lazy loading
2020-07-20 13:07:41 +10:00
romale
19c7d11df5
Missing translation key for new_order
...
admin/orders/new
2020-07-19 22:06:07 +03:00
romale
eb2e894802
Missing translation key for shipping_method
...
admin/orders
2020-07-19 21:55:37 +03:00
Luis Ramos
62a3b6b720
Merge pull request #5406 from kristinalim/fix/5300-optimistic_locking_in_stock_items
...
5300 Avoid race conditions in Spree::StockItem
2020-07-17 22:24:59 +01:00
Luis Ramos
152e432f78
Merge pull request #5749 from mbudm/issue/1253
...
Ensure the hero image doesn't pixelate on hamburger menu open
2020-07-17 22:15:46 +01:00
Pau Pérez Fabregat
89906f581d
Merge pull request #5778 from openfoodfoundation/transifex
...
Transifex
2020-07-17 18:37:22 +02:00
Luis Ramos
001d40d691
Move require_login_then_redirect_to to the only place where it is called
...
This fixes a class loading issue where orders controllers was getting a undefined method require_login_then_redirect_to
2020-07-17 14:35:42 +01:00
Maikel
ea1e23abab
Merge pull request #5756 from mkllnk/broken-spec
...
Make broken spec fail reliably and set it pending
2020-07-17 09:56:56 +10:00
Maikel Linke
b0ac188430
Make broken spec fail reliably and set it pending
...
This spec has been broken for a long time, at least eight months. But it
regularly passed because the search filter is applied with a delay and
in that time the content matches. And once the filter is applied, no
products are shown and the negative matchers pass.
2020-07-17 09:28:17 +10:00
Transifex-Openfoodnetwork
f31a1ff59c
Updating translations for config/locales/en_GB.yml
2020-07-17 04:10:57 +10:00
Luis Ramos
2fe37b5237
Update all locales with the latest Transifex translations
2020-07-16 18:07:40 +01:00
Luis Ramos
981f1c0932
Merge pull request #5754 from openfoodfoundation/transifex
...
Transifex
2020-07-16 18:06:17 +01:00
Pau Perez
dd5e679f69
Address code review comments
...
Mostly styling issues.
2020-07-16 15:30:28 +02:00
Maikel
4e3502cce7
Merge pull request #5766 from mkllnk/5764-fix-pin-payments
...
5764 Provide credit card brand to Pin Payments
2020-07-16 10:28:18 +10:00
Matt-Yorkley
19b3041e1d
Merge pull request #5768 from Matt-Yorkley/pin-payments-params
...
Update StrongParams for Pin Payments
2020-07-16 00:01:34 +02:00
Pau Perez
4e00c45782
Doc defensive coding needed by pin payments
...
[skip ci]
2020-07-15 16:46:09 +02:00
Luis Ramos
efacca6292
Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
2020-07-15 15:33:03 +01:00
Luis Ramos
31e072179b
Make method a little simple by extracting method
2020-07-15 15:23:16 +01:00
Luis Ramos
57fd1bdee2
Merge pull request #5744 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.1
...
Bump i18n-js from 3.7.0 to 3.7.1
2020-07-15 15:04:55 +01:00
Luis Ramos
2605c4249b
Simplify spec, the 2 minutes wait is not necessary anylonger
2020-07-15 14:54:53 +01:00
Luis Ramos
3599cb2047
Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
...
It adapts the method in ControllerHelpers::Auth to also use the after_login mechanism.
Ideally we would remove one of the two after_login mechanisms after_login and spree_user_return_to but they might still be in use.
2020-07-15 14:54:53 +01:00
Luis Ramos
8fac1bc9ca
Move unauthorized view to HomeController only, all other calls to unauthorized will go through Auth which will redirect to the home controller IF the user is logged in or to login if user is not logged in
2020-07-15 14:54:52 +01:00
Luis Ramos
7f1797de58
Adapt specs to the move of unauthorized route from the spree routes to the main app routes
2020-07-15 14:54:52 +01:00
Luis Ramos
bf3150ddc8
Delete spree_user_signup which is from spree promotions code that we dont use
2020-07-15 14:53:35 +01:00
Luis Ramos
1666ffb191
Remove try_spree_current_user
...
This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
2020-07-15 14:53:35 +01:00
Luis Ramos
144811268e
Adapt require statements to new undecorated classes
2020-07-15 14:53:35 +01:00
Luis Ramos
d2e52f3136
Update rubocop manual todo
2020-07-15 14:53:35 +01:00
Luis Ramos
046c5f6585
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
97f00153ad
Bring controller_helpers/ssl.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
643a82c73c
Fix easy rubocop issues, some early returns make the indentation changes
2020-07-15 14:53:08 +01:00
Luis Ramos
a3ea4b757d
Merge decorator into the class brought from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
1167a1a9bb
Bring ControllerHelpers respond_with from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
20f610fbee
Merge controller_helpers/order with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
d5744572f7
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
23ff9d6fbb
Bring controller_helpers/order to OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
10849504c3
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2452202e92
Move lib/spree/core/controller_helpers/common.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
96839a03aa
Move lib/spree/core/controller_helpers.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
4ee30d7cac
Remove spree.root route and respective controller. Also move
...
unauthorized route to main app.
This route is no longer used in OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
7e75581da6
Merge class brought from spree with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
c8dd841c48
Fix some rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2ea026ea31
Bring controller helper auth from spree
2020-07-15 14:53:08 +01:00
Pau Perez
70afcee3fc
Fix Spree's spec clashing with a customization
...
`#save_requested_by_customer` is an accessor we added and thus, the
Spree's spec didn't consider.
2020-07-15 14:18:36 +02:00
Pau Perez
3a64cc426a
Reuse #calculate_refund_amount method
2020-07-15 14:01:58 +02:00
Pau Perez
a8af3a27b1
Fix all but Metrics Rubocop cops in processing.rb
2020-07-15 14:01:58 +02:00
Pau Perez
42658b5255
Refactor #process! nested ifs to guard clauses
...
Following Rubocop's indications.
2020-07-15 14:01:58 +02:00
Pau Perez
66dbd85eb4
Run rubocop autocorrect on payment/processing.rb
2020-07-15 14:01:58 +02:00
Pau Perez
3435d5ac97
Fix Rubocop non-metrics issues in payment model
2020-07-15 14:01:30 +02:00
Matt-Yorkley
c009fed6be
Update StrongParams for Pin Payments
2020-07-15 14:00:19 +02:00
dependabot-preview[bot]
5fae2c08c8
Bump i18n-js from 3.7.0 to 3.7.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-15 08:13:42 +00:00
Pau Pérez Fabregat
d4fea5223d
Merge pull request #5762 from openfoodfoundation/dependabot/bundler/oj-3.10.7
...
Bump oj from 3.10.6 to 3.10.7
2020-07-15 10:13:19 +02:00
Maikel Linke
25155cab18
Provide credit card brand to Pin Payments
...
Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.
I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
2020-07-15 17:13:46 +10:00
Steve Roberts
dbc7632c4e
Add inline comment to explain two height properties
2020-07-15 09:52:04 +10:00
Luis Ramos
646f48f0af
Add translation keys for test and shipment emails and make them lazy lookups
2020-07-14 14:35:36 +01:00
Luis Ramos
f66538d2cb
Convert test and shipment email templates to haml
2020-07-14 14:26:05 +01:00
Luis Ramos
55f160c309
Bring test and shipment email templates from spree_core
2020-07-14 14:23:09 +01:00
Luis Ramos
5835a0ee3a
Transpec mailer specs
2020-07-14 14:20:30 +01:00
Luis Ramos
e96d9c1f45
Fix mailer specs brought from spree_core
2020-07-14 14:19:19 +01:00
Luis Ramos
5162964936
Fix easy rubocop issues
2020-07-14 13:46:01 +01:00
Luis Ramos
d12495f3db
Merge decorators with original classes brought from spree and merge order_mailer specs
2020-07-14 13:38:11 +01:00
Luis Ramos
c6cd695b3c
Bring remaing mailers from spree_core
2020-07-14 13:28:11 +01:00
Steve Roberts
c4d7899a99
Use vh units for new browsers and align tagline bg to top.
2020-07-14 19:26:12 +10:00
Transifex-Openfoodnetwork
f79269e96b
Updating translations for config/locales/ca.yml
2020-07-14 17:46:12 +10:00
Steve Roberts
60870a1215
Fix linting errors
2020-07-14 12:58:48 +10:00
Steve Roberts
63a080266e
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/1253
2020-07-14 12:45:14 +10:00
dependabot-preview[bot]
f4cb14ab1a
Bump oj from 3.10.6 to 3.10.7
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.6 to 3.10.7.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.6...v3.10.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-14 00:10:40 +00:00
Luis Ramos
9c8318d828
Merge pull request #5613 from luisramos0/calculators
...
Move all Calculators from spree to OFN and out of the Spree namespace
2020-07-13 15:16:15 +01:00
Luis Ramos
d536cc8108
Merge pull request #5755 from Matt-Yorkley/groups-images
...
Fix StrongParameters for groups images
2020-07-13 14:50:24 +01:00
Matt-Yorkley
f450c21308
Merge pull request #5759 from luisramos0/vo_spec
...
Comment very flaky spec
2020-07-10 21:44:03 +02:00
Luis Ramos
eb4d648a23
Comment this very flaky spec for now
2020-07-10 19:27:31 +01:00
Pau Perez
cf64d3a290
Merge skipped callback from decorator into model
...
If we don't want that callback we can just as well remove it now that we
own that code.
2020-07-10 15:07:12 +02:00
Pau Perez
55d52b875f
Run rubocop autocorrect on payment model
2020-07-10 15:04:29 +02:00
Luis Ramos
5afb862ce1
Extract setup and authorize to a new method called prepare_for_payment to fix rubocop ABCsize issue
...
It looks like this rubocop rule weights a raise over a return...
2020-07-10 13:14:07 +01:00
Pau Perez
6389fdb16e
Simplify code related to error handling
2020-07-10 13:14:07 +01:00
Luis Ramos
01ab974a3b
Add rescue statment to failed payment email so that the processing of other orders continues if there is a problem while sending the email
2020-07-10 13:14:07 +01:00
Luis Ramos
7a9f9a5624
Log bugsnag and still send failed payment email when any exception is caught during the confirmation process
2020-07-10 13:14:05 +01:00
Transifex-Openfoodnetwork
50427472c4
Updating translations for config/locales/en_NZ.yml
2020-07-10 20:25:20 +10:00
Pau Perez
683794636b
Rename spec file
2020-07-10 11:57:36 +02:00
Pau Perez
2f4648342f
Merge decorator specs with Spree's ones
...
They are now isolated from each other.
2020-07-10 11:50:20 +02:00
Pau Perez
562f397b22
Isolate Spree's specs into their own context
...
This way we don't mix contexts while merging in our own decorator tests.
2020-07-10 11:46:59 +02:00
Pau Perez
8fbbb0bb64
Bring back our card factory modification
...
Merging Spree's an our factory didn't really work.
2020-07-10 11:42:56 +02:00
Pau Perez
d8b748a851
Merge alias_method method and its original version
2020-07-10 10:41:44 +02:00
Pau Perez
d49068ce66
Move method delegation from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
cf6138da66
Replace model method with its decorated version
2020-07-10 10:41:44 +02:00
Pau Perez
3fb6193098
Move adjustments logic from decorator into model
2020-07-10 10:41:44 +02:00
Pau Perez
861726200c
Move localize_number from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
48910aeb77
Move #refund! to the processing.rb
2020-07-10 10:41:44 +02:00
Pau Perez
6d9a518616
Move method from decorator to model
2020-07-10 10:41:44 +02:00
Pau Perez
322c4d0f3f
Move decorator's callbacks to model
2020-07-10 10:41:44 +02:00
Pau Perez
eafaa97b0e
Temporarily skip spec
...
I'll move on to other easier issues and get back to it when we're in
a better position.
2020-07-10 10:41:44 +02:00
Pau Perez
31d0d4bcae
Fix error "no parent is saved"
...
The exact error is
```
ActiveRecord::RecordNotSaved:
You cannot call create unless the parent is saved
```
raised from app/models/spree/payment_decorator.rb:29:in `ensure_correct_adjustment'
2020-07-10 10:41:44 +02:00
Pau Perez
9935df9f2d
Move Pin payment method from decorator into model
2020-07-10 10:41:44 +02:00
Pau Perez
0ad8dcc2c5
Fix payment log entries specs
...
The tight coupling between doesn't give other option but to check the
private method is called. The specs successfully stub
`log_entries#create` but for some reason the model instance that gets
evaluated it's not the stubbed one.
2020-07-10 10:41:44 +02:00
Pau Perez
a01f601363
Fix yet another spec
2020-07-10 10:41:44 +02:00
Pau Perez
34de219233
Bring in missing translation
2020-07-10 10:41:44 +02:00
Pau Perez
e1ea5dbcb3
Fix all but the 7 last payment specs
2020-07-10 10:41:44 +02:00
Pau Perez
abacd06f6b
Fix credit card instance in specs
2020-07-10 10:41:44 +02:00
Pau Perez
06aa56164f
Bring in Payment model from Spree
2020-07-10 10:41:44 +02:00
Maikel
c1d700196b
Merge pull request #5739 from Matt-Yorkley/flaky-spec-complex-oc
...
Flaky spec order_cycles/complex_updating_specific_time
2020-07-10 14:59:59 +10:00
Luis Ramos
cc3361aaac
Merge pull request #5659 from dmarcoux/issue-5555
...
Filter orders on inclusive dates in admin/orders
2020-07-09 20:40:45 +01:00
Luis Ramos
ed915006fa
Merge pull request #5738 from openfoodfoundation/dependabot/bundler/wicked_pdf-2.1.0
...
Bump wicked_pdf from 1.4.0 to 2.1.0
2020-07-09 20:40:11 +01:00
Matt-Yorkley
1a132924d2
Fix StrongParameters for groups images
2020-07-09 10:00:02 +02:00
Transifex-Openfoodnetwork
e3980521ea
Updating translations for config/locales/fr_CA.yml
2020-07-09 07:58:41 +10:00
Transifex-Openfoodnetwork
e6a2eb8af9
Updating translations for config/locales/en_CA.yml
2020-07-09 07:53:34 +10:00
Luis Ramos
5648b2e281
Add rescue statements to subs jobs so that when an order placement or confirmation fails, there's a bugsnag alert for it and the job continues processing the rest of the orders
2020-07-08 18:41:14 +01:00
Luis Ramos
fabddbd1c0
Merge pull request #5746 from coopdevs/remove-specs-dead-code
...
Remove dead specs helper method
2020-07-08 12:38:24 +01:00
Steve Roberts
2f562809c0
Ensure the hero image doesn't attempt to use the full height of all page content
...
Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
2020-07-08 21:31:52 +10:00
Matt-Yorkley
a763a5ee0b
Update all locales with the latest Transifex translations
2020-07-08 12:49:20 +02:00
Matt-Yorkley
d718eb9a23
Merge pull request #5726 from openfoodfoundation/transifex
...
Transifex
2020-07-08 12:33:09 +02:00
Matt-Yorkley
d78db16abe
Merge pull request #5718 from Matt-Yorkley/available-locales-bug
...
Available locales bug
2020-07-08 12:30:18 +02:00
Steve Roberts
eda9293619
Change to new directive that prevents enter default and blurs the input field
2020-07-08 19:19:46 +10:00
Matt-Yorkley
e742069959
Refactor UI interactions for opening exchange product tabs in OC edit
2020-07-08 11:11:39 +02:00
Matt-Yorkley
c8254b8338
Adjust exchange_row assertion to use slightly more specific criteria
2020-07-08 11:11:39 +02:00
Matt-Yorkley
be1e39f0cb
Ensure next page has loaded before interacting with form elements
2020-07-08 11:11:39 +02:00
Pau Perez
a1e8c8ad03
Remove dead specs helper method
...
I found it while reviewing
https://github.com/openfoodfoundation/openfoodnetwork/pull/5718#discussion_r451390809 .
2020-07-08 10:59:13 +02:00
Luis Ramos
312e78ba61
Merge pull request #5742 from Matt-Yorkley/flaky-spec-shopping
...
Fix flaky shopping_spec
2020-07-07 18:11:00 +01:00
Luis Ramos
207c6bc205
Merge pull request #5741 from Matt-Yorkley/flaky-spec-exchange-renderer
...
Re-enable and fix flaky exchange products renderer spec
2020-07-07 18:09:02 +01:00
Luis Ramos
f8f7b30095
Merge pull request #5716 from openfoodfoundation/dependabot/bundler/database_cleaner-1.8.5
...
Bump database_cleaner from 1.7.0 to 1.8.5
2020-07-07 17:29:10 +01:00
Luis Ramos
ebc1ab4469
Merge pull request #5710 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.15
...
Bump mini_racer from 0.2.14 to 0.2.15
2020-07-07 17:28:33 +01:00
Luis Ramos
5e6739c9f7
Fix long lines in new spec
2020-07-07 17:26:24 +01:00
Luis Ramos
99e12b6f07
Convert calculators in new spec
2020-07-07 17:26:24 +01:00
Luis Ramos
0b79e7c48c
Fix rubucop issue in enterprise_fee model
2020-07-07 17:26:24 +01:00
Luis Ramos
d92f97716a
Extract compute_for and thus resolve the rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
68359d4d1a
Remove unnecessary variable (this sum and += come from the original
...
spree code and is not necessary here now)
2020-07-07 17:26:24 +01:00
Luis Ramos
70432e301d
Early exit if max is zero to make method shorted
2020-07-07 17:26:24 +01:00
Luis Ramos
fbe0a3246d
Extract applicable_rate? and thus resolve rubocop complexity issue
2020-07-07 17:26:24 +01:00
Luis Ramos
b096717172
Extract per_order_fees_total out of compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
21120dd6ab
Extract per_item_fees_total out of compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
4b12a5f592
Extract line_items_total from compute_order
2020-07-07 17:26:24 +01:00
Luis Ramos
eedf31e449
Make migration a bit easier to read
2020-07-07 17:26:24 +01:00
Luis Ramos
e225c5ce3a
Migrate calculators to outside spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
f62546254f
Define DefaultTax calculator outside of spree namespace the tax_rate to be used by the app and make spree specs use calculators outside the spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
6a94168ee5
Remove Spree namespace from DefaultTax
2020-07-07 17:26:24 +01:00
Luis Ramos
9c7cb23262
Move calculator specs out of the spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
5e8438c446
Move all calculators outside the spree namespace
2020-07-07 17:26:23 +01:00
Luis Ramos
9c3eb3725e
Remove dead code related to promotions, we dont have promotions in OFN
2020-07-07 17:20:22 +01:00
Luis Ramos
a544102b1b
Fix some rubocop issues
2020-07-07 17:20:22 +01:00
Luis Ramos
f2a46d2cef
Merge decorators into original classes brought from spree_core
2020-07-07 17:20:22 +01:00
Luis Ramos
6b04df0dea
Fix indentation and extract Calculator as a separate module declaration
2020-07-07 17:20:22 +01:00
Luis Ramos
c2898ba389
Bring calculators from spree_core
2020-07-07 17:20:22 +01:00
Transifex-Openfoodnetwork
6be0ae543a
Updating translations for config/locales/pt_BR.yml
2020-07-07 21:46:44 +10:00
Matt-Yorkley
f2e0b0f35a
Ensure products list has loaded before interacting with product list UI elements
2020-07-07 13:14:11 +02:00
Matt-Yorkley
0f659d0f5e
Merge pull request #5728 from luisramos0/ams_comment
...
Update ams dependency comment
2020-07-07 12:32:03 +02:00
Matt-Yorkley
30492157f9
Re-enable and fix flaky exchange products renderer spec
...
For some inexplicable reason `order_cycle.exchanges.incoming.first` and `order_cycle.exchanges.incoming.second` were returning the same exchange. Subsequently the inventory items being created were for the same variant, which throws an error due to a uniqueness validation in InventoryItem on variant_id. Changing from #first and #second to #first and #last results in the correct exchanges being assigned.
2020-07-07 11:21:18 +02:00
Luis Ramos
c1fa4fcc85
Merge pull request #5736 from Matt-Yorkley/flaky-spec-embedded
...
Fix flaky embedded shopping spec
2020-07-07 09:36:27 +01:00
dependabot-preview[bot]
4bee038109
Bump wicked_pdf from 1.4.0 to 2.1.0
...
Bumps [wicked_pdf](https://github.com/mileszs/wicked_pdf ) from 1.4.0 to 2.1.0.
- [Release notes](https://github.com/mileszs/wicked_pdf/releases )
- [Changelog](https://github.com/mileszs/wicked_pdf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mileszs/wicked_pdf/compare/1.4.0...2.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-06 23:50:22 +00:00
Matt-Yorkley
447a873e5c
Fix flaky embedded spec
...
The new cart sidebar takes 300ms to animate in. If we try to click the button on the left during this time, we may click the button on the right as it slides in.
2020-07-07 00:23:43 +02:00
Matt-Yorkley
3d955a952c
Merge pull request #5674 from mkllnk/caching_spec
...
Fix flaky caching spec
2020-07-06 21:56:02 +02:00
Luis Ramos
ce1114556d
Merge pull request #5578 from mbudm/issue/3770-manual-update
...
Update orders swagger spec and fix api_key access to orders endpoint
2020-07-06 20:32:25 +01:00
Luis Ramos
761871c90e
Merge pull request #5715 from luisramos0/ship_method
...
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
2020-07-06 19:15:50 +01:00
Transifex-Openfoodnetwork
2a68e0fbba
Updating translations for config/locales/tr.yml
2020-07-07 03:55:56 +10:00
Luis Ramos
ceac8a5d40
Merge pull request #5725 from Matt-Yorkley/admin-order-images
...
Fix default image display in admin order edit
2020-07-06 14:03:56 +01:00
Luis Ramos
b0dd83b773
Update ams dependency comment
2020-07-05 19:55:53 +01:00
Dany Marcoux
3dfabdc117
Filter orders on inclusive dates in admin/orders
...
Closes #5555
Co-authored-by: Luis Ramos <luisramos0@gmail.com >
2020-07-05 20:12:16 +02:00
Transifex-Openfoodnetwork
b951bcc379
Updating translations for config/locales/en_IN.yml
2020-07-05 04:34:29 +10:00
Transifex-Openfoodnetwork
6f6e8c0c92
Updating translations for config/locales/en_IN.yml
2020-07-05 04:29:50 +10:00
Transifex-Openfoodnetwork
787648eff2
Updating translations for config/locales/en_FR.yml
2020-07-04 23:52:01 +10:00
Transifex-Openfoodnetwork
7a4a673578
Updating translations for config/locales/fr.yml
2020-07-04 23:51:45 +10:00
Matt-Yorkley
96138e9129
Refactor UserLocaleSetter public methods
2020-07-04 10:15:35 +02:00
Matt-Yorkley
f08a530877
Make #valid_locale_for_user an instance method
2020-07-04 09:51:00 +02:00
Luis Ramos
d2adcd20e5
Merge pull request #5719 from coopdevs/index-state-changes
...
Index spree_state_changes.stateful_id column
2020-07-03 23:02:01 +01:00
Luis Ramos
ff9133b7aa
Merge pull request #5699 from coopdevs/fix-order-button-radius
...
Make button border radius consistent
2020-07-03 23:01:14 +01:00
Luis Ramos
b917238d1e
Merge pull request #5446 from luisramos0/sca_refunds
...
Make StripeSCA void action work
2020-07-03 22:45:35 +01:00
Transifex-Openfoodnetwork
45b960a7ee
Updating translations for config/locales/pt_BR.yml
2020-07-04 07:39:50 +10:00
Matt-Yorkley
e2626a0c3b
Add unit tests for UserLocaleSetter service
2020-07-03 23:14:38 +02:00
Matt-Yorkley
46c40bdf33
Fix default image display in admin order edit
2020-07-03 22:58:29 +02:00
Luis Ramos
a472b6525f
Merge pull request #5707 from luisramos0/missing_spaces
...
Add space after translations so that translators dont have to guess a space is needed
2020-07-03 16:10:55 +01:00
Matt-Yorkley
05c1f093b2
Delete dead code
...
There's nothing done in this bit of code that isn't already done somewhere else, and more effectively.
2020-07-03 16:44:37 +02:00
Matt-Yorkley
0c2fd4bfd2
Fix ensure_valid_locale_persisted and change public interface of service
2020-07-03 16:39:24 +02:00
Matt-Yorkley
cc7b5e2df3
Add pending test for setting locale from cookies during login
...
This test currently fails
2020-07-03 16:39:23 +02:00
Luis Ramos
804450bcc5
Fix buggy spec
...
The different shipping method was in the page but only as an option in the dropdown, not as the final selected shipping method! That was the cause of bug #5694 . We now check for the label Shipping which preceeds the final shipping method selection in the order page
2020-07-03 15:35:13 +01:00
Luis Ramos
b883a0eb75
Fix easy rubocop issues in shipment_spec
2020-07-03 13:48:12 +01:00
Luis Ramos
7b89b52ab8
Transpec shipment_spec brough from spree_core
2020-07-03 13:48:12 +01:00
Luis Ramos
07a44cfaf3
Update selected shipping rate if there is an original shipping method to keep and it is different from the one selected through the Estimator process
...
Make sure the shipment is saved (callbacks!) whenever the ship method has changed in the refresh_rates process
2020-07-03 13:48:12 +01:00
Luis Ramos
cd60ee2116
Use flat_map to make ship methods selection faster
2020-07-03 13:48:08 +01:00
Matt-Yorkley
ab63d2234c
Guard against nils in conditions
2020-07-03 14:22:32 +02:00
Matt-Yorkley
078726dcca
Add explanatory comment on saving selected locale in cookies
2020-07-03 14:21:45 +02:00
Matt-Yorkley
dab0add492
Make conditional more concise
2020-07-03 14:20:51 +02:00
Matt-Yorkley
ebffa381c6
Update cookies[:locale] logic
2020-07-03 14:06:05 +02:00
Matt-Yorkley
faa7c0a7c5
Extract save_cookies_from_locale comment-method
2020-07-03 14:03:52 +02:00
Matt-Yorkley
02549d1b0f
Extract all locale-setting logic to a service
2020-07-03 13:44:13 +02:00
Matt-Yorkley
7a00a3ba1e
Rename method and add explanatory comment
2020-07-03 11:52:21 +02:00
Matt-Yorkley
c726340ba3
Extract #save_locale_from_params comment-method
2020-07-03 11:48:39 +02:00
Luis Ramos
fcaa9d1b37
Remove extra space from base translations in closing and welcome to
2020-07-03 10:32:09 +01:00
Matt-Yorkley
d2db9b3a66
Merge pull request #5599 from luisramos0/submit_on_enteer
...
Make Enter submit the form on both products and orders admin
2020-07-03 11:14:57 +02:00
Luis Ramos
91026e6606
Merge pull request #5601 from jeduardo824/enhancement/5454-links-to-shops-in-new-tabs
...
Enhancement/5454 make links to shops under Groups > Producers open in new tab
2020-07-02 23:51:59 +01:00
Luis Ramos
d9ab7a8d49
Merge pull request #5667 from mkllnk/shopping-spec
...
Stabilise shopping specs and open them for change
2020-07-02 23:51:25 +01:00
Luis Ramos
758bb17142
Fix some easy rubocop issues and add some exceptions to to manual todo list
2020-07-02 21:24:15 +01:00
Luis Ramos
659de3d24d
Replay spree commit a4622ee13a723f0dba2943967b445b9989f67fb2 to fix issue introduced in spree 2.1
2020-07-02 21:24:15 +01:00
Luis Ramos
21ec6ccf0d
Remove unused sort packages from prioritizer
2020-07-02 21:24:15 +01:00
Luis Ramos
d323c5bdcb
Simplify packer and coordinator baed on the fact that there's only one stock_location so there will only be one package per order
2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c
Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
ee937988e8
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521
Move adjuster, estimator, packer and prioritizer to order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c
Move Coordinator from Spree::Stock to OrderManagement::Stock
2020-07-02 21:24:14 +01:00
Luis Ramos
01b1abbd52
Bring method from Spree::Order so that we can move Coordiantor to the order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
b487185a65
Remove package factory, it is no longer needed, we can just call the Package class in the two places where it is used
2020-07-02 21:24:14 +01:00
Luis Ramos
f0b3ed0d79
Merge Spree::Stock::Package into OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
943cb7bf05
Move Stock::Package to OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
1b28592f58
Now that the stock code is on out side we can clean up!
...
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
Luis Ramos
8e116dd58a
Make ensure_correct_adjustment a public method because we call it in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
46cf106047
Fix shipment spec brought from spree
2020-07-02 21:24:14 +01:00
Luis Ramos
2e33e02d7f
Remove dead code, this method was removed in spree 2.0.4
2020-07-02 21:24:14 +01:00
Luis Ramos
7a03f57da0
Merge shipment decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
494251b7cf
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
4e5259f491
Bring shipment from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
55a4021157
Convert to modern rspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
bdb40d68e9
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
b7255130b6
Bring Package from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
0ca8b6aab6
Fix easy rubocop issue
2020-07-02 21:24:14 +01:00
Luis Ramos
3e14c9777e
Merge decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d505fc2131
Bring availability validator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
720ad9de0e
Convert specs to modern rsspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
feadbb086f
Adapt spec to OFN context
2020-07-02 21:24:14 +01:00
Luis Ramos
b16db2f40e
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
8c3b8c4db5
Bring estimator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
4711a7469a
Adapt coordinator spec to ofn and remove spec that is not applicable (multi stock locations)
2020-07-02 21:24:14 +01:00
Luis Ramos
69b9cfbad2
Make packer use BasicSplitter by default
2020-07-02 21:24:14 +01:00
Luis Ramos
fdc085f701
Convert to modern rspec and remove specs not applicable to ofn
2020-07-02 21:24:14 +01:00
Luis Ramos
ccf928df12
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
e0f9894b7a
Bring packer from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
ec50a788a6
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
c2ec34ab9f
Bring coordinator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
a6d7acb6f1
Convert spec to modern rspec syntax
2020-07-02 21:24:14 +01:00
Luis Ramos
eb13595fd3
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
3ae2877d4e
Bring adjuster and prioritizer from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125
Move Base splitter from main app models to order management engine services
2020-07-02 21:24:14 +01:00
Luis Ramos
735ee1e7ed
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
4fce506201
Bring splitter/base from spree
2020-07-02 21:24:14 +01:00
Luis Ramos
658c77f3f5
Merge pull request #5701 from Matt-Yorkley/noimage
...
Noimage
2020-07-02 20:17:04 +01:00
Luis Ramos
510449547f
Merge pull request #5644 from coopdevs/manage-font-with-asset-pipeline
...
Manage OFN's font through the asset pipeline
2020-07-02 20:09:08 +01:00
Matt-Yorkley
8fc407a9d5
Extract repeated variant thumbnail code to a shared partial
2020-07-02 18:36:43 +02:00
Matt-Yorkley
eeb6c57f99
Update missing image paths in other order views
2020-07-02 18:36:27 +02:00
Matt-Yorkley
b10fd99a53
Update all locales with the latest Transifex translations
2020-07-02 16:46:53 +02:00
Matt-Yorkley
e328dc7657
Merge pull request #5717 from openfoodfoundation/transifex
...
Transifex
2020-07-02 16:43:58 +02:00
Pau Perez
dee61e8b82
Index spree_state_changes.stateful_id column
...
This speeds up a great deal one of the most awful queries our DB servers
execute. It's not rare to see traces above 20s in Datadog 😱 .
In staging, with no traffic, we go from
```
EXPLAIN ANALYZE SELECT COUNT ( * )
FROM spree_state_changes
WHERE spree_state_changes . stateful_id = 2024
AND spree_state_changes . stateful_type = 'Spree::Order';
Planning time: 0.142 ms
Execution time: 9.073 ms
```
to
```
EXPLAIN ANALYZE SELECT COUNT ( * )
FROM spree_state_changes
WHERE spree_state_changes . stateful_id = 2024
AND spree_state_changes . stateful_type = 'Spree::Order';
Planning time: 0.284 ms
Execution time: 0.202 ms
```
2020-07-02 15:39:08 +02:00
Matt-Yorkley
4e08d2049f
Ensure a valid locale is persisted during login
...
This action has to be performed here and not in I18nHelper, as spree_current_user is not initialized yet during the other checks / setting the selected locale value in the app
2020-07-02 15:33:19 +02:00
Matt-Yorkley
91880cdbec
Make I18nHelper #available_locale? method public
2020-07-02 14:35:59 +02:00
Matt-Yorkley
d70d61439a
Always return an available locale
2020-07-02 14:35:59 +02:00
Matt-Yorkley
aa6f4d4fb9
Don't set unavailable locales on the current user
2020-07-02 14:35:59 +02:00
Matt-Yorkley
8dfaea629b
Refactor current_user_locale to a new method
2020-07-02 14:35:59 +02:00
Matt-Yorkley
3326366c6e
Add specs for applying stored locales during login
2020-07-02 14:35:58 +02:00
dependabot-preview[bot]
cc34f126ec
Bump mini_racer from 0.2.14 to 0.2.15
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.14...v0.2.15 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-02 11:22:57 +00:00
Pau Pérez Fabregat
4ced16c206
Merge pull request #5709 from luisramos0/empty
...
Replace empty? with blank? and replace unless empty? with if present?
2020-07-02 11:36:37 +02:00
Matt-Yorkley
26c511d47e
Remove taxon icons
...
These icons are inconsistently used across instances and have already been removed in a few places in the app in the mobile UX redesign.
2020-07-02 11:25:17 +02:00
Transifex-Openfoodnetwork
1b8669bb0b
Updating translations for config/locales/en_NZ.yml
2020-07-02 18:28:33 +10:00
Pau Pérez Fabregat
c1b635903c
Merge pull request #5658 from openfoodfoundation/transifex
...
Transifex
2020-07-02 10:05:16 +02:00
dependabot-preview[bot]
eff9d6edd0
Bump database_cleaner from 1.7.0 to 1.8.5
...
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner ) from 1.7.0 to 1.8.5.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases )
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc )
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.7.0...v1.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-07-02 00:06:17 +00:00
Luis Ramos
7dcc2bb27c
Merge pull request #5703 from Matt-Yorkley/checkout-addresses
...
Checkout addresses
2020-07-01 19:06:29 +01:00
Luis Ramos
e8417b8be6
Remove specs testing filtering of master variants
...
Master variants are not used in the report
2020-07-01 18:13:30 +01:00
Luis Ramos
6555f8bfba
Add specs to cover stripeSCA refunds
...
Duplication between stripe connect and stripeSCA is done on purpose so we can easily delete stripeConnect code when the migration is done
2020-07-01 18:13:27 +01:00
Pau Pérez Fabregat
66ddde1808
Merge pull request #5682 from Matt-Yorkley/in-digest-ion
...
Move default versions of Paperclip-managed images to /public
2020-07-01 18:02:15 +02:00
Pau Pérez Fabregat
28376b1056
Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address
...
Do not print the bill addr. name when there's none
2020-07-01 17:50:09 +02:00
Luis Ramos
2d4326ded3
Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
...
Present is not blank, so unless blank? becomes if present?
2020-07-01 14:08:07 +01:00
Luis Ramos
ce493866f9
Extract refunds specs from payments controller spec
2020-07-01 13:19:38 +01:00
Luis Ramos
ecb1920fa9
Move payment_controller_spec to specific folder so we can break it in more specific parts
2020-07-01 13:14:39 +01:00
Luis Ramos
9e4a793b24
Fix rubocop issues
2020-07-01 13:14:39 +01:00
Luis Ramos
2179cc7faf
Make StripeSCA void action make a refund instead
...
StripeSCA does not support voiding confirmed payment intents so we need to make a refund instead
2020-07-01 13:10:56 +01:00
Luis Ramos
63934b7863
Add space after translation so that translators dont have to guess a space is needed after the translation
2020-07-01 11:56:37 +01:00
Pau Pérez Fabregat
819af03239
Merge pull request #5706 from luisramos0/ent
...
Fix admin enterprises controller spec
2020-07-01 12:28:19 +02:00
Pau Pérez Fabregat
5a72526107
Merge pull request #5692 from luisramos0/taxonomies
...
Fix taxonomies flaky spec
2020-07-01 12:26:56 +02:00
Pau Perez
8c371fd0d1
Do not print bill addr. in invoice2 either
2020-07-01 11:27:57 +02:00
Matt-Yorkley
49fb01a3bb
Add assign default value of current time whilst altering NOT NULL constraint
...
This argument in #change_column_null assigns this value where any NULL values are found, but it doesn't alter the table's `:default` value
2020-07-01 10:00:21 +02:00
Luis Ramos
2dce10bec2
Fix admin enterprises controller spec, for some reason the correct controller is not being picked up in the test
2020-06-30 10:49:45 +01:00
Matt-Yorkley
11da385624
Enable pending checkout spec
2020-06-30 11:30:16 +02:00
Matt-Yorkley
3e7f5a4ea9
Update user address tests
...
I considered deleting these tests, as they're not very good and are testing Rails functionality. I decided to leave them in case something explodes in a future upgrade. For reference: there are issues in Rails 4 when using `object.clone.attributes`, and with assigning a hash containing `created_at` and `updated_at` values with `object.update(attributes_hash)`.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
87cd936c94
Blacklist timestamp attributes when assigning for update
...
Doing #clone or #dup of an object's attributes then passing it to an #update/#update_attributes call means we are manually passing values for created_at and updated_at, which can cause problems, especially if the object being duped hasn't been persisted yet: in this case we would be manually attempting to save timestamps with nil values, which is not a good idea. Here they are blacklisted from the attributes hash.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
ce8908f53b
Use #dup when copying attributes hash
...
In Rails 4, #clone behaves differently. The attributes hash of the cloned object is shared with the original, it's not a separate object! https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/core.rb#L217-L220
2020-06-30 11:30:16 +02:00
Matt-Yorkley
abe96c6f32
Add specs for updating existing default addresses during checkout
...
These specs fail with the "NULL values for created_at / updated_at" errors we've been seeing.
2020-06-30 11:30:14 +02:00
Pau Pérez Fabregat
e69d3e5e0c
Merge pull request #5693 from luisramos0/knapsack
...
Reload knapsack report
2020-06-30 09:43:36 +02:00
Pau Pérez Fabregat
2a1fe3f05f
Merge pull request #5684 from openfoodfoundation/dependabot/bundler/ddtrace-0.37.0
...
Bump ddtrace from 0.36.0 to 0.37.0
2020-06-30 09:41:48 +02:00
Matt-Yorkley
57ba2481c4
Require timestamps
2020-06-30 09:09:35 +02:00
Pau Perez
0c93de8298
Manage OFN's font through the asset pipeline
2020-06-30 09:02:36 +02:00
Pau Perez
23178763b0
Do not print the bill addr. name when there's none
...
The error
```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```
happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.
This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
2020-06-30 08:46:01 +02:00
Luis Ramos
de8b97b2e1
Merge pull request #5526 from cillian/drop-blockenspiel
...
Drop blockenspiel
2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c
Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning
...
Rename *.css.scss to *.scss
2020-06-29 20:36:42 +02:00
Matt-Yorkley
bd0e4c75c4
Merge pull request #5636 from fatihorhan/make-user-guide-links-consistent
...
Update Sell page to use User Guide links from configuration
2020-06-29 20:33:00 +02:00
Matt-Yorkley
b441ac2644
Update paths to "noimage" images
2020-06-29 20:07:08 +02:00
Matt-Yorkley
5bec887f93
Move /assets/images/noimage/* to /public/noimage/*
2020-06-29 19:58:38 +02:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Pau Perez
c892f9c69b
Make button border radius consistent
2020-06-29 12:01:59 +02:00
Transifex-Openfoodnetwork
bb80c81097
Updating translations for config/locales/en_US.yml
2020-06-29 05:22:13 +10:00
Luis Ramos
6516037420
Reload knapsack report
2020-06-27 20:36:33 +01:00
Luis Ramos
10b8c2b789
Relax the assertion and dont check row number so that it passes even if order of elements is not the same
2020-06-27 15:54:58 +01:00
Matt-Yorkley
b325e48957
Update content config spec to use new default image paths
2020-06-27 10:32:38 +02:00
Matt-Yorkley
a5f541b59d
Update admin logo path
2020-06-27 08:53:05 +02:00
Matt-Yorkley
ff8cb43717
Move default versions of Paperclip-managed images to /public
...
Image paths for these files are handled by Paperclip, which (with our current version) does not handle fingerprints on assets. Therefore we need to make these images available under /public
2020-06-27 08:45:59 +02:00
Cillian O'Ruanaidh
1199a356c4
Extract out a JS service for calculating where to centre the map when given a set of coordinates.
...
Also removing the hardcoded default latitude/longitude from open_street_map directive because it's probably not very likely that it will be needed.
2020-06-26 22:26:39 +01:00
dependabot-preview[bot]
032a70fa7e
Bump ddtrace from 0.36.0 to 0.37.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.36.0 to 0.37.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.36.0...v0.37.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-26 19:16:32 +00:00
Transifex-Openfoodnetwork
4f2d32b262
Updating translations for config/locales/tr.yml
2020-06-27 04:22:14 +10:00
Cillian O'Ruanaidh
c40697cf61
If no enterprises have been geocoded yet make sure Open Street Map still displays correctly.
...
Before it would display a gray/blank div instead of map because the map latitude, longitude couldn't be calculated without geocoded enterprises. This adds a setting so the default coordinates can be set even if no geocoded enterprises present.
2020-06-26 15:45:58 +01:00
Luis Ramos
5e3d7be545
Merge pull request #5630 from openfoodfoundation/dependabot/bundler/ransack-1.8.10
...
Bump ransack from 1.2.3 to 1.8.10
2020-06-26 13:37:03 +01:00
Transifex-Openfoodnetwork
0d5ad6fac3
Updating translations for config/locales/en_IE.yml
2020-06-26 21:04:54 +10:00
Transifex-Openfoodnetwork
a1227d93ae
Updating translations for config/locales/en_GB.yml
2020-06-26 20:27:34 +10:00
Transifex-Openfoodnetwork
f47271ba98
Updating translations for config/locales/fr.yml
2020-06-26 16:59:37 +10:00
Transifex-Openfoodnetwork
1266bcde1b
Updating translations for config/locales/en_FR.yml
2020-06-26 16:56:19 +10:00
Maikel Linke
e567348a69
Ensure that enough time passes for caching spec
2020-06-26 14:24:01 +10:00
Maikel Linke
4b25c2d49a
Correct typo in file naming
2020-06-26 14:21:21 +10:00
Maikel Linke
d7c9bb2e5a
Navigate more efficiently in spec
...
The spec is not supposed to test the navigation to the shop. Going
directly to the shop reduces the test execution time by 7%.
2020-06-26 09:55:57 +10:00
Maikel Linke
70347148a1
Stabilise shopping specs and open them for change
...
The way we add items to the cart will change. Encapsulating that code in
a common place will make the mobile ux work clearer and avoid merge
conflicts.
The waiting for background requests has also been improved and made more
consistent which should make these specs more reliable.
2020-06-26 09:55:57 +10:00
Maikel Linke
a0c7dc2ccb
Remove leftover empty spec context
2020-06-26 09:55:57 +10:00
Luis Ramos
5929b9c1e5
Merge pull request #5627 from openfoodfoundation/dependabot/bundler/geocoder-1.6.3
...
[Security] Bump geocoder from 1.5.2 to 1.6.3
2020-06-25 20:34:19 +01:00
Luis Ramos
2ad2836ac6
Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n
...
add missing i18n key for closed OC
2020-06-25 20:33:55 +01:00
Luis Ramos
93a2e57bc6
Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard
...
Fix Payment Methods table to show proper provider name
2020-06-25 20:32:04 +01:00
Luis Ramos
cb2ccf76d2
Merge pull request #5590 from rmklaus12/5558-shippingcategory-translation
...
Added translation key to config/locales/en.yml file for shipping_cat…
2020-06-25 20:31:48 +01:00
Luis Ramos
f44533bbd5
Merge pull request #5589 from rmklaus12/2617-mainmenu-translation
...
Added more key to en.yml to translate More dropdown text
2020-06-25 20:27:46 +01:00
Luis Ramos
bfc134c9e6
Merge pull request #5615 from openfoodfoundation/dependabot/bundler/acts-as-taggable-on-4.0.0
...
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
2020-06-25 20:26:59 +01:00
Pau Pérez Fabregat
7338f196e9
Merge pull request #5663 from luisramos0/constraints
...
Make db timestamps nullable
2020-06-25 13:14:41 +02:00
Luis Ramos
68946a765e
Make timestamps nullable
2020-06-25 08:47:18 +01:00
Transifex-Openfoodnetwork
0b48a53c2f
Updating translations for config/locales/tr.yml
2020-06-25 16:02:01 +10:00
Transifex-Openfoodnetwork
54ce5d8c0f
Updating translations for config/locales/en_CA.yml
2020-06-25 09:15:11 +10:00
Luis Ramos
ba50491c6d
Restructure the spec a little
2020-06-24 16:16:58 +01:00
Luis Ramos
34207fc20f
Bring changes to stock_item from spree 2.1, the previous version was from spree 2.0.4
2020-06-24 16:16:58 +01:00
Luis Ramos
e12e50aa84
Move rubocop exception to rubocop todo
2020-06-24 16:16:58 +01:00
Kristina Lim
20fd3c2642
Reset negative count on hand in existing non backorderable stock items
2020-06-24 16:16:58 +01:00
Kristina Lim
4694f1b21a
Require count on hand in non backorderable StockItem to be positive or zero
...
Fix setting of count on hand in line item specs
2020-06-24 16:16:45 +01:00
Kristina Lim
e53913756c
Add lock_version to Spree::StockItem
2020-06-24 16:15:37 +01:00
Kristina Lim
774b3720d5
Update stock item count on hand in Spree core specs
2020-06-24 16:15:09 +01:00
Kristina Lim
13ecf0ec73
Update specs for StockItem with transpec
2020-06-24 16:15:09 +01:00
Kristina Lim
fb20f220c0
Use break instead of return in StockItem#process_backorders
...
We are not using the return value of this method anywhere.
2020-06-24 16:15:09 +01:00
Kristina Lim
0a1cb71ee4
Ignore Rails/UniqueValidationWithoutIndex for unique index of StockItem#stock_location
2020-06-24 16:15:09 +01:00
Kristina Lim
bc530b92b5
Address violation of Rubocop Rails/Validation:
2020-06-24 16:15:09 +01:00
Kristina Lim
2acf61fd0f
Address violation of Rubocop Rails/Delegate
2020-06-24 16:15:09 +01:00
Kristina Lim
1e8543dfe7
Address violation of Rubocop Rails/ReadWriteAttribute
2020-06-24 16:15:09 +01:00
Kristina Lim
22c0693beb
Address violation of Rubocop Style/NumericPredicate
2020-06-24 16:15:09 +01:00
Kristina Lim
d1725014c4
Auto-correct violationso of Rubocop Layout/*
2020-06-24 16:15:09 +01:00
Kristina Lim
0fd66f9a55
Auto-correct violationso of Rubocop Style/*
2020-06-24 16:15:09 +01:00
Kristina Lim
b783118700
Auto-correct violationso of Rubocop Style/RedundantSelf
2020-06-24 16:15:09 +01:00
Kristina Lim
84d973d383
Specify RSpec.describe in StockItem spec file
2020-06-24 16:15:09 +01:00
Kristina Lim
0e711832fd
Bring Spree::StockItem code from spree_core into the app
2020-06-24 16:15:09 +01:00
Transifex-Openfoodnetwork
8d4a9cba21
Updating translations for config/locales/nb.yml
2020-06-24 23:33:12 +10:00
Steve Roberts
3d2a0d4d67
Remove UI and API engine as we will not host the swagger spec right now
2020-06-24 15:51:08 +10:00
Steve Roberts
9541dbf495
Fix order api spec and add incomplete generated swagger.yml
2020-06-24 15:15:18 +10:00
Steve Roberts
b59dbebba6
Revert Gemfile change to specific version of rubocop
...
Turns out it wasn't necessary. I thought it was needed to install a compatible version of rswag
2020-06-24 13:21:49 +10:00
Steve Roberts
e619ae621c
Add rswag and coverage for orders endpoint
...
Add coverage for core orders endpoint queries (WIP)
2020-06-24 13:21:49 +10:00
Steve Roberts
9e19d79337
Add more detail on the ransack based queries in the description
2020-06-24 13:21:49 +10:00
Steve Roberts
8b79d41b81
Update orders swagger spec and fix api_key access to orders endpoint
2020-06-24 13:21:49 +10:00
Luis Ramos
9e39d970ca
Result of running db:migrate
2020-06-23 19:19:18 +01:00
Pau Pérez Fabregat
9e730e6445
Merge pull request #5660 from coopdevs/fix-spree-preferences
...
Migrate all spree pref. keys to the new format
2020-06-23 18:00:01 +02:00
Transifex-Openfoodnetwork
99096eee2d
Updating translations for config/locales/ca.yml
2020-06-24 01:41:21 +10:00
Pau Perez
a81e17f23c
Flush the cache
...
So all preferences are fetch from DB now that they have changed.
2020-06-23 17:23:22 +02:00
Pau Perez
190797717a
Defend from the running the migration twice
...
We only migrate preferences if there are any to migrate.
2020-06-23 17:22:11 +02:00
Pau Perez
0ffa7b3734
Migrate all spree pref. keys to the new format
...
We realized in Spree v2.1 they follow this format instead and this is
what's causing issues to Katuma production.
This will remove the duplicate ones and convert the current preferences
to the new thus, keeping the values.
2020-06-23 16:21:20 +02:00
Transifex-Openfoodnetwork
923b905a9c
Updating translations for config/locales/en_GB.yml
2020-06-23 22:30:53 +10:00
Pau Pérez Fabregat
973ea2ea2d
Merge pull request #5641 from openfoodfoundation/transifex
...
Transifex
2020-06-23 10:43:26 +02:00
Pau Pérez Fabregat
3939febc2f
Merge pull request #5653 from luisramos0/rubocop_refresher
...
Auto correct rubocop, refresh todo lists and fix some more rubocop issues
2020-06-23 10:25:59 +02:00
Luis Ramos
91fc0cd26f
Adapt specs to new Ar method update that replaces update_attributes
2020-06-22 17:39:20 +01:00
Luis Ramos
f004b3d573
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
b49eef5fa9
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
1c550a594f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
0ba1642bd2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
1e5975c6e2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ab59ab45f5
Use auto correct to fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
f54abbd376
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
730959f85f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
8870dc4b06
Move rubocop exception to code
2020-06-22 17:39:20 +01:00
Luis Ramos
1b5f9f105a
Fix block alignment
2020-06-22 17:39:20 +01:00
Luis Ramos
ed5fc29c44
Fix hash alignment issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ff68303ef6
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0f2e07cc2d
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0e3b5ad4c3
Revert rubocop auto correct because update! is a method in the adjustment model
2020-06-22 17:39:17 +01:00
Luis Ramos
41ff406e86
Fix rubocop issue by avoiding rails method name update_attributes
2020-06-22 16:51:46 +01:00
Luis Ramos
6a7ed6e0c9
Rebuild .rubocop_manual_todo.yml
2020-06-22 16:51:46 +01:00
Luis Ramos
4e9c21d525
Add new regenerated rubocop_todo
2020-06-22 16:51:46 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
Luis Ramos
1b6e51c79e
Fix rubocop issue
2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
46a1c1cf26
Fix rubocop issue
2020-06-22 13:08:54 +01:00
Luis Ramos
adfe1f89b6
Revert previous rubocop auto correct fix that breaks the cart spec
2020-06-22 13:08:38 +01:00
Luis Ramos
473fee19eb
Fix rubocop issues
2020-06-22 13:03:18 +01:00
Luis Ramos
6eebb0e399
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:58:33 +01:00
Luis Ramos
e574e254db
Use rubocop autocorrect to fix rubocop issue
2020-06-22 12:57:12 +01:00
Luis Ramos
3b91dd9dea
Use rubocop auto-correct to fix more issues
2020-06-22 12:51:47 +01:00
Luis Ramos
5d710f1e24
Use ruboccop autocorrect to fix issues
2020-06-22 12:46:07 +01:00
Luis Ramos
fb92745db4
Fix rubocop issues
2020-06-22 12:41:31 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Luis Ramos
15babd8bc4
Merge pull request #5651 from luisramos0/xhr
...
[Rails 4.1] Change for xhr rquest to avoid csrf during testing
2020-06-22 12:20:41 +01:00
Luis Ramos
57d925a7de
Add new rubocop rules and fix the single offence
2020-06-22 12:19:19 +01:00
Lucas Hiago
357c2c7b25
change for xhr to avoid csrf during testing
2020-06-21 20:22:33 +01:00
Transifex-Openfoodnetwork
eb55d00051
Updating translations for config/locales/en_US.yml
2020-06-20 03:34:37 +10:00
Transifex-Openfoodnetwork
c5d3156351
Updating translations for config/locales/fr.yml
2020-06-20 02:37:11 +10:00
Transifex-Openfoodnetwork
28a6f694de
Updating translations for config/locales/en_FR.yml
2020-06-20 02:34:30 +10:00
Pau Pérez Fabregat
dd9d9e3316
Merge pull request #5639 from luchiago/fix-seeds-on-setup
...
FIx setup seed
2020-06-19 16:49:16 +02:00
Pau Perez
f36e08a163
Rename *.css.scss to *.scss
...
This fixes the following deprecation warning
```
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename /usr/src/app/app/assets/stylesheets/darkswarm/variables.css.scss to /usr/src/app/app/assets/stylesheets/darkswar
m/variables.scss. (called from _app_views_layouts_darkswarm_html_haml___3990351141569700945_46957256630860 at /usr/src/app/app/views/layouts/darkswarm.html.haml:18)
(...)
```
2020-06-19 16:29:08 +02:00
Matt-Yorkley
66de0a4a71
Merge pull request #5642 from Matt-Yorkley/fix-table-width
...
Ensure cart page table is full-width
2020-06-19 14:27:00 +02:00
Matt-Yorkley
cda5a042b3
Ensure cart page table is full-width
2020-06-19 12:56:47 +02:00
Transifex-Openfoodnetwork
fd6cbe064d
Updating translations for config/locales/tr.yml
2020-06-19 20:27:09 +10:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Matt-Yorkley
444097c75f
Merge pull request #5559 from luisramos0/display_only_shop
...
Make display only shops work again
2020-06-19 11:12:55 +02:00
Matt-Yorkley
be4a4c48d9
Merge pull request #5480 from Matt-Yorkley/mobile-cart-restyle
...
[Mobile] Cart Dropdown
2020-06-19 09:25:04 +02:00
Matt-Yorkley
b189d06eb7
Update shopping CTA logic
...
Shows "Take me shopping!" button on /shops page if a shop is selected
2020-06-19 08:59:43 +02:00
Lucas Hiago
52da896b03
Fix name when try to search on seed
2020-06-18 21:06:04 -03:00
Eduardo
573f7b1087
make shop links on the producers page open in new tab
2020-06-18 19:55:06 -03:00
Matt-Yorkley
ff6ba8819f
Use image_tag helper with relative paths when loading static images in /app/assets/images folder
...
This seems to be needed for Rails 4
2020-06-18 22:22:31 +02:00
Matt-Yorkley
7c7ab322bb
Ensure cart-header has the same height when the cart is empty
...
Fixes a minor visual bug
2020-06-18 22:21:55 +02:00
Matt-Yorkley
5a480439ca
Remove test for items from previous orders looking in cart dropdown
...
This feature has been removed
2020-06-18 22:21:55 +02:00
Matt-Yorkley
a6edc1c973
Enable control over body scroll with BodyScroll service
2020-06-18 22:21:55 +02:00
Matt-Yorkley
ed086c2db5
Add character limit to product and variant names in cart sidebar
2020-06-18 22:21:55 +02:00
Matt-Yorkley
2cc02d9711
Make cart header stick to top of cart
2020-06-18 22:21:55 +02:00
Matt-Yorkley
886df0e87d
Fix cart page button style regression
2020-06-18 22:21:55 +02:00
Matt-Yorkley
076ecfdb43
Adjust scrollbar visibility in sidebar
2020-06-18 22:21:55 +02:00
Matt-Yorkley
7093e0f7a3
Use plural or singular description in cart, depending on number of items
2020-06-18 22:21:55 +02:00
Matt-Yorkley
850e1b0364
Reduce specificity in cart css rules
2020-06-18 22:21:55 +02:00
Matt-Yorkley
b58ccc02ee
Adjust shop.css.scss and remove indentation
2020-06-18 22:21:55 +02:00
Matt-Yorkley
234f0f94cf
Change images in serializer to use product.images over variant.images
2020-06-18 22:21:55 +02:00
Matt-Yorkley
9c6dd1b324
Add comment on z-index
2020-06-18 22:21:55 +02:00
Matt-Yorkley
1eb9d11e27
Update colour variables
2020-06-18 22:21:55 +02:00
Matt-Yorkley
17c2721ab6
Remove unused translation keys
2020-06-18 22:21:55 +02:00
Matt-Yorkley
656c23f407
Replace previous min-width breakpoint.
...
This was mistakenly changed to use a max-width breakpoint in a previous commit.
2020-06-18 22:21:55 +02:00
Matt-Yorkley
1d8386bee8
Disable two SCSS-lint rules
2020-06-18 22:21:55 +02:00
Matt-Yorkley
c0282b57b6
Fix some linting warnings
2020-06-18 22:21:55 +02:00
Matt-Yorkley
042b4fc395
Remove tests for viewing previous order items in cart dropdown
...
This behavior has been removed
2020-06-18 22:21:55 +02:00
Matt-Yorkley
bd97939062
Move homepage "register here" CTA to bottom of screen.
...
The CTA breaks the layout when the new cart sidebar is open. I can't see a nice way to keep it at the top without making a mess.
2020-06-18 22:21:55 +02:00
Matt-Yorkley
2bcadd52e8
Hide "Take me shopping" button on /shop and /shops pages
2020-06-18 22:21:55 +02:00
Matt-Yorkley
387a5ec950
Implement "Take me shopping" button
2020-06-18 22:21:55 +02:00
Matt-Yorkley
10b8470e29
Set a fixed width for cart sidebar on tablet up
2020-06-18 22:21:55 +02:00
Matt-Yorkley
4acb08e52b
Update hamburger menu icon
2020-06-18 22:21:55 +02:00
Matt-Yorkley
786348bc71
Remove colon from cart total text
2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ac971651c
Fix flaky spec
2020-06-18 22:21:55 +02:00
Matt-Yorkley
459e53f43d
Adjust specs for new cart display
2020-06-18 22:21:55 +02:00
Matt-Yorkley
2f2ef28351
Use links instead of buttons and fix up styles
2020-06-18 22:21:55 +02:00
Matt-Yorkley
b74b9fbd1d
Shift sidebar down vertically (below navigation) and bring navigation up (z-index)
2020-06-18 22:21:55 +02:00
Matt-Yorkley
4a0f43a831
Ensure cart item count is visible in header cart button (for screens smaller than desktop)
2020-06-18 22:21:55 +02:00
Matt-Yorkley
439674ad9c
Make cart view fullwidth on mobile
2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ca0119f5d
Add empty cart feedback
2020-06-18 22:21:55 +02:00
Matt-Yorkley
95686eda78
Update translations
2020-06-18 22:21:54 +02:00
Matt-Yorkley
7efccac7bb
Add close functionality to close button
2020-06-18 22:21:54 +02:00
Matt-Yorkley
4362b8b25b
Improve line spacing on cart product list
2020-06-18 22:21:54 +02:00
Matt-Yorkley
be8c0f3600
Remove old cart dropdown view and directive
2020-06-18 22:21:54 +02:00
Matt-Yorkley
33a2dd100e
Add new layout for cart sidebar
2020-06-18 22:21:54 +02:00
Matt-Yorkley
400fce8ef9
Separate cart page and cart dropdown styles
2020-06-18 22:21:54 +02:00
Matt-Yorkley
b4e5542e5f
Extract re-usable sidebar styes
2020-06-18 22:21:54 +02:00
Matt-Yorkley
a8b981e9cd
Add product thumbnais to serializer for cart dropdown images
2020-06-18 22:21:54 +02:00
Matt-Yorkley
b1ce7f2c15
Simplify product naming in cart
2020-06-18 22:21:54 +02:00
Matt-Yorkley
85abfd2056
Create Cart sidebar and controller
2020-06-18 22:21:54 +02:00
Matt-Yorkley
7290d68687
Update all locales with the latest Transifex translations
2020-06-18 20:46:41 +02:00
Fatih Orhan
27fb3f156c
Update sell.html.haml
2020-06-18 20:36:50 +03:00
Luis Ramos
208623bb0a
Merge pull request #5635 from Matt-Yorkley/map-icons
...
Ensure map icon URLs are correctly generated with fingerprints
2020-06-18 18:02:47 +01:00
Matt-Yorkley
130f639b61
Rename service and use #call
2020-06-18 17:14:50 +02:00
Pau Pérez Fabregat
63f8830eba
Merge pull request #5530 from cillian/remove-spinjs
...
Remove spinjs-rails dependency and use spinning-circles.svg instead.
2020-06-18 16:47:09 +02:00
Matt-Yorkley
5338e782f8
Extract serializer helper method to service so the method isn't globally available
2020-06-18 16:44:15 +02:00
Luis Ramos
66f955f00d
Merge pull request #5597 from luisramos0/bo_stripe_payments
...
[Spree 2.1] Make backoffice stripe payments work in rails 4
2020-06-18 14:50:27 +01:00
Matt-Yorkley
75e57e5c2c
Call #image_path on map cluster icon
2020-06-18 14:14:41 +02:00
Matt-Yorkley
9a39cbbbc5
Convert MapConfiguration service to .js.erb.coffee
2020-06-18 14:14:41 +02:00
Matt-Yorkley
551daaadea
Use #image_path correctly on map marker icons
2020-06-18 14:14:41 +02:00
Matt-Yorkley
2143122a30
Add helper method for correctly generating with fingerprints in Serializers
2020-06-18 14:14:39 +02:00
Pau Pérez Fabregat
e02191078d
Merge pull request #5595 from coopdevs/improve-payments-report-performance
...
Remove N+1 fetching payments in report
2020-06-18 12:32:40 +02:00
Pau Pérez Fabregat
762b3a4a59
Merge pull request #5618 from openfoodfoundation/dependabot/bundler/httparty-0.18.1
...
Bump httparty from 0.17.3 to 0.18.1
2020-06-18 12:30:18 +02:00
Pau Pérez Fabregat
98490efbb3
Merge pull request #5600 from openfoodfoundation/transifex
...
Transifex
2020-06-18 12:29:10 +02:00
Matt-Yorkley
7cc47d652c
Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile
...
v3 image precompile
2020-06-18 12:01:23 +02:00
Luis Ramos
52dd7ce916
Improve comment about httparty
2020-06-18 10:12:37 +01:00
dependabot-preview[bot]
669330ee90
Bump httparty from 0.17.3 to 0.18.1
...
Bumps [httparty](https://github.com/jnunemaker/httparty ) from 0.17.3 to 0.18.1.
- [Release notes](https://github.com/jnunemaker/httparty/releases )
- [Changelog](https://github.com/jnunemaker/httparty/blob/master/Changelog.md )
- [Commits](https://github.com/jnunemaker/httparty/compare/v0.17.3...v0.18.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-18 10:12:37 +01:00
Transifex-Openfoodnetwork
20c41ce69e
Updating translations for config/locales/it.yml
2020-06-18 19:11:23 +10:00
Luis Ramos
f6e3e01a10
Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller
...
Add spec to verify payment source attributes are passed
2020-06-18 09:54:34 +01:00
Transifex-Openfoodnetwork
b5a67e65c5
Updating translations for config/locales/es.yml
2020-06-18 17:42:06 +10:00
Transifex-Openfoodnetwork
da7d36cd0e
Updating translations for config/locales/ca.yml
2020-06-18 17:41:48 +10:00
Pau Pérez Fabregat
8f885dd1c5
Merge pull request #5628 from Matt-Yorkley/flaky-caching-spec
...
Flaky caching spec
2020-06-18 09:37:45 +02:00
Transifex-Openfoodnetwork
fba5f96968
Updating translations for config/locales/nb.yml
2020-06-18 17:33:09 +10:00
Transifex-Openfoodnetwork
0c634c566c
Updating translations for config/locales/fr.yml
2020-06-18 17:08:17 +10:00
Transifex-Openfoodnetwork
a9ed081488
Updating translations for config/locales/en_FR.yml
2020-06-18 17:01:02 +10:00
dependabot-preview[bot]
9c643447c2
Bump ransack from 1.2.3 to 1.8.10
...
Bumps [ransack](https://github.com/activerecord-hackery/ransack ) from 1.2.3 to 1.8.10.
- [Release notes](https://github.com/activerecord-hackery/ransack/releases )
- [Changelog](https://github.com/activerecord-hackery/ransack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/activerecord-hackery/ransack/compare/v1.2.3...v1.8.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-17 19:15:45 +00:00
Luis Ramos
37cbcf4172
Merge pull request #5605 from luisramos0/spree_rev
...
Update spree revision and upgrade ransack to 1.2.3
2020-06-17 20:00:25 +01:00
Luis Ramos
06a37d8ff0
Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed
...
Add handling of CSV::MalformedCSVError for product_importer
2020-06-17 19:58:35 +01:00
Luis Ramos
d0bb625c19
Merge pull request #5593 from coopdevs/fix-report-order-link
...
Fix link from report to order
2020-06-17 19:55:40 +01:00
Luis Ramos
5163317b10
Merge pull request #5623 from luisramos0/zones
...
Make Zones editable again
2020-06-17 19:41:20 +01:00
Luis Ramos
91489827a1
Merge pull request #5614 from openfoodfoundation/dependabot/bundler/coffee-rails-4.2.2
...
Bump coffee-rails from 4.0.1 to 4.2.2
2020-06-17 19:40:59 +01:00
Matt-Yorkley
64b5bde952
Wait for page to actually load after visit shops_path
2020-06-17 12:47:08 +02:00
Matt-Yorkley
86fe032cdb
Update calls to #update_attributes! (Rails 4 Rubocop violation)
2020-06-17 12:37:20 +02:00
Matt-Yorkley
640c9e6d2b
Re-enable flaky spec
2020-06-17 12:36:42 +02:00
dependabot-preview[bot]
d67fa6fa5a
[Security] Bump geocoder from 1.5.2 to 1.6.3
...
Bumps [geocoder](https://github.com/alexreisner/geocoder ) from 1.5.2 to 1.6.3. **This update includes a security fix.**
- [Release notes](https://github.com/alexreisner/geocoder/releases )
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md )
- [Commits](https://github.com/alexreisner/geocoder/compare/v.1.5.2...v1.6.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-16 23:49:32 +00:00
Lucas Hiago
419b3ef26e
add missing i18n key for check hub ready for checkout
2020-06-16 19:49:43 -03:00
Lucas Hiago
e9e43c985f
add missing i18n key for closed OC
2020-06-16 19:48:24 -03:00
Luis Ramos
01e27dd68c
Merge pull request #5492 from pacodelaluna/include-negative-tax-adjustments-in-sales-report
...
Include adjustments with negative taxes on Sales Tax reports
2020-06-16 20:23:04 +01:00
Matt-Yorkley
add38bf550
Use #image_path helper correctly
...
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
2020-06-16 18:25:13 +02:00
Matt-Yorkley
c07476e22c
Use new Rails 4 #image-url SCSS helper
...
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image-url("home/banner.jpg")`
2020-06-16 18:25:12 +02:00
Matt-Yorkley
c370ab04d7
Ensure images in /assets/images** are precompiled and moved correctly to /public/assets folder
2020-06-16 17:01:58 +02:00
Pau Pérez Fabregat
6a31c56601
Merge pull request #5598 from luisramos0/checkout_error
...
Make checkout js error handling a bit more defensive
2020-06-16 16:18:49 +02:00
François Turbelin
6672cfdaf5
Readd price_adustments after bad rebase
2020-06-16 16:13:56 +02:00
Luis Ramos
2fcafdcf45
Add spec to cover editing zones
2020-06-16 15:13:54 +01:00
Pau Pérez Fabregat
3cfec157ed
Merge pull request #5621 from Matt-Yorkley/xit-caching-spec
...
Set flaky caching spec to pending
2020-06-16 16:11:34 +02:00
Luis Ramos
774b75b649
Make zones spec faster by going directly to zone list page withouth repeating the navigation through Configuration menu
2020-06-16 14:06:01 +01:00
Luis Ramos
3f7fb0ecc2
Add missing permitted attributes to zones
2020-06-16 13:56:39 +01:00
Pau Perez
ff4d7fbc45
Refactor with Arel to perform a single query
2020-06-16 14:01:27 +02:00
Pau Perez
00c9dd7ece
Remove N+1 fetching order and li adjustments
2020-06-16 14:01:27 +02:00
François Turbelin
b4952dcbfb
Cosmetics
2020-06-16 14:01:27 +02:00
François Turbelin
9abe41f6cb
Use OrderTaxAdjustmentsFetcher service
2020-06-16 14:01:27 +02:00
François Turbelin
c729f64fcf
Include adjustments without positive taxes
2020-06-16 14:01:27 +02:00
Matt-Yorkley
cf214251fa
Set flaky caching spec to pending
2020-06-16 12:59:58 +02:00
dependabot-preview[bot]
f8c66cae81
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
...
Bumps [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on ) from 3.5.0 to 4.0.0.
- [Release notes](https://github.com/mbleigh/acts-as-taggable-on/releases )
- [Changelog](https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.5.0...v4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-16 02:30:03 +00:00
dependabot-preview[bot]
dfdf57746a
Bump coffee-rails from 4.0.1 to 4.2.2
...
Bumps [coffee-rails](https://github.com/rails/coffee-rails ) from 4.0.1 to 4.2.2.
- [Release notes](https://github.com/rails/coffee-rails/releases )
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/coffee-rails/compare/v4.0.1...v4.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-16 02:29:08 +00:00
Luis Ramos
7db519ab62
Merge pull request #5570 from luisramos0/ship_methods_form
...
[Spree 2.1] Make Shipping methods form save calculator details
2020-06-15 15:05:50 +01:00
Luis Ramos
0c97278d69
Upgrade ransack to 1.2.3
2020-06-15 14:20:34 +01:00
Luis Ramos
2c794c148b
Update spree rev
2020-06-15 14:14:53 +01:00
Pau Pérez Fabregat
257b311e04
Merge pull request #5158 from openfoodfoundation/3-0-stable
...
Merge 3-0-stable to master
2020-06-15 13:35:58 +02:00
Pau Pérez Fabregat
62fe54d90d
Merge pull request #5604 from luisramos0/xit_vo_flaky_2
...
Comment out flaky variant overrides spec
2020-06-15 13:11:24 +02:00
Luis Ramos
d5bdf306a9
Comment out flaky variant overrides spec
2020-06-15 11:43:30 +01:00
Luis Ramos
538d886c83
Merge pull request #5573 from Matt-Yorkley/payment-report-500
...
Fix fatal error in reports helper for orders without payments
2020-06-15 11:27:17 +01:00
Luis Ramos
c113ee92e6
Merge pull request #5603 from luisramos0/xit_exchange_prods
...
Comment out Exchange Products Renderer spec
2020-06-15 11:13:50 +01:00
Luis Ramos
d82a1c3bf1
Merge pull request #5602 from coopdevs/fix-style-issues
...
Fix outstanding Rubocop violations
2020-06-15 11:13:21 +01:00
Luis Ramos
ea8c5d2711
Comment out flaky spec
2020-06-15 11:01:35 +01:00
Pau Pérez Fabregat
e2e3b16250
Merge pull request #5549 from luisramos0/vo_flaky
...
[Spree 2.1] Make Variant Overrides spec less flaky and... comment it anyway
2020-06-15 12:00:16 +02:00
Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Pau Perez
df887b5576
Wrap long line
...
pick e84e0aebe Fix fatal error in reports helper for orders without payments
pick e725f3331 Defend from an order w/o payments when building table
2020-06-15 09:25:30 +02:00
Transifex-Openfoodnetwork
40dd9a8fda
Updating translations for config/locales/en_NZ.yml
2020-06-14 08:11:27 +10:00
Eduardo
27c76cfae2
add view spec to replace feature spec
2020-06-13 14:24:17 -03:00
Cillian O'Ruanaidh
430e5ea9cc
Permission to view :bulk_coop report is now added in the #add_bulk_coop_abilities method.
2020-06-13 16:57:43 +01:00
Cillian O'Ruanaidh
0ef3a7e24f
Fix some more code climate violations for bulk coop specs which have been moved to the order management engine.
2020-06-13 16:23:11 +01:00
Cillian O'Ruanaidh
fdf0d92366
Move feature spec for bulk coop report to the order management engine.
2020-06-13 15:52:42 +01:00
Cillian O'Ruanaidh
ba126d5afc
Move the bulk coop controller specs to the order management engine.
...
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
2020-06-13 15:42:26 +01:00
Cillian O'Ruanaidh
c1e57fcc12
Adjust CanCan ability to reflect that the bulk coop report now runs from the order management engine.
2020-06-13 15:41:09 +01:00
Cillian O'Ruanaidh
3abcb5b23c
Don't move the :parameter_not_allowed_error translation to a different scope yet.
...
It will make it harder to merge and deploy this PR if every translation locale file has to be updated too.
2020-06-13 15:37:44 +01:00
Cillian O'Ruanaidh
bcf79ef803
Fix code climate violations related to removing blockenspiel.
2020-06-13 13:27:44 +01:00
Cillian O'Ruanaidh
6dbb6f3f09
Add an underscore before unused method arguments rather than an empty splat operator so it's easier to understand what is being passed in.
2020-06-13 13:09:09 +01:00
Cillian O'Ruanaidh
293e8949a9
Remove unused AuthenticationWorkflow module from the BulkCoopReport specs.
2020-06-13 12:59:23 +01:00
Cillian O'Ruanaidh
bfc6daf076
Remove duplicate PackingReport tests from the BulkCoopReport spec.
...
These tests already exist in spec/lib/open_food_network/packing_report_spec.rb:72
2020-06-13 12:57:14 +01:00
Cillian O'Ruanaidh
ed82c7e3db
BulkCoopReport has been moved to the engines/order_management so move it's spec there too.
2020-06-13 12:51:29 +01:00
Cillian O'Ruanaidh
e9ff84a746
Add a partial for the AJAX progress spinner so it can be reused in the spree admin and bare admin layouts.
2020-06-13 12:26:17 +01:00
Luis Ramos
e6e4b6f95c
Add keypress events to text input fields on orders search page
2020-06-13 12:15:49 +01:00
Luis Ramos
1740879261
Revert directive and just use ng-kkeypress
2020-06-13 12:07:45 +01:00
Luis Ramos
f08b837115
Make enter submit the search form in products list
2020-06-13 11:51:00 +01:00
Eduardo
5ed5ed2873
fix payment methods table to show proper provider name
2020-06-12 18:26:54 -03:00
Luis Ramos
ed262a19a9
Make checkout js error handling a bit more defensive
2020-06-12 20:33:22 +01:00
Luis Ramos
02b351b9d5
Make display only shops work again, this will show the product list when the OC is open but ship and pay methods are not available
...
Add spec to cover display only shops, it's oficially a feature now :-)
2020-06-12 20:15:08 +01:00
Pau Perez
018772bbba
Remove N+1 fetching payments in report
2020-06-12 16:42:40 +02:00
Pau Perez
29246c15fe
Defend from order without billing address
...
This a data integrity issue that needs deeper investigation but while
this happens, our users can still render their reports.
2020-06-12 16:34:23 +02:00
Luis Ramos
6dcb2d4a3b
Add xit, spec is still too flaky on semaphore
...
It's not the most important spec, this scenario should never happen as
the user will not be able to access the page.
2020-06-12 15:33:34 +01:00
Luis Ramos
f56e0ba0c0
Mock current_spree_user to return a user without permissions so that the controller does not use an already loaded version of current_spree_user that still has enough permissions
2020-06-12 14:23:45 +01:00
Luis Ramos
cf5af68438
Make spec less flaky by making it wait for the Saving text to go away
2020-06-12 13:04:33 +01:00
Luis Ramos
72870530ce
Merge pull request #5594 from Matt-Yorkley/3-0-reports-subquery
...
[Spree 2.1] Fix "subquery has too many columns" in reports query
2020-06-12 12:42:04 +01:00
Matt-Yorkley
86db1b6d68
Fix "subquery has too many columns" in reports query
2020-06-12 12:55:50 +02:00
Pau Perez
6a7df0b165
Fix link from report to order
2020-06-12 12:26:56 +02:00
Pau Pérez Fabregat
034c3d9568
Merge pull request #5548 from luisramos0/3-0-stable-jun-2
...
[Spree 2.1] Merge master into 3-0-stable
2020-06-12 11:27:29 +02:00
Pau Pérez Fabregat
a91c81059f
Merge pull request #5588 from openfoodfoundation/transifex
...
Transifex
2020-06-12 11:00:10 +02:00
Luis Ramos
7245a80f94
Merge branch 'master' into 3-0-stable-jun-2
2020-06-12 09:22:47 +01:00
Robin Klaus
f8ebe11728
Added translation keyt to config/locales/en.yml file for shipping_category
2020-06-12 13:19:15 +10:00
Transifex-Openfoodnetwork
10f0958819
Updating translations for config/locales/fr_CA.yml
2020-06-12 12:19:08 +10:00
Transifex-Openfoodnetwork
fce74bd008
Updating translations for config/locales/es.yml
2020-06-12 12:19:00 +10:00
Transifex-Openfoodnetwork
9908692da9
Updating translations for config/locales/en_FR.yml
2020-06-12 12:16:07 +10:00
Transifex-Openfoodnetwork
ff0e3ed379
Updating translations for config/locales/fr.yml
2020-06-12 12:16:00 +10:00
Transifex-Openfoodnetwork
2914500d5b
Updating translations for config/locales/ca.yml
2020-06-12 12:15:53 +10:00
Robin Klaus
b8f228cc3d
Added more key to en.yml to translate More dropdown text
2020-06-12 11:34:22 +10:00
Luis Ramos
898d525201
Merge pull request #5552 from coopdevs/remove-forgotten-photos
...
Remove unused stock photo
2020-06-11 20:41:01 +01:00
Luis Ramos
e2265dd165
Fix issue in product_spec
2020-06-11 20:26:57 +01:00
Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
Transifex-Openfoodnetwork
17bf163378
Updating translations for config/locales/fr_CA.yml
2020-06-12 03:53:33 +10:00
Transifex-Openfoodnetwork
e371c5f788
Updating translations for config/locales/en_CA.yml
2020-06-12 03:48:39 +10:00
Pau Pérez Fabregat
5cca8693b3
Merge pull request #5540 from romale/patch-1
...
Missing translation key "return_authorizations"
2020-06-11 16:39:15 +02:00
Transifex-Openfoodnetwork
bfcf5f8ca0
Updating translations for config/locales/ca.yml
2020-06-12 00:38:46 +10:00
Transifex-Openfoodnetwork
ab76319861
Updating translations for config/locales/en_FR.yml
2020-06-12 00:35:51 +10:00
Transifex-Openfoodnetwork
30917c64f5
Updating translations for config/locales/fr.yml
2020-06-12 00:35:44 +10:00
Transifex-Openfoodnetwork
6d7c1b7933
Updating translations for config/locales/es.yml
2020-06-12 00:35:36 +10:00
Pau Perez
9d5c657ff9
Update all locales with the latest Transifex translations
2020-06-11 15:49:05 +02:00
Pau Pérez Fabregat
e0bcc71882
Merge pull request #5569 from rmklaus12/5204-inventory-translation
...
Add translation keys to en.yml file for variant_override error messag…
2020-06-11 15:35:30 +02:00
Pau Pérez Fabregat
06feae994d
Merge pull request #5353 from pacodelaluna/sort-invoices-in-bulk-invoice-with-forced-order
...
Sort invoices in bulk invoice with completed_at desc order
2020-06-11 15:34:39 +02:00
Pau Pérez Fabregat
2052756169
Merge pull request #5556 from Matt-Yorkley/geocoding-service
...
Rename Angular Geo service
2020-06-11 15:19:08 +02:00
Pau Pérez Fabregat
bc8a10c6a0
Merge pull request #5541 from luisramos0/has_variants
...
Delete dead code related to products without variants
2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat
01a9b33fc9
Merge pull request #5482 from rmklaus12/5094-new-order-translation
...
created partial for order page title to resolve French translation of…
2020-06-11 13:23:28 +02:00
Pau Pérez Fabregat
ab743c3af9
Merge pull request #5407 from luisramos0/oc_sweep
...
Order Cycle design sweep
2020-06-11 12:49:04 +02:00
Pau Pérez Fabregat
246a4995cb
Merge pull request #5490 from luchiago/change-price-sack-amount-int-to-float
...
Change minimal amount in price sack calculator to float
2020-06-11 12:42:11 +02:00
Matt-Yorkley
e725f33318
Defend from an order w/o payments when building table
2020-06-11 12:37:51 +02:00
Matt-Yorkley
e84e0aebe6
Fix fatal error in reports helper for orders without payments
2020-06-11 11:22:07 +02:00
Pau Pérez Fabregat
75d24c19fc
Merge pull request #5206 from chrishil1/clear_filters
...
Clear filters on admin/products page
2020-06-11 10:37:17 +02:00
Pau Pérez Fabregat
bdc4340034
Merge pull request #5582 from openfoodfoundation/transifex
...
Transifex
2020-06-11 10:30:13 +02:00
Pau Pérez Fabregat
961be38734
Merge pull request #5581 from openfoodfoundation/dependabot/bundler/test-unit-3.3.6
...
Bump test-unit from 3.3.5 to 3.3.6
2020-06-11 09:16:57 +02:00
Transifex-Openfoodnetwork
e76bc07d72
Updating translations for config/locales/es.yml
2020-06-11 17:11:55 +10:00
Transifex-Openfoodnetwork
6ef94febe5
Updating translations for config/locales/ca.yml
2020-06-11 17:10:49 +10:00
Gaetan Riou
359c0b9d85
fix typo
2020-06-11 16:54:00 +10:00
Gaetan Riou
d3943bc92a
refactor error handling of CSV::MalformedCSVError and fix some typos
2020-06-11 16:47:58 +10:00
Transifex-Openfoodnetwork
472338b522
Updating translations for config/locales/fr.yml
2020-06-11 16:32:02 +10:00
Transifex-Openfoodnetwork
220c84075f
Updating translations for config/locales/en_FR.yml
2020-06-11 16:25:36 +10:00
Luis Ramos
ccf6cbb003
Merge pull request #5483 from rmklaus12/5281-missing-translation-ordercreation
...
Changed translation syntax to normal t() call and lazy lookup.
2020-06-10 23:00:44 +01:00
Luis Ramos
13a4a3edbe
Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight
...
Fix admin config separator without highlight
2020-06-10 23:00:30 +01:00
Luis Ramos
21746e72ce
Merge pull request #5484 from rmklaus12/5336-errormsg-translation
...
Added translation keys to error messages partial and en.yml file to a…
2020-06-10 23:00:07 +01:00
Luis Ramos
1e248c1848
Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method
...
Enhancement/5277 be able to filter orders according to shipping method
2020-06-10 20:50:06 +01:00
Luis Ramos
28f126eed1
Merge pull request #5545 from mbudm/task/matomo-tag-manager
...
Add configuration to enable Matomo Tag Manager
2020-06-10 20:49:34 +01:00
dependabot-preview[bot]
1a700f870c
Bump test-unit from 3.3.5 to 3.3.6
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.5...3.3.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-06-10 19:16:40 +00:00
Luis Ramos
113533e3b1
Merge pull request #5557 from Matt-Yorkley/reports-improvement
...
Improve performance in various reports
2020-06-10 18:54:51 +01:00
Pau Pérez Fabregat
a547aae770
Merge pull request #5562 from openfoodfoundation/transifex
...
Transifex
2020-06-10 17:57:07 +02:00
Transifex-Openfoodnetwork
1abbd7261e
Updating translations for config/locales/es.yml
2020-06-11 01:13:33 +10:00
Transifex-Openfoodnetwork
9a2618cd39
Updating translations for config/locales/ca.yml
2020-06-11 01:09:41 +10:00
Steve Roberts
f8673fb575
Moved tag manager instructions to be directly below the field
2020-06-10 15:06:53 +10:00
Maikel Linke
7d53b12baf
Preserve sorting by completion date
2020-06-10 10:19:15 +10:00
Maikel Linke
680ee3dc86
Check the bulk invoice rendering order
...
As it turns out, our performance optimisation with `find_each` overrides
or custom sorting.
2020-06-10 10:05:47 +10:00
Luis Ramos
89003aece7
Merge pull request #5414 from openfoodfoundation/dependabot/bundler/stripe-5.22.0
...
Bump stripe from 5.15.0 to 5.22.0
2020-06-09 17:41:20 +01:00
Pau Pérez Fabregat
86d59c4e86
Merge pull request #5564 from dmarcoux/improve-dockerfile
...
Improve Dockerfile
2020-06-09 16:17:37 +02:00
Luis Ramos
0c1ed1731d
Add more specs to ship method controller
2020-06-09 12:33:55 +01:00
Luis Ramos
87292a8ce5
Refactor spec to add more similar specs
2020-06-09 12:15:52 +01:00
Luis Ramos
f05b0d1a57
Add missing fields to ship method controller permitted params list
2020-06-09 12:02:59 +01:00
Luis Ramos
fd5062429a
Add context to delete specs so we can add other specs
2020-06-09 12:02:59 +01:00
Luis Ramos
7924330321
Fix problem with stub_const, we need auto load the controller before the const is stubbed otherwise the controller will be broken
...
See details here: https://github.com/rspec/rspec-mocks/issues/1079#issuecomment-215620243
2020-06-09 10:52:53 +01:00
Robin Klaus
c4fbce30c8
Add translation keys to en.yml file for variant_override error message translation
2020-06-09 19:20:29 +10:00
François Turbelin
795106aaa2
Use real orders inside spec to extend coverage
2020-06-09 10:11:11 +02:00
François Turbelin
6056c1699f
Use batches in order to fetch orders
2020-06-09 10:10:34 +02:00
Steve Roberts
5fcc0dcd14
Add configuration to enable matomo tag manager
...
- Update embed codes and allow both scripts concurrently
- Add lines around blocks
- Update MTM copy based on PR feedback
- checked cookies unchanged
2020-06-09 10:21:11 +10:00
Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
jeffrey s hill md
c4e910a7c8
Make clear filters fetch products automatically without filters
...
The spec change is needed: fetchProducts() makes cleared filters values undefined in removeClearedValues.
2020-06-08 18:27:10 +01:00
Transifex-Openfoodnetwork
dceae2a98b
Updating translations for config/locales/it.yml
2020-06-08 23:23:41 +10:00
Transifex-Openfoodnetwork
7515b9c86c
Updating translations for config/locales/it.yml
2020-06-08 23:20:30 +10:00
Gaetan Riou
9b8a97aadd
Add handling of CSV::MalformedCSVError for product_importer
2020-06-08 16:21:02 +10:00
Dany Marcoux
a751d24562
Run bundler install in parallel with the amount of available CPUs
2020-06-07 23:32:50 +02:00
Dany Marcoux
6c564dc7b2
Shallow clone specific release for rbenv and ruby-build
...
We don't need the whole git history, so doing a shallow clone is
favourable. Cloning a specific release (the latest at the time of
writing this) allows us to have reproducible results since we're not
cloning whatever is on master at the time of building the Docker image.
2020-06-07 23:29:17 +02:00
Transifex-Openfoodnetwork
e8f59ca80f
Updating translations for config/locales/tr.yml
2020-06-06 20:02:55 +10:00
Cillian O'Ruanaidh
f90969134d
Fix a couple of Rubocop violations.
2020-06-05 20:03:17 +01:00
Pau Perez
a287f370b5
Remove unused home photos
2020-06-05 18:05:58 +02:00
Cillian O'Ruanaidh
bafa8beab3
Use :parameter_not_allowed_error_message to from base Reports::Authorizer.
2020-06-05 17:05:26 +01:00
Cillian O'Ruanaidh
e58852289f
Move the :require_valid_datetime_range method to OrderManagement::Reports::Parameters::Base so it can be reused on multiple reports.
2020-06-05 16:58:56 +01:00
Cillian O'Ruanaidh
9172606780
Allow the order management report partial to be reused on different reports.
2020-06-05 16:51:43 +01:00
Cillian O'Ruanaidh
406309c577
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
...
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +01:00
Pau Pérez Fabregat
ca458018ca
Merge pull request #5547 from luisramos0/ctrl_hacks
...
Bring the spree_get spec helpers from spree and move them together with the api_get spec helpers
2020-06-05 17:34:16 +02:00
Matt-Yorkley
9e278d5b2f
Improve performance in various reports
2020-06-05 16:39:01 +02:00
Luis Ramos
e2e3ae68b7
Update all locales with the latest Transifex translations
2020-06-05 11:36:27 +01:00
Luis Ramos
8ba15931e3
Merge pull request #5521 from openfoodfoundation/transifex
...
Transifex
2020-06-05 11:34:13 +01:00
Cillian O'Ruanaidh
d436d18d19
Fix code climate violations in removal of Blockenspiel dependency.
2020-06-05 10:13:06 +01:00
Transifex-Openfoodnetwork
c317ae7bf3
Updating translations for config/locales/en_FR.yml
2020-06-05 17:51:47 +10:00
Transifex-Openfoodnetwork
76aded5fb5
Updating translations for config/locales/fr.yml
2020-06-05 17:51:06 +10:00
Matt-Yorkley
78fc6b7138
Rename "Geo" service to "GmapsGeo" for clarity.
...
This service directly calls methods in the google maps javascript included in the darkswarm layout. If we're moving away from it, we should clarify where it's used.
2020-06-05 08:35:15 +02:00
Robin Klaus
d5d6fbc01d
created partial for order page title to resolve French translation of new order
2020-06-05 11:27:51 +10:00
Luis Ramos
82290bb5e1
Merge pull request #5448 from rmklaus12/5302-paypal-missingkey
...
Added translation keys for PayPalExpress payment method
2020-06-04 21:32:27 +01:00
Luis Ramos
3a20de1465
Merge pull request #5398 from cillian/open-street-map
...
Add support for using Open Street Map on the Map and Group pages.
2020-06-04 17:01:25 +01:00
Transifex-Openfoodnetwork
52323887b6
Updating translations for config/locales/en_FR.yml
2020-06-04 15:58:45 +10:00
Transifex-Openfoodnetwork
095d0f4ca8
Updating translations for config/locales/fr.yml
2020-06-04 15:58:22 +10:00
Luis Ramos
12000d2d44
Merge pull request #5425 from luisramos0/pay_method_warning
...
Add warning to payment method edit page
2020-06-03 21:03:56 +01:00
Luis Ramos
cce26cb453
Merge branch '3-0-stable' into 3-0-stable-jun-2
2020-06-03 19:51:43 +01:00
Pau Pérez Fabregat
93dd61c6fc
Merge pull request #5456 from luisramos0/3-0-stable-with-spree-deps
...
[Spree 2.1] Move all spree_core dependencies to OFN so we can upgrade them later
2020-06-03 18:57:24 +02:00
Luis Ramos
0b76a25941
Add spree_core dependencies to OFN so we can upgrade them
...
This will enable us to upgrade these dependencies independently
2020-06-03 14:25:27 +01:00
Lucas Hiago
bfe17f54d7
Change minimal amount in price sack calculator to float
2020-06-03 08:51:41 -03:00
Pau Perez
7900cf9438
Style spinner SVG by inlining it
...
This way we can tweak the `fill` property of the SVG and style it with
CSS as the documented in the author's repo
(https://github.com/SamHerbert/SVG-Loaders )
> An icon's color can be manipulated by changing the fill attribute in
the SVG file.
2020-06-03 11:13:03 +02:00
Transifex-Openfoodnetwork
bbf381d130
Updating translations for config/locales/es.yml
2020-06-03 18:32:57 +10:00
Pau Pérez Fabregat
da3d51b500
Merge pull request #5539 from luisramos0/dev_docs
...
Improve Dev onboarding docs
2020-06-03 09:50:03 +02:00
Transifex-Openfoodnetwork
61d85eda61
Updating translations for config/locales/ca.yml
2020-06-03 17:40:19 +10:00
Pau Pérez Fabregat
8a62c8aeb5
Merge pull request #5544 from luisramos0/api_ctrl
...
[Spree 2.1] Fix specs in Api::EnterprisesController and Api::ShopsController
2020-06-03 09:34:43 +02:00
Pau Pérez Fabregat
833e2ff9c4
Merge pull request #5543 from luisramos0/product_stock
...
[Spree 2.1] Fix product_stock spec
2020-06-03 09:18:52 +02:00
Pau Pérez Fabregat
4935932e45
Merge pull request #5531 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.0
...
Bump i18n-js from 3.6.0 to 3.7.0
2020-06-03 09:17:58 +02:00
Pau Pérez Fabregat
d9cf22fed5
Merge pull request #5528 from luisramos0/checkout_js
...
Make checkout JS code send bugsnag alert even if there's an error processing an error
2020-06-03 09:13:40 +02:00
Pau Pérez Fabregat
fb339d6a99
Merge pull request #5263 from luisramos0/pdp
...
[Mobile] Restyle product modal
2020-06-03 08:55:20 +02:00
Transifex-Openfoodnetwork
4e497d93b7
Updating translations for config/locales/en_CA.yml
2020-06-03 10:31:14 +10:00
romale
325cbbf3c7
formatting
2020-06-02 23:40:57 +03:00
Luis Ramos
f9d86eb7ed
Join module and describe declaration so that rspec picks up correct controller under Api namespace and not the controller with the same name in the base namespace
2020-06-02 20:17:46 +01:00
Luis Ramos
251c04f2d9
Make all tests in enterprises_controller_spec use api_post instead of spree_post
2020-06-02 20:17:07 +01:00
Luis Ramos
ff0c93a76b
Join module and describe declaration so that rspec picks up correct
...
controller under Api namespace and not the controller with the same name
in the base namespace
2020-06-02 20:15:25 +01:00
Luis Ramos
c68459f212
Make enterprises_controller_spec use api_post instead of spree_post
2020-06-02 20:06:52 +01:00
Luis Ramos
5fd0a6028f
Merge pull request #5420 from luisramos0/pi_fix
...
[Spree 2.1] Product Import - Add variant_unit_name to the list of fields to be ignored when creating a variant
2020-06-02 18:13:48 +01:00
Luis Ramos
53a80de503
Improve method names and set use_route with reverse_merge so it can be overridden
2020-06-02 17:32:46 +01:00
Luis Ramos
4438f620e9
Merge pull request #5421 from luisramos0/more_strong_params
...
[Spree 2.1] Add missing strong params to less important controllers missed by specs
2020-06-02 16:59:27 +01:00
Luis Ramos
23b677f547
Merge pull request #5388 from luisramos0/reg_proc
...
[Spree 2.1] Fix enterprise package selection submit button
2020-06-02 16:23:52 +01:00
Luis Ramos
beb1b3f3bc
Replay 02d46b7c51 lost in the last merge from master
2020-06-02 16:11:03 +01:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
8bb4310cba
Merge pull request #5383 from luisramos0/admin_orders_bug
...
[Spree 2.1] Fix Update and Calculate Fees button
2020-06-02 15:30:16 +01:00
Luis Ramos
7b89f4d6c5
Switch controller helper calls routes from spree to main_app, this will include all routes all the time
2020-06-02 15:00:57 +01:00
Luis Ramos
13836a62bb
Rename parameters to params and change default from nil to {}
2020-06-02 14:36:06 +01:00
Luis Ramos
3136aa5a8b
Make api_process use process_spree_action
2020-06-02 14:00:24 +01:00
romale
9d56c180b2
formatting
2020-06-02 15:56:59 +03:00
Luis Ramos
2f76e0b15b
Bring methods from Spree::TestingSupport::ControllerRequests to our ControllerRequestsHelper so we can merge them later
2020-06-02 13:54:33 +01:00
Luis Ramos
5d0856e5a3
Rename ControllerHacks to ControllerRequestsHelper and move it's configuration to spec_helper
2020-06-02 13:47:59 +01:00
Luis Ramos
cd3bc54c37
Remove resource_scoping to make things more simple
2020-06-02 13:43:33 +01:00
Luis Ramos
2c2263ab78
Fix rubocop issues in shipments_controller_spec
2020-06-02 13:41:50 +01:00
Luis Ramos
092e047b44
Remove resource_scoping from api/shipments_controller spec
2020-06-02 13:35:48 +01:00
Luis Ramos
a0aa42cd58
Remove resource_scoping from api/variants spec
2020-06-02 13:26:12 +01:00
romale
d16bfe3779
formatting
2020-06-02 14:44:16 +03:00
romale
9d3f010173
formating
2020-06-02 14:42:50 +03:00
Luis Ramos
89c461662f
Merge pull request #5502 from Matt-Yorkley/dropshadow-regression
...
[mobile ux] Fix missing drop-shadow
2020-06-02 12:07:37 +01:00
romale
35648025df
formating
2020-06-02 12:09:38 +03:00
romale
b21904ada1
moved to 2882
2020-06-02 10:38:36 +03:00
Robin Klaus
f4a64e89c2
Added translation keys to error messages partial and en.yml file to add translation to error messages
2020-06-02 15:41:01 +10:00
Luis Ramos
2d7f1ce283
Delete all variants from test product not just the first one
2020-06-01 21:21:26 +01:00
Luis Ramos
072da7316e
Remove views code that tests for the existence of product variants
...
A product always has the standard variant, the only case where a product will not have variants is immediatly after creation and before being saved
2020-06-01 14:09:14 +01:00
Luis Ramos
e7828e107b
Delete dead methods from product_decorator
2020-06-01 14:07:34 +01:00
Luis Ramos
a4a6431faf
Fix strong params problem where order object is not sent to controller
2020-06-01 13:42:22 +01:00
Luis Ramos
48985bbcd1
Use patch instead of put, because it's rails 4
...
Extend the registration process spec to cover package selection
2020-06-01 13:41:37 +01:00
Luis Ramos
c6842ada7f
Add variant_unit_name to the list of fields to be ignored when creating a variant, it's a product field
2020-06-01 13:41:15 +01:00
Luis Ramos
754b657f81
Move controller methods to protected to keeep consitency and isolation
2020-06-01 13:40:59 +01:00
Luis Ramos
bae128738b
Add spec for return authorizations controller
2020-06-01 13:40:59 +01:00
Luis Ramos
583b4a1df7
Add spec to countries_controller
2020-06-01 13:40:59 +01:00
Luis Ramos
73f2844fe3
Add spec for shipping categories
2020-06-01 13:40:59 +01:00
Luis Ramos
e77d9aba7b
Add missing strong params to less important controllers not tested in specs
2020-06-01 13:40:59 +01:00
romale
069241f307
Missing translation key "return_authorizations"
...
return_authorizations: Return Authorizations
2020-06-01 15:25:46 +03:00
Transifex-Openfoodnetwork
e5cc425662
Updating translations for config/locales/tr.yml
2020-06-01 16:39:17 +10:00
Luis Ramos
5d9e88a3bc
Restructure GETTING STARTED to make it clear what the wiki pages are for
2020-05-31 23:00:32 +01:00
Luis Ramos
fb45cb602e
Remove duplication from CONTRIBUTING
2020-05-31 21:07:52 +01:00
Matt-Yorkley
8e57f9d929
Adjust shared map partial
2020-05-31 19:21:20 +02:00
Cillian O'Ruanaidh
94b85fb9e3
Fix up Code Climate issues with Open Street Map code.
2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
deafe32354
Add support for using Open Street Map on the Map and Group pages.
...
The map is displayed using https://leafletjs.com/
To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.
The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers )
Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.
Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.
The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
2020-05-31 18:42:55 +02:00
Matt-Yorkley
1e3bf7fec4
Merge pull request #5487 from coopdevs/fix-schedule-factory
...
[Spree 2.1] Allow to create order_cycle_schedules
2020-05-30 13:49:47 +02:00
Luis Ramos
c01da01c70
Merge pull request #5518 from openfoodfoundation/dependabot/bundler/ddtrace-0.36.0
...
Bump ddtrace from 0.35.2 to 0.36.0
2020-05-30 11:05:40 +01:00
Lucas Hiago
528db54f36
Correct controller name for matching
2020-05-29 22:24:41 -03:00
Lucas Hiago
19ef66f3ad
Change mail method config route
2020-05-29 21:51:57 -03:00
dependabot-preview[bot]
f773e57dee
Bump i18n-js from 3.6.0 to 3.7.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.6.0...v3.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-29 19:20:40 +00:00
Cillian O'Ruanaidh
e6fa296d03
Remove spinjs-rails dependency and use spinning-circles.svg instead.
...
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3491
The spinjs-rails gem provides a CSS3 a spinning activity indicator. This commit removes the gem so we don't have to keep the gem up-to-date and uses the spinning-circles.svg which is used already in other places.
The spinjs spinner can be seen when viewing or editing taxonomies in /admin/taxonomies. It is loaded from the .ajaxStart call in app/assets/javascripts/admin/spree/progress.coffee
To test or restyle this spinner you can change the display property of the #progress element in app/assets/stylesheets/admin/components/progress.scss to 'block'.
2020-05-29 18:04:49 +01:00
Pau Perez
24e897d145
Do not build OC with schedules at the same time
...
It's not possible when neither the OC nor the schedule has an id due to
the new join table order_cycle_schedules.
2020-05-29 17:00:52 +02:00
Pau Perez
538c53fe9e
Improve code readability
...
Also removing an useless vars
2020-05-29 15:56:05 +02:00
Luis Ramos
6e842212ea
Always throw back error even if there is an error loading the flash for example translating the error message
2020-05-29 14:45:22 +01:00
Luis Ramos
3e0839de73
Increase warning sign line height so that it renders correctly on smaller screens
2020-05-29 12:56:22 +01:00
Luis Ramos
2c55bef544
Remove unnecessary padding
...
This is looking broken in ipad mini 3
2020-05-29 12:56:22 +01:00
Luis Ramos
a376a17f64
Group related properties together
2020-05-29 12:56:20 +01:00
Cillian O'Ruanaidh
d02f64da06
Define bulk coop report summary row and columns with lists of method names instead of Procs.
2020-05-29 11:34:12 +01:00
Matt-Yorkley
c73defa8a1
Merge pull request #5494 from Matt-Yorkley/group-maps-fix
...
Fix group maps
2020-05-29 12:05:55 +02:00
Pau Pérez Fabregat
c0ad992352
Merge pull request #5465 from luisramos0/rename_accessible_by
...
[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record
2020-05-29 12:04:19 +02:00
Pau Pérez Fabregat
8d1944d714
Merge pull request #5506 from Matt-Yorkley/3-0-dfc-specs
...
[Spree 2.1] DFC specs updates
2020-05-29 11:43:19 +02:00
Pau Perez
815cd73ff3
DRY specs
2020-05-29 11:15:47 +02:00
Pau Perez
032dce1a88
Move OC save within success block
...
This makes more evident there are two scenarios: schedule save success
or failure. We deal with OCs failures raising an exception.
2020-05-29 10:46:29 +02:00
Pau Perez
768568c75c
Rename @object to @schedule
...
This level of abstraction makes sense in the framework-like code in
ResourceController but here it just makes things more difficult.
2020-05-29 10:44:43 +02:00
Pau Perez
4f3d01bd93
Remove unused HTML response format
2020-05-29 10:43:16 +02:00
Pau Perez
56b590a6f8
Extract #sync_subscription
...
This makes it far easier to spot what's the difference between create
and update regarding subs syncing without having to mess with `#update`
and its callbacks (for now).
2020-05-29 10:41:42 +02:00
Pau Perez
65c53df2ef
Remove unnecessary callback invocations
...
There are no registered callback methods to execute.
2020-05-29 10:25:38 +02:00
Pau Perez
f25ee8c998
Extract #editable_order_cycles
...
This makes it far easier to spot what's the difference between create
and update regarding the editable order cycles.
I stop here before a slightly deeper refactor which would make the PR
quite hard to review. This will come an upcoming one.
2020-05-29 10:25:37 +02:00
Pau Perez
862364ebbb
Fix schedule destroy spec
2020-05-29 10:24:50 +02:00
Pau Perez
4f635339e3
Fix schedule creation and subs syncing
2020-05-29 10:24:42 +02:00
Transifex-Openfoodnetwork
5e0e88bf2c
Updating translations for config/locales/fr.yml
2020-05-29 17:24:01 +10:00
Transifex-Openfoodnetwork
9fbd8b4fe1
Updating translations for config/locales/en_FR.yml
2020-05-29 16:46:33 +10:00
Maikel
2f82a58055
Merge pull request #5365 from mbudm/task/orderCycleSpecSplit
...
Split order_cycle_spec into smaller specs grouped by theme
2020-05-29 13:46:42 +10:00
Transifex-Openfoodnetwork
11f33bd911
Updating translations for config/locales/pt_BR.yml
2020-05-29 08:12:24 +10:00
Luis Ramos
2203bca1ce
Merge pull request #5489 from luisramos0/3-0-stable-may-22
...
[Spree 2.1] Merge master into 3-0-stable
2020-05-28 19:55:14 +01:00
Luis Ramos
bb8401a0fc
Merge pull request #5444 from luisramos0/dead_js_code
...
Remove some dead JS code related to admin sub menus
2020-05-28 19:54:42 +01:00
Luis Ramos
bd5de9d82f
Delete unused translations
2020-05-28 19:51:23 +01:00
Luis Ramos
bec798c6c9
Bring some spree translations to ofn in payment methods pages
2020-05-28 19:51:23 +01:00
Luis Ramos
fe6bcb5093
Add de-activation warning to payment methods edit page
2020-05-28 19:50:58 +01:00
Luis Ramos
26f1dfb080
Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method
2020-05-28 19:50:58 +01:00
Luis Ramos
83edfbd1dd
Merge pull request #5266 from luchiago/improve-order-cancellation-email
...
Improve order cancellation email
2020-05-28 19:48:26 +01:00
Cillian O'Ruanaidh
1fba998b9e
Drop Blockenspiel and use :rules/:columns methods instead of :organise/:summary_columns DSL.
...
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3231
2020-05-28 19:04:18 +01:00
Pau Perez
9a29e634fc
Deal with Schedule creation in its own controller
...
This way it can assign the order cycles to the schedule when this is
persisted. An OrderCycleSchedule (the join table) can't be created until
both schedule and order_cycle got an id.
Also, we do not call `#adapt_params` when creating the Schedule as that
assigns `order_cycle_ids` to `@object.attributes` thus, attempting to
create the OrderCycleSchedule without a schedule_id.
2020-05-28 17:49:36 +02:00
Transifex-Openfoodnetwork
29f266d3a5
Updating translations for config/locales/tr.yml
2020-05-28 23:17:00 +10:00
Transifex-Openfoodnetwork
c428b2f133
Updating translations for config/locales/tr.yml
2020-05-28 23:07:06 +10:00
Pau Perez
06b7a95fb1
DRY duplicate subscription declaration
2020-05-28 14:00:53 +02:00
Matt-Yorkley
ea7a2c91ee
Update all locales with the latest Transifex translations
2020-05-28 13:12:12 +02:00
Matt-Yorkley
2ae84ad710
Merge pull request #5491 from openfoodfoundation/transifex
...
Transifex
2020-05-28 13:08:36 +02:00
dependabot-preview[bot]
8632383e60
Bump ddtrace from 0.35.2 to 0.36.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.35.2 to 0.36.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.35.2...v0.36.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-27 20:23:11 +00:00
Luis Ramos
6f0106251e
Move product-img css class to parent div so we can center align it and keep existing img styling
2020-05-27 19:16:31 +01:00
Pau Pérez Fabregat
3b4266cbc8
Merge pull request #5495 from luisramos0/byebug
...
Fix error in dependency requirement specification for byebug and pry-byebug
2020-05-27 08:54:32 +02:00
Pau Pérez Fabregat
22be41ebed
Merge pull request #5498 from mbudm/task/local_db_port_config
...
Add support for an env var to override DB port
2020-05-27 08:53:29 +02:00
Pau Pérez Fabregat
127e48e579
Merge pull request #5413 from luisramos0/edit_orders_mobile
...
Show order edit link on mobile instead of the cancel link
2020-05-27 08:51:41 +02:00
Pau Pérez Fabregat
4d3ae8fa53
Merge pull request #5439 from coopdevs/fix-misplaced-paragraph
...
[mobile ux] Fix misplaced paragraph in shop tab
2020-05-27 08:51:13 +02:00
Luis Ramos
7313e3c096
Merge pull request #5501 from luisramos0/grumpy_cat_take_2
...
Enterprises Controller: reset_distributor must be called before any call to memoized current_distributor
2020-05-26 23:06:59 +01:00
Transifex-Openfoodnetwork
d2e46b8561
Updating translations for config/locales/ca.yml
2020-05-27 00:32:12 +10:00
Transifex-Openfoodnetwork
8d3c8c62fb
Updating translations for config/locales/en_CA.yml
2020-05-27 00:02:52 +10:00
Transifex-Openfoodnetwork
daf9fab16d
Updating translations for config/locales/en_CA.yml
2020-05-26 23:59:48 +10:00
Matt-Yorkley
89dd7ddb86
Update setting of request headers in DFC controller spec
2020-05-26 15:32:07 +02:00
Matt-Yorkley
bde4acd22f
Update get calls in DFC controller spec
2020-05-26 15:21:02 +02:00
Matt-Yorkley
953e1f8ff4
Adjust z-index on overlapping elements to fix missing drop-shadow regression
2020-05-26 12:59:51 +02:00
Luis Ramos
52810b0f4a
Make enterprises controller spec assert the corrrect state of current_distributor
...
This validates bug #5496 is fixed
2020-05-26 11:26:20 +01:00
Luis Ramos
4026e072d5
Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor
2020-05-26 11:13:16 +01:00
Luis Ramos
a582261d7a
Merge pull request #5493 from luisramos0/display_on_4_managers
...
Make display_on attribute available for managers to change in shipping and payment methods
2020-05-26 09:57:56 +01:00
Pau Pérez Fabregat
c3f66203bb
Merge pull request #5497 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.2
...
Bump rack-mini-profiler from 2.0.1 to 2.0.2
2020-05-26 09:55:26 +02:00
Robin Klaus
50a63139e3
Changed translation syntax to normal t() call and lazy lookup.
2020-05-26 15:14:26 +10:00
Steve Roberts
d4a256fcca
Add support for an env var to override DB port
2020-05-26 11:04:42 +10:00
Steve Roberts
2bb3cf1c54
Name checkbox element id var more informatively
2020-05-26 09:53:51 +10:00
dependabot-preview[bot]
fc186f5342
Bump rack-mini-profiler from 2.0.1 to 2.0.2
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.1...v2.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-25 21:24:42 +00:00
Luis Ramos
513ee6393a
Make product modal display image on the right for medium screens like it was doing for large screens
2020-05-25 19:31:02 +01:00
Luis Ramos
1e0e3a063d
Add margin right to product modal title so that the close button doesnt overlap with it
2020-05-25 19:14:40 +01:00
Luis Ramos
50e4896e32
Fix error in dependency requirement specification
...
~> 11.0 allows upgrades to 11.1, we want to lock it to 11.0.x so we need ~> 11.0.0
Same logic for pry-byebug
2020-05-25 18:15:47 +01:00
Matt-Yorkley
8095371304
Ensure OpenStreetMap credits are aways shown with map and fix credits positioning for /groups page map display
2020-05-25 14:12:12 +02:00
Matt-Yorkley
a3660dfe37
Extract repeated map code to new partial
2020-05-25 14:04:11 +02:00
Matt-Yorkley
e03005ed56
Fix maps and tidy up groups map code
2020-05-25 13:52:56 +02:00
Luis Ramos
cb0aefd29c
Make display on attribute available for managers to change, not just super admins
2020-05-25 11:21:53 +01:00
Transifex-Openfoodnetwork
d9d221e4f3
Updating translations for config/locales/en_GB.yml
2020-05-25 18:46:48 +10:00
François Turbelin
b2b988b063
Apply new order directly inside service
2020-05-24 14:41:40 +02:00
Transifex-Openfoodnetwork
5de3fbba1e
Updating translations for config/locales/en_FR.yml
2020-05-24 19:14:49 +10:00
Transifex-Openfoodnetwork
ed27ed32e3
Updating translations for config/locales/fr.yml
2020-05-24 19:14:25 +10:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Kristina Lim
cf534237cd
Update all locales with the latest Transifex translations
2020-05-23 01:51:23 +08:00
Pau Pérez Fabregat
da88399ca6
Merge pull request #5411 from Matt-Yorkley/orders-closed-fullwidth
...
Fix closed shop message not displaying full-width
2020-05-22 19:32:08 +02:00
Pau Pérez Fabregat
a5b4c5316c
Merge pull request #5458 from Matt-Yorkley/oc-form-ui-bug
...
Fix display issue on order cycle edit form
2020-05-22 19:31:41 +02:00
Pau Pérez Fabregat
f1dbad1007
Merge pull request #5466 from Matt-Yorkley/shop-search-fix
...
Fix search bar in /shops and /groups
2020-05-22 18:40:27 +02:00
Pau Pérez Fabregat
17e77df14f
Merge pull request #5451 from Matt-Yorkley/oc-selector-fix
...
Fix tab-buttons element overlapping order cycle selector
2020-05-22 18:39:10 +02:00
Pau Pérez Fabregat
3f593d6246
Merge pull request #5440 from luisramos0/grumpy_cat
...
Fix Grumpy Cat on shop page (cart with items from a closed OC)
2020-05-22 18:38:41 +02:00
Pau Pérez Fabregat
72399cb6df
Merge pull request #5485 from luisramos0/byeby_phantom_js
...
Rename method refering to phantomjs
2020-05-22 18:37:28 +02:00
Pau Pérez Fabregat
ff0e85c877
Merge pull request #5486 from Matt-Yorkley/3-0-caching
...
[Spree 2.1] Caching
2020-05-22 18:36:49 +02:00
Pau Pérez Fabregat
b804036822
Merge pull request #5469 from openfoodfoundation/transifex
...
Transifex
2020-05-22 18:24:14 +02:00
Pau Perez
a33396984f
Fix and DRY specs
2020-05-22 18:17:59 +02:00
Pau Perez
d9686d6982
Enable spec files to be executed alone
...
This fixes the annoying error
```
NameError:
uninitialized constant OrderManagement::Subscriptions::Whatever
```
and let's you execute the spec file in isolation. It slows down way too
much having the run the entire engine test suite while developing. And
it makes me nervous too.
2020-05-22 15:55:03 +02:00
Transifex-Openfoodnetwork
88ab5c2dd7
Updating translations for config/locales/fr.yml
2020-05-22 23:31:48 +10:00
Transifex-Openfoodnetwork
466bbe52ae
Updating translations for config/locales/en_FR.yml
2020-05-22 23:29:08 +10:00
Luis Ramos
9a71ffc093
Merge pull request #5438 from Matt-Yorkley/cart-stock-ux
...
Cart stock UX
2020-05-22 14:21:16 +01:00
Matt-Yorkley
f0525b861c
Update expectations in API caching test
...
Rails 4 has slightly changed the format of the cache keys here, so the response was not as expected.
2020-05-22 14:54:57 +02:00
Pau Perez
e339a37cd5
Allow to create order_cycle_schedules
...
There's no way we can create an order_cycle_schedules if the schedule
doesn't have an id, which we can't get if to persist it we need an OC
first, which in turn, will create an order_cycle_schedules.
2020-05-22 14:22:31 +02:00
Matt-Yorkley
b00fbd69ae
Update Fragment Caching for Rails 4
...
Rails 4 introduced "automagically" modified cache keys, that included a digest in the key on any cache entry related to views. This is not what we want at all, fixed here with the `skip_digest: true` option.
2020-05-22 14:22:21 +02:00
Matt-Yorkley
a9abe48ede
Re-enable cache invalidation test
2020-05-22 14:21:45 +02:00
Matt-Yorkley
04ffe7b911
Fix expectations and mock responses for Rails 4
...
Mocking these objects is working differently in Rails 4, and utilising `#and_call_original` helped to ensure different parts of the codebase were receiving the correct response objects (AR relations, etc).
2020-05-22 14:21:45 +02:00
Pau Perez
be9fbae300
Fix misplaced paragraph in shop tab
...
By wrapping message within 12-cols container, keeping consistency with
the other shop tabs.
2020-05-22 12:37:07 +02:00
Luis Ramos
b7c601abcd
Merge pull request #5424 from luisramos0/ship_method_warning
...
Add warning to enterprise Shipping Method list and to Shipping method edit page
2020-05-22 11:24:12 +01:00
Luis Ramos
639c1e1ccc
Rename method, it's not phantomjs running underneath any more
2020-05-22 10:57:51 +01:00
Robin Klaus
53c0bcbd0b
Changed translation syntax to normal t() call and lazy lookup.
2020-05-22 13:22:57 +10:00
Luis Ramos
6fcca0197c
Merge pull request #5450 from rmklaus12/5095-ordercycle-amtqty-translations
...
Changed report_header fields for amount and quantity to reflect corre…
2020-05-21 21:21:14 +01:00
Luis Ramos
12f512e98b
Move arrow on OC selector a little to the right so it's centered between end of text (if max length reached) and border
2020-05-21 15:41:26 +01:00
Luis Ramos
b2bfe28173
Remove extra right pad on OC selector, in mobile, this will make the selector be centered
2020-05-21 15:38:55 +01:00
Luis Ramos
ed14a92c7b
Make OC selector wider to support more characters where there is enough space for that
2020-05-21 15:38:54 +01:00
Transifex-Openfoodnetwork
adb3c9e56f
Updating translations for config/locales/en_NZ.yml
2020-05-22 00:22:33 +10:00
Pau Pérez Fabregat
c6c9dcc345
Merge pull request #5478 from luisramos0/bundler1-17-3
...
Upgrade bundler, byebug and pry-byebug
2020-05-21 16:10:38 +02:00
Pau Pérez Fabregat
16dfb3c7e9
Merge pull request #5408 from luisramos0/columns_params
...
[Spree 2.1] Add missing permitted param to Column Preferences controller
2020-05-21 14:41:30 +02:00
Luis Ramos
6e6dab8f72
Merge pull request #5474 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.5
...
Bump activerecord-import from 1.0.4 to 1.0.5
2020-05-21 13:17:51 +01:00
Luis Ramos
574e4a02c0
Force pry to 0.12 so that it works well with pry-byebug 3.7
2020-05-21 13:10:59 +01:00
Luis Ramos
01eda90a00
Upgrade bundler, byebug and pry-byebug
2020-05-21 12:59:57 +01:00
Pau Pérez Fabregat
050e83e745
Merge pull request #5410 from luisramos0/fix_some_specs
...
[Spree 2] Make api/enterprises_controller_spec less flaky
2020-05-21 13:45:39 +02:00
Pau Pérez Fabregat
6851921e9d
Merge pull request #5443 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.14
...
Bump mini_racer from 0.2.11 to 0.2.14
2020-05-21 13:32:30 +02:00
Luis Ramos
8cdc9b82df
Merge pull request #5427 from luisramos0/jquery-ui-rails
...
Upgrade jquery-ui-rails to v4.2.1
2020-05-21 10:57:10 +01:00
Luis Ramos
2ae34d8df3
Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page
...
change shop name to be link to shop on transactions page
2020-05-21 10:56:19 +01:00
Luis Ramos
35b249f40d
Merge pull request #5390 from rmklaus12/fix-enyml-keys
...
Fix translation keys in en.yml file from previous conflicting PRs
2020-05-21 10:56:01 +01:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Luis Ramos
d017c0b701
Change base translation from applies to active so the naming is consistent: ship methods can be active or inactive for an enterprises which means they can be linked or not to that enterprise
2020-05-21 10:45:58 +01:00
Luis Ramos
cf0ad179a1
Move hubs_sidebar to the last 4 columns at the top of the page
2020-05-21 10:45:58 +01:00
Transifex-Openfoodnetwork
8bb47ef467
Updating translations for config/locales/en_NZ.yml
2020-05-21 16:43:58 +10:00
Maikel
da55956a6e
Merge pull request #5392 from luisramos0/ship_method_bo
...
Make "backoffice only" ship methods work and remove option "frontoffice only"
2020-05-21 10:16:15 +10:00
dependabot-preview[bot]
0e1ae03454
Bump activerecord-import from 1.0.4 to 1.0.5
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.4...v1.0.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-20 20:02:29 +00:00
Luis Ramos
e287680c1b
Merge pull request #5429 from mkllnk/5400-orders-distributors-report
...
5400 List each order only once in Orders And Distributors report
2020-05-20 20:36:58 +01:00
Matt-Yorkley
6b3a7228ce
Update flash message with instruction to update the quantities
2020-05-20 09:43:29 +02:00
Transifex-Openfoodnetwork
8387c71b6e
Updating translations for config/locales/tr.yml
2020-05-20 15:55:52 +10:00
Robin Klaus
16f2c8d7d1
Removed 5 keys per change request in ref to pr5425
2020-05-20 14:13:42 +10:00
Luis Ramos
76b721b663
Merge pull request #5457 from Matt-Yorkley/cart-fix
...
Fix cart fields sharing same scope
2020-05-19 19:31:49 +01:00
Luis Ramos
942dde62ff
Merge pull request #5464 from luisramos0/3-0-action-caching
...
[Spree 2.1] Add actionpack-action_caching gem to make action caching work again
2020-05-19 18:47:55 +01:00
Matt-Yorkley
3df2d4721b
Fix search bar in /shops and /groups
2020-05-19 14:00:20 +02:00
Luis Ramos
758d7c82f7
Rename order_cycle.accessible_by to remove name clash with active record
2020-05-19 12:21:13 +01:00
Luis Ramos
2e9f911958
Add actionpack-action_caching to support action caching
2020-05-19 12:06:24 +01:00
Matt-Yorkley
4a837e8c07
Fix display issue on order cycle form
...
Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.
2020-05-19 11:56:41 +02:00
Matt-Yorkley
05e6f5792d
Fix cart fields sharing same scope
...
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
2020-05-19 10:23:12 +02:00
Matt-Yorkley
e54fad9bfd
Add spec for maximum quantities with multiple items in cart
...
This currently fails
2020-05-19 10:21:24 +02:00
Steve Roberts
446bf268b4
scroll_to substitute
2020-05-19 14:16:45 +10:00
Lucas Hiago
ba30f55e70
Add fullwidth for table selector
2020-05-18 22:53:46 -03:00
Maikel Linke
2d95e9ebc0
List each order only once in report
2020-05-19 10:38:28 +10:00
Maikel Linke
19f7f04816
Add spec for report bug
2020-05-19 10:38:28 +10:00
Maikel Linke
359fd1ac98
Improve readability of report spec
2020-05-19 10:38:28 +10:00
Steve Roberts
049b1b4638
Split up the specs again.
...
This now shows that there is one consistent spec erroring, spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb:
Capybara::ElementNotFound:
Unable to find visible checkbox "order_cycle_incoming_exchange_0_select_all_variants" that is not disabled
2020-05-19 10:14:26 +10:00
Eduardo
6d54e6d4a0
change SearchOrders service to search with shipping_method
2020-05-18 20:44:55 -03:00
Eduardo
473b4c63c4
add Shipping Method filter to admin/orders page
2020-05-18 18:46:43 -03:00
Matt-Yorkley
e3c337ef7e
Fix mixed error display issue
2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc
Use fresh scope for each quantity field
2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082
Move reused available stock logic to service
2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799
Update invalid input feedback
2020-05-18 16:14:14 +02:00
Luis Ramos
d1eebe1cfb
Merge pull request #5426 from luisramos0/3-0-stable-may13
...
[Spree 2.1] Merge master into 3-0-stable
2020-05-18 15:05:11 +01:00
Matt-Yorkley
f7b4717f29
Improve validation code
2020-05-18 14:51:11 +02:00
Matt-Yorkley
fe27c8466e
Add feature specs for full cart page stock correction process
2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4
Update cart page links to be disabled when changes are required and form is unsaved
...
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432
Fix tab-buttons element overlapping order cycle selector
2020-05-18 14:27:05 +02:00
Matt-Yorkley
3a46f32aa3
Merge pull request #5435 from openfoodfoundation/transifex
...
Transifex
2020-05-18 13:44:32 +02:00
Luis Ramos
ea8157a5c6
Merge pull request #5304 from dacook/5299-orders-filter-several-tags
...
5299 Impossible to filter orders with several tags
2020-05-18 11:25:54 +01:00
Luis Ramos
37350fcbb0
Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query
2020-05-18 10:55:03 +01:00
Luis Ramos
05136b51d1
Merge pull request #5356 from rmklaus12/4534-mobile-searchkey
...
Changed search input to inputmode to enable 'go' button on dynamic mo…
2020-05-18 10:30:56 +01:00
Robin Klaus
311bbd2aa2
Changed report_header fields for amount and quantity to reflect correct translation to French
2020-05-18 18:41:04 +10:00
Robin Klaus
a0334953db
Added 14 translation keys for PayPalExpress payment method
2020-05-18 17:06:07 +10:00
Transifex-Openfoodnetwork
d2b8b5e888
Updating translations for config/locales/pt_BR.yml
2020-05-18 05:14:19 +10:00
Luis Ramos
6c81c19f00
Remove dead code
2020-05-16 14:19:25 +01:00
Robin Klaus
438c0ecde9
delete extra lines
2020-05-16 20:12:54 +10:00
Robin Klaus
ba8ecf19ac
Added input code to two additional pages to cover shop tab search boxes
2020-05-16 12:56:06 +10:00
dependabot-preview[bot]
f4afc8ffcd
Bump mini_racer from 0.2.11 to 0.2.14
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.11 to 0.2.14.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.11...v0.2.14 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-15 19:20:08 +00:00
Luis Ramos
ace73be4e2
Add unit tests to order_cart_reset
2020-05-15 20:05:45 +01:00
Luis Ramos
1c749a8029
Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles
2020-05-15 19:36:59 +01:00
Luis Ramos
f22eae752d
Adapt spec to validate issue #5340
2020-05-15 19:30:01 +01:00
Luis Ramos
a438317d69
Extract order_cart_reset service from enterprises_controller
2020-05-15 19:30:00 +01:00
Luis Ramos
35824c7aa1
Rename restartCheckout to order_checkout_restart to make it follow service naming convention
2020-05-15 19:29:37 +01:00
Luis Ramos
ba585064e1
Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders
2020-05-15 19:29:37 +01:00
Luis Ramos
21d1a7bc04
Remove dead code
2020-05-15 19:29:37 +01:00
Luis Ramos
6827ce5c7f
Refactor order.set_order_cycle, return early and remove indentation
2020-05-15 19:29:37 +01:00
Luis Ramos
493adc8b1f
Fix problem in spec where wrong enterprise was being used
2020-05-15 19:29:37 +01:00
Luis Ramos
94bb95861b
If selected OC is not in the available OCs, empty the order
2020-05-15 19:29:35 +01:00
Lucas Hiago
98cbe5762a
Remove unused css property from image in cancel email
2020-05-15 10:59:56 -03:00
Lucas Hiago
0caa91d057
Remove second table of cancel email instructions style
2020-05-15 10:59:56 -03:00
Lucas Hiago
5d286cb349
Add i18n of new symbols for order cancel mail
2020-05-15 10:59:56 -03:00
Lucas Hiago
f72da4abe4
Add refund message in order cancel mail
2020-05-15 10:59:56 -03:00
Lucas Hiago
42012d6482
Add new order sumary in order cancel mail
2020-05-15 10:59:55 -03:00
Lucas Hiago
1c1200125e
Add new greeting table in order cancel mail
2020-05-15 10:59:55 -03:00
Lucas Hiago
0b8771ccf0
Add connect with us footer to order cancelation email
2020-05-15 10:59:55 -03:00
Luis Ramos
52e7ca2417
Select first default OC only if no OC is already selected
2020-05-15 14:26:56 +01:00
Luis Ramos
c3f0c0ed7f
Extract method to prepare work ahead
2020-05-15 14:25:20 +01:00
Transifex-Openfoodnetwork
4f14d7910a
Updating translations for config/locales/en_IE.yml
2020-05-15 23:04:12 +10:00
Pau Pérez Fabregat
5c7541e63d
Merge pull request #5415 from openfoodfoundation/dependabot/bundler/bugsnag-6.13.1
...
Bump bugsnag from 6.13.0 to 6.13.1
2020-05-15 13:47:46 +02:00
Matt-Yorkley
c2efa901c2
Don't highlight update button when form is invalid
2020-05-15 13:38:17 +02:00
Luis Ramos
4292636e70
Remove close button in product modal
2020-05-15 12:16:19 +01:00
Luis Ramos
d95b2a97b0
Add missing padding above close button (both for the case with image or just with text) and also below product image
2020-05-15 12:12:07 +01:00
Luis Ramos
edaf419857
Use rem instead of px or em
2020-05-15 12:12:07 +01:00
Luis Ramos
38bc076c77
Fix some rubocop issues
2020-05-15 12:12:07 +01:00
Luis Ramos
30fe457cb5
Make product modal show close button only if there is a scroll bar
2020-05-15 12:12:07 +01:00
Luis Ramos
e239bb33f8
Improve the mobile cookies policy modal with a margin
2020-05-15 12:12:07 +01:00
Luis Ramos
3a512478d6
Improve the mobile registration modal by adding a margin
2020-05-15 12:12:07 +01:00
Luis Ramos
4b63893377
Improve mobile login modal with a margin
2020-05-15 12:12:07 +01:00
Luis Ramos
50fa4fc93d
Make modal close buttons a little darker with a white cross
2020-05-15 12:12:07 +01:00
Luis Ramos
cbfaaabb72
Adjust different paddings and margins to make mobile product modal contents similar to required design
2020-05-15 12:12:07 +01:00
Luis Ramos
0a378a897b
Add close button to mobile product modal, this can be reused in other modals later
2020-05-15 12:12:07 +01:00
Luis Ramos
35ac5e093e
Adapt modal size to leave some background visible so that user can click to disable modal
2020-05-15 12:12:07 +01:00
Luis Ramos
39e47998e1
Make the background opacity of modals in the FrontOffice a litle darker according to design
2020-05-15 12:12:07 +01:00
Luis Ramos
14478d5fc1
Style producer name and properties in product modal
2020-05-15 12:12:07 +01:00
Luis Ramos
59a13adff0
Remove product category from product modal
2020-05-15 12:11:32 +01:00
Luis Ramos
fee03c4101
Remove repeated/dead rules
2020-05-15 12:11:32 +01:00
Luis Ramos
9a115afd4f
Remove bars around product description and border around product image
2020-05-15 12:11:32 +01:00
Matt-Yorkley
3ba1182661
Dynamically mark quantity field as invalid when stock is incorrect
2020-05-15 12:59:29 +02:00
Matt-Yorkley
42195b76d3
Highlight update button when cart page form is "dirty"
2020-05-15 12:59:29 +02:00
Matt-Yorkley
73b533690e
Refactor cart update button syntax
2020-05-15 12:59:29 +02:00
Matt-Yorkley
78f736db45
Add red border on quantity field when it must be updated
2020-05-15 12:59:28 +02:00
Luis Ramos
367de87c61
Upgrade jquery-ui-rails to v4.2
2020-05-15 08:58:40 +01:00
Luis Ramos
4fe1135a33
Merge pull request #5376 from rmklaus12/5104-mobile-keyboard-inputs
...
Added inputmode attribute to show appropriate mobile keyboard for sel…
2020-05-15 08:49:42 +01:00
Transifex-Openfoodnetwork
78db7e0e5f
Updating translations for config/locales/en_GB.yml
2020-05-15 17:36:21 +10:00
David Cook
b4228e8cdd
5299 Remove unnecessary comments
2020-05-15 15:11:26 +10:00
David Cook
f5629d59b0
5299: Add trailing square brackets for array parameters (distributor and order_cycle)
2020-05-15 15:04:01 +10:00
David Cook
8a2c65b6bb
Remove duplicate line
2020-05-15 15:04:01 +10:00
David Cook
79df4868de
5299: Unit and feature test for filtering by multiple order cycles
2020-05-15 15:04:01 +10:00
Maikel Linke
51feef83ca
Update translations from Transifex
2020-05-15 14:10:36 +10:00
Maikel
90baec0e2c
Merge pull request #5393 from openfoodfoundation/transifex
...
Transifex
2020-05-15 13:53:56 +10:00
Maikel
d566051e7d
Merge pull request #5432 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.11
...
Bump mini_racer from 0.2.10 to 0.2.11
2020-05-15 11:20:46 +10:00
Maikel
6c409d6c70
Merge pull request #5380 from ckhung5/5201-fix-missing-jquery-ui
...
Update jquery-ui-rails version to 4.1.1
2020-05-15 11:11:36 +10:00
dependabot-preview[bot]
4613502707
Bump bugsnag from 6.13.0 to 6.13.1
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.13.0 to 6.13.1.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.13.0...v6.13.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-14 21:04:00 +00:00
dependabot-preview[bot]
3bc09cfcfb
Bump stripe from 5.15.0 to 5.22.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 5.15.0 to 5.22.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.15.0...v5.22.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-14 21:03:21 +00:00
dependabot-preview[bot]
99ab7688b6
Bump mini_racer from 0.2.10 to 0.2.11
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.10 to 0.2.11.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.10...v0.2.11 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-14 20:36:44 +00:00
Luis Ramos
644c65b124
Merge pull request #5430 from coopdevs/make-logger-spec-more-reliable
...
Make JobLogger spec more reliable
2020-05-14 14:33:52 +01:00
Pau Perez
403e1d317d
Make JobLogger spec more reliable
...
This will hopefully fix our bild. I believe that the underlying issue is
that the logger's test double gets leaked into other examples, as RSpec
tells when running `spec/jobs/` specs.
```
5) SubscriptionPlacementJob performing the job when unplaced proxy_orders exist processes placeable proxy_orders
Failure/Error: JobLogger.logger.info("Placing Order for Proxy Order #{proxy_order.id}")
#<InstanceDouble(Logger) (anonymous)> was originally created in one example but has leaked into another example and can no longer be used. rspec-mocks' doubles are designed to only last for one example, and you need to create a new one in each example you wish to use it for.
# ./app/jobs/subscription_placement_job.rb:31:in `place_order_for'
```
Read more: https://relishapp.com/rspec/rspec-mocks/v/3-4/docs/basics/scope#doubles-cannot-be-reused-in-another-example
For whatever reason the JobLogger keeps its `.logger` being stubbed
after this spec.
2020-05-14 13:51:57 +02:00
Transifex-Openfoodnetwork
bd8b3f11d1
Updating translations for config/locales/en_FR.yml
2020-05-14 05:42:38 +10:00
Transifex-Openfoodnetwork
937c981dd8
Updating translations for config/locales/fr.yml
2020-05-14 05:41:55 +10:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2
Merge pull request #5377 from manvil/1782_enterprise_at_same_address
...
Handling multiple enterprises at the same location
2020-05-13 19:31:14 +01:00
Luis Ramos
1671184a3c
Merge pull request #5375 from luisramos0/sample_order
...
[Spree 2.1] OFN v3 comes with sample orders :-)
2020-05-13 12:04:06 +01:00
Luis Ramos
be998a9eb6
Reload shipment before shipping otherwise shipment stays as ready but with shipped_at defined
2020-05-13 12:00:37 +01:00
Transifex-Openfoodnetwork
9b7de5ee6e
Updating translations for config/locales/en_NZ.yml
2020-05-13 19:27:55 +10:00
Luis Ramos
ef2d7f9485
Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
...
[mobile ux] Merge search and filter epic to master
2020-05-13 08:59:32 +01:00
Luis Ramos
58842e8cab
Show order edit link on mobile instead of the cancel link
2020-05-12 19:44:01 +01:00
Matt-Yorkley
598071fa78
Remove conflicting "clear search" buttons added by Chrome
2020-05-12 18:59:15 +02:00
Matt-Yorkley
70e3f0f1f1
Fix closed shop message not displaying full-width
2020-05-12 18:29:48 +02:00
Matt-Yorkley
265a8ed573
Move messages and products form outside of row and columns to enable full-width
2020-05-12 18:24:10 +02:00
Luis Ramos
83381ad439
Relax array order verification
2020-05-12 15:46:23 +01:00
Luis Ramos
7804c740a6
Add name to permitted params and fix some rubocop issues
2020-05-12 15:35:47 +01:00
Luis Ramos
41645e8351
Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file
...
Output logs in Delayed Job's log file
2020-05-12 10:05:26 +01:00
Luis Ramos
5f4882fc32
Merge pull request #5403 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.2
...
Bump ddtrace from 0.35.1 to 0.35.2
2020-05-12 08:39:26 +01:00
dependabot-preview[bot]
1114e062b5
Bump ddtrace from 0.35.1 to 0.35.2
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.35.1 to 0.35.2.
- [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.35.1...v0.35.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-11 22:07:52 +00:00
Luis Ramos
dcd097a22e
Merge pull request #5231 from pacodelaluna/add-dfc-provider-engine
...
Add DFC Provider engine
2020-05-11 20:27:21 +01:00
Matt-Yorkley
ab143ceaed
Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report
...
Change date displayed on sales_tax reports
2020-05-11 09:56:38 +02:00
Matt-Yorkley
0cd4ad0a1a
Ensure large amount of search text doesn't break layout with clear all button
2020-05-10 09:44:12 +02:00
Matt-Yorkley
9f882a8674
Ensure search results feedback wraps nicely onto next line
2020-05-10 09:44:12 +02:00
Matt-Yorkley
cb9c56d8aa
Ensure correct left-alignment on text in search results feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
dee793a392
Change join word between the two filter sets to be "and", to match the actual logic
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7e6683581a
Remove full stop from translation
...
This doesn't fit with the new syntax structure
2020-05-10 09:44:12 +02:00
Matt-Yorkley
b78976fcd7
Ensure consistent styling in both "no results" and "searching for" text
2020-05-10 09:44:12 +02:00
Matt-Yorkley
82b11d6947
Ensure join words are not bold
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a75d3276a4
Include applied filters list in "no results" feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a1435e78c9
Extract applied filters feedback to partial
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7be85d1dab
Use bold font with teal colour for both applied taxons and applied properties
2020-05-10 09:44:12 +02:00
Matt-Yorkley
483a654d31
Add join word "or" when both categories and properties are present
...
Previously for example with "Organic" property and "Fruit" and "Nuts" categories it rendered as: "Fruit or Nuts Organic" instead of: "Fruit or Nuts or Organic"
2020-05-10 09:44:12 +02:00
Matt-Yorkley
f6b910b38a
Fix clear search (x) button position on some layouts
...
Hopefully this will work on iPhones as well...?
2020-05-10 09:44:12 +02:00
Matt-Yorkley
ea06ec7ede
Remove smaller (less than 1em) scaling in search bar on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
07ac7dd9c7
Add explicit 'search' input type to search field.
...
In theory this should improve some of the custom-keyboard functionality added by mobiles, but the implementations will be vary...
2020-05-10 09:44:12 +02:00
Matt-Yorkley
71fb3b1845
Focus search field after it's cleared, ready for immediate typing of new search term on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
e0cb514cad
Add hover state to filters button with darker background
2020-05-10 09:44:12 +02:00
Matt-Yorkley
5ceaff24e9
Darken overlay background colour to reduce distraction
2020-05-10 09:44:11 +02:00
Matt-Yorkley
a7771a20c4
Adjust border-radius on filters button
2020-05-10 09:44:11 +02:00
Matt-Yorkley
03afae01b3
Decrease sidebar width on mobile for more tapping space
2020-05-10 09:44:11 +02:00
Matt-Yorkley
96c6da304a
Increase margin between filter selectors
2020-05-10 09:44:11 +02:00
Matt-Yorkley
2964ec138d
Update display of join words in filters list and rearrange code a bit for clarity
...
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.
$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
14d928c39d
Fix feature specs where UI has changed
2020-05-10 09:44:11 +02:00
Matt-Yorkley
6b66787004
Update "no results" layout on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4
Update "no results" styling
2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465
Update styling on search feedback bar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
026b98022c
Add clear search button in shop searchbar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff69389bb0
Make search bar "sticky" for tablets and mobile
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f24969edb1
Remove gutter padding on shop content to gain a bit more horizontal real-estate
2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbb67e15ed
Extract button styles
2020-05-10 09:44:11 +02:00
Matt-Yorkley
865dcf79cb
Extract some properties to variables
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ebe00bdc31
Update filters clear button functionality
2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0
Add missing translation key
2020-05-10 09:44:11 +02:00
Matt-Yorkley
d1ea2c5f77
Extract shop searchbar styles to separate file
2020-05-10 09:44:11 +02:00
Matt-Yorkley
035bde9eff
Define breakpoints in mixin and refactor
2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbd77b4941
Improve element sizing and position on small screens
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f337fd49e1
Extract search feedback bar into partial and move into main column
2020-05-10 09:44:11 +02:00
Matt-Yorkley
e25e4e7482
Fix issue with button submitting form instead of opening popup
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff07b97033
Add sidebar footer and buttons
...
Also includes a minor refactor to resolve an issue with animation timings. Angular was not adding the "shown" class to the different elements at the same time in the digest cycle, and it looked a bit shaky.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
94145d0f7e
Improve layout and sizing on mobile
2020-05-10 09:44:11 +02:00
Matt-Yorkley
da1d8e90e2
Update search placeholder
2020-05-10 09:44:11 +02:00
Matt-Yorkley
7c00d41fc4
Add some animation effects
2020-05-10 09:44:11 +02:00
Matt-Yorkley
8e9833fd06
Implement overlaid sidebar on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f43bf3880c
Add filters button on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
142cef3f3a
Add filters count
2020-05-10 09:44:11 +02:00
Matt-Yorkley
0d9f049d24
Add inner icon and restyle search input element
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f46ca0c595
Move search to new searchbar
...
This required a lot of refactoring, as the search needed to be inside both the form element and the Angular ProductsCtrl element, but to get a full-width row for the searchbar it needed to be outside of the 12 column layout of the other shop page elements...
2020-05-10 09:44:11 +02:00
Matt-Yorkley
532e27b7e1
Move filters into new column on desktop
2020-05-10 09:37:56 +02:00
Matt-Yorkley
3ca491683a
Merge pull request #5317 from Matt-Yorkley/caching-timed-shops
...
[Caching] Timed caching on shops data
2020-05-09 15:33:26 +02:00
Transifex-Openfoodnetwork
644d06fb08
Updating translations for config/locales/en_FR.yml
2020-05-09 18:41:29 +10:00
Transifex-Openfoodnetwork
3044e62d8b
Updating translations for config/locales/fr.yml
2020-05-09 18:06:16 +10:00
Pau Pérez Fabregat
b85e439b0e
Merge pull request #5395 from coopdevs/skip-broken-spec
...
Skip unreliable caching test
2020-05-08 17:11:12 +02:00
Pau Perez
fa8c1270ce
Skip unreliable caching test
...
This spec failed two times in a row and it's blocking the release.
2020-05-08 16:37:30 +02:00
Pau Pérez Fabregat
09caf88b6c
Merge pull request #5396 from coopdevs/fix-brittle-test
...
Make test not depend on response's order
2020-05-08 16:37:06 +02:00
Pau Perez
b99bcc3c12
Make test not depend on response's order
...
I'm assuming this is failing in CI due to the order in which the closed
shops are returned.
2020-05-08 15:56:20 +02:00
Transifex-Openfoodnetwork
296a927900
Updating translations for config/locales/en_FR.yml
2020-05-08 22:49:17 +10:00
Transifex-Openfoodnetwork
32ead7b6b7
Updating translations for config/locales/fr.yml
2020-05-08 22:49:02 +10:00
Luis Ramos
0a6bd1424c
Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only
...
Adding both unit and feature tests as this is important enough for that
2020-05-08 12:59:17 +01:00
Luis Ramos
34d8b1957e
Improve variable names
2020-05-08 12:42:32 +01:00
Luis Ramos
40dd307a35
Remove shipping method display on front_end option, it is not working and it's not straight forward to make it work correctly
2020-05-08 12:00:58 +01:00
Transifex-Openfoodnetwork
4485dcd7fe
Updating translations for config/locales/en_GB.yml
2020-05-08 20:57:56 +10:00
Pau Perez
ad70a63370
Update all locales with the latest Transifex translations
2020-05-08 12:01:42 +02:00
Pau Pérez Fabregat
60470aaf9f
Merge pull request #5332 from coopdevs/add-timestamps-to-oc-schedule
...
Add timestamps to OC schedule join table
2020-05-08 10:51:43 +02:00
Pau Pérez Fabregat
2cf407ce35
Merge pull request #5349 from openfoodfoundation/transifex
...
Transifex
2020-05-08 10:20:07 +02:00
Pau Pérez Fabregat
c38c59b0b9
Merge pull request #5223 from luisramos0/def_user
...
Change default user from spree@example.com to ofn@example.com ❤️
2020-05-08 09:51:31 +02:00
Luis Ramos
424932d61b
Merge pull request #5262 from luisramos0/closed_shop_msg
...
[Mobile] Improve the design of shop page messages (closed shop, private shop and select OC)
2020-05-08 07:52:58 +01:00
Robin Klaus
aa46aec935
Fix translation keys in en.yml file from previous conflicting PRs
2020-05-08 13:21:47 +10:00
Kok Hung Cheah
19d5bcb150
Upgrade jquery-ui-rails to 4.1.2 instead of 4.1.1
2020-05-08 09:54:10 +10:00
Matt-Yorkley
5518ffa856
Ensure validations are called when updating attributes in test
2020-05-07 19:37:43 +02:00
Luis Ramos
dd5041db65
Remove unnecessary default user email and pwd from docker setup
...
These are now the default values in the app
2020-05-07 18:18:42 +01:00
Luis Ramos
052dbca1ba
Merge pull request #5370 from Matt-Yorkley/dont-render-twice
...
Don't render twice
2020-05-07 18:15:47 +01:00
Matt-Yorkley
86bfd1bebb
Add explanatory comments on usages of Timecop.travel
2020-05-07 17:29:58 +02:00
Pau Perez
ee94101edd
Log subs jobs to DJ's log file
...
There's a bunch of logging bits we need to find out what happened in
`#5294`, the first of which is logging as we are used to for Rails
itself. Turns out we were already logging but the log lines weren't
displayed.
That's because workers have no access to the Rails logger unless we hack
things a bit in the config/initializer. If we want to keep DJ's logs in
a different file, which I think is good for debugging purposes, we need
to diverge from Rails.logger.
However, there's no access to Delayed::Worker.logger in custom job
classes either so there's no way other than mimicking that logger's format
if we want log lines to be consistent.
Now the current logs will see the light like:
```
2020-05-07T14:09:42+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) RUNNING
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 1
2020-05-07T14:09:42+0000: Issue in Subscription Order 2: complete
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 7
2020-05-07T14:09:42+0000: Issue in Subscription Order 3: complete
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) COMPLETED after 0.3378
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] 1 jobs processed at 2.8054 j/s, 0 failed
```
We'll see if we need to format these messages differently to make them
more greppeable.
2020-05-07 17:21:39 +02:00
Luis Ramos
468576ee8a
Merge pull request #5329 from romale/master
...
Correct translations
2020-05-07 16:04:24 +01:00
Luis Ramos
c9b60d0f62
Merge pull request #5341 from mathewdbutton/5173-show-outstanding-order-balance-on-orders-page
...
Show outstanding balance on orders page
2020-05-07 16:03:58 +01:00
Luis Ramos
52b39d04a4
Merge pull request #5359 from mbudm/issue/5108
...
Add NavigationCheck to order cycles edit form
2020-05-07 14:37:32 +01:00
Matt-Yorkley
01d741509f
Fix test of rendered properties AMS
...
Here the displayed properties that we're testing also rely on shops data (including the list of supplied properties), which is now cached for 15 seconds. We clear that cache entry so we can cleanly test only the caching of the properties AMS array.
2020-05-07 15:20:37 +02:00
Manvil George
63a1a6fefa
More optimsations: removing unwanted code
2020-05-07 22:58:09 +10:00
Luis Ramos
66fe26fcc5
Merge pull request #5295 from Matt-Yorkley/shopfront-optimising
...
Enterprise serializer optimisations
2020-05-07 13:08:14 +01:00
Matt-Yorkley
460ab6cdb4
Use #allow instead of #stub
2020-05-07 13:20:30 +02:00
Matt-Yorkley
7457543c2b
Adds spec for timed caching on shops data
2020-05-07 13:20:30 +02:00
Matt-Yorkley
6b6ab864ef
Improve comment on Fragment Caching
2020-05-07 13:20:30 +02:00
Matt-Yorkley
e73c8232de
Improve unit test in cache_service_spec
2020-05-07 13:20:30 +02:00
Matt-Yorkley
37821beb1b
Extract home stats caching to method in service
2020-05-07 13:20:30 +02:00
Matt-Yorkley
2292cbaae4
Extract timed enterprise AMS fragment caching options to service
2020-05-07 13:20:28 +02:00
Luis Ramos
987347d5ab
Move translation keys to new correct location
2020-05-07 12:18:40 +01:00
Luis Ramos
3c7970f72f
Add select oc message when there are multiple OCs
2020-05-07 12:18:40 +01:00
Luis Ramos
d4980893a1
Refactor darker-background directive, extract method
2020-05-07 12:17:43 +01:00
Luis Ramos
0d6d071db2
Remove dead class .shopfront_hidden_message
2020-05-07 12:17:43 +01:00
Luis Ramos
cba9382230
Replace line-height with margin
2020-05-07 12:17:43 +01:00
Luis Ramos
7fcee0fe6d
Fix problem in warning sign
2020-05-07 12:17:43 +01:00
Luis Ramos
f3347a8e16
Make teal links appear only when the darker background is activated
...
This way links in producers, about, etc, where the background is white will still appear as orange, as per design
2020-05-07 12:17:43 +01:00
Luis Ramos
782988b61c
Fix with-darker-background class by moving it inside page-view selector and using opacity instead of just grey so that other elements in the page (shadow from element above) can be seen
2020-05-07 12:17:43 +01:00
Luis Ramos
21a1ba2fb5
Move translation keys according to new location in the customer_required partial
2020-05-07 12:17:43 +01:00
Luis Ramos
ba25986756
Fix some css rubocop issues
2020-05-07 12:17:43 +01:00
Luis Ramos
098ad6f250
Merge partial messages back to home partial where it is only used
2020-05-07 12:17:43 +01:00
Luis Ramos
319657d2c5
Move closed shop partial to /messages
2020-05-07 12:17:43 +01:00
Luis Ramos
eb773a813e
Extract open shop message to partial
2020-05-07 12:17:43 +01:00
Luis Ramos
5dedbc4231
Extract customer_required message to separate partial
2020-05-07 12:17:43 +01:00
Luis Ramos
84c00fe215
Remove duplicate conditionals already present in ShopHelper#shop_tabs, when these partials are rendered, these conditions will always be true
...
In the shops partial, by adding the else, we avoid rendering empty space with an empty
products list in case the shop is closed
2020-05-07 12:17:43 +01:00
Luis Ramos
77d7d2b804
Make the background darker only in specific cases
2020-05-07 12:17:43 +01:00
Luis Ramos
b34fb79d69
Move content div to messages partial so that it's not used in the closed shop message (no margin according to design)
2020-05-07 12:17:43 +01:00
Luis Ramos
1c41061f9e
If shop is closed show closed shop message partial in the home tab
2020-05-07 12:17:43 +01:00
Luis Ramos
b86081090f
Extract closed shop message to a partial
2020-05-07 12:17:43 +01:00
Luis Ramos
dbdbe01d6a
Add new style to closed shop message
2020-05-07 12:17:43 +01:00
Luis Ramos
0996c28c09
Memoize helper methods that are called several times in the views
2020-05-07 12:17:43 +01:00
Luis Ramos
5f70ef6e75
Improve style of closed shop message and remove border from message
2020-05-07 12:17:43 +01:00
Luis Ramos
e0b3e9a040
Remove border of message and paddings, add background color, change link color and split message in two lines
2020-05-07 12:17:43 +01:00
Matt-Yorkley
2876b98155
Use time-based caching on rendered AMS data for shops
2020-05-07 13:11:53 +02:00
Matt-Yorkley
545ca85644
Extract caching of homepage stats to service
2020-05-07 13:11:28 +02:00
Luis Ramos
c64ba75e8d
Merge pull request #5348 from luisramos0/single_oc_selector
...
Replace select box with text when only one OC is available for selection
2020-05-07 12:07:19 +01:00
Luis Ramos
56b9737676
Merge pull request #5343 from luisramos0/windows
...
Make OC selector options color explicitly gray and not white
2020-05-07 11:44:14 +01:00
Luis Ramos
d967d855fc
Merge pull request #5319 from Matt-Yorkley/caching-by-class
...
[Caching] Caching data by class
2020-05-07 11:43:44 +01:00
Luis Ramos
1e9b4516cb
Merge pull request #5318 from Matt-Yorkley/caching-api
...
[Caching] API Action Caching on shop filters
2020-05-07 11:42:52 +01:00
Transifex-Openfoodnetwork
ffebaee9c7
Updating translations for config/locales/tr.yml
2020-05-07 17:34:22 +10:00
Manvil George
a629e1ecb7
Remove incorrect commenting
2020-05-07 11:46:49 +10:00
Manvil George
d7cf825531
Minimised version of the svg
2020-05-07 11:33:35 +10:00
Manvil George
585a754b18
Missed out on inverting the boolean expression
2020-05-07 11:31:27 +10:00
Kok Hung Cheah
edcdae6b58
Update jquery-ui-rails version to 4.1.1
2020-05-07 10:48:07 +10:00
Manvil George
d3504c177e
A better SVG
2020-05-07 10:40:48 +10:00
Manvil George
7123d8347a
XML Formatted The SVG
2020-05-07 09:50:27 +10:00
Manvil George
7847c4ed9e
Removing unwanted blank lines
2020-05-07 09:37:35 +10:00
Manvil George
5b009f606a
More optimizations around coding standards
2020-05-07 09:07:32 +10:00
Luis Ramos
066f978c59
Update ruby version in GETTING_STARTED
2020-05-06 22:19:43 +01:00
François Turbelin
d5b69ec90c
Remove before call when no factorization
2020-05-06 22:04:56 +02:00
François Turbelin
13f00480ce
Use serialized_data
2020-05-06 22:04:56 +02:00
François Turbelin
f6e06b5658
Use default enterprise_id to get the entreprise
2020-05-06 22:04:56 +02:00
François Turbelin
99798b010f
Use ActionController::Base
2020-05-06 22:04:56 +02:00
François Turbelin
43293f00df
Make the endpoint unrelated to enterprise id
...
Better to avoid to have endpoint specific to an enterprise
as we don't know the enterprise id yet on DFC side
2020-05-06 22:04:56 +02:00
François Turbelin
f0f8224934
Put back former lighter inclusions
2020-05-06 22:04:56 +02:00
François Turbelin
013198b33b
Update routes
2020-05-06 22:04:56 +02:00
François Turbelin
830bf796d0
Update authors and remove emails
2020-05-06 22:04:56 +02:00
François Turbelin
dd9c994f9d
Use spree_api_controller_setup layer
2020-05-06 22:04:56 +02:00
François Turbelin
c1d173d601
Add the access token logic, light version
2020-05-06 22:04:56 +02:00
François Turbelin
a8fb059482
Add basic spec
2020-05-06 22:04:56 +02:00
François Turbelin
496174255f
Add REAME.md file
2020-05-06 22:04:56 +02:00
François Turbelin
80bbd5d513
Adjust namespace and scope for routes
2020-05-06 22:04:56 +02:00
François Turbelin
b152e532d2
Cosmetics
2020-05-06 22:04:56 +02:00
François Turbelin
d9d218f661
Add DFC Provider engine
2020-05-06 22:04:56 +02:00
Luis Ramos
d1392d400a
Merge pull request #5350 from luisramos0/edit_order_snail
...
Improve order edit page in data inconsistency scenario (follow up from S2 #4186 )
2020-05-06 20:33:40 +01:00
Luis Ramos
20984ac008
Merge pull request #5379 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.1
...
Bump ddtrace from 0.35.0 to 0.35.1
2020-05-06 20:31:20 +01:00
dependabot-preview[bot]
7f9dfb6142
Bump ddtrace from 0.35.0 to 0.35.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.35.0 to 0.35.1.
- [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.35.0...v0.35.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-06 19:20:07 +00:00
Transifex-Openfoodnetwork
6c71259b25
Updating translations for config/locales/en_FR.yml
2020-05-07 03:10:34 +10:00
Transifex-Openfoodnetwork
29a54cbfe4
Updating translations for config/locales/fr.yml
2020-05-07 03:10:22 +10:00
Manvil George
bf3bb4fb63
Review Comments incorporation
2020-05-07 00:54:01 +10:00
Transifex-Openfoodnetwork
05820c7ef0
Updating translations for config/locales/tr.yml
2020-05-07 00:14:33 +10:00
Transifex-Openfoodnetwork
492f96c90f
Updating translations for config/locales/tr.yml
2020-05-07 00:11:28 +10:00
Pau Pérez Fabregat
ace3767eb2
Merge pull request #5333 from coopdevs/add-worker-docker-container
...
Create a container to run a DJ worker in dev
2020-05-06 16:11:21 +02:00
Luis Ramos
c7c8bfe212
Merge pull request #5347 from luisramos0/hide_oc_selector_for_private_shop
...
[Mobile] Hide OC selector if shop requires login/customer
2020-05-06 14:31:52 +01:00
Pau Pérez Fabregat
dadc17398f
Merge pull request #5371 from Matt-Yorkley/cart-add-error
...
Cart add error handling
2020-05-06 15:22:06 +02:00
Pau Pérez Fabregat
194c87e805
Merge pull request #5361 from Matt-Yorkley/cart-with-soft-deletion
...
Cart with soft-deletion
2020-05-06 15:20:35 +02:00
Manvil George
6c51841039
Reverting unrelated changes
2020-05-06 23:05:34 +10:00
Luis Ramos
cb7a261594
Merge pull request #5374 from luisramos0/3-0-stable-may-5
...
[Spree 2.1] Merge master into 3-0-stable
2020-05-06 13:57:11 +01:00
Manvil George
d1e03909ec
Minor CSS alterations to make the button visible at the bottom
2020-05-06 22:30:33 +10:00
Pau Pérez Fabregat
ead21a97cc
Merge pull request #5327 from openfoodfoundation/luisramos0-patch-2
...
Add link to docker tips wiki page to Docker.md
2020-05-06 14:10:37 +02:00
Pau Pérez Fabregat
a0012e1c5b
Merge pull request #5326 from openfoodfoundation/luisramos0-patch-1-1
...
Add link to Docker.md from GETTING_STARTED.md
2020-05-06 12:31:00 +02:00
Matt-Yorkley
9c24c1cd05
Ensure #caches_action works in test suite
2020-05-06 12:24:33 +02:00
Matt-Yorkley
4aac97c985
Add feature spec for action caching of taxon and properties endpoints
2020-05-06 11:47:51 +02:00
Matt-Yorkley
7e4c00ba3f
Ensure caching works in cache tests for API controllers
2020-05-06 11:47:45 +02:00
Pau Pérez Fabregat
65433c6ac6
Merge pull request #5351 from luisramos0/improve_sample_data
...
Improve ship methods names on sample data
2020-05-06 11:27:34 +02:00
Pau Pérez Fabregat
b3205c5459
Merge pull request #5309 from luisramos0/better-karma
...
Make dockerfile install node and adapt karma browser config to work inside a docker container
2020-05-06 11:11:00 +02:00
Transifex-Openfoodnetwork
d52db51b29
Updating translations for config/locales/nb.yml
2020-05-06 17:25:07 +10:00
Mathew Button
e088b27a13
Always display the outstanding balance if not zero
2020-05-06 16:45:44 +10:00
Manvil George
f802775ad6
Fixing up old Enterprise Modal references
2020-05-06 15:37:28 +10:00
Manvil George
e9cba32f31
Appeasing the Codeclimate Workers
2020-05-06 13:13:35 +10:00
Manvil George
19b5f6a562
Handling multiple enterprises at the same location
...
Changes:
* Introduced a cluster marker to denote multiple points of interest at
the same location
* Seperated out a plain enterprise modal into 2 parts
* A modal called EnterpriseModal for showing a list of enterprises at
the same location
* A box called EnterpriseBox(which by the way is also a technically a
modal) that shows the details of that particular enterprise selected
* If at a location there exists only a single enterprise then only the
box is shown
2020-05-06 12:54:42 +10:00
Robin Klaus
f43380fce5
Added inputmode attribute to show appropriate mobile keyboard for selected field
2020-05-06 12:52:53 +10:00
Robin Klaus
7dce53a77b
Added inputmode attribute to show appropriate mobile keyboard for selected field
2020-05-06 12:46:37 +10:00
Steve Roberts
4573127c59
Add NavigationCheck to order cycles edit form
...
- Simplify if statements with safe navigation operator
- Simplify order cycle nav check spec
- Rename nav check callback so a comment is not needed and remove unnecessary assignation to $scope
2020-05-06 10:43:21 +10:00
Luis Ramos
825f747dff
Add more types of sample orders
2020-05-05 23:16:54 +01:00
Luis Ramos
4083da5b16
Add sample order to sample data
2020-05-05 23:16:54 +01:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Matt-Yorkley
61d7adaf74
Enable optional caching tag in test metadata
2020-05-05 18:43:09 +02:00
Matt-Yorkley
bdc2d002fa
Update karma tests
2020-05-05 17:22:12 +02:00
Matt-Yorkley
13e4411b89
Add error message on cart populate failure and don't keep re-sending the data to the server.
...
This was triggering many requests to be continuously re-sent in a very problematic way (server-melting), and with no user feedback.
2020-05-05 17:22:10 +02:00
Luis Ramos
c2a9a698f4
Merge pull request #5312 from openfoodfoundation/dependabot/bundler/unicorn-5.5.5
...
Bump unicorn from 5.5.4 to 5.5.5
2020-05-05 15:24:59 +01:00
Matt-Yorkley
9a7807b134
Don't continuously re-post data on cart error
2020-05-05 16:04:05 +02:00
Luis Ramos
24414b83dd
Merge pull request #5325 from oeoeaio/enhancement-5214
...
Add order number and date/time to order cycles customer report
2020-05-05 14:34:47 +01:00
Matt-Yorkley
4f4b3fb206
Don't render twice 🙈
2020-05-05 15:21:05 +02:00
Matt-Yorkley
6afda87baf
Add explanatory comment on soft-deleted variant stock logic
2020-05-05 13:57:50 +02:00
Matt-Yorkley
0a28abbf2d
Add additional feature specs for soft-deleted variants in cart
2020-05-05 13:57:50 +02:00
Matt-Yorkley
26ba76cff9
Fix soft-deletion in CartService and update spec
2020-05-05 13:57:50 +02:00
Matt-Yorkley
a3458aa562
Ensure VariantStockLevels can process soft-deleted variants
2020-05-05 13:57:50 +02:00
Matt-Yorkley
0e429da377
Return zero available stock (total_on_hand) for variants that are soft-deleted
2020-05-05 13:57:50 +02:00
Matt-Yorkley
eb51b87bea
Add spec for current soft deletion behaviour in OrderCycle#variants_distributed_by scope
2020-05-05 13:57:50 +02:00
Matt-Yorkley
d3de1ce47e
Add spec for current soft deletion behaviour in VariantOverride#indexed
2020-05-05 13:57:50 +02:00
Matt-Yorkley
5639b21c77
Add tests for current soft-deleted variant behavior in CartService
2020-05-05 13:57:50 +02:00
Matt-Yorkley
068c8feea7
Merge pull request #5289 from Matt-Yorkley/cart-populate
...
Cart populate
2020-05-05 13:56:17 +02:00
François Turbelin
6e5cbebf4a
Change date value on order_and_distributor_report
2020-05-05 12:27:17 +02:00
François Turbelin
9cfd7db99d
Change date displayed on sales_tax reports
2020-05-05 12:27:17 +02:00
Luis Ramos
bcfa8982ef
Merge pull request #5364 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.0
...
Bump ddtrace from 0.34.2 to 0.35.0
2020-05-05 10:58:13 +01:00
Matt-Yorkley
805f91e838
Remove unnecessary #all call
2020-05-05 09:56:08 +02:00
Matt-Yorkley
a3757992b5
Use #tap to destroy and remove before block
2020-05-05 09:55:14 +02:00
Steve Roberts
3b8acdc577
Split order_cycle_spec into smaller specs grouped by theme
2020-05-05 15:39:45 +10:00
dependabot-preview[bot]
7180af2736
Bump ddtrace from 0.34.2 to 0.35.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.34.2 to 0.35.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.34.2...v0.35.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-04 22:46:59 +00:00
Eduardo
2fca16f02f
change shop name to be link to shop on transactions page
2020-05-04 07:06:07 -03:00
Mathew Button
fe6c810505
Add brackets in view instead of API response
2020-05-04 19:09:18 +10:00
Luis Ramos
44872844ed
Make ship methods in sample data have the name of the enterprise so it's easier to distinguish them
2020-05-03 16:36:12 +01:00
Luis Ramos
bf0b941e1c
Merge pull request #4935 from coopdevs/data-archiving
...
Allow data archiving using the :truncate_data task
2020-05-03 12:58:31 +01:00
Luis Ramos
e2b26b2e9c
Replace break with if
...
What we would need would be a continue, not break, so that other units will be processed without halting the cycle through the units
2020-05-03 12:00:23 +01:00
Luis Ramos
92d0a5b735
Change default user from spree@example.com to ofn@example.com
2020-05-03 10:12:43 +01:00
Luis Ramos
8e27ace563
Adapt specs where there is only one OC available to the absence of the OC selector
2020-05-02 20:16:41 +01:00
Transifex-Openfoodnetwork
93881a742e
Updating translations for config/locales/en_GB.yml
2020-05-03 05:09:16 +10:00
Luis Ramos
b92e257e44
Fix codeclimate issue
2020-05-02 19:12:47 +01:00
Luis Ramos
fa908d4024
Extract change_order_cycle partial from main enterprise shop view
2020-05-02 19:01:36 +01:00
Luis Ramos
7fd14cf29b
Adjust line height of select label and select itself
2020-05-02 19:01:36 +01:00
Luis Ramos
ef0e9dc0ca
Replace select box with text when only one OC is available for selection
2020-05-02 19:01:33 +01:00
Luis Ramos
89cb447387
Hide OC selector if shop requires login/customer
2020-05-02 17:56:49 +01:00
Luis Ramos
b568d25446
Update all locales with the latest Transifex translations
2020-05-02 17:08:53 +01:00
Luis Ramos
303464a04e
Merge pull request #5297 from openfoodfoundation/transifex
...
Transifex
2020-05-02 15:40:54 +01:00
Luis Ramos
0662c57d9d
Merge pull request #5344 from luisramos0/debug_assets
...
Move PROFILE debug assets flag to another ENV var
2020-05-02 14:21:15 +01:00
Luis Ramos
acb7e9751b
Move debug assets flag to another env var so we go back to having both profile and debug assets disabled by default
2020-05-02 10:42:49 +01:00
Luis Ramos
9ae3ad9279
Move rule on option out of the select rule to fix rubocop issue
2020-05-01 17:43:52 +01:00
Luis Ramos
240e2a36d3
Make option color explicitly gray and not white otherwise we will have options render white on white on some browsers, namely chrome on windows 10
2020-05-01 17:39:12 +01:00
Mathew Button
8087e6b31b
Show outstanding balance on orders page
...
Prior to this change, there was no way of knowing how much was owed (or
in need of refunding) at a glance for each order on the orders index page,
this information was only available by clicking through to an order
payment page
This change adds the outstanding balance for each order
2020-05-01 21:38:20 +10:00
Transifex-Openfoodnetwork
39875308c2
Updating translations for config/locales/en_FR.yml
2020-05-01 04:55:35 +10:00
Transifex-Openfoodnetwork
c424e7b65e
Updating translations for config/locales/fr.yml
2020-05-01 04:55:21 +10:00
Pau Perez
9d253e1e3e
Create a container to run a DJ worker in dev
2020-04-30 17:52:22 +02:00
Matt-Yorkley
1990417b72
Test values are not fetched from database when cache exists
2020-04-30 17:37:48 +02:00
Matt-Yorkley
7a22f7f783
Move and rename caching spec
2020-04-30 17:37:45 +02:00
Luis Ramos
74c7a01151
Merge pull request #5259 from luchiago/add-extra-social-media-to-emails
...
Add extra social media to order confirmation email
2020-04-30 15:01:09 +01:00
Matt-Yorkley
f724d1b572
Add feature spec for caching properties and taxons AMS
2020-04-30 15:35:39 +02:00
Luis Ramos
8845260979
Merge pull request #5285 from rmklaus12/5246-missing-translation-orders-list
...
5246 missing translation orders list
2020-04-30 14:00:26 +01:00
Pau Perez
1903134e13
Add timestamps to OC schedule join table
...
This is critical to debug bugs related to subscriptions.
Essentially, `has_and_belongs_to_many` doesn't give us the option for
any other column that the foreign keys themselves:
> A has_and_belongs_to_many association creates a direct many-to-many
> connection with another model, with no intervening model.
Source: https://guides.rubyonrails.org/v3.2/association_basics.html#the-has_and_belongs_to_many-association
Note however, that there's no way to update an order_cycle_schedule,
that I can think of but `updated_at` doesn't do any harm.
2020-04-30 15:00:13 +02:00
Pau Pérez Fabregat
4174ea69a1
Merge pull request #5247 from chrishil1/Placeholders_variant
...
Added placeholders in variant edit page
2020-04-30 12:05:59 +02:00
Pau Pérez Fabregat
676add18c3
Merge pull request #5322 from luisramos0/dead_content
...
Delete some dead views
2020-04-30 12:02:14 +02:00
Matt-Yorkley
a35f8cdb02
Move cache keys used in views into the cache service
2020-04-30 09:45:15 +02:00
Luis Ramos
8a107bee98
Merge pull request #5235 from luisramos0/mail_methods
...
Remove smtp config from admin config page
2020-04-29 19:10:02 +01:00
Matt-Yorkley
210029aaff
Enable optional caching tag in test metadata
2020-04-29 20:04:54 +02:00
Transifex-Openfoodnetwork
5bc5ef9a9d
Updating translations for config/locales/pt_BR.yml
2020-04-30 03:52:57 +10:00
Matt-Yorkley
f2cd122ec8
Update variant_stock_spec for unsaved and soft-deleted cases
2020-04-29 18:29:44 +02:00
Matt-Yorkley
4054bdd722
Add Bugsnag call for "variant with no stock item" case
2020-04-29 17:34:48 +02:00
Pau Pérez Fabregat
e04b18c70e
Merge pull request #5320 from luisramos0/vo_fix
...
[Spree 2.1] Fix variant overrides specs and shops spec
2020-04-29 17:30:41 +02:00
romale
3a4ef2697c
Correct translations
...
Without it, some labels not translated to other language.
And, please check code:
en.admin.subscription.subscriptions - does not exists
but
en.admin.subscriptions.subscriptions - is exist
2020-04-29 18:27:09 +03:00
Matt-Yorkley
2bdda7de04
Change order of methods for easier reading
2020-04-29 17:22:46 +02:00
Matt-Yorkley
92a881c584
Simplify relation used in #exchanges_supplying
2020-04-29 17:19:16 +02:00
Pau Perez
647a7bdddf
Clarify we won't use truncate_date in prod yet
...
We initially aimed at implementing data archiving in production reusing
this rake task but priorities have changed. It'll be just a refactor for
now.
2020-04-29 17:00:53 +02:00
Pau Perez
e0228f66af
Default to archiving data older than 2 years.
...
This is safer than the current 3 months.
2020-04-29 16:49:43 +02:00
Pau Perez
38ea95ea85
Prevent nil input to turn into 0
2020-04-29 16:49:43 +02:00
Pau Perez
6ceeda7d9e
Instrument TruncateData logging start and end
2020-04-29 16:49:43 +02:00
Pau Perez
703706ee0b
Replace one-letter variable with full word
2020-04-29 16:49:43 +02:00
Pau Perez
e2a3dd0c6f
Delete only return auths. of the deleted orders
...
They are associated to order and as such we can't remove them all
blindly.
2020-04-29 16:49:43 +02:00
Pau Perez
a3b8638faf
Delete sessions older than two weeks
...
This affects users that are actively purchasing, so 2 weeks data is more
than enough. Others can afford to log in again.
2020-04-29 16:49:43 +02:00
Pau Perez
4f015320a3
Upper case DELETE statement
...
This keeps it consistent with the rest of the log.
2020-04-29 16:49:43 +02:00
Pau Perez
0f1d57db73
Delete LogEntries older than a month
...
They are useful for troubleshooting but a month data seems enough.
2020-04-29 16:49:43 +02:00
Pau Perez
5f84c51c13
Delete StateChanges older than a month
...
They are useful for troubleshooting but a month data seems enough.
2020-04-29 16:49:43 +02:00
Pau Perez
d215c76bc9
Make it even more explicit the action is dangerous
...
We're yelling at the person to make a backup before proceeding.
2020-04-29 16:49:43 +02:00
Pau Perez
e1a80edb7e
Carefully doc how to archive data from an instance
2020-04-29 16:49:43 +02:00
Pau Perez
a4372e4d31
Fix long lines
2020-04-29 16:49:43 +02:00
Pau Perez
b6d3c3039a
Fix "Method has too many lines" violation
2020-04-29 16:49:43 +02:00
Pau Perez
f199cb1bea
Warn but allow executing :truncate_data in prod
2020-04-29 16:49:43 +02:00
Pau Perez
be123b2a72
Specify how much data to remove in :truncate_data
2020-04-29 16:49:43 +02:00
Pau Perez
60d29d619f
Replace :truncate_data definition with new class
...
And cover it with a test.
2020-04-29 16:49:43 +02:00
Pau Perez
78fd785f0c
Extract TruncateData out of :truncate_data task
2020-04-29 16:49:43 +02:00
Pau Pérez Fabregat
f9f4bdae8f
Merge pull request #5238 from Matt-Yorkley/moar-performance
...
Improve Pain Points
2020-04-29 16:36:15 +02:00
Luis Ramos
0f16c43f21
Add link to docker tips wiki page to Docker.md
2020-04-29 14:16:59 +01:00
Luis Ramos
865024fc1f
Add link to the docker setup guide to the getting started guide.
2020-04-29 14:05:45 +01:00
Luis Ramos
407d890d23
Merge pull request #5315 from Matt-Yorkley/ordercyles-controller-tweaks
...
OrderCylesController tweaks
2020-04-29 13:50:10 +01:00
Luis Ramos
0e5d7c1eb1
Add migration to drop dead spree_mail_methods table and some dead mail_methods preferences
2020-04-29 13:34:50 +01:00
Luis Ramos
a38b18bd0d
Remove smtp config from admin config page
2020-04-29 13:34:19 +01:00
Rob H
6405c34428
Add order number and date/time to order cycles customer report
2020-04-29 21:20:14 +10:00
Pau Pérez Fabregat
e7df9bb58d
Merge pull request #5178 from coopdevs/dont-populate-empty-cart
...
Dont populate empty cart
2020-04-29 13:08:26 +02:00
Matt-Yorkley
d3af3d3f27
Avoid extra query on stock_items every time #on_demand is called on a variant.
...
In the case where the variant has not been saved yet, we can use #new_record? here instead of #stock_items.empty?, to avoid an additional query. This can be called a vast number of times per request, in various N+1s. The other case where we need to return here is when a variant has been deleted, so #stock_items will be empty and #stock_item will be nil. Likewise, we can just check that with #deleted? and avoid #stock_items.empty?
2020-04-28 20:54:04 +02:00
Matt-Yorkley
9682544442
Eager-load and update BasicEnterpriseSerializer
2020-04-28 20:10:40 +02:00
Matt-Yorkley
f4bcf6c6d5
Eager-load line_item associations in order
2020-04-28 20:10:40 +02:00
Luis Ramos
e6fa08edfc
Delete some dead views
2020-04-28 19:07:19 +01:00
Luis Ramos
f3e651b1f7
present? calls length which is breaking it with error ActiveModel::MissingAttributeError Exception: missing attribute: address_id
...
any? works well as it just verifies the size of the collection
2020-04-28 16:31:11 +01:00
Luis Ramos
7e12142f91
Collection must be after load_data so that hubs are already available for VOs calculation
2020-04-28 16:31:11 +01:00
Luis Ramos
794fb5dfc5
Merge pull request #5316 from luisramos0/3-0-stable-Apr28
...
[Spree 2.1] Merge master into 3-0-stable
2020-04-28 16:30:29 +01:00
Transifex-Openfoodnetwork
18fc4b7c92
Updating translations for config/locales/ca.yml
2020-04-29 01:13:42 +10:00
Transifex-Openfoodnetwork
612cc45ab7
Updating translations for config/locales/en_FR.yml
2020-04-29 01:13:35 +10:00
Transifex-Openfoodnetwork
16e289bf37
Updating translations for config/locales/en_GB.yml
2020-04-29 01:13:29 +10:00
Transifex-Openfoodnetwork
b54c6fcb26
Updating translations for config/locales/nb.yml
2020-04-29 01:13:26 +10:00
Transifex-Openfoodnetwork
8365c66add
Updating translations for config/locales/fil_PH.yml
2020-04-29 01:13:22 +10:00
Transifex-Openfoodnetwork
5590671c23
Updating translations for config/locales/fr.yml
2020-04-29 01:13:19 +10:00
Luis Ramos
9e43661127
Merge pull request #5153 from luisramos0/bye_bye_ga
...
Bye bye Google Analytics
2020-04-28 16:09:16 +01:00
Luis Ramos
8c29797b23
Remove empty space on ffi line that was breaking bundle install
...
fuubar gets automatically moved to 2-5-0 as it is in master
2020-04-28 14:57:21 +01:00
Matt-Yorkley
ec581dccb8
Use class-based caching for queries in EnterpriseInjectionData
2020-04-28 15:11:59 +02:00
Matt-Yorkley
4d098448f5
Cache rendered AMS arrays in darkswarm layout based on latest timestamps of rendered object classes
2020-04-28 15:11:59 +02:00
Matt-Yorkley
53ebe10483
Fix issue with generic primary taxon in product factory changing which taxons are correctly counted as being in open order cycles.
2020-04-28 15:11:59 +02:00
Matt-Yorkley
eb5f8b85ff
Touch primary taxon when a product's primary_taxon is changed
2020-04-28 15:11:59 +02:00
Matt-Yorkley
1b18808d21
Touch ShippingMethod when it's assigned to a new distributor
2020-04-28 15:11:59 +02:00
Matt-Yorkley
6ef345c5d8
Touch taxon when a taxon is applied to a product
2020-04-28 15:11:59 +02:00
Matt-Yorkley
a25a75bbe8
Ensure action caching includes GET params
...
By default the auto-generated action cache keys looks like this:
`views/0.0.0.0:3000/api/order_cycles/1/properties`
With this change the cache keys now look like this:
`views/0.0.0.0:3000/api/order_cycles/1/properties?distributor=3`
2020-04-28 15:11:14 +02:00
Matt-Yorkley
ea1ec1a1c6
Use ActionCaching in OrderCyclesController (taxons and properties)
2020-04-28 15:11:12 +02:00
Matt-Yorkley
975afb3152
Enable use of Action Caching in the API 🎉
...
See: https://guides.rubyonrails.org/api_app.html#adding-other-modules
2020-04-28 15:11:00 +02:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Kristina Lim
265871932f
Merge pull request #5146 from coopdevs/dev-mode-profiling-settings
...
Add PROFILE var to set production-like settings
2020-04-28 20:31:13 +08:00
Kristina Lim
c34570e96e
Merge pull request #5313 from kristinalim/fix/mirror_db_script_bucket
...
Fix script for syncing public/ in AWS bucket to local
2020-04-28 20:28:05 +08:00
Matt-Yorkley
ac166f3590
Add CacheService
2020-04-28 14:15:16 +02:00
Matt-Yorkley
e4985a9d51
Avoid needlessly fetching the current user records (for authentication and API key checks)
...
These endpoints are absolutely public, and don't need the current user at any point.
2020-04-28 14:06:02 +02:00
Matt-Yorkley
eb7de18298
Return early (before hitting the DB) in complex product list rendering if we already know the order cycle is closed
2020-04-28 13:51:25 +02:00
Matt-Yorkley
67a7140642
Memoize distributor and order_cycle in Api::OrderCyclesController
2020-04-28 13:48:07 +02:00
Luis Ramos
868929eed3
Merge pull request #4993 from luisramos0/move_ent_fees
...
Change engine routes to better work with specs in rails 4
2020-04-28 11:48:41 +01:00
Transifex-Openfoodnetwork
8e6d53f6c6
Updating translations for config/locales/nb.yml
2020-04-28 17:59:10 +10:00
Robin Klaus
f072e9d9c2
Add missing translations on order list page
2020-04-28 16:47:39 +10:00
Kristina Lim
7c985f39ab
Fix script for syncing public/ in AWS bucket to local
2020-04-28 13:22:48 +08:00
Kristina Lim
efb83c2f95
Merge pull request #5250 from mkllnk/mirror-db-script
...
Add cache to mirror_db script
2020-04-28 13:18:29 +08:00
Matt-Yorkley
74e81b078f
Avoid N+1s in Order#cap_quantity_at_stock!
2020-04-28 01:11:28 +02:00
Matt-Yorkley
3fa2b3161f
Avoid N+1s when using OrderCycle#exchanges_supplying
2020-04-28 01:10:07 +02:00
Matt-Yorkley
fe2bf8d531
Eager-load variants and stock items when doing stock checks on multiple variants
2020-04-28 01:05:42 +02:00
Matt-Yorkley
eb858159ce
Eager-load :default_price on variants
2020-04-28 01:04:22 +02:00
Matt-Yorkley
43869fc140
Replace fired events with clearer method call
...
The 'spree.cart.add' event has no listeners in spree_core on in ofn. The 'spree.order.contents_changed' just has a single listener that calls `order.update_distribution_charge`.
2020-04-28 00:56:18 +02:00
Matt-Yorkley
a5c4364f92
Fetch (or create) current_order only once
2020-04-28 00:52:09 +02:00
dependabot-preview[bot]
02775d033d
Bump unicorn from 5.5.4 to 5.5.5
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.4 to 5.5.5.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-27 20:50:56 +00:00
Luis Ramos
6559b4d3a4
Make dockerfile install node and adapt karma browser config to work inside a docker container
2020-04-27 19:05:11 +01:00
Luis Ramos
d851aa5106
Add model definition to migration to make migration more resilient
2020-04-27 18:40:56 +01:00
Luis Ramos
c5b9727177
Remove ga_cookies_preference from DB
2020-04-27 18:40:56 +01:00
Luis Ramos
248b0016d4
Remove trackers and google analytics
2020-04-27 18:40:33 +01:00
Luis Ramos
d8d6bad11c
Remove config and sections related to google analytics in the cookies banner and cookies page
2020-04-27 18:40:00 +01:00
Luis Ramos
ab16931d70
Merge pull request #5257 from luisramos0/stripe_sca_payments_last
...
StripeSCA - reuse better method to fetch last payment of an order to avoid nasty bugs in the future
2020-04-27 18:34:35 +01:00
Matt-Yorkley
e33de8a20e
Update specs and refactor a bit
2020-04-27 19:27:07 +02:00
Matt-Yorkley
468cb3f57e
Remove obviously private methods from the public interface in CartService
...
These methods are not called from anywhere in the app, only in a couple of tests in cart_service_spec.
2020-04-27 19:27:07 +02:00
Matt-Yorkley
1152f307e2
Eager-load associated line_items data in #update_distribution_charge!
2020-04-27 19:27:07 +02:00
Matt-Yorkley
25525d4f75
Use guard clause in each block
2020-04-27 19:27:07 +02:00
Matt-Yorkley
a759d8c7c7
Avoid N+1s for variants and for line_items of variants
2020-04-27 19:27:07 +02:00
Matt-Yorkley
b3242041e5
Return earlier (before scoping process, if possible)
2020-04-27 19:27:07 +02:00
Matt-Yorkley
106bb7a27f
Rename some variables and add comments for clarity in cart_service
2020-04-27 19:27:07 +02:00
Matt-Yorkley
2334ab6d00
Delete some dead code in cart_service
...
This Bugsnag error was added a year ago and hasn't been seen
2020-04-27 19:27:07 +02:00
Matt-Yorkley
11af5dffdc
Memoize scoper in cart_service
...
Avoids fetching all of the hub's variant overrides from the db every time it's initialized.
2020-04-27 19:27:07 +02:00
Matt-Yorkley
3ce7e96777
Add some debounce and an onwheel hack to product add to basket field
...
Debounce ensures we don't get a million requests if the up/down buttons are clicked rapidly. The onwheel hack adds some protection against scrolling triggering the quantity up/down. See: https://stackoverflow.com/a/51076231
2020-04-27 19:27:07 +02:00
Transifex-Openfoodnetwork
670fff9d36
Updating translations for config/locales/es_CR.yml
2020-04-28 02:38:07 +10:00
Transifex-Openfoodnetwork
171ba09663
Updating translations for config/locales/fr.yml
2020-04-28 01:40:44 +10:00
Transifex-Openfoodnetwork
65c9c287e8
Updating translations for config/locales/en_FR.yml
2020-04-28 01:37:49 +10:00
Transifex-Openfoodnetwork
4332734f27
Updating translations for config/locales/ca.yml
2020-04-28 01:37:44 +10:00
Transifex-Openfoodnetwork
340f669506
Updating translations for config/locales/en_GB.yml
2020-04-28 01:37:36 +10:00
Transifex-Openfoodnetwork
3b7ad0ef4e
Updating translations for config/locales/ca.yml
2020-04-27 23:49:48 +10:00
Luis Ramos
6e23f5bdac
Merge pull request #5233 from luisramos0/stripe_sca_bo
...
[StripeSCA] Fix card payments in the Backoffice
2020-04-27 13:00:24 +01:00
Luis Ramos
8b5378e673
Merge pull request #5251 from luisramos0/Issue4654
...
Change Result of PriceSack Calculation from Integers to Floats, clone #4812
2020-04-27 12:36:18 +01:00
Transifex-Openfoodnetwork
ba32e2d676
Updating translations for config/locales/fil_PH.yml
2020-04-27 18:08:38 +10:00
Pau Pérez Fabregat
74c4722cfe
Merge pull request #5286 from rmklaus12/4966-missing-translation-admin-prod-list
...
4966 missing translation admin prod list
2020-04-27 09:28:57 +02:00
Luis Ramos
b3eda9fecb
Merge pull request #5256 from dacook/5190-fix-order-sorting
...
Fix sorting of orders list
2020-04-26 14:24:00 +01:00
Pau Perez
c224df9b6a
Do not trigger an orderChanged with null quantity
...
When loading the page $watchGroup calls the listener function for every
listed line item but with a set variant and null quantity and
max_quantity. There's no point on computing an order change when there
was none.
This saves an empty request on the second most used endpoint of the app,
specially busy when users are placing orders.
2020-04-24 15:54:46 +02:00
Luis Ramos
b9c86d54b0
Merge pull request #5261 from luisramos0/search-iphone
...
[Mobile] Make search box font size be 16px so that no zoom happens on iphone
2020-04-24 11:30:26 +01:00
Transifex-Openfoodnetwork
cebba4dd43
Updating translations for config/locales/en_GB.yml
2020-04-24 18:22:49 +10:00
Matt-Yorkley
43ba73ac19
Avoid expensive queries for supplied product properties if enterprise is not a supplier
2020-04-23 21:51:39 +02:00
Matt-Yorkley
728326c2a5
Eager-load :properties on supplied products in enterprise_shopfront_serializer
2020-04-23 21:48:41 +02:00
Transifex-Openfoodnetwork
8bcc9456d8
Updating translations for config/locales/en_FR.yml
2020-04-24 04:30:04 +10:00
Transifex-Openfoodnetwork
5f51b21fe9
Updating translations for config/locales/fr.yml
2020-04-24 04:29:52 +10:00
Luis Ramos
2984829790
Merge pull request #5253 from luisramos0/edit_order
...
Make edit order page work even if inventory_items dont have a corresponding line_item in the order
2020-04-23 19:27:31 +01:00
Luis Ramos
f366aa2605
Merge pull request #5290 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.10
...
Bump mini_racer from 0.2.9 to 0.2.10
2020-04-23 18:53:14 +01:00
Matt-Yorkley
bf16a10129
Update all locales with the latest Transifex translations
2020-04-23 19:05:22 +02:00
Matt-Yorkley
43836d2b30
Merge pull request #5292 from openfoodfoundation/transifex
...
Transifex
2020-04-23 18:53:36 +02:00
Pau Pérez Fabregat
82156e32e0
Merge pull request #4920 from luisramos0/api_var_ctrl
...
Bring Spree::Variant#active from Spree so that we can improve it
2020-04-23 17:35:49 +02:00
Matt-Yorkley
69cf7dff2c
Memoize :active in enterprise serializers that call it multiple times
2020-04-23 13:17:44 +02:00
Pau Pérez Fabregat
a8ca471cd2
Merge pull request #5189 from Matt-Yorkley/mobile-buttons
...
[Mobile UX] Style updates on buttons
2020-04-23 12:56:49 +02:00
Luis Ramos
aa52cf8bf0
Merge pull request #5254 from chrishil1/missing_translation_save_as_default
...
Added missing translation to column dropdown
2020-04-23 11:08:33 +01:00
Luis Ramos
ac6501c5d8
Merge pull request #5195 from luisramos0/prod_helper
...
Delete dead code from several places...
2020-04-23 11:07:44 +01:00
Luis Ramos
568e570b4b
Move method to more generic helper to use it in mailers
2020-04-23 16:08:10 +10:00
Luis Ramos
42be6c905f
Added spec for OrderPaymentFinder
2020-04-23 16:08:10 +10:00
Luis Ramos
d482cccefe
Use OrderPaymentFinder methods instead of payments.last and payments.pending.last
2020-04-23 16:08:10 +10:00
Luis Ramos
52becf6abc
Extract payment method logic from OrderPaymentFinder into the orders helper
2020-04-23 16:08:10 +10:00
Transifex-Openfoodnetwork
15319d66e2
Updating translations for config/locales/es_CR.yml
2020-04-23 12:27:58 +10:00
Robin Klaus
d8f4df4bcc
Fixed missing translation, added keys to en.yml file
2020-04-23 09:58:47 +10:00
dependabot-preview[bot]
240d4a7802
Bump mini_racer from 0.2.9 to 0.2.10
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.9 to 0.2.10.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.9...v0.2.10 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-22 19:41:50 +00:00
Luis Ramos
3dff11e405
Merge pull request #5182 from luisramos0/nokogiri
...
Bump Nokogiri
2020-04-22 20:40:04 +01:00
Pau Perez
2d9b41729e
Use memory cache-store when profiling
...
Or you want see any change when playing fragment-caching or other caching
strategies.
2020-04-22 17:56:56 +02:00
Pau Perez
de8d8e658c
Add PROFILE var to set production-like settings
...
I took this from a recent newsletter I read. Sometimes replication
performance issues locally is actually slower than production due to dev
mode settings (code reloading, etc.), heavy de-only gems and the asset
pipeline.
The PROFILE env var switches these settings all at the same time,
giving us an environment closer to production, essential for reliable
profiling. Then, rack-mini-profiler is going to be more accurate.
Apparently it's something
[RubyGems](b026df86ae/config/environments/development.rb (L72-L92) )
and
[CodeTriage](a3c957647d )
both use.
2020-04-22 17:53:17 +02:00
Pau Pérez Fabregat
a7013b5542
Merge pull request #5241 from Matt-Yorkley/remove-old-migrations
...
Remove old migrations!
2020-04-22 17:01:01 +02:00
Maikel
24fe7e8878
Merge pull request #5280 from openfoodfoundation/transifex
...
Transifex
2020-04-22 16:08:57 +10:00
Maikel
eb94c5a5bd
Merge pull request #5283 from Matt-Yorkley/customer-tags
...
Fix disappearing tags issue
2020-04-22 16:03:17 +10:00
Matt-Yorkley
4ef61b642e
Fix disappearing tags issue
2020-04-22 01:33:38 +02:00
Luis Ramos
23f4faf192
Merge pull request #4841 from luisramos0/kill_rabl
...
Hide broken product taxons field, remove last rabl template and rabl itself
2020-04-21 18:49:12 +01:00
Transifex-Openfoodnetwork
becd57f7a4
Updating translations for config/locales/fr.yml
2020-04-21 22:52:47 +10:00
Transifex-Openfoodnetwork
2e4b224d48
Updating translations for config/locales/en_FR.yml
2020-04-21 22:42:53 +10:00
Transifex-Openfoodnetwork
2b210bd096
Updating translations for config/locales/fr.yml
2020-04-21 22:42:34 +10:00
Matt-Yorkley
53183b8598
Eager-load properties in inject_enterprise_and_relatives
2020-04-21 11:13:20 +02:00
Pau Perez
91306d5ce4
Update all locales with the latest Transifex translations
2020-04-21 10:13:00 +02:00
Pau Pérez Fabregat
e20e19f963
Merge pull request #5244 from coopdevs/include-deleted-variants-and-products
...
Include deleted products in OC mailer
2020-04-20 20:46:21 +02:00
Luis Ramos
2ab07bc6a9
Make search box font size be 16px so that no zoom happens on iphone
2020-04-18 18:50:25 +01:00
Luis Ramos
15e56b21ae
Merge pull request #5229 from chrishil1/missing_translation
...
Added missing translations to enterprise_relationship page
2020-04-18 18:15:54 +01:00
Luis Ramos
629db3ae4d
Merge pull request #5230 from chrishil1/missing_translation_2
...
Add product translations to admin order creation
2020-04-18 18:15:01 +01:00
Luis Ramos
43274ecb4f
Remove dead code
...
Dead since https://github.com/openfoodfoundation/openfoodnetwork/pull/3305
2020-04-18 14:47:33 +01:00
Luis Ramos
437c7367db
Remove dead code
2020-04-18 14:37:07 +01:00
Lucas Hiago
acfe0c540a
Create instagram css property and apply
2020-04-18 10:06:14 -03:00
Lucas Hiago
ac2ab34e11
Add connect with us footer to customer order confirmation email
2020-04-18 10:06:06 -03:00
Lucas Hiago
41c0204cfa
Update instagram and linkedin links
2020-04-18 10:05:59 -03:00
Luis Ramos
910cc99c2f
Add spec to cover orders_controller watch sortOptions
2020-04-18 10:23:02 +01:00
David Cook
a0a361673a
Fix sorting of orders
...
(wrong copied function call)
2020-04-18 15:03:39 +10:00
jeffrey s hill md
70005a99a3
Added missing translations
2020-04-17 17:02:37 -05:00
Luis Ramos
8f8dce4bab
Do not render inventory items in the shipment that dont have a line item in the order
2020-04-17 20:23:29 +01:00
Luis Ramos
8973a1b76c
Merging 6 specs in one takes around 1 minute of execution time
2020-04-17 20:18:13 +01:00
Luis Ramos
c1b28543c6
Extract print ticket spec to a separate file
2020-04-17 20:07:45 +01:00
Luis Ramos
c33352904a
Make spec a bit more resilient
2020-04-17 18:48:20 +01:00
Luis Ramos
8bd3062b16
Fix rubocop issues
2020-04-17 18:17:54 +01:00
jeffrey s hill md
ed91c179cd
Changed translation paths
2020-04-17 12:04:27 -05:00
Luis Ramos
c7fb85a715
Replace background with members with before with let statements
2020-04-17 17:34:36 +01:00
Luis Ramos
e901615b61
Make spec simpler
2020-04-17 16:56:56 +01:00
Pau Perez
d8e6d98912
Preload line item's option_values
...
This fixes an N+1 with the query
```sql
SELECT "spree_option_values".* FROM "spree_option_values"
INNER JOIN "spree_option_types"
ON "spree_option_types"."id" = "spree_option_values"."option_type_id"
INNER JOIN "spree_option_values_line_items"
ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id"
WHERE "spree_option_values_line_items"."line_item_id" = 1679
ORDER BY spree_option_types.position asc
```
2020-04-17 17:34:53 +02:00
Luis Ramos
c455dfb609
Make some specs faster by going directly to the order edit page and move incomplete order spec to a specific context
2020-04-17 16:28:27 +01:00
Pau Perez
63eb0980eb
Memoize result of line items query
...
No need to fetch twice what we just loaded from DB.
2020-04-17 17:27:21 +02:00
Pau Perez
06ead827d8
Split long method
2020-04-17 17:27:21 +02:00
Pau Perez
6dd4a866e5
Address some Rubocop violations
2020-04-17 17:25:35 +02:00
Pau Perez
04c962432a
Skip deleted default_scope in OC notification
...
This fixes the RuntimeError we get when accessing deleted variants due
to the variant being nil.
https://github.com/rails/rails/issues/11036 is still an open Rails bug,
as some people mention in https://github.com/rails/rails/pull/21550 .
The issue is that `includes` doesn't respect `unscoped`. I found
a potential solution for the entire app in
https://github.com/rails/rails/issues/11036#issuecomment-302133116 but
our friend @markets has a gem,
https://github.com/markets/unscoped_associations , that solves that too.
2020-04-17 17:25:34 +02:00
Luis Ramos
d96d6b2337
Split orders_spec in two: tests for orders list page and tests for orders edit page
2020-04-17 15:21:03 +01:00
Luis Ramos
9147518422
Remove some unnecessary code
2020-04-17 14:51:06 +01:00
Luis Ramos
d23397f250
Move float test to a separate context
2020-04-17 14:49:09 +01:00
blainebillings
993a684e44
Add Price Sack Spec for Float Amounts
2020-04-17 14:43:28 +01:00
blainebillings
427dc54945
Change Result of PriceSack Calculation from Integers to Floats
2020-04-17 14:43:28 +01:00
Luis Ramos
ffceff3f0a
Update GETTING_STARTED.md
...
Update link to osx catalina setup guide in wiki
2020-04-17 11:41:02 +01:00
Maikel Linke
b5d159e163
Add cache to mirror_db script
...
Also added some better error handling around image syncing.
2020-04-17 16:09:22 +10:00
Maikel Linke
4658a53aeb
Update translations from Transifex
2020-04-17 15:37:54 +10:00
Maikel
3bc834435d
Merge pull request #5152 from Matt-Yorkley/missing-indexes
...
Add missing indexes to spree_orders and spree_products
2020-04-17 15:16:03 +10:00
Maikel
9111ff1a38
Merge pull request #5211 from openfoodfoundation/transifex
...
Transifex
2020-04-17 14:24:26 +10:00
Maikel
b0eac1ecaa
Merge branch 'master' into missing-indexes
2020-04-17 14:17:32 +10:00
Maikel
2e31f234d6
Merge pull request #5196 from Matt-Yorkley/customers-performance
...
Admin Customers performance
2020-04-17 13:28:39 +10:00
Maikel
e29a81cacc
Merge pull request #5186 from oeoeaio/customer-totals-inventory-sku
...
Take sku overrides into account in customer totals report
2020-04-17 13:27:43 +10:00
Maikel
a672af1a79
Merge pull request #5237 from luisramos0/master_with_change
...
Clone of #5176
2020-04-17 13:27:14 +10:00
Maikel Linke
75207247e6
Correct database commands
2020-04-17 12:52:05 +10:00
Maikel Linke
8af40f4675
Format and indent migration message
...
It's much clearer to read this way:
```
== OldMigrationsRemoved: migrating ===========================================
rake aborted!
StandardError: An error has occurred, this and all later migrations canceled:
You haven't updated your dev environment in a long time!
Legacy migration files before 2019 have now been removed.
Run `rails db:schema:load` before running `rails db:migrate`.
```
2020-04-17 12:47:49 +10:00
Maikel Linke
63ac6c5088
Remove superfluous conditional
...
A migration's `up` method is only run when the migration needs to be
applied. The only case we could have a higher version number is when a
migration with a higher version got merged before the current one. And
in that case, we still want this migration to fail, because it hasn't
been applied yet.
2020-04-17 12:40:54 +10:00
jeffrey s hill md
d8444dcf3c
Added placeholders
2020-04-16 14:59:41 -05:00
Matt-Yorkley
71c7c35679
Remove old migrations! 🎉
2020-04-16 13:44:18 +02:00
Pau Pérez Fabregat
e1c2b7e105
Merge pull request #5159 from luisramos0/timezone_mixup
...
[Spree 2.1] Fix timezone mix up in a spec
2020-04-16 11:38:54 +02:00
Pau Pérez Fabregat
7b656fa0a4
Merge pull request #5194 from luisramos0/update_spree_rev
...
[Spree 2.1] Update spree revision to a version that doesnt depend on deface
2020-04-16 11:37:42 +02:00
Maikel
f282ff805d
Merge pull request #5172 from kristinalim/feature/5170-increase_locale_chars_in_spree_users
...
Increase max characters for locale in spree_users
2020-04-16 18:18:45 +10:00
Transifex-Openfoodnetwork
2f7dc9a578
Updating translations for config/locales/es.yml
2020-04-16 17:09:44 +10:00
chrishil1
a9829ba5d9
Update _enterprise_relationship.html.haml
2020-04-15 17:01:22 -05:00
Luis Ramos
8532fa16cd
Merge pull request #5202 from luisramos0/improve_checkout_js
...
Improve Checkout error handling in JS
2020-04-15 22:25:05 +01:00
chrishil1
c3f01be580
Fixed display all required tag
2020-04-15 19:00:35 +01:00
Luis Ramos
fcc746a1b7
Fix long lines in payments_controller_spec
2020-04-15 16:18:17 +01:00
Luis Ramos
8f7b3df9b5
Make payment controller authorize stripe_sca payments before processing them or advancing order workflow (that also calls payment.process)
2020-04-15 16:07:34 +01:00
jeffrey s hill md
e23045b19e
Add product translations
2020-04-14 14:15:57 -05:00
jeffrey s hill md
5e1dea61a8
added missing translations to enterprise_relationship page
2020-04-14 11:20:56 -05:00
Luis Ramos
cedf1b26f2
If no flash is sent from the server, show the generic error
2020-04-14 14:31:34 +01:00
Luis Ramos
47a93568dc
Make code simpler by extracting methods
2020-04-14 13:55:20 +01:00
Luis Ramos
62471bf2ab
Clear Loading spinner when exception is caught
2020-04-14 13:50:38 +01:00
Luis Ramos
cdf5bcb7eb
Improve unexpected error handling and add test cases for it
2020-04-14 13:44:58 +01:00
Luis Ramos
7414047b92
Switch from old success/error to modern then/catch structure
...
Catch() will get a few more errors then errors()
Also, add try/catch inside catch to detect any errors parsing the
response error payload
2020-04-14 13:04:28 +01:00
Pau Pérez Fabregat
4ef5dfe430
Merge pull request #5199 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.2
...
Bump rubocop-rails from 2.5.1 to 2.5.2
2020-04-14 10:17:59 +02:00
Pau Pérez Fabregat
e58a1d080f
Merge pull request #5205 from openfoodfoundation/dependabot/bundler/ddtrace-0.34.2
...
Bump ddtrace from 0.34.1 to 0.34.2
2020-04-14 10:17:06 +02:00
Luis Ramos
357a88fa22
Merge pull request #4786 from luisramos0/stripe_sca_extra_subs_fix
...
Make StripeSCA (with new authorize/purchase workflow) work with Subscriptions again
2020-04-13 17:21:53 +01:00
Rob H
f71045b3f2
Improve naming of variables in VariantOverridesIndexed for readability
2020-04-13 22:24:25 +10:00
Rob H
dcdd3f2444
Modify interface of VariantOverridesIndexed#indexed
...
Stop using keyword args and accept variant_ids instead of line_items
2020-04-13 22:11:58 +10:00
Rob H
6820919552
Rename VariantOverrides class to VariantOverridesIndexed
2020-04-13 21:56:37 +10:00
Rob H
4a4173bdc0
Move VariantOverrides class to app/services
2020-04-13 21:54:10 +10:00
Rob H
9a7e782102
Only load up variant overrides for relevant hubs
2020-04-13 12:07:17 +10:00
Transifex-Openfoodnetwork
9fa892346e
Updating translations for config/locales/es_CR.yml
2020-04-13 10:30:00 +10:00
Transifex-Openfoodnetwork
7341912390
Updating translations for config/locales/pt_BR.yml
2020-04-12 07:14:21 +10:00
Transifex-Openfoodnetwork
d0c797b797
Updating translations for config/locales/es_CR.yml
2020-04-12 07:12:21 +10:00
Transifex-Openfoodnetwork
cb2e17d7dc
Updating translations for config/locales/es_CR.yml
2020-04-12 07:09:21 +10:00
Transifex-Openfoodnetwork
147654df41
Updating translations for config/locales/es_CR.yml
2020-04-12 07:05:59 +10:00
Rob H
14cf168e3b
Take sku overrides into account in customer totals report
2020-04-11 16:05:15 +10:00
dependabot-preview[bot]
c3ee7b7c64
Bump ddtrace from 0.34.1 to 0.34.2
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.34.1 to 0.34.2.
- [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.34.1...v0.34.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-10 19:19:13 +00:00
Matt-Yorkley
a6414b6dbe
Make sure taggable_type is 'Customer' when querying customer tags
2020-04-10 20:14:14 +02:00
Luis Ramos
eafffa2c23
Update all locales with the latest Transifex translations
2020-04-10 13:08:11 +01:00
Luis Ramos
82a4753eec
Merge pull request #5191 from openfoodfoundation/transifex
...
Transifex
2020-04-10 13:05:30 +01:00
Matt-Yorkley
b92e858448
Merge pull request #5197 from Matt-Yorkley/cart-populate-performance
...
Cart populate performance
2020-04-10 11:41:56 +02:00
Matt-Yorkley
4c41c84cc1
Refactor tag rules loading for customers
...
Fixes N+1 queries on customer tags
2020-04-10 10:12:32 +02:00
Matt-Yorkley
e53f733966
Eager-load addresses in customer serializer
2020-04-10 08:20:15 +02:00
Matt-Yorkley
2a8809e6e8
Eager-load default card in customer serializer
2020-04-10 08:20:15 +02:00
Matt-Yorkley
31a54e49c5
Allow User#default_card to work with eager-loading
2020-04-10 08:20:13 +02:00
Luis Ramos
b5ba2acb21
Merge pull request #5169 from jeduardo824/enhancement/5102-make-shop-names-links
...
make shop name a link on /account
2020-04-09 22:01:34 +01:00
dependabot-preview[bot]
0fabde8849
Bump rubocop-rails from 2.5.1 to 2.5.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.1...v2.5.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-09 19:21:30 +00:00
Transifex-Openfoodnetwork
e97a16cb40
Updating translations for config/locales/ca.yml
2020-04-10 04:14:21 +10:00
Luis Ramos
314fed063d
Merge property with property_decorator both in our codebase
2020-04-09 19:09:22 +01:00
Luis Ramos
0d5c08c363
Remove dead code, there's no Spree::Money in app/models/spree and the Spree::Money in lib/spree already has a class_eval with this function
2020-04-09 19:06:05 +01:00
Matt-Yorkley
57d87a8042
Eager-load variant stock items
...
Avoids another N+1
2020-04-09 19:55:08 +02:00
Matt-Yorkley
0ca87580e8
Load variants in cart in one query
...
Avoids an N+1
2020-04-09 19:55:06 +02:00
Luis Ramos
59f56cb0f6
Remove before delivery method in checkout controller, this differentiator is never used in OFN, only in Spree frontend code
2020-04-09 17:32:28 +01:00
Matt-Yorkley
cf712e9478
Select only enterprise id
2020-04-09 17:41:13 +02:00
Luis Ramos
2ff8356c63
Delete dead code from products helper
2020-04-09 16:33:17 +01:00
Luis Ramos
59e0f3d9f4
Merge pull request #5175 from Matt-Yorkley/memoize-scoper
...
Memoize ScopeProductToHub in product list
2020-04-09 14:45:57 +01:00
Luis Ramos
fc5aff8c79
Merge pull request #5145 from luisramos0/inv_perf
...
Performance improvements to Inventory page
2020-04-09 13:56:33 +01:00
Luis Ramos
7d82c6a014
Update spre revision to a version that doesnt depend on deface, this allows us to upgrade nokogiri (done in another PR in the master branch)
2020-04-09 13:51:54 +01:00
Luis Ramos
4aad80c134
Update message for capybara with new upgrade blocker
2020-04-09 13:39:40 +01:00
Luis Ramos
71ffa6b178
Upgrade nokogiri as much as possible (it's not an explicit dependency of OFN and we dont need to control the version now, so I remove it from Gemfile)
2020-04-09 13:39:40 +01:00
Luis Ramos
e3de71668a
Depend on a spree version in which spree_core doesnt depend on deface AND remove deface from list of dependencies
2020-04-09 13:39:40 +01:00
Luis Ramos
dd717fe8ac
Merge pull request #5184 from Matt-Yorkley/inventory-loading
...
Inventory loading
2020-04-09 13:26:12 +01:00
Luis Ramos
4b23adca2d
Merge pull request #5157 from luisramos0/email_validation
...
[Spree 2.1] Add order.email regexp validation
2020-04-09 10:14:11 +01:00
Luis Ramos
6341c5fd80
Merge pull request #4964 from luisramos0/po_fix
...
Fix proxy orders controller in rails 4 by removing the use of responders
2020-04-09 10:12:33 +01:00
Matt-Yorkley
47ac6c1491
Remove unused methods from ProductSimpleSerializer
2020-04-09 09:51:32 +02:00
Matt-Yorkley
6afda141a1
Remove track_inventory_levels conditional
...
This value is always true in OFN
2020-04-09 09:19:37 +02:00
Matt-Yorkley
5bb2614f9d
Refactor PagedFetcher so it makes one request at a time
2020-04-09 09:19:37 +02:00
Matt-Yorkley
b3c968856b
Fix some rubocop issues
2020-04-09 09:19:37 +02:00
Matt-Yorkley
b0a7497f2a
Remove another N+1 in product serialization
2020-04-09 09:19:37 +02:00
Matt-Yorkley
f959e632ea
Modify Spree::Stock::Quantifier to not re-fetch stock items if they are already eager-loaded
...
This helps to remove a big N+1 here, and will also be very helpful elsewhere in the app
2020-04-09 09:19:37 +02:00
Matt-Yorkley
f9cf826f1c
Bring Spree::Stock::Quantifier in to OFN
...
This is the original unmodified Class from Spree. Modifications added in subsequent commits.
2020-04-09 09:19:36 +02:00
Matt-Yorkley
ececbce596
Only select id in producers query
2020-04-09 09:16:44 +02:00
Matt-Yorkley
1b7ac1a252
Don't re-use fat serializers when thin ones are needed.
...
This cuts the pageload and query count in half, again.
2020-04-09 09:10:41 +02:00
Transifex-Openfoodnetwork
d31b24786a
Updating translations for config/locales/en_NZ.yml
2020-04-09 16:16:24 +10:00
Matt-Yorkley
374bf04118
Merge pull request #5142 from Matt-Yorkley/shops-firefighting
...
Don't load distributed properties on inactive distributors
2020-04-08 20:45:01 +02:00
Matt-Yorkley
3aff7f62e3
Don't query distributed properties on enterprises that aren't active distributors
...
Cuts page load on /shops by ~75% (with production data) and removes ~300 expensive and superfluous queries.
2020-04-08 20:08:12 +02:00
Matt-Yorkley
fc5e346a06
Merge pull request #5156 from Matt-Yorkley/closed-shops
...
Load closed shops in a separate request on /shops page
2020-04-08 20:05:26 +02:00
Matt-Yorkley
538e4e54d2
Set cart buttons to fixed width and expand when screen is too small
2020-04-08 11:19:14 +02:00
Matt-Yorkley
1ddbabd841
Adjust colours of primary buttons to use (bright) orange instead of (warning) red
2020-04-08 10:57:33 +02:00
Matt-Yorkley
0414f4984d
Align buttons left and right on cart page
2020-04-08 10:55:55 +02:00
Matt-Yorkley
9c421e146e
Remove arrows from cart and checkout buttons
2020-04-08 10:23:18 +02:00
Luis Ramos
29bbf2fa74
Merge pull request #5088 from coopdevs/do-not-recreate-when-booting-docker
...
Do not reset the dev env when booting docker
2020-04-07 21:56:09 +01:00
Matt-Yorkley
64c66ddedc
Eager-load variant data for overridable products
...
Cuts query count and page load time in half for this endpoint.
2020-04-07 15:16:32 +02:00
Luis Ramos
e0e2c32d9f
Merge pull request #5177 from openfoodfoundation/dependabot/bundler/oj-3.10.6
...
Bump oj from 3.10.5 to 3.10.6
2020-04-07 11:44:09 +01:00
Luis Ramos
ff799b6e82
Avoid using update_attributes that save the order to the DB
2020-04-07 11:13:29 +01:00
Matt-Yorkley
003341ef7a
Add loading indicator when showing closed shops
2020-04-07 10:40:49 +02:00
Matt-Yorkley
94f8ea2f93
Fix flicker effect showing 3 buttons when clicking "Show Closed Shops" button
2020-04-07 10:31:56 +02:00
Kristina Lim
e6cd33ee57
Increase max characters for locale in spree_users
...
There are many locales that have six (6) characters.
2020-04-07 15:08:49 +08:00
Maikel
45c0209971
Merge pull request #5154 from luisramos0/prop_strong
...
[Spree 2.1] Add strong params implementation to properties controller
2020-04-07 16:27:22 +10:00
Maikel
eb64112b22
Merge pull request #5144 from openfoodfoundation/transifex
...
Transifex
2020-04-07 16:23:35 +10:00
Maikel
3e14b62b46
Merge pull request #5136 from openfoodfoundation/dependabot/bundler/ddtrace-0.34.1
...
Bump ddtrace from 0.34.0 to 0.34.1
2020-04-07 16:05:53 +10:00
Maikel
3244650932
Merge pull request #5135 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.1
...
Bump rubocop-rails from 2.5.0 to 2.5.1
2020-04-07 16:05:18 +10:00
Transifex-Openfoodnetwork
b6753a2593
Updating translations for config/locales/fil_PH.yml
2020-04-07 16:03:57 +10:00
Transifex-Openfoodnetwork
1b119805b4
Updating translations for config/locales/fil_PH.yml
2020-04-07 15:15:12 +10:00
Transifex-Openfoodnetwork
edde7689a9
Updating translations for config/locales/de_DE.yml
2020-04-07 13:57:54 +10:00
Transifex-Openfoodnetwork
8060977786
Updating translations for config/locales/en_GB.yml
2020-04-07 13:54:53 +10:00
Transifex-Openfoodnetwork
837a345958
Updating translations for config/locales/en_FR.yml
2020-04-07 13:54:46 +10:00
dependabot-preview[bot]
7c5e511fde
Bump oj from 3.10.5 to 3.10.6
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.5 to 3.10.6.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.5...v3.10.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-06 19:24:48 +00:00
Luis Ramos
d18a06a0f7
Merge pull request #4783 from luisramos0/stripe_sca_extra_subs
...
Move all subscriptions services to the OrderManagement engine
2020-04-06 20:20:02 +01:00
Luis Ramos
d23b4fd307
Merge pull request #5174 from coopdevs/change-pool-size
...
Allow changing the connection pool size
2020-04-06 19:29:09 +01:00
Matt-Yorkley
2cb4c6bec2
Memoize OpenFoodNetwork::ScopeProductToHub
...
This means we avoid fetching all of the hub's variants every time we scope a product. Applies to every product loaded when displaying a shops's product list.
2020-04-06 19:41:05 +02:00
Pau Pérez Fabregat
924e816a5b
Merge pull request #5151 from luisramos0/fix_order_perms
...
Fix Permissions::Order spec in rails 4
2020-04-06 18:07:39 +02:00
Pau Pérez Fabregat
109da43905
Merge pull request #2 from luisramos0/do-not-recreate-when-booting-docker
...
Re-add setup instructions removed from docker-compose into Dockerfile…
2020-04-06 16:55:59 +02:00
Pau Perez
33ca6a2096
Allow changing the connection pool size
...
This allows us to tune for UK. The hypothesis from @kristinalim is:
> From what I understand, it can result to Rails processes waiting for
each other to complete, while the DB server can take more simultaneous
connections.
2020-04-06 16:03:06 +02:00
Eduardo
e7b780f963
make shop name a link on /account
2020-04-06 08:34:24 -03:00
dependabot-preview[bot]
13cba3d244
Bump ddtrace from 0.34.0 to 0.34.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.34.0 to 0.34.1.
- [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.34.0...v0.34.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-06 11:27:10 +00:00
Matt-Yorkley
ce45e7cf71
Merge pull request #5162 from Matt-Yorkley/unicorn-worker-killer
...
Add optional unicorn-worker-killer configs
2020-04-06 13:25:22 +02:00
Matt-Yorkley
ba5a56db14
Make upper and lower bounds configurable
2020-04-06 10:39:51 +02:00
Matt-Yorkley
276dcf4a3b
Add optional unicorn-worker-killer configs
2020-04-06 10:39:50 +02:00
Transifex-Openfoodnetwork
dcfb1aec6d
Updating translations for config/locales/en_PH.yml
2020-04-06 18:11:07 +10:00
Pau Pérez Fabregat
fde2aac366
Merge pull request #5163 from coopdevs/collect-Ruby-GC
...
Enable Ruby Runtime Metrics in Datadog
2020-04-05 14:32:54 +02:00
Luis Ramos
63138aef30
Re-add setup instructions removed from docker-compose into Dockerfile and Docker.md
2020-04-05 00:06:31 +01:00
Pau Perez
7612415991
Enable Ruby Runtime Metrics in Datadog
...
This automatically collects a bunch of Ruby's GC-related metrics that
will come in handy while we tune the Unicorn workers. Some of theres
are:
* runtime.ruby.class_count
* runtime.ruby.gc.malloc_increase_bytes
* runtime.ruby.gc.total_allocated_objects
* runtime.ruby.gc.total_freed_objects
* runtime.ruby.gc.heap_marked_slots
* runtime.ruby.gc.heap_available_slots
* runtime.ruby.gc.heap_free_slots
* runtime.ruby.thread_count
Check https://docs.datadoghq.com/tracing/runtime_metrics/ruby/#data-collected for the complete list.
The cool thing is that
> Runtime metrics can be viewed in correlation with your Ruby services
2020-04-05 00:16:10 +02:00
Luis Ramos
53d901b41b
Merge pull request #5064 from luisramos0/fix_sample_data
...
Fix sample data and custom paper_trail config on order_cycles and schedules on rails 4
2020-04-04 18:29:26 +01:00
Luis Ramos
fa4b8832e9
Fix timezone mix up in specs
...
Converting times with timezones to string was ignoring the timezone and this making the start date be before the end date in this spec
2020-04-04 16:39:23 +01:00
Luis Ramos
4ceaebf098
Add order.email regexp validation and add some tests for it
2020-04-04 16:13:23 +01:00
Matt-Yorkley
bc859cf9f7
Add api/shops_controller and refactor
2020-04-04 17:02:27 +02:00
Matt-Yorkley
af48cac140
Load closed shops in a separate request on /shops page
2020-04-04 14:06:10 +02:00
Luis Ramos
451cfac788
Merge pull request #4995 from Matt-Yorkley/3-0-eager-load
...
[Spree 2.1] Staging and Production configs
2020-04-04 12:21:25 +01:00
Luis Ramos
59bb956677
Merge pull request #5010 from Matt-Yorkley/remove_simple_form
...
Remove simple_form
2020-04-04 11:53:06 +01:00
Luis Ramos
4f08ed1801
Remove commented turbo-sprockets-rails3 from Gemfile, thsi gem is not needed in rails 4
2020-04-04 11:39:20 +01:00
Luis Ramos
1364a5e367
Merge pull request #4916 from luisramos0/adj_eli
...
[Spree 2.1] Make Spree::OrderUpdater update all adjustments, not just promotions and shipment adjustments
2020-04-04 11:28:13 +01:00
Luis Ramos
07264446e6
Add strong params implementation to properties controller
2020-04-04 11:17:38 +01:00
Luis Ramos
b8f8db0341
Merge pull request #5147 from luisramos0/3-0-stable-apr3
...
[Spree 2.1] Merge master into 3-0-stable
2020-04-04 11:03:14 +01:00
Matt-Yorkley
8a544f3ab3
Add missing indexes to spree_orders and spree_products
2020-04-04 10:12:15 +02:00
Luis Ramos
04986dd0d5
Merge pull request #4932 from luisramos0/line_items_fix
...
Adapt line items scope to include deleted variants and deleted products - rails 4 fix
2020-04-03 20:09:35 +01:00
Luis Ramos
55b3f4d54f
Move search params test case to a different context so that we dont have to set the producer of the products in the order
...
This is working in master by chance of the factories but breaks in rails 4 because the orders in this test dont have products supplied by the producer which is a necessary condition in the context where it was
2020-04-03 19:47:33 +01:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Luis Ramos
452ab3a842
Add comment to better explain variant_override_set.collection_to_delete
2020-04-03 15:36:19 +01:00
Luis Ramos
a049e7a433
Add product to includes to avoid N+1 queries to fetch products when VO authorization is done right after this
2020-04-03 14:48:06 +01:00
Transifex-Openfoodnetwork
97063bf47e
Updating translations for config/locales/en_GB.yml
2020-04-03 23:24:25 +11:00
Luis Ramos
e64d573337
Revert accidental push of a byebug statement with the direct translations push to master 🙈
2020-04-03 12:06:39 +01:00
Luis Ramos
7858a26e5e
Update all locales with the latest Transifex translations
2020-04-03 12:03:40 +01:00
Luis Ramos
4922c05bcf
Merge pull request #5139 from openfoodfoundation/transifex
...
Transifex
2020-04-03 11:28:11 +01:00
Transifex-Openfoodnetwork
d06b7b8606
Updating translations for config/locales/de_DE.yml
2020-04-03 19:26:04 +11:00
Transifex-Openfoodnetwork
72b47fbceb
Updating translations for config/locales/de_DE.yml
2020-04-03 19:22:55 +11:00
Luis Ramos
da7b0966be
Merge pull request #5133 from Matt-Yorkley/cache-in-hand
...
Cache counts used in homepage for 24 hours
2020-04-03 08:34:58 +01:00
Luis Ramos
445eb9f287
Merge pull request #5121 from Matt-Yorkley/flaky-maps-js
...
Update vendor/assets/angular-google-maps.min.js
2020-04-02 22:13:51 +01:00
dependabot-preview[bot]
5b4dd57380
Bump rubocop-rails from 2.5.0 to 2.5.1
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.0...v2.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-02 19:15:11 +00:00
Matt-Yorkley
adb61e48c5
Cache counts used in homepage for 24 hours
2020-04-02 19:09:03 +02:00
Matt-Yorkley
838ffdbf00
Add code comment for dependency
2020-04-02 17:33:10 +02:00
Pau Pérez Fabregat
fe8beb5448
Merge pull request #5099 from Matt-Yorkley/ticking-time-bom
...
Improve BOM
2020-04-02 16:01:48 +02:00
Matt-Yorkley
18ee5254f9
Make Geo service calls more resilient in /shops page
...
The Geo service is used heavily in the /shops page and especially in the search function. If the google maps js library has failed to load it was throwing a lot of fatal errors, so this change ensures the /shops page can at least: a) load, b) show some shops, and c) search for shops by name (but not location)
2020-04-02 13:56:25 +02:00
Matt-Yorkley
40f8cf660c
Update vendor/assets/angular-google-maps.min.js
...
Fixes an issue where if the js library from maps.googleapis.com failed to load in the <head>, all of our subsequent Angular would completely break.
See: https://github.com/angular-ui/angular-google-maps
Note: `bluebird.js` is a new dependency of `angular-google-maps.js`.
2020-04-02 13:32:55 +02:00
Matt-Yorkley
2c70db7952
Merge pull request #5070 from luisramos0/master_card
...
Translate credit card brand so that active merchand code handles the payment correctly
2020-04-02 12:18:00 +02:00
Pau Pérez Fabregat
1a38a4e1a7
Merge pull request #5091 from openfoodfoundation/transifex
...
Transifex
2020-04-02 11:56:29 +02:00
Pau Pérez Fabregat
15d106bb0a
Merge pull request #5116 from openfoodfoundation/dependabot/bundler/ddtrace-0.34.0
...
Bump ddtrace from 0.33.1 to 0.34.0
2020-04-02 11:55:53 +02:00
Pau Pérez Fabregat
c8be2fb89a
Merge pull request #5125 from openfoodfoundation/dependabot/bundler/rubocop-0.81.0
...
Bump rubocop from 0.80.1 to 0.81.0
2020-04-02 11:54:00 +02:00
Transifex-Openfoodnetwork
b1f8f91011
Updating translations for config/locales/fr.yml
2020-04-02 18:03:11 +11:00
Transifex-Openfoodnetwork
e08606a310
Updating translations for config/locales/en_FR.yml
2020-04-02 18:02:57 +11:00
Transifex-Openfoodnetwork
2230d83729
Updating translations for config/locales/pt_BR.yml
2020-04-02 08:41:25 +11:00
dependabot-preview[bot]
d38da02113
Bump rubocop from 0.80.1 to 0.81.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.1 to 0.81.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.1...v0.81.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-04-01 19:20:42 +00:00
Luis Ramos
0e268a171f
Switch to console.error so we get a bugsnag alert everytime a user has a problem with their card
...
Add paymentMethodsAPI specific mapping function, we had some errors in production with mastercards probably caused by ActiveMerchant not handling the card type correctly
2020-04-01 18:58:43 +01:00
Luis Ramos
73c4eedd06
Translate credit card brand so that active merchant code handles the payment correctly
...
Adds a simple console.log statement in case there is an error adding the
card
2020-04-01 18:58:10 +01:00
Luis Ramos
8a220742f5
Merge pull request #5103 from jeduardo824/bug/5092-remove-blue-setence-in-payment-method-setting
...
remove blue sentence in payment method setting
2020-04-01 18:56:09 +01:00
Luis Ramos
9fa604db0d
Merge pull request #5076 from luisramos0/rails_f_helper
...
Remove Rails Foundation Helper and improve error display and logging in checkout controller
2020-04-01 18:54:45 +01:00
Transifex-Openfoodnetwork
6083d91d3e
Updating translations for config/locales/ca.yml
2020-04-02 01:57:50 +11:00
Transifex-Openfoodnetwork
9bdb396b86
Updating translations for config/locales/ca.yml
2020-04-02 01:54:42 +11:00
Matt-Yorkley
ad42b1b485
Remove pagination limits in BOM
...
We can re-assess this later, but for now it looks like some of the BOM functionality won't work if results are returned across multiple pages.
2020-04-01 13:43:21 +02:00
Luis Ramos
78170bc709
Merge pull request #4807 from openfoodfoundation/dependabot/bundler/compass-rails-4.0.0
...
Bump compass-rails from 3.1.0 to 4.0.0
2020-04-01 12:42:42 +01:00
Luis Ramos
957b398a54
Add call to $evalAsync() after Loading and FlashLoader are updated so
...
that a angular digest is triggered
This is required so that Loading.clear triggers a refresh and makes its placeholder to be cleared
2020-04-01 12:08:55 +01:00
Luis Ramos
c3d25bf163
Make checkout controller send bugsnag alerts on every checkout problem
...
There are two new situations here: we will see order.errors after update_attributes fails but before order restart; and we will see how often the order is not complete when the workflow finishes (maybe none)
2020-04-01 12:03:39 +01:00
Luis Ramos
ce2a164c66
Stop using f_form_for
...
Add labels for some fields, this was done automatically by rails foundation helper
2020-04-01 12:03:39 +01:00
Luis Ramos
b898ce1ae1
Make checkout controller add flash error if order contains any type of error
...
Here we add translations for a particular case where the credit card expiry date is in the past
2020-04-01 12:03:39 +01:00
Luis Ramos
409681b7af
Merge pull request #5089 from Matt-Yorkley/checkout-scoping
...
Cart variant scoping
2020-04-01 11:49:23 +01:00
Luis Ramos
9317549103
Merge pull request #4813 from luisramos0/oc_selector
...
If there's only one OC available to the customer because there are tag rules hidding other OCs, select that OC by default
2020-04-01 10:44:58 +01:00
Luis Ramos
154e223a12
Make sure test data is available before the test
2020-04-01 10:00:07 +01:00
Luis Ramos
80b9800b36
Replace SQL with equivalent AR code
2020-04-01 10:00:07 +01:00
Luis Ramos
6e095bdb68
Fix bug in line_item_decorator, should be inner join not left outer join
2020-04-01 10:00:07 +01:00
Luis Ramos
a4c7dbc329
Add comment to better explain why this scope is not simply using joins(:product)
2020-04-01 10:00:07 +01:00
Luis Ramos
8909238682
Fix one rubocop issue
2020-04-01 10:00:07 +01:00
Luis Ramos
7c367da904
Adapt LineItem#supplied_by_any scope to include deleted variants and deleted products (both not included in the respective default scopes) and use it in Permissions::Order so that variants of deleted products are seen in reports
2020-04-01 10:00:07 +01:00
Luis Ramos
0c8635403a
Delete dead scope in line_items
...
This is not used anywhere in the code
2020-04-01 10:00:07 +01:00
dependabot-preview[bot]
b22ad244f9
Bump ddtrace from 0.33.1 to 0.34.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.33.1 to 0.34.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.33.1...v0.34.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-31 19:40:01 +00:00
Transifex-Openfoodnetwork
9c17a91215
Updating translations for config/locales/en_GB.yml
2020-04-01 05:07:08 +11:00
Luis Ramos
6a1c541479
Remove specific error color on checkout page so that the error message takes the default foundation error color which is white
2020-03-31 16:32:33 +01:00
Luis Ramos
6c64261868
Merge pull request #5113 from mkllnk/5110-bugsnag-js-logging
...
Add Bugsnag JS logging
2020-03-31 15:51:12 +01:00
Matt-Yorkley
f437d0f8a0
Report environment correctly in Bugsnag JS
2020-03-31 15:59:17 +02:00
Transifex-Openfoodnetwork
79d6d7cc9e
Updating translations for config/locales/de_DE.yml
2020-03-31 22:09:16 +11:00
Matt-Yorkley
e200ece280
Rename partial to bugsnag_js for clarity
2020-03-31 12:57:12 +02:00
Matt-Yorkley
30bf9257ab
Move conditional inside partial and use default key as fallback
2020-03-31 12:55:28 +02:00
Matt-Yorkley
03e229da08
Add bugsnag js script to admin layout above all.js
2020-03-31 12:25:42 +02:00
Maikel Linke
28473c9087
Add Bugsnag JS logging
2020-03-31 15:51:04 +11:00
Matt-Yorkley
09c8819e5a
Remove unnecessary Bugsnag calls
...
The Bugsnag notification was just here to see if this was dead code. It's not.
2020-03-30 20:36:45 +02:00
Matt-Yorkley
f7c047b798
Memoize ScopeVariantToHub to avoid fetching the hub's overrides each time
2020-03-30 20:33:27 +02:00
Luis Ramos
635ea9c505
Fix some long lines on variant_decorator
2020-03-30 11:21:47 +01:00
Luis Ramos
fbbe586996
Avoid rails 3 bug where the first where clause is overriden by a second where clause
...
Co-Authored-By: Maikel <maikel@email.org.au >
2020-03-30 11:21:47 +01:00
Luis Ramos
a5184cce9d
Make method a bit more readable and add comment with details
2020-03-30 11:21:47 +01:00
Luis Ramos
69b57544f1
Bring Spree::Variant#active so that we can make it return just variants without includes
...
This makes the variants returned not readonly in rails 4 and thus fixes a spec in Spree::VariantsController#destroy
2020-03-30 11:21:47 +01:00
Eduardo
b6da0e2092
remove @payment_method explict variable from the view
2020-03-29 20:32:55 -03:00
Matt-Yorkley
95963c5732
Refactor Angular line_items_controller
2020-03-29 19:54:49 +02:00
Matt-Yorkley
aba1b5b67a
Add pagination specs and refactor
2020-03-29 19:54:49 +02:00
Matt-Yorkley
fe58121c7f
Fix clear filters button
2020-03-29 19:54:49 +02:00
Matt-Yorkley
5c4a2c2790
Update javascript specs
2020-03-29 19:54:49 +02:00
Matt-Yorkley
a07281910b
Fix dropdown placeholders
2020-03-29 19:54:49 +02:00
Matt-Yorkley
72f9da3ac4
Fix regex validation and HTML "type" settings not allowing decimals for final_weight_volume
...
`final_weight_volume` can be a decimal, and often *is* in production data. Not regarding them as valid was breaking the form submission in various cases
2020-03-29 19:54:49 +02:00
Matt-Yorkley
375b4648dc
Add pagination to Bulk Order Management
2020-03-29 19:54:47 +02:00
Transifex-Openfoodnetwork
9af0a39305
Updating translations for config/locales/en_FR.yml
2020-03-29 06:43:01 +11:00
Transifex-Openfoodnetwork
6817231f29
Updating translations for config/locales/fr.yml
2020-03-29 06:42:36 +11:00
Matt-Yorkley
7c7f9551d6
Fix bug in order cycle select dropdown
...
The date filters were being filled with the string: "Invalid date" because momentjs was not able to parse the input
2020-03-28 15:17:31 +01:00
Matt-Yorkley
d568b45d4a
Limit spamming the server with lots of requests
...
This uses "debounce" to add a little waiting time whilst the user is part-way through selecting dates (or manually typing in the date filter) so we don't make too many unnecessary requests.
2020-03-28 11:20:23 +01:00
Matt-Yorkley
b76a6d15a3
Improve date field query triggers
...
Don't submit the request if the user is part-way through typing something in the date field and the date is (currently) invalid; this results in the date ranges being broken and triggering a query for *all* results (with no date range).
2020-03-28 11:16:25 +01:00
Luis Ramos
940423acfc
Merge pull request #5067 from gao329700254/fix/fix_fr_translation_in_order_cycles_outgoing(4937)
...
Fix translation missing in order cycles outgoing page (closed #4937 )
2020-03-27 22:00:19 +00:00
Transifex-Openfoodnetwork
6a57aa3b29
Updating translations for config/locales/en_FR.yml
2020-03-28 04:08:31 +11:00
Transifex-Openfoodnetwork
ca78e9d0e2
Updating translations for config/locales/fr.yml
2020-03-28 04:08:17 +11:00
Luis Ramos
e705e88007
Merge pull request #5087 from luisramos0/custom_data
...
Fix bug in subscriptions logging by making versions.custom_data a longer field
2020-03-27 16:04:31 +00:00
Pau Pérez Fabregat
1fbb9fa3df
Merge pull request #5083 from openfoodfoundation/transifex
...
Transifex
2020-03-27 16:51:30 +01:00
Matt-Yorkley
71f00f9283
Remove comment warning about this issue
2020-03-27 14:23:48 +01:00
Matt-Yorkley
7d33a237d0
Add scoping to VariantsStockLevels when variant is not in the order
2020-03-27 14:15:15 +01:00
Matt-Yorkley
857cacb74b
Add test for additional case where variant is not in the order
2020-03-27 14:03:17 +01:00
Matt-Yorkley
fbfe663ebc
Add variant scoping to VariantStockLevels
2020-03-27 13:38:57 +01:00
Matt-Yorkley
83b90f3167
Add spec variant override test to VariantsStockLevels
2020-03-27 13:31:39 +01:00
Luis Ramos
14fd9a121e
Make versions.custom_data text so it can take longer lists
2020-03-27 11:34:01 +00:00
Pau Perez
904e89e325
Do not reset the dev env when booting docker
...
The current web container's command destroys anything you might have in
your local DB from a previous session, assuming you always want start
from a clean environment. This is hardly the case and makes
`docker-compose up` take quite long. What if you just stopped containers
temporally while developing?
This changes the approach to not assume anything. If you need to install
a new gem or reset your DB just run the commands you would without
docker. You can run anything you want with `docker-compose run web bundle exec
<rails/rake command>` anyway.
For someone setting things for the first time, the `Dockerfile` process
still installs all dependencies.
2020-03-27 12:17:09 +01:00
Maikel
d254df7ccc
Merge pull request #5073 from Matt-Yorkley/mobile-checkout
...
[Mobile UX] Order cycle section updates
2020-03-27 15:34:19 +11:00
Pau Pérez Fabregat
a218eab67b
Merge pull request #4987 from Matt-Yorkley/3-0-packing
...
[Spree 2.1] Packing report deleted variants
2020-03-26 17:37:51 +01:00
Pau Pérez Fabregat
8caf10f634
Merge pull request #5079 from openfoodfoundation/dependabot/bundler/unicorn-5.5.4
...
Bump unicorn from 5.5.3 to 5.5.4
2020-03-26 17:32:17 +01:00
Transifex-Openfoodnetwork
2e98b0b5c1
Updating translations for config/locales/en_GB.yml
2020-03-27 01:40:20 +11:00
Matt-Yorkley
2966dd9536
Update all locales with the latest Transifex translations
2020-03-26 14:25:34 +01:00
Matt-Yorkley
21e1c0ed0b
Merge pull request #5025 from openfoodfoundation/transifex
...
Transifex
2020-03-26 14:22:38 +01:00
Matt-Yorkley
48b99d02b9
Merge pull request #5060 from Matt-Yorkley/weight-calculator
...
Fix weight calculator
2020-03-26 14:19:21 +01:00
Pau Pérez Fabregat
f17a2eeaea
Merge pull request #5062 from luisramos0/prop_bug
...
Fix broken new property button in properties page (regression from removing spree_backend)
2020-03-26 11:35:47 +01:00
Pau Pérez Fabregat
18419d0276
Merge pull request #5043 from luisramos0/fix_cookies
...
Fix cookies policy helper spec in rails 4
2020-03-26 11:23:49 +01:00
Pau Pérez Fabregat
1c2815d2b7
Merge pull request #5044 from luisramos0/add_spring
...
[Spree 2.1] Re-add spring and newrelic_rpm
2020-03-26 11:23:19 +01:00
Pau Pérez Fabregat
bd19d8b0bd
Merge pull request #5042 from luisramos0/api_base
...
Make explicit the namespace of the BaseController for api controllers
2020-03-26 11:21:27 +01:00
Pau Pérez Fabregat
b3a47964e6
Merge pull request #5033 from luisramos0/ent_fees_data_types
...
[Spree 2.1] Adapt EnterpriseFeeSummary report code to slightly different rails 4 sql data conversion
2020-03-26 11:20:44 +01:00
Pau Pérez Fabregat
9daa40ce9c
Merge pull request #5028 from luisramos0/remove_attr_accessible
...
[Spree 2.1] Remove new attr_accessible entries
2020-03-26 11:20:08 +01:00
Pau Pérez Fabregat
f70e155b1b
Merge pull request #4984 from Matt-Yorkley/3-0-cart-route
...
[Spree 2.1] Fix cart page update
2020-03-26 11:14:07 +01:00
Maikel Linke
4bcd665379
Handle all line items without unit_value in weight calculation
2020-03-26 17:13:29 +11:00
Matt-Yorkley
e63dbcfa89
Fix some SCSS linting warnings
2020-03-25 23:12:23 +01:00
Matt-Yorkley
c3283adcf5
Show full-width ordercycle subheader on tablet and below
2020-03-25 23:12:23 +01:00
Matt-Yorkley
b2ed69831b
Adjust style contexts
2020-03-25 23:12:23 +01:00
Matt-Yorkley
7daba62f43
Update colours for different order cycle sidebar cases
2020-03-25 23:12:23 +01:00
Matt-Yorkley
a08020490d
Define new colour and use variable where already in use
2020-03-25 23:12:23 +01:00
Matt-Yorkley
eb4d970bc7
Adjust positioning for order cycle sidebar
2020-03-25 23:12:23 +01:00
Matt-Yorkley
7a3549209f
Use 4 columns on checkout sidebar
2020-03-25 23:12:23 +01:00
Matt-Yorkley
52ebd1b402
Remove order cycle popovers; these styles are no longer used
2020-03-25 23:12:08 +01:00
Matt-Yorkley
a3a26f704f
Extract re-used box-shadow style
2020-03-25 23:07:39 +01:00
Matt-Yorkley
cff8f6dd96
Add box-shadow to distributor header for cart, checkout, and order confirmation pages
2020-03-25 23:07:39 +01:00
Matt-Yorkley
81537d92cf
Extract styles for distributor header
...
These styles are used in shop, cart, checkout, order confirmation. Not just shop.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
91e88bd028
Allow conditional use of order cycle sidebar
...
We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
f5e254a105
Remove quick fix for hiding oc selector
2020-03-25 23:07:39 +01:00
Sigmund Petersen
b41b5d0395
Update Slack invitation link
2020-03-25 20:38:45 +01:00
dependabot-preview[bot]
296d2e5edb
Bump unicorn from 5.5.3 to 5.5.4
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.3 to 5.5.4.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-25 19:17:31 +00:00
Luis Ramos
ac0a62e962
Merge pull request #5050 from Matt-Yorkley/bullet_tweaks
...
Performance tweaks 2
2020-03-25 18:32:49 +00:00
Matt-Yorkley
0cc5cbd1d2
Merge pull request #5038 from luisramos0/strong_params_prod
...
[Spree 2.1] Implement strong params in products, variants, variant_overrides and resource controllers
2020-03-25 18:35:58 +01:00
Luis Ramos
523faa670d
Remove FoundationRailsHelper, this is dead code now
2020-03-25 17:31:56 +00:00
Luis Ramos
2c5db8935b
Merge pull request #5022 from Matt-Yorkley/performance_tweaks
...
Performance tweaks
2020-03-25 15:42:07 +00:00
Luis Ramos
e5e9325499
Fix paper_trail custom_data for order_cycle, custom data must be a string, cant be an array
2020-03-25 15:35:51 +00:00
Luis Ramos
2e4f8003b6
Fix group factory in rails 4
...
params[:address] was breaking the creation of the EnterpriseGroup
2020-03-25 15:32:16 +00:00
Luis Ramos
24c8f38111
Restructure spec to avoid variable names with numbers
2020-03-25 15:48:57 +01:00
Luis Ramos
b801bffcd9
Merge pull request #5030 from Matt-Yorkley/reports-loading
...
Improve reports performance
2020-03-25 12:54:34 +00:00
Yuhao Gao
60d9edb185
fix translation missing in order cycles outgoing page ( closed #4937 )
2020-03-25 21:51:13 +09:00
Luis Ramos
434b68b019
Merge pull request #5048 from Matt-Yorkley/3-0-user-spec
...
Ensure perform_deliveries is correctly set in user email spec
2020-03-25 11:52:43 +00:00
Luis Ramos
f1b64e90e0
Add comment to explain unusual fix
2020-03-25 11:49:14 +00:00
Matt-Yorkley
433ae00818
Ensure :info log level is set in Rails 4
2020-03-25 11:39:03 +00:00
Matt-Yorkley
7bc29769cd
Fix logging configs for Rails 4
2020-03-25 11:38:29 +00:00
Matt-Yorkley
483d847b00
Use eager_load = true in production and staging environments
2020-03-25 11:36:33 +00:00
Luis Ramos
9af4bb9757
Use create instead of build so that we test with callbacks
2020-03-25 11:22:40 +00:00
Luis Ramos
95ba1fd02c
Merge pull request #5065 from luisramos0/upgrade_deps
...
[Spree 2.1] Upgrade some dependencies... rails 4.0.13 :-)
2020-03-25 11:04:13 +00:00
Luis Ramos
c02a3e919f
Merge pull request #5039 from luisramos0/strong_params_ent
...
[Spree 2.1] Implement strong params in enterprises, enterprise_groups, enterprise_roles, customers and customer_details controllers
2020-03-25 10:53:01 +00:00
Luis Ramos
b7cb95ae3e
Fix problem in PermittedAttributes::Address namespace
2020-03-25 10:52:23 +00:00
Luis Ramos
6b62c8aafd
Extract permitted attributes to separate service
2020-03-25 10:52:23 +00:00
Luis Ramos
e5f56c19c0
Switch to using PermittedAttributes::Address instead of spree version of it that will be removed later
2020-03-25 10:52:23 +00:00
Luis Ramos
22a005df47
Add needed permitted attributes to admin/customers_controller
2020-03-25 10:51:55 +00:00
Luis Ramos
9b0d7b9604
Ammend customers_controller to include ship address attributes permit and also permit #update with specific attributes
2020-03-25 10:51:55 +00:00
Luis Ramos
4fd3026bd8
Add strong parameters permits to some controllers
2020-03-25 10:51:55 +00:00
Luis Ramos
a9a92e11e2
Bring some strong parameters code from spree to our Spree controllers
...
This code comes from spree commit fbc2d150f6
2020-03-25 10:51:55 +00:00
Luis Ramos
fec5e1d84e
Add needed param to enterprises controller
2020-03-25 10:51:55 +00:00
Luis Ramos
ad9e5d979a
Permit extra needed params in enterprises controller
2020-03-25 10:51:55 +00:00
Luis Ramos
29a457575b
Permit specific params in enterprise_groups controller
2020-03-25 10:51:55 +00:00
Luis Ramos
5c179a0932
Ammend strong params on enterprise controller to cover create action
2020-03-25 10:51:55 +00:00
Luis Ramos
34488e5f63
Handle strong params in enterprise_roles controller
2020-03-25 10:51:55 +00:00
Luis Ramos
6ba3a3c373
Handle strong params in admin/enterprises_controller
2020-03-25 10:51:55 +00:00
Matt-Yorkley
d847560d7c
Fix rubocop issues
2020-03-25 10:15:03 +01:00
Pau Pérez Fabregat
a72957e3c3
Merge pull request #4827 from luisramos0/strong_params
...
[Spree 2.1] Implement Strong Parameters in various controllers
2020-03-25 10:07:14 +01:00
Pau Pérez Fabregat
87fae15434
Merge pull request #4909 from luisramos0/line_items_spec
...
Adapt line_items_spec to work in the rails 4 branch as well
2020-03-25 10:05:20 +01:00
Pau Pérez Fabregat
2c487c2592
Merge pull request #5037 from luisramos0/strong_params_subs
...
[Spree 2.1] Implement strong params in subscriptions controller
2020-03-25 09:50:47 +01:00
Pau Pérez Fabregat
d4d72c6c6c
Merge pull request #5036 from luisramos0/strong_params_users
...
[Spree 2.1] Implement strong params in user related controllers
2020-03-25 09:48:52 +01:00
Pau Pérez Fabregat
b323364661
Merge pull request #5035 from luisramos0/strong_params_checkout
...
[Spree 2.1] Implement strong params in checkout controller
2020-03-25 09:46:53 +01:00
Pau Pérez Fabregat
e70daf53ce
Merge pull request #4876 from luisramos0/strong_params_oc
...
[Spree 2.1] Implement strong params in admin Order cycles controller
2020-03-25 09:44:13 +01:00
Pau Pérez Fabregat
c5621b7740
Merge pull request #5034 from luisramos0/strong_params_payment_methods
...
[Spree 2.1] Implement strong params in admin payment methods controller
2020-03-25 09:39:34 +01:00
Matt-Yorkley
e27f7a4301
Ensure perform_deliveries is correctly set when testing user confirmation emails
2020-03-25 08:42:21 +01:00
Luis Ramos
bddfa95eb5
Fix broken new property button in properties page
2020-03-24 21:50:49 +00:00
Matt-Yorkley
ef0fb18fda
Fix calculations for weight when variant.unit_value is zero
2020-03-24 22:05:55 +01:00
Luis Ramos
570fb4bfb4
Upgrade factory_bot_rails
2020-03-24 19:18:13 +00:00
Luis Ramos
89cc7ee5ef
Upgrade devise-encryptable to 0.2.0 which is latest
2020-03-24 19:18:13 +00:00
Luis Ramos
5453fed716
Upgrade rails from 4.0.0 to 4.0.13
2020-03-24 19:18:13 +00:00
Luis Ramos
b8ed28b38c
Remove deface, it's already included in spree_core, it's not a direct dependency of OFN anymore
2020-03-24 19:18:13 +00:00
Matt-Yorkley
87ee4bbebc
Add spec for current problematic behaviour
2020-03-24 20:09:54 +01:00
Transifex-Openfoodnetwork
f5567e556b
Updating translations for config/locales/pt_BR.yml
2020-03-25 02:22:31 +11:00
Matt-Yorkley
e014e6c1a4
Ensure perform_deliveries is correctly set when testing user confirmation emails
2020-03-24 13:12:20 +00:00
Matt-Yorkley
54c3c73ed2
Fix duplicate key in hash
2020-03-24 12:46:21 +01:00
Luis Ramos
8dfdc9bc15
Merge pull request #5056 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.0
...
Bump rubocop-rails from 2.4.2 to 2.5.0
2020-03-24 11:22:21 +00:00
Matt-Yorkley
36aa52736a
Refactor order filtering logic
2020-03-24 09:36:59 +01:00
Matt-Yorkley
ac38b2735c
Eager-load data in OrdersController
2020-03-23 22:38:57 +01:00
Matt-Yorkley
8b93c5ab56
Invert conditionals for better readability
2020-03-23 22:38:57 +01:00
Matt-Yorkley
434f98fb46
Fix insane N+1 in Package
...
The #ships_with? method was being called ~800 times when loading the admin order edit page (with Aus production data), and triggering a new query each time it was called.
2020-03-23 22:38:57 +01:00
Matt-Yorkley
c82c54873c
Pluck :id when querying active distributors for serializer data
2020-03-23 22:38:55 +01:00
dependabot-preview[bot]
de180d32bf
Bump rubocop-rails from 2.4.2 to 2.5.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-23 20:37:57 +00:00
Matt-Yorkley
5b481c19cc
Eager-load country in Producers controller
2020-03-23 19:33:15 +01:00
Matt-Yorkley
7110f9e6ee
Eager-load data used in EnterpriseGroupsController
...
Cuts page load time by ~75%
2020-03-23 19:33:13 +01:00
Transifex-Openfoodnetwork
63d748b2a4
Updating translations for config/locales/pt_BR.yml
2020-03-24 03:32:23 +11:00
Transifex-Openfoodnetwork
310906c7da
Updating translations for config/locales/en_NZ.yml
2020-03-23 15:49:19 +11:00
Transifex-Openfoodnetwork
b81843921b
Updating translations for config/locales/en_CA.yml
2020-03-23 08:57:54 +11:00
Luis Ramos
2de550eac1
Make OrderUpdate update all adjustments again as in v2.0.4 otherwise adjustments that are not shipment adjustments will not be calculated correctly
2020-03-22 20:08:11 +00:00
Luis Ramos
85f6be756e
Merge pull request #5027 from luisramos0/3-0-stable-mar20
...
[Spree 2.1] Merge master into 3-0-stable - 20 March 2020
2020-03-22 13:20:54 +00:00
Matt-Yorkley
dd0e135a4d
Add test coverage for Permissions::Order with search_params
2020-03-22 11:45:40 +01:00
Luis Ramos
658a024272
Re-add spring and newrelix_rpm
2020-03-22 10:41:59 +00:00
Luis Ramos
0f2c5d379a
Add test locales to I18n.available_locales before the test and reset them afterwards
2020-03-22 10:32:16 +00:00
Luis Ramos
a29f263041
Make explicit the namespace of the BaseController for api controllers
2020-03-22 09:55:07 +00:00
Luis Ramos
478f885b26
Fix problem in PermittedAttributes::Variant namespace
2020-03-21 22:36:31 +00:00
Luis Ramos
5e6a210632
Fix problem in PermittedAttributes::User namespace
2020-03-21 22:36:03 +00:00
Luis Ramos
26cd0f4a9d
Merge pull request #5023 from mkllnk/5019-invoice-bill-address
...
Display shipping and billing address on invoices
2020-03-21 20:38:00 +00:00
Luis Ramos
4e43535512
Add missing permitted attribute
2020-03-21 20:30:34 +00:00
Luis Ramos
3ccd58d50b
Fix a problem in the permit list to allow a list to be taken
2020-03-21 20:30:34 +00:00
Luis Ramos
5a0319213f
Fix schedules controller permitted attributes
2020-03-21 20:30:34 +00:00
Luis Ramos
b7c0caf883
Add needed permitted attributes to orders_controller
2020-03-21 20:30:34 +00:00
Luis Ramos
8c5dfea92f
Fix strong params in order_cycles and schedules controllers
2020-03-21 20:30:34 +00:00
Luis Ramos
2a426d29b6
Permit specific params in zones controller
2020-03-21 20:30:34 +00:00
Luis Ramos
47505b6225
Permit specific params in shipping methods controller
2020-03-21 20:30:34 +00:00
Luis Ramos
6fa1ed03dc
Permit specific params in adjustments controller
2020-03-21 20:30:34 +00:00
Luis Ramos
d73d851095
Permit specific params in tax_rates controller
2020-03-21 20:30:34 +00:00
Luis Ramos
495c3a3810
Permit specific params in images controller
2020-03-21 20:30:34 +00:00
Luis Ramos
9681437fba
Permit specific params in tax_categories controller
2020-03-21 20:30:34 +00:00
Luis Ramos
b99d4ab627
Permit specific params in schedules controller
2020-03-21 20:30:34 +00:00
Luis Ramos
423d5a5a61
Permit specific params in taxonomies controller
2020-03-21 20:30:34 +00:00
Luis Ramos
e5a214da78
Permit specific params in states controller
2020-03-21 20:30:34 +00:00
Luis Ramos
46025915d5
Make taxons_controller strong_params method consistent with all other controllers
2020-03-21 20:30:34 +00:00
Luis Ramos
e23267156d
Improve inventory_items_controller strong params by not using permit!
2020-03-21 20:30:34 +00:00
Luis Ramos
6bd72f44de
Handle strong params in credit card controllers
2020-03-21 20:30:34 +00:00
Luis Ramos
913ea5b883
Handle strong parameters in bulk_line_items controller
2020-03-21 20:30:34 +00:00
Luis Ramos
d496a4bdc8
Add strong parameters permits to some controllers
2020-03-21 20:30:34 +00:00
Luis Ramos
c15433af3f
Bring some strong parameters code from spree to our Spree controllers
...
This code comes from spree commit fbc2d150f6
2020-03-21 20:30:34 +00:00
Luis Ramos
244499a27d
Extract permitted atttributes to specific classes
2020-03-21 19:41:05 +00:00
Luis Ramos
58a2805bc9
Make resource controller raise error if permitted_resource_params is not overriden
2020-03-21 19:41:05 +00:00
Luis Ramos
49a2522305
Permit specific params in variants controller
2020-03-21 19:27:55 +00:00
Luis Ramos
527f6cb624
Add necessary attributes to admin/products_controller and handle empty params case
2020-03-21 19:14:26 +00:00
Luis Ramos
36389b7bed
Add missing permitted attributes to bulk_product_update controller
2020-03-21 19:14:26 +00:00
Luis Ramos
b5cdcdf8cb
Permit specific params in products controller
2020-03-21 19:14:26 +00:00
Luis Ramos
a261ae118d
Add missing permitted attributes to variant overrides controller
2020-03-21 19:14:26 +00:00
Luis Ramos
7320b38b93
Add missing attributes to variant override controller
2020-03-21 19:14:26 +00:00
Luis Ramos
0151b5ee9a
Permit extra needed params in variant overrides controller
2020-03-21 19:14:26 +00:00
Luis Ramos
5b37e89738
Handle strong params in variant_overrides_controller
...
We use a simpler way to permit on array within params here and change products_controller to the same style
2020-03-21 19:14:26 +00:00
Luis Ramos
c110f4832d
Handle strong params in spree/admin/products_controller
2020-03-21 19:14:26 +00:00
Luis Ramos
79b0867507
Extract permitted attributes to separate service
2020-03-21 19:08:37 +00:00
Luis Ramos
58c83d056d
Add missing permitted attributes to subscriptions controller
2020-03-21 18:57:37 +00:00
Luis Ramos
c3897b2f1c
Handle strong params in subscriptions controller
2020-03-21 18:57:37 +00:00
Luis Ramos
d7cfda8385
Handle strong params in subscription_line_items controller
2020-03-21 18:57:37 +00:00
Luis Ramos
0ee562c718
Add test coverage for PermittedAttributes::User
2020-03-21 18:48:04 +00:00
Luis Ramos
aec7f12f5a
Extract common user permitted attributes to a separate class
2020-03-21 18:31:14 +00:00
Luis Ramos
6ed93da3f1
Fix case with empty spree_user in user_registrations controller
2020-03-21 18:00:04 +00:00
Luis Ramos
d0bd2818c2
Handle strong params on users_controller
2020-03-21 18:00:04 +00:00
Luis Ramos
431076fc6d
Add strong parameters permits to admin users_controller
2020-03-21 17:59:46 +00:00
Luis Ramos
980fdd65a1
Replace hash rockets syntax
2020-03-21 17:00:08 +00:00
Luis Ramos
2c453359c1
Extract permitted params into a specific service
2020-03-21 16:49:26 +00:00
Luis Ramos
1d9a6edefb
Permit params in checkout controller before we adapt them to bypass issues with permitting added attributes like source CreditCard
2020-03-21 16:30:20 +00:00
Luis Ramos
5ae2e6865c
Add one more needed permitted attribute to checkout controller
2020-03-21 16:30:20 +00:00
Luis Ramos
d7cccd4143
Add guard clause in checkout_controller for empty params[:order]
2020-03-21 16:30:20 +00:00
Luis Ramos
5af27bb14e
Make checkout controller handle strong parameters
2020-03-21 16:30:20 +00:00
Luis Ramos
fd2cf7295e
Extract permitted_attributes from order_cycle_controller into a specific service
2020-03-21 16:17:20 +00:00
Luis Ramos
20c7a0d3ef
Adapt to latest changes in order cycles controller strong params changes
2020-03-21 14:45:51 +00:00
Luis Ramos
57f8fa26ab
Fix strong params in order_cycles
2020-03-21 14:45:51 +00:00
Luis Ramos
1a46e7b7ee
Improve strong params implementation on order_cycle controller and fix corresponding specs
2020-03-21 14:45:51 +00:00
Luis Ramos
905811ccb3
Handle strong params in admin order_cycles controller
2020-03-21 14:45:51 +00:00
Luis Ramos
df799340df
Add missing permitted attributes to payment_methods controller
2020-03-21 14:21:52 +00:00
Luis Ramos
eac0da9812
Fix payment method controllers by removing unnecessary param that only exists in stripe connect payment method preferred_enterprise_id
2020-03-21 14:09:33 +00:00
Luis Ramos
e5ebf45765
Improve strong params implementation on payment methods controller by specifying specific list of permitted attributes
2020-03-21 14:09:33 +00:00
Luis Ramos
38849f5589
Extract method in payments_method_controller to make it readable
2020-03-21 14:09:32 +00:00
Luis Ramos
86d09ff21e
Bring strong parameters code from spree to payment_methods_controller
...
This code comes from spree commit fbc2d150f6
2020-03-21 14:08:03 +00:00
Luis Ramos
337b2ab592
Merge pull request #4979 from Matt-Yorkley/3-0-customer-details
...
[Spree 2.1] Customer details
2020-03-21 13:26:09 +00:00
Matt-Yorkley
80e5608436
Ensure customer selection dropdown is visible when adding customer details
...
For some reason the order is in address state here instead of cart state when adding customer details. There's a conditional in the view which loads the customer selection dropdown that was not being triggered, so a customer could not be selected (and their existing address was not being filled out in the form).
Fixes:
1)
As an administrator
I want to manage orders
filling customer details
Failure/Error: expect(order.ship_address.lastname).to eq @customer.ship_address.lastname
NoMethodError:
undefined method `lastname' for nil:NilClass
# ./spec/features/admin/orders_spec.rb:179:in `block (2 levels) in <top (required)>'
2020-03-21 14:14:31 +01:00
Luis Ramos
b33969e6a2
Adapt to slightly different rails 4 sql data conversion
2020-03-21 12:50:34 +00:00
Matt-Yorkley
0b878dd0a2
Use named scope for finding line_items in a set of orders
2020-03-21 09:45:35 +01:00
Matt-Yorkley
45c204017f
Improve reports performance
...
Add the scoping from the search filters for reports into the logic of building sets like `editable_line_items` before combining them into the query to reduce the number of `line_item` ids in the IN clause.
2020-03-21 09:45:33 +01:00
Transifex-Openfoodnetwork
fa98a8ea17
Updating translations for config/locales/en_NZ.yml
2020-03-21 15:19:06 +11:00
Luis Ramos
17c2f7b138
Merge pull request #4889 from luisramos0/3-0-prod-set
...
[Spree 2.1] Fix ProductSet spec (1 broken spec)
2020-03-20 19:33:19 +00:00
Matt-Yorkley
70643a84b2
Update all locales with the latest Transifex translations
2020-03-20 18:44:23 +01:00
Matt-Yorkley
62a00b17a2
Merge pull request #5026 from Matt-Yorkley/checkout_display
...
Temporarily hide OC selector in checkout page
2020-03-20 18:33:47 +01:00
Luis Ramos
9915717a22
Remove attr_accessible from paper_trail config
...
In rails 4 this is not needed
2020-03-20 15:09:18 +00:00
Luis Ramos
03cdaf589e
Remove newly added attr_accessible from stripe_sca
...
This is not needed, in rails 4 the params are permitted at controller level
2020-03-20 15:08:29 +00:00
Pau Pérez Fabregat
c4f96a1dcf
Merge pull request #4972 from mkllnk/4810-tab-navigation
...
4810 Shop tab / page navigation with browser buttons
2020-03-20 15:24:50 +01:00
Pau Pérez Fabregat
6f4f3d42cc
Merge pull request #5012 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.1
...
Bump rack-mini-profiler from 2.0.0 to 2.0.1
2020-03-20 15:22:43 +01:00
Transifex-Openfoodnetwork
7582df2771
Updating translations for config/locales/en_CA.yml
2020-03-21 00:37:37 +11:00
Luis Ramos
1c628fac58
Merge branch 'master' into 3-0-stable-mar20
2020-03-20 11:28:06 +00:00
Matt-Yorkley
e8692fec4c
Temporarily hide OC selector in checkout page
2020-03-20 12:08:58 +01:00
Luis Ramos
9994bc75ca
Adapt reports controller to handle routes of reports in the order_management engine differently
2020-03-20 11:07:23 +00:00
Luis Ramos
3f5a964dec
Move enterprise_fee_summaries_spec to order_management engine, moving
...
translation keys for the views and adapting some routes
2020-03-20 11:07:23 +00:00
Luis Ramos
b4befea606
Fix namespace in spec
2020-03-20 11:07:23 +00:00
Luis Ramos
58465c4645
Adapt routes placeholder in the new catalog engine to make it similar to the other engines
2020-03-20 11:07:23 +00:00
Luis Ramos
0b05312f19
Move cookies spec to web engine and adapt routes to the fact they are now normal main apps routes
2020-03-20 11:07:23 +00:00
Luis Ramos
e209452f8b
Make engine routes just prepend to apps routes instead of creating engine routes
...
This makes things a bit simpler in terms of routing, we avoid a problem running specs and we can still have the engine routes separated in specific files
2020-03-20 11:07:23 +00:00
Luis Ramos
a8078b22f8
Move enterprise fees summaries controller and views to ordermanagement engine
2020-03-20 11:07:23 +00:00
Luis Ramos
3b2c10526d
Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5
...
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
2020-03-20 09:49:22 +00:00
Luis Ramos
0e62dc04bd
Improve comments to explain glitch on set_order_cycle and OrderCyclesList
2020-03-20 09:47:59 +00:00
Luis Ramos
e2940eb9ff
Add namespace to OrderCyclesList
...
Shop will probably be the name of the future engine/domain for the shopfront pages
2020-03-20 09:47:59 +00:00
Luis Ramos
1c1f066884
Extract Shop::OrderCyclesList from base_controller
2020-03-20 09:47:59 +00:00
Luis Ramos
d5cf355a11
Call fetch_order_cycles from reset_order_cycles so we dont repeat the calculation
...
BaseController#set_order_cycle cant be used in reset_order_cycle because it will empty the order if the OC is not defined previously
2020-03-20 09:47:59 +00:00
Luis Ramos
d2eee1dafd
Extract and fix reset_order_cycle logic from set_order_cycles: ActiveRecord.count will reload the relation and ignore the changes done by the TagRuleApplicator
2020-03-20 09:46:05 +00:00
Luis Ramos
540b26105f
Delete dead code in oc helper
2020-03-20 09:46:05 +00:00
Transifex-Openfoodnetwork
c788f1ae57
Updating translations for config/locales/it.yml
2020-03-20 19:32:35 +11:00
Maikel Linke
b1a274ea27
Update translations
2020-03-20 16:20:21 +11:00
Maikel
00c7b9986b
Merge pull request #5020 from openfoodfoundation/transifex
...
Transifex
2020-03-20 16:15:54 +11:00
Maikel Linke
25b11f1f4b
Display delivery details in the header
2020-03-20 15:51:49 +11:00
Maikel Linke
22384cb4da
Display shipping and billing address on invoices
2020-03-20 15:14:24 +11:00
Transifex-Openfoodnetwork
9dc18afef0
Updating translations for config/locales/pt_BR.yml
2020-03-20 12:20:04 +11:00
Matt-Yorkley
7baa875a91
Fix big N+1 issues in enterprises#edit for superadmin
...
The page is usable now as superadmin. Roughly 10x faster...
2020-03-19 23:41:47 +01:00
Matt-Yorkley
3de887e1d8
Remove some N+1s relating to address (found with bullet gem)
2020-03-19 23:41:47 +01:00
Transifex-Openfoodnetwork
d2d3d767ac
Updating translations for config/locales/en_GB.yml
2020-03-19 23:53:09 +11:00
Transifex-Openfoodnetwork
a4ff74272b
Updating translations for config/locales/nb.yml
2020-03-19 22:47:36 +11:00
Transifex-Openfoodnetwork
1000dc52bf
Updating translations for config/locales/en_FR.yml
2020-03-19 19:37:32 +11:00
Transifex-Openfoodnetwork
54b8d22e0d
Updating translations for config/locales/fr.yml
2020-03-19 19:37:21 +11:00
Maikel Linke
7e00f78a77
Highlight menu item only when active or hovered
...
The `:focus` selector meant that every link that was clicked on was
still highlighted after going back or forward in the browser history. We
don't need that selector because tabs you click on are then active and
are highlighted anyway.
2020-03-19 15:49:29 +11:00
Maikel Linke
5a9b5660f1
Simplify logic in PageSelectionCtrl
2020-03-19 15:38:00 +11:00
Maikel Linke
1d42ce885b
Stay on shop page when opening login modal
...
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Maikel Linke
17751c448f
Rename PageSelectionCtrl for clarity
2020-03-19 15:37:13 +11:00
Maikel Linke
4b8d9d18d7
Simplify PagesetCtrl
2020-03-19 15:37:13 +11:00
Maikel Linke
a21ef19529
Render only shop tabs within shop
...
The include directive was listening to all $location paths including
`#login` which is unrelated to the shop tabs. Angular tried to load the
template `shop/login.html` which doesn't exist.
We now whitelist the templates that can be included by having an include
tag for each shop tab/page.
2020-03-19 15:37:13 +11:00
Maikel Linke
ea80ae3832
Enable page navigation via URL fragment
...
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.
As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.
40 lines less code.
2020-03-19 15:37:13 +11:00
Maikel Linke
bf26a26743
Reduce complexity by removing unused code branch
2020-03-19 15:36:24 +11:00
Maikel Linke
e3f840f48c
Remove dependency to Tabsets
2020-03-19 15:36:23 +11:00
Maikel Linke
42ca7888c0
Simplify by reducing unused options
2020-03-19 15:36:23 +11:00
Maikel Linke
8aa892136e
Duplicate shop tab code for rewrite
...
The old code is still used on the user page.
2020-03-19 15:36:23 +11:00
Maikel Linke
2d21341183
Update all locales with the latest Transifex translations
2020-03-19 14:06:04 +11:00
Maikel
5cabf59015
Merge pull request #5016 from openfoodfoundation/revert-4879-inner-join-visible-orders
...
Revert "Inner join visible orders"
2020-03-19 12:37:20 +11:00
Maikel
289dff5b91
Merge pull request #4988 from openfoodfoundation/transifex
...
Transifex
2020-03-19 12:06:37 +11:00
Maikel
c4e4beb912
Revert "Inner join visible orders"
2020-03-19 12:01:00 +11:00
Maikel
27d8951add
Merge pull request #5013 from openfoodfoundation/mobile-ux-3
...
Merge mobile-ux-3 branch into master
2020-03-19 11:51:41 +11:00
Transifex-Openfoodnetwork
f7720f1b1f
Updating translations for config/locales/en_FR.yml
2020-03-19 05:18:19 +11:00
Transifex-Openfoodnetwork
c46ae4354d
Updating translations for config/locales/en_FR.yml
2020-03-19 05:15:09 +11:00
Transifex-Openfoodnetwork
5f00323cbb
Updating translations for config/locales/fr.yml
2020-03-19 05:14:27 +11:00
Transifex-Openfoodnetwork
c52f29706b
Updating translations for config/locales/en_CA.yml
2020-03-19 03:47:42 +11:00
Luis Ramos
2590745b2e
Merge pull request #4954 from luisramos0/dead_temp
...
Delete templates that are not used
2020-03-18 13:52:15 +00:00
Matt-Yorkley
6db0421347
Merge pull request #4764 from Matt-Yorkley/mobile-tabs-styling
...
[mobile ux] Mobile tabs styling
2020-03-18 08:42:44 +01:00
Maikel
b63c47cca2
Merge pull request #4816 from mkllnk/1860-copy-paste
...
1860 Remove style from pasted text for shopfront messages
2020-03-18 16:23:50 +11:00
Maikel
2b9f57f4e0
Merge pull request #4998 from mkllnk/4277-signup-flow
...
Direct new enterprise users to their dashboard
2020-03-18 16:17:41 +11:00
Matt-Yorkley
8a1de72542
Center order cycle select elements in tablet view
2020-03-17 20:32:18 +01:00
Matt-Yorkley
2cb3a0cd99
Adjust padding, size, colour (transparency), caret size and position, border-radius, etc
2020-03-17 20:32:18 +01:00
Matt-Yorkley
b0637a24ff
Adjust padding, size, colour transparency, caret size
2020-03-17 20:32:18 +01:00
Matt-Yorkley
d969b68c8c
Add placeholder to order cycle selector
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a89d4266d5
Update ordercycleselector to show message in red and remove powertip.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
4b8ced5fc0
Add right-margin on bullet points in groups tab
2020-03-17 20:32:18 +01:00
Matt-Yorkley
2678342122
Reduce padding on ordercycle selector
2020-03-17 20:32:18 +01:00
Matt-Yorkley
b33c819863
Reduce rounding on ordercycle edges (box-radius)
2020-03-17 20:32:18 +01:00
Matt-Yorkley
97d7e27786
Update social icon colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
e73e43838c
Add 2px margin under Contact subheadings
2020-03-17 20:32:18 +01:00
Matt-Yorkley
cdc40fbc38
Update Contact tab subheading text colour
2020-03-17 20:32:18 +01:00
Matt-Yorkley
3430cc617a
Maximise space for tabs to fit on small screens
2020-03-17 20:32:18 +01:00
Matt-Yorkley
ed6f042446
Adjust tab widths/spacing on mobile and tablet
2020-03-17 20:32:18 +01:00
Matt-Yorkley
80a8c436d6
Update box-shadow underneath tab buttons
2020-03-17 20:32:18 +01:00
Matt-Yorkley
049a87e8a9
Remove defunct text-shadow from tab text
2020-03-17 20:32:18 +01:00
Matt-Yorkley
deb5b8e74c
Fix minor display issue where "Ready For" option with lots of characters is too big to fit on screen on mobile.
...
The layout was breaking in some specific cases where the content didn't fit on very small screens.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a5dd14d902
Adjust new colour variables to match Zeplin
2020-03-17 20:32:18 +01:00
Matt-Yorkley
9a6859edc0
Fix CodeClimate issue with SCSS variable naming
2020-03-17 20:32:18 +01:00
Matt-Yorkley
c0c53113d3
Change font on shop tab titles
2020-03-17 20:32:18 +01:00
Matt-Yorkley
26688409a1
Use alternate dots in <ul> display
2020-03-17 20:32:18 +01:00
Matt-Yorkley
0893d14025
Add new shop link colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
efd314e3b1
Restyle contact tab
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bd7549c57f
Update layout for producers and groups tabs
2020-03-17 20:23:45 +01:00
Matt-Yorkley
45cf54408d
Readjust layout after rebase
2020-03-17 20:23:45 +01:00
Matt-Yorkley
15360740b1
Add ng-cloak to ordercycle box to improve appearance whilst page loads
2020-03-17 20:23:45 +01:00
Matt-Yorkley
5ce5072f26
Adjust position of OC popover tip to not cover up the "ready for" label
2020-03-17 20:23:45 +01:00
Matt-Yorkley
35133f7ee8
Adjust height of ordercycle selector on desktop
2020-03-17 20:23:45 +01:00
Matt-Yorkley
5becbc2a11
Move caret svg to /app/assets/images
2020-03-17 20:23:45 +01:00
Matt-Yorkley
390d80f0eb
Update order cycle selector positioning
2020-03-17 20:23:45 +01:00
Matt-Yorkley
6da43850d1
Restyle order cycle dropdown
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a146bdacc8
Realign ordercycle text on tablet downwards
2020-03-17 20:23:45 +01:00
Matt-Yorkley
43cadb00c4
Recolour order cycle selector
2020-03-17 20:23:45 +01:00
Matt-Yorkley
2e616a9e31
Fix conditional display of order cycle selection element
2020-03-17 20:23:45 +01:00
Matt-Yorkley
1927e2883e
Move brackets inside conditionals for rendering last closed / next open message
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a4b94cf39f
Add dividing line on tabs
...
Shows a thin grey line when the tab view content is white, but doesn't interfere when the content below is a full-width colour image.
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a35f3c130e
Recolour shop tab buttons
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a93243a8b7
Change vertical position of shop name in relation to logo
2020-03-17 20:23:45 +01:00
Matt-Yorkley
de4402457a
Improve layout and positioning on mobile and tablet
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bf9f7309f7
Adapt style definitions to altered layout
2020-03-17 20:23:45 +01:00
Matt-Yorkley
4b0e1610ec
Update order cycle selection box
2020-03-17 20:23:45 +01:00
dependabot-preview[bot]
0c6fe20e82
Bump rack-mini-profiler from 2.0.0 to 2.0.1
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.0...v2.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-17 19:19:22 +00:00
Luis Ramos
0f2e23d225
Merge pull request #4968 from lin-d-hop/customer-balances
...
Revert changes that broke existing usage of this report
2020-03-17 18:06:35 +00:00
Matt-Yorkley
45b5e838b7
Remove simple_form
...
It looks like we don't use this at all. Discovered during the Spree 2.1 upgrade.
2020-03-17 17:03:48 +01:00
Luis Ramos
da837ff100
Remove rabl dependency 🎉
2020-03-17 15:51:50 +00:00
Luis Ramos
da2598282b
Can be object or {}, it's what the injector is doing, not related to rabl any more
2020-03-17 15:51:26 +00:00
Luis Ramos
0308f1465d
Remove taxons/search action and respective rabl view
...
This is dead code
2020-03-17 15:51:26 +00:00
Luis Ramos
a6e4893287
Remove taxons list field from product edit form.
...
It is not working and it's not used in any other place in the app, there's the product category already (product.primary_taxon_id)
2020-03-17 15:51:25 +00:00
Luis Ramos
eccaaca907
Merge pull request #4930 from luisramos0/3-0-stable-mar6
...
Merge master into 3-0-stable
2020-03-17 14:49:30 +00:00
Pau Pérez Fabregat
42d5b5d8a3
Merge pull request #4974 from luisramos0/payment_rollback
...
[Spree 2.1] Bypass broken payment rollback callback
2020-03-17 15:37:28 +01:00
Pau Pérez Fabregat
129de8fd57
Merge pull request #5006 from Matt-Yorkley/loggageddon
...
Logageddon Hotfix
2020-03-17 14:48:12 +01:00
Matt-Yorkley
e24d858af9
Ensure log level is the default :info for staging and production
...
The default was being ignored in our new logging configuration, and the actual log output was way too high. This was causing serious disk space issues.
2020-03-17 12:25:25 +01:00
Matt-Yorkley
d2cacf5330
Add comments for unusable log_level setting
2020-03-17 12:22:58 +01:00
Transifex-Openfoodnetwork
af231d2ebe
Updating translations for config/locales/fr.yml
2020-03-17 20:32:15 +11:00
Pau Pérez Fabregat
711a3debe7
Merge pull request #4990 from openfoodfoundation/dependabot/bundler/webmock-3.8.3
...
Bump webmock from 3.8.2 to 3.8.3
2020-03-17 09:59:10 +01:00
Pau Pérez Fabregat
d09b0849e4
Merge pull request #4936 from luisramos0/fix_order_syncer
...
Fixes spec/services/order_syncer_spec in rails 4
2020-03-17 09:56:17 +01:00
Pau Pérez Fabregat
b2d015416a
Merge pull request #4934 from luisramos0/latest_spree_branch
...
[Spree 2.1] Use latest version of spree which includes PR openfoodfoundation/spree#39
2020-03-17 09:55:49 +01:00
Pau Pérez Fabregat
c639821dc3
Merge pull request #4931 from luisramos0/fix_ent_ser
...
Fix serializers/api/enterprise_shopfront_serializer_spec in rails 4
2020-03-17 09:53:31 +01:00
Maikel
d9b643d795
Merge pull request #4799 from mkllnk/4771-back-to-shop-button
...
4771 Back to shop button
2020-03-17 19:51:02 +11:00
Maikel Linke
6b8b3be524
Show "Back To Store" button when no shop has been selected yet
2020-03-17 10:28:03 +11:00
Maikel Linke
1db8283e98
Link "Back To Store" button to products page
2020-03-17 10:28:03 +11:00
Maikel Linke
5fce40ee71
Link "Continue shopping" to products tab
2020-03-17 10:28:03 +11:00
Maikel Linke
c64493ca77
Continue shopping with the products list
2020-03-17 10:28:03 +11:00
Maikel Linke
5b942e6933
Add spec for "continue shopping" from cart
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4771
2020-03-17 10:28:03 +11:00
Luis Ramos
26769b4150
Add StripeSCA payment authorize and use it both subs_confirm job as well as on teh checkout stripe redirect
2020-03-16 20:04:59 +00:00
Luis Ramos
84745e4ccb
Add stripe payment setup spec and make minor tweaks to the code itself.
...
Also, add a missing . to card_set? that eanbles it! If the card was
already set, it would anyway set the default card. Now it will use the
defined card if there is one already.
2020-03-16 20:03:12 +00:00
Luis Ramos
aac7a5e559
Adapt PaymentSetup spec to new version and remove some private method testing (payment) as well as some tests testing order.pending_payments logic
2020-03-16 20:03:12 +00:00
Luis Ramos
0a2941ed96
Extract StripePaymentSetup from PaymentSetup
2020-03-16 20:03:12 +00:00
Luis Ramos
ffbb5934d7
Merge pull request #4989 from luisramos0/specs_in_engines
...
Adapt task that runs engine specs
2020-03-16 19:17:04 +00:00
dependabot-preview[bot]
05ccd1ecbf
Bump compass-rails from 3.1.0 to 4.0.0
...
Bumps [compass-rails](https://github.com/Compass/compass-rails ) from 3.1.0 to 4.0.0.
- [Release notes](https://github.com/Compass/compass-rails/releases )
- [Changelog](https://github.com/Compass/compass-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Compass/compass-rails/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-16 18:49:51 +00:00
Luis Ramos
bae9df8214
Merge pull request #4787 from luisramos0/catalog_domain
...
Add new domain/engine Catalog
2020-03-16 18:47:55 +00:00
Luis Ramos
f8a4f00d52
Fix rubocop issues in subs specs
2020-03-16 17:20:01 +00:00
Luis Ramos
29377bbff9
Move 5 subscriptions services from app/services to the engines/order_management/app/services
2020-03-16 17:20:01 +00:00
Luis Ramos
f68d0c2a0f
Remove Subscription from the name of the subscription summarizer and summary because it is already in the namespace
2020-03-16 17:20:01 +00:00
Luis Ramos
3901c49af9
Fix rubocop issues
2020-03-16 17:20:01 +00:00
Luis Ramos
ae0ceb61a1
Move ProxyOrderSyncer to OrderManagement engine
2020-03-16 17:20:01 +00:00
Luis Ramos
fb1c825fbc
Move both subscription summarizer and subscription summary to order management engine
2020-03-16 17:20:01 +00:00
Luis Ramos
e36b0249b9
Use nested module names to fix rubocpo issue
2020-03-16 17:20:01 +00:00
Luis Ramos
34fa2d7ad6
Move Subscriptions::PaymentSetup to OrderManagement engine where all subscription code will be at some point in the future
2020-03-16 17:19:04 +00:00
Luis Ramos
3aefea9f04
Prepare SubsConfirmJob to receive a bit more payment logic
2020-03-16 17:19:04 +00:00
Luis Ramos
15231a9128
Make SubsConfirmJob more readable
2020-03-16 17:19:04 +00:00
Luis Ramos
25e3f72934
Fix rubocop issues in subs payment_setup
2020-03-16 17:19:04 +00:00
Luis Ramos
523d819575
Move and rename SubscriptionPaymentUpdater to Subscriptios::PaymentSetup to move to services/subscriptions and call it Setup instead to make explicit this is executed before the payment is processed
2020-03-16 17:16:31 +00:00
Luis Ramos
5da47b3f19
Merge pull request #4757 from luisramos0/stripe_sca_extra
...
StripeSCA - Handle further SCA auth request when checking out
2020-03-16 16:45:28 +00:00
Luis Ramos
b14e4237cc
Make the task that runs engines specs run from the main app, not inside the engine
...
Right now and for some time the engines are not independent of the main_app. We should aim for that but it will naturally take a while to disentangle the code
2020-03-16 16:20:36 +00:00
Pau Pérez Fabregat
3e7685193f
Merge pull request #4996 from luisramos0/fix_build
...
Fix broken master build
2020-03-16 16:37:09 +01:00
Luis Ramos
8558000c22
Merge pull request #5 from coopdevs/fix-suppliers-report-test-case
...
Fix suppliers report test case
2020-03-16 13:47:03 +00:00
Pau Perez
6486e5f908
Provide a non-zero amount for ship/pay calculator
...
This way the adjustment's total_amount is not 0 and thus, not filtered
out but the report service.
2020-03-16 13:56:52 +01:00
Maikel Linke
9244a95472
Direct new enterprise users to their dashboard
...
People were directed to the home page and had to do several more clicks
to continue with their enterprise setup.
2020-03-16 11:18:32 +11:00
Transifex-Openfoodnetwork
bd237ef257
Updating translations for config/locales/fr_CA.yml
2020-03-15 07:22:12 +11:00
Transifex-Openfoodnetwork
bc06e10146
Updating translations for config/locales/en_CA.yml
2020-03-15 07:21:33 +11:00
Pau Perez
05eadac935
Fix some filtering test cases for fee report
...
The calculators of the adjustments related to the enterprise fees
created in the test setup have a preferred_amount of 0. So, when
computed, the adjustments' amounts end up being `0 = 0 * 1 line_item`.
Then, the ReportService filters these out in
`#exclude_groups_with_zero_total` from the result set. This is why the
assertions can't find them in `totals`.
2020-03-14 11:19:35 +01:00
Pau Perez
5a83b12c66
Make EnterpriseFee report SQL readable
2020-03-14 11:04:49 +01:00
Pau Perez
71576fd7db
Refactor PerItem calculator to ease readability
2020-03-14 11:04:16 +01:00
Luis Ramos
63a1d4145a
Adapt order factories to work with enterprise fees summaries report specs
2020-03-13 12:36:01 +00:00
Luis Ramos
1049525e50
Merge pull request #4963 from luisramos0/variants_fix
...
Fix 2 broken buttons in the product variants list page
2020-03-12 23:48:50 +00:00
Luis Ramos
bd32510837
Merge pull request #4860 from mkllnk/3395-remove-unused-assets
...
3395 remove unused assets
2020-03-12 22:44:41 +00:00
dependabot-preview[bot]
f0b40eea1e
Bump webmock from 3.8.2 to 3.8.3
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.2...v3.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-12 19:20:17 +00:00
Transifex-Openfoodnetwork
ed790ab65d
Updating translations for config/locales/en_GB.yml
2020-03-13 05:26:37 +11:00
Matt-Yorkley
1cba129432
Ensure line_item.variant succeeds when variant is soft-deleted
2020-03-12 19:13:15 +01:00
Matt-Yorkley
e24d8d7104
Fix deprecation warning for use of #includes without #references
2020-03-12 19:12:36 +01:00
Matt-Yorkley
40b8eb470c
Fix deprecation warning for use of #all
2020-03-12 19:12:06 +01:00
Luis Ramos
f2089af0c4
Merge pull request #4907 from luisramos0/3-0-enterprise_relationship
...
[Spree 2.1] Uncomment Enterprise#relate_to_owners_enterprises
2020-03-12 17:18:47 +00:00
Luis Ramos
949b6ebad1
Merge pull request #4982 from Matt-Yorkley/3-0-orders-form
...
[Spree 2.1] Fix order index search form
2020-03-12 16:58:08 +00:00
Luis Ramos
32a4355f09
Merge branch 'master' into 3-0-stable-mar6
2020-03-12 16:54:09 +00:00
Luis Ramos
46e23b28fd
Merge pull request #4975 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.1
...
Bump rspec-rails from 3.9.0 to 3.9.1
2020-03-12 16:47:14 +00:00
Luis Ramos
bc904a7afa
Merge pull request #4976 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.0
...
Bump rack-mini-profiler from 1.1.6 to 2.0.0
2020-03-12 16:46:43 +00:00
Luis Ramos
a209b3e860
Merge pull request #4980 from Matt-Yorkley/3-0-destroy-route
...
[Spree 2.1] Line items destroy route
2020-03-12 16:28:05 +00:00
Matt-Yorkley
9a5452cd52
Delete test in line_items_controller_spec.rb
...
Rails 4 does not recognise requests to destroy routes without ids as valid routes.
Fixes:
14) LineItemsController destroying a line item on a completed order without a line item id fails and raises an error
Failure/Error: delete :destroy
ActionController::UrlGenerationError:
No route matches {:action=>"destroy", :controller=>"line_items"}
# ./spec/controllers/line_items_controller_spec.rb:46:in `block (5 levels) in <top (required)>'
2020-03-12 14:15:00 +01:00
Matt-Yorkley
a207c6c45f
Fix cart page update
...
Fixes:
2) full-page cart viewing the cart updating quantities with insufficient stock available shows the quantities saved, not those submitted
Failure/Error: @app.call(env)
AbstractController::ActionNotFound:
The action 'update' could not be found for CartController
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
# ------------------
# --- Caused by: ---
# Capybara::ExpectationNotMet:
# expected to find text "Insufficient stock available, only 2 remaining" in "Internal Server Error The action 'update' could not be found for CartController WEBrick/1.3.1 (Ruby/2.3.7/2018-03-28) at 127.0.0.1:38614"
# ./spec/features/consumer/shopping/cart_spec.rb:182:in `block (5 levels) in <top (required)>'
2020-03-12 13:34:55 +01:00
Pau Perez
8ccc8dfaf6
Update all locales with the latest Transifex translations
2020-03-12 13:33:42 +01:00
Luis Ramos
55b32c828c
Merge pull request #4978 from Matt-Yorkley/dev-env-reload
...
Fix reloading issue in dev environment
2020-03-12 12:22:00 +00:00
Pau Pérez Fabregat
25dfd8ad40
Merge pull request #4939 from openfoodfoundation/transifex
...
Transifex
2020-03-12 13:19:59 +01:00
Pau Pérez Fabregat
62c35ef6e5
Merge pull request #4953 from luisramos0/sch_fix
...
Fix problem with misssing params in schedules controller
2020-03-12 12:57:27 +01:00
Pau Pérez Fabregat
f6a1a101a8
Merge pull request #4955 from luisramos0/auth_fix
...
[Spree 2.1] Fix authentication spec by adapting code to devise 3
2020-03-12 12:51:46 +01:00
Pau Pérez Fabregat
2a5311493f
Merge pull request #4969 from luisramos0/oc_apli
...
Fix spec in rails 4 branch by making code in OrderCycleFormApplicator a bit more resilient
2020-03-12 12:51:23 +01:00
Pau Pérez Fabregat
57ac28cfbd
Merge pull request #4970 from openfoodfoundation/dependabot/bundler/ddtrace-0.33.1
...
Bump ddtrace from 0.33.0 to 0.33.1
2020-03-12 12:50:01 +01:00
Pau Pérez Fabregat
1cba857bdb
Merge pull request #4933 from luisramos0/ent_helper
...
[Spree 2.1] Fix tag rule applicator in enterprises_helper
2020-03-12 12:49:18 +01:00
Pau Pérez Fabregat
568cba9d58
Merge pull request #4941 from luisramos0/devise
...
[Spree 2.1] Delete unnecessary code related to spree_auth_devise
2020-03-12 12:48:59 +01:00
Pau Pérez Fabregat
4b12d0be46
Merge pull request #4940 from luisramos0/ent_ctrl
...
[Spree 2.1] Fix issues in EnterprisesController
2020-03-12 12:48:28 +01:00
Pau Pérez Fabregat
de06eed945
Merge pull request #4911 from luisramos0/3-0-manifest
...
[Spree 2.1] Change Shipment#manifest to include deleted variants (again, this time in rails 4)
2020-03-12 12:47:45 +01:00
Pau Pérez Fabregat
fb02043e6e
Merge pull request #4926 from luisramos0/prod_api
...
Fix products api spec in rails 4
2020-03-12 12:46:45 +01:00
Matt-Yorkley
d62d89aa4f
Fix order index search form
...
Fixes:
2) spree/admin/orders/index.html.haml print invoices button displays button when invoices are enabled
Failure/Error: = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do
ActionView::Template::Error:
No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
# ./app/views/spree/admin/orders/index.html.haml:20:in `block in _d04c5552f7a480bf5f02e5fad0c10de6'
# ./app/views/spree/admin/orders/index.html.haml:19:in `_d04c5552f7a480bf5f02e5fad0c10de6'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:26:in `block (3 levels) in <top (required)>'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:8:in `block (2 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# ActionController::UrlGenerationError:
# No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
3) spree/admin/orders/index.html.haml print invoices button does not display button when invoices are disabled
Failure/Error: = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do
ActionView::Template::Error:
No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
# ./app/views/spree/admin/orders/index.html.haml:20:in `block in _d04c5552f7a480bf5f02e5fad0c10de6'
# ./app/views/spree/admin/orders/index.html.haml:19:in `_d04c5552f7a480bf5f02e5fad0c10de6'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:34:in `block (3 levels) in <top (required)>'
# ./spec/views/spree/admin/orders/index.html.haml_spec.rb:8:in `block (2 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# ActionController::UrlGenerationError:
# No route matches {:action=>"index", :controller=>"spree/admin/orders"}
# ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
2020-03-12 12:44:50 +01:00
Transifex-Openfoodnetwork
30d7cc89fa
Updating translations for config/locales/pt_BR.yml
2020-03-12 09:25:51 +11:00
Transifex-Openfoodnetwork
d14b5eb46b
Updating translations for config/locales/pt_BR.yml
2020-03-12 09:22:44 +11:00
dependabot-preview[bot]
8eb60388fd
Bump rack-mini-profiler from 1.1.6 to 2.0.0
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.1.6 to 2.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-11 19:19:24 +00:00
dependabot-preview[bot]
633f1bd7cf
Bump rspec-rails from 3.9.0 to 3.9.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-11 19:15:51 +00:00
Luis Ramos
5506cc86d2
Bypass after_rollback callback in payment
...
This is causing several specs to fail on rollback and, according to some manual testing (and all the auto tests we have), we dont need this fix in OFN
2020-03-11 14:33:54 +00:00
Matt-Yorkley
933b5f1606
Fix reloading issue in dev environment
...
I constantly get `NameError: uninitialized constant Spree::AuthenticationHelpers` when touching local files and then reloading a page, and have to restart my rails server every time (in development). I read the other day that this is the best way to fix the issue, and it seems to work...
2020-03-11 15:31:25 +01:00
Transifex-Openfoodnetwork
4c7b8209b9
Updating translations for config/locales/nb.yml
2020-03-11 19:49:14 +11:00
Pau Pérez Fabregat
802ac647e3
Merge pull request #4879 from coopdevs/inner-join-visible-orders
...
Inner join visible orders
2020-03-10 22:54:03 +01:00
dependabot-preview[bot]
c83bded763
Bump ddtrace from 0.33.0 to 0.33.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.33.0 to 0.33.1.
- [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.33.0...v0.33.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-10 19:19:31 +00:00
Luis Ramos
03246d425d
Make this method handle the case where the variants hash passed is nil
...
This fixes a spec in the rails 4 branch
2020-03-10 18:41:26 +00:00
Luis Ramos
7585e3d1d6
The variants_to_a method was dead but actually we can use it to make the code simpler
2020-03-10 18:40:46 +00:00
Luis Ramos
bc0a1d9bae
Remove one more responder and fix rubocop issues
2020-03-10 15:56:08 +00:00
Luis Ramos
a53dc3a8c1
Remove usage of the responder as this is a json only controller
2020-03-10 14:46:16 +00:00
Luis Ramos
bc1430c984
Make new_variant button work again by making a normal call to the server, isntead of an ajax call that was no longer working
2020-03-10 14:21:26 +00:00
Luis Ramos
676d949972
Make variants collection show deleted again by bypassing the default scope that removed deleted variants
2020-03-10 14:21:20 +00:00
Luis Ramos
de2c6a8717
Revert previous commits and use collection_singular_ids=(ids) setter instead
2020-03-10 11:21:36 +00:00
lin-d-hop
e4bd7c4e30
Revert changes that broke existing usage of this report
2020-03-10 10:59:18 +00:00
Pau Pérez Fabregat
50cdda7c63
Merge pull request #4802 from luisramos0/too_many
...
Last batch to fix error "subquery with too many columns" in rails 4 branch
2020-03-10 09:20:44 +01:00
Pau Pérez Fabregat
d0af046e59
Merge pull request #4908 from luisramos0/package_spec
...
Make package spec work in rails 4
2020-03-10 09:17:53 +01:00
Pau Pérez Fabregat
5811f3ead1
Merge pull request #4905 from luisramos0/untouch
...
Remove some live but elderly debug code
2020-03-10 09:17:13 +01:00
Pau Pérez Fabregat
d7d3c9ea53
Merge pull request #4938 from openfoodfoundation/dependabot/bundler/ddtrace-0.33.0
...
Bump ddtrace from 0.32.0 to 0.33.0
2020-03-10 08:48:31 +01:00
Pau Pérez Fabregat
a02cc1de34
Merge pull request #4857 from luisramos0/schedules_ctrl
...
Remove dead spec in SchedulesController
2020-03-10 08:38:46 +01:00
Luis Ramos
014e22a7ad
Fix problem with misssing params in schedules controller and adapt its spec
2020-03-09 16:04:59 +00:00
Luis Ramos
5ce4fec68b
Add html to show the errors reported by devise 3 about password and password confirmation mismatch on user.errors[:password_confirmation] (instead of user.errors[:password])
2020-03-09 15:48:45 +00:00
Luis Ramos
94783f44f9
Delete templates that are not used
2020-03-09 15:30:37 +00:00
Luis Ramos
8c367a2ed2
Merge branch 'master' into 3-0-stable-mar6
2020-03-09 13:20:19 +00:00
Luis Ramos
e5f05b4db9
Handle case where no user_ids are sent to the controller. Fixes original spec.
2020-03-07 20:10:32 +00:00
Luis Ramos
7daa68a8bc
Adapt consumer/shopping/orders_spec to use an order with a nil user to test a guest checkout, which is what happens in the real checkout
2020-03-07 20:00:40 +00:00
Luis Ramos
56c29ab472
Make EnterprisesController inherit from Api::BaseController to fix authentication and fix problem with saving params[:user_ids]
2020-03-07 18:14:36 +00:00
Luis Ramos
ffe814ce6b
Adapt specs to not use anonymous user
...
Api::BaseController#authenticate is already taking care of the unauthenticated use case when spree_current_user is nil
2020-03-07 18:14:07 +00:00
Luis Ramos
e4d307fe5e
Remove dead code related to user management
2020-03-07 18:14:07 +00:00
Luis Ramos
2184c7c06b
Merge pull request #4856 from Matt-Yorkley/dead-code
...
Delete some dead code in Product Import (fixes 1 broken spec)
2020-03-07 15:26:39 +00:00
Transifex-Openfoodnetwork
928bf0d9c7
Updating translations for config/locales/fr.yml
2020-03-08 01:24:08 +11:00
Transifex-Openfoodnetwork
0d02b2afcf
Updating translations for config/locales/en_FR.yml
2020-03-08 01:21:12 +11:00
Transifex-Openfoodnetwork
1e76f3f744
Updating translations for config/locales/fr.yml
2020-03-08 01:20:57 +11:00
dependabot-preview[bot]
7c3a0a292f
Bump ddtrace from 0.32.0 to 0.33.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.32.0 to 0.33.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.32.0...v0.33.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-06 19:31:47 +00:00
Luis Ramos
c5ca0976a5
Merge pull request #4873 from jeduardo824/ampersand-not-showing-correctly
...
fix ampersand problem using ng-bind-html
2020-03-06 17:40:54 +00:00
Pau Pérez Fabregat
be7b3d5a12
Merge pull request #4809 from jeduardo824/redirect-to-shops-when-shop-does-not-exist
...
redirect to shops list when an enterprise is not found
2020-03-06 18:39:00 +01:00
Luis Ramos
d3f498f5b1
The shipping rates refresh process changed a little in spree 2.1 and the selection is and was random, it picks the first acceptable
...
In this case we need to specifically select one shipping method so that the test is valid
2020-03-06 16:39:20 +00:00
Luis Ramos
855d08957c
Adjust completed_order_with_totals to have a distributor so that logic around refreshing shipping rates doesnt fail badly
2020-03-06 16:01:29 +00:00
Luis Ramos
063f733dda
Use latest version of spree which includes PR openfoodfoundation/spree#39
2020-03-06 15:05:29 +00:00
Luis Ramos
4b21aaafc4
Convert ActiveRecord_Associations_CollectionProxy to array so that the modifications the tagRuleApplicator does on it will remain
...
Reject on ActiveRecord_Associations_CollectionProxy wont work
2020-03-06 13:51:53 +00:00
Luis Ramos
55941a1206
Round time values to make spec green as in rails 4, for unknown reason, the timestamps are differing in some miliseconds
2020-03-06 10:16:58 +00:00
Luis Ramos
0815068050
Merge branch 'master' into 3-0-stable-mar6
2020-03-06 09:20:03 +00:00
Luis Ramos
6304a085c0
Update all locales with the latest Transifex translations
2020-03-06 08:30:04 +00:00
Luis Ramos
7c708de937
Merge pull request #4928 from openfoodfoundation/transifex
...
Transifex
2020-03-06 08:28:09 +00:00
Transifex-Openfoodnetwork
5d51e5d393
Updating translations for config/locales/pt_BR.yml
2020-03-06 07:41:46 +11:00
Transifex-Openfoodnetwork
464717dec5
Updating translations for config/locales/pt_BR.yml
2020-03-06 07:38:36 +11:00
Pau Pérez Fabregat
4ea891ee2f
Merge pull request #4834 from Matt-Yorkley/3-0-bind-message
...
[Spree 2.1] PG::ProtocolViolation: ERROR: bind message supplies 0 parameters...
2020-03-05 19:31:06 +01:00
Pau Pérez Fabregat
7a06018c3e
Merge pull request #4874 from openfoodfoundation/transifex
...
Transifex
2020-03-05 19:29:21 +01:00
Pau Pérez Fabregat
b8c76ff633
Merge pull request #4906 from luisramos0/ent_caching
...
Fix enterprise_caching_spec in rails 4
2020-03-05 19:28:54 +01:00
Pau Pérez Fabregat
1ecc0bfe07
Merge pull request #4927 from luisramos0/variants_delete
...
Fix spree/admin/variants_controller_spec.rb in rails 4
2020-03-05 19:24:35 +01:00
Pau Pérez Fabregat
600d2d23c8
Merge pull request #4912 from luisramos0/cart_serv_fix
...
Make cart_service spec green in rails 4 branch
2020-03-05 19:11:58 +01:00
Pau Pérez Fabregat
bf3211fd01
Merge pull request #4918 from luisramos0/bulk_lis
...
Fix spec/controllers/admin/bulk_line_items_controller_spec in rails 4
2020-03-05 19:07:37 +01:00
Pau Pérez Fabregat
2a010a3233
Merge pull request #4919 from luisramos0/ship_ctrl
...
[Spree 2.1] Fix shipments admin/enterprises and api/enterprises controller specs
2020-03-05 19:07:10 +01:00
Pau Pérez Fabregat
5fd0d9406d
Merge pull request #4923 from openfoodfoundation/dependabot/bundler/oj-3.10.5
...
Bump oj from 3.10.3 to 3.10.5
2020-03-05 19:06:20 +01:00
Pau Pérez Fabregat
c78a6bea91
Merge pull request #4921 from luisramos0/li_ctrl
...
Fix line_items_controller_spec in the rails 4 branch
2020-03-05 19:05:46 +01:00
Pau Pérez Fabregat
be9f33312b
Merge pull request #4904 from luisramos0/tax_rates_match
...
Move TaxRate#match to OFN to avoid having to adapt to the spree 2.1 version
2020-03-05 18:55:55 +01:00
Luis Ramos
f23575302b
In rails 4 variant.destroy is removing the variants from the exchanges as needed and variant.exchange_variants becomes immediatly empty but variant.exchanges is not automatically updated anymore and needs a refresh to become empty
2020-03-05 17:07:08 +00:00
Pau Perez
0042ab2f28
Rewrite INNER JOIN in ActiveRecord's DSL
2020-03-05 17:45:06 +01:00
Pau Perez
53a63775fe
Replace LEFT JOIN with INNER JOIN
...
I see no reason why a LEFT might be needed and its the root cause of the
awful performance.
2020-03-05 17:45:06 +01:00
Pau Perez
461b1b26f3
Add controller tests to cover totals by supplier
2020-03-05 17:45:06 +01:00
Luis Ramos
f13d7d6845
Fix products api spec in rails 4
2020-03-05 15:20:45 +00:00
Luis Ramos
cfbec2accc
Fix controller specs after PR #4675 adapted code to rails 4 finders
2020-03-05 11:55:13 +00:00
dependabot-preview[bot]
e4d09b5404
Bump oj from 3.10.3 to 3.10.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-04 19:16:40 +00:00
Luis Ramos
415415273c
In rails 4 we need to update the stub after we update the order.user otherwise the stub will return the previous value
2020-03-04 15:50:52 +00:00
Luis Ramos
0f726c207f
Fix shipments controller after PR #4675 adapted code to rails 4 finders
2020-03-04 14:47:32 +00:00
Luis Ramos
d969190ca5
Bypass problem with quick_login_as_admin in rails 4 and just user simple factory
2020-03-04 14:29:11 +00:00
Luis Ramos
a180576c0a
Make cart_service spec green in rails 4 branch
2020-03-03 17:29:38 +00:00
Luis Ramos
3b37fa8872
Move variant scoping from alias method into manifest method
2020-03-03 16:40:31 +00:00
Luis Ramos
5688de4936
Make Shipment#manifest work with deleted variants again
...
This makes the default variant scope in inventory_unit being used which includes deleted variants
2020-03-03 16:38:03 +00:00
Luis Ramos
d8a92eec4b
Bring Shipment#manifest from spree as is
2020-03-03 16:37:00 +00:00
Luis Ramos
1382bb3c6b
For some reason in rails 4/spree 2.1 setting the line item as adjustable on the adjustment is not enough to populate line_item.adjustments. Here we make this assignment explicit fixing the spec in rails 4
2020-03-03 15:04:51 +00:00
Luis Ramos
7fdaa0f0c7
Make package spec work in rails 4 by persisting the test enterprises so that the copnnection between shipping methods and enterprises works
2020-03-03 14:46:12 +00:00
Luis Ramos
e584233c9e
Uncomment code that was commented earlier on in the upgrade, we are now ready to handle this
2020-03-03 14:25:17 +00:00
Luis Ramos
ba750547a2
The touch process in 'belongs_to :supplier, class_name: 'Enterprise', touch: true' must have changed in rails 4 and now we need to reload the enterprise to get the new updated_at value
2020-03-03 12:26:18 +00:00
Luis Ramos
af8369ae1b
Remove 5 years old debug code
...
This reverts ab9bc7b1dc , it can be added if the issue happens again
2020-03-03 10:56:57 +00:00
Luis Ramos
cf777b3fa2
Merge pull request #4882 from Matt-Yorkley/3-0-api-with-nil-id
...
[Spree 2.1] Fix spec setup in api/orders_controller_spec
2020-03-03 10:00:32 +00:00
Luis Ramos
829a73c58d
Merge pull request #4886 from openfoodfoundation/dependabot/bundler/oj-3.10.3
...
Bump oj from 3.10.2 to 3.10.3
2020-03-03 09:57:46 +00:00
Luis Ramos
a2691df64e
Merge pull request #4887 from openfoodfoundation/dependabot/bundler/rubocop-0.80.1
...
Bump rubocop from 0.80.0 to 0.80.1
2020-03-03 09:56:37 +00:00
Pau Pérez Fabregat
9980723060
Merge pull request #4880 from Matt-Yorkley/3-0-duplicate-validations
...
[Spree 2.1] Fix duplicate validations in payment methods and shipping methods
2020-03-03 10:44:40 +01:00
Pau Pérez Fabregat
f5ec11047a
Merge pull request #4896 from Matt-Yorkley/3-0-cc_type
...
[Spree 2.1] Add missing :cc_type attribute to default :credit_card factory
2020-03-03 10:43:18 +01:00
Pau Pérez Fabregat
f50593ced8
Merge pull request #4883 from Matt-Yorkley/3-0-helper
...
[Spree 2.1] Fix expectation in helper spec
2020-03-03 10:42:28 +01:00
Pau Pérez Fabregat
b0962f65da
Merge pull request #4872 from Matt-Yorkley/3-0-touch
...
[Spree 2.1] Touch on new records
2020-03-03 10:39:58 +01:00
Pau Pérez Fabregat
a47745c1cc
Merge pull request #4866 from Matt-Yorkley/3-0-ofn-qz
...
[Spree 2.1] ofn-qz
2020-03-03 10:37:10 +01:00
Pau Pérez Fabregat
a60974c760
Merge pull request #4864 from luisramos0/oc_times
...
[Spree 2.1] Fix OrderCycle.earliest_closing_times spec
2020-03-03 10:36:35 +01:00
Pau Pérez Fabregat
e733761e8a
Merge pull request #4847 from Matt-Yorkley/3-0-enterprise-user
...
[Spree 2.1] Fix #create_enterprise_user
2020-03-03 10:30:25 +01:00
Luis Ramos
6c8b175344
Merge match and its alias method
2020-03-03 09:29:02 +00:00
Pau Pérez Fabregat
390cc61273
Merge pull request #4867 from Matt-Yorkley/3-0-gmappable
...
[Spree 2.1] acts_as_gmappable
2020-03-03 10:28:12 +01:00
Pau Pérez Fabregat
ad10053271
Merge pull request #4903 from luisramos0/address_finder
...
[Spree 2.1] Adapt address finder spec to work with spree 2.1 code
2020-03-03 10:27:13 +01:00
Luis Ramos
a508c55700
Bring TaxRate.match to OFN
...
The version of this method in spree 2.1 will break our build
This way we simply bypass this fix in spree: https://github.com/spree/spree/pull/3669
We can get back to this in the future if we ever experience the mentioned bug
2020-03-03 09:27:04 +00:00
Pau Pérez Fabregat
1e2e50ce54
Merge pull request #4888 from Matt-Yorkley/3-0-shipping-method-id
...
[Spree 2.1] Remove assignment of invalid attribute in test setup
2020-03-03 10:26:15 +01:00
Pau Pérez Fabregat
c48bd12440
Merge pull request #4843 from Matt-Yorkley/3-0-product-import
...
[Spree 2.1] Product import specs
2020-03-03 10:21:48 +01:00
Transifex-Openfoodnetwork
2712be3fa4
Updating translations for config/locales/fr.yml
2020-03-03 14:14:38 +11:00
Transifex-Openfoodnetwork
484326561f
Updating translations for config/locales/en_GB.yml
2020-03-03 14:11:28 +11:00
Transifex-Openfoodnetwork
7ea96f88e8
Updating translations for config/locales/en_CA.yml
2020-03-03 14:08:26 +11:00
Transifex-Openfoodnetwork
de752b05a7
Updating translations for config/locales/fr_CA.yml
2020-03-03 14:08:17 +11:00
Maikel
0b18344572
Merge pull request #4790 from mkllnk/4779-payment-method-display
...
4779 payment method display
2020-03-03 10:10:51 +11:00
Luis Ramos
690474c01a
Adapt address finder spec to work with spree 2.1 code
...
Order ship address is required to get have an order with shipping rates
2020-03-02 21:55:21 +00:00
Matt-Yorkley
6cb8bb2fc3
Add missing :cc_type attribute to default :credit_card factory
...
Fixes 5 specs, including:
11) Spree::CreditCardsController#update when the specified credit card is found and the card is owned by the user when the update completes successfully renders a serialized copy of the updated card
Failure/Error: object.cc_type.capitalize
NoMethodError:
undefined method `capitalize' for nil:NilClass
# ./app/serializers/api/credit_card_serializer.rb:6:in `brand'
# (eval):4:in `_fast_attributes'
# ./app/controllers/spree/credit_cards_controller.rb:26:in `update'
# ./spec/controllers/spree/credit_cards_controller_spec.rb:100:in `block (7 levels) in <top (required)>'
# ./spec/controllers/spree/credit_cards_controller_spec.rb:100:in `block (6 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# NoMethodError:
# undefined method `capitalize' for nil:NilClass
# ./app/serializers/api/credit_card_serializer.rb:6:in `brand'
2020-03-02 22:07:20 +01:00
Luis Ramos
777754f8a9
Remove dead code that creates products in product_set
2020-03-02 19:41:51 +00:00
Matt-Yorkley
13b8cfcd9c
Remove assignment of invalid attribute in test setup
...
Fixes:
11) Order Management viewing a completed order when checking out as an anonymous guest allows the user to see the details
Failure/Error:
order.update_attributes!(
bill_address: bill_address,
ship_address: ship_address,
shipping_method_id: shipping_method.id
)
ActiveRecord::UnknownAttributeError:
unknown attribute: shipping_method_id
# ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# NoMethodError:
# undefined method `shipping_method_id=' for #<Spree::Order:0x00007f5e82a94d80>
# ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
12) Order Management viewing a completed order when logged in as the customer allows the user to see order details
Failure/Error:
order.update_attributes!(
bill_address: bill_address,
ship_address: ship_address,
shipping_method_id: shipping_method.id
)
ActiveRecord::UnknownAttributeError:
unknown attribute: shipping_method_id
# ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# NoMethodError:
# undefined method `shipping_method_id=' for #<Spree::Order:0x00007f5e83382708>
# ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
13) Order Management viewing a completed order when not logged in allows the user to see order details after login
Failure/Error:
order.update_attributes!(
bill_address: bill_address,
ship_address: ship_address,
shipping_method_id: shipping_method.id
)
ActiveRecord::UnknownAttributeError:
unknown attribute: shipping_method_id
# ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# NoMethodError:
# undefined method `shipping_method_id=' for #<Spree::Order:0x00007f5e8bafe6f0>
# ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
2020-03-02 20:37:58 +01:00
dependabot-preview[bot]
e4c5893c1e
Bump rubocop from 0.80.0 to 0.80.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.0 to 0.80.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.0...v0.80.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 19:36:43 +00:00
dependabot-preview[bot]
67aeae4a6d
Bump oj from 3.10.2 to 3.10.3
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.2 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.2...v3.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 19:34:09 +00:00
Matt-Yorkley
0d08ad7d2e
Fix expectation in helper spec
...
The output of this link helper has changed slightly. All the attributes are the same as before, but they seem to be in alphabetical order now.
Fixes:
69) Spree::BaseHelper#link_to_remove_fields returns an `a` tag followed by a hidden `input` tag
Failure/Error: expect(subject).to eq("<a href=\"#\" class=\"remove_fields icon_link with-tip icon-trash\" data-action=\"remove\" title=\"Remove\"><span class='text'>Hola</span></a><input type="hidden" name="_method" value="destroy">")
expected: "<a href=\"#\" class=\"remove_fields icon_link with-tip icon-trash\" data-action=\"remove\" title=\"...</span></a><input type="hidden" name="_method" value="destroy">"
got: "<a class=\"remove_fields icon_link with-tip icon-trash\" data-action=\"remove\" href=\"#\" title=\"...</span></a><input type="hidden" name="_method" value="destroy">"
(compared using ==)
# ./spec/helpers/spree/admin/base_helper_spec.rb:12:in `block (3 levels) in <top (required)>'
2020-03-02 19:41:47 +01:00
Matt-Yorkley
0784b8263a
Fix spec setup in api/orders_controller_spec
...
ActionController doesn't accept nil values for :id as a valid route request in Rails 4.
Fixes:
2) Api::OrdersController#show Resource not found when no order number is given
Failure/Error: get :show, id: nil
ActionController::UrlGenerationError:
No route matches {:action=>"show", :controller=>"api/orders", :id=>nil}
# ./spec/controllers/api/orders_controller_spec.rb:168:in `block (4 levels) in <module:Api>'
2020-03-02 19:22:43 +01:00
Matt-Yorkley
ed5351d23e
Fix duplicate validations in payment methods and shipping methods
...
Updates the syntax to follow the recommended usage in the code comments of the ActiveModel #validates_with method.
Fixes:
12) Spree::PaymentMethod raises errors when required fields are missing
Failure/Error: expect(pm.errors.to_a).to eq(["Name can't be blank", "At least one hub must be selected"])
expected: ["Name can't be blank", "At least one hub must be selected"]
got: ["Name can't be blank", "At least one hub must be selected", "At least one hub must be selected"]
(compared using ==)
# ./spec/models/spree/payment_method_spec.rb:16:in `block (2 levels) in <module:Spree>'
2020-03-02 19:02:07 +01:00
Luis Ramos
02008769e9
Make spree_payment.cvv_response_message without size limit so that long stripe redirect URLs can be stored there
2020-03-02 17:31:01 +00:00
Luis Ramos
65dd9f51cf
Add spec to cover update request where a stripe redirect must happen
2020-03-02 17:30:12 +00:00
Luis Ramos
a224c53200
Add spec to test receiving a redirect from stripe with a valid payment intent id
2020-03-02 17:30:12 +00:00
Luis Ramos
66f07c0d1c
Make checkout controller spec test both extracted payment redirects
2020-03-02 17:30:12 +00:00
Luis Ramos
d5287026f8
Add spec for Checkout::PostCheckoutActions
2020-03-02 17:30:12 +00:00
Luis Ramos
6b80eb2c16
Add spec for AuthorizeResponsePatcher
2020-03-02 17:30:12 +00:00
Luis Ramos
b54b981740
Improve readability of PaymentIntentValidator and cover with specs
2020-03-02 17:30:12 +00:00
Luis Ramos
895032fe6a
Move stubbed requests to the top as they are the same for every test
2020-03-02 17:30:12 +00:00
Luis Ramos
531c385aae
Adapt stripe sca spec to new double step auth+capture payment process
2020-03-02 17:30:12 +00:00
Luis Ramos
d0a3ab68f3
Make processing payments also pending payments
2020-03-02 17:30:12 +00:00
luisramos0
b5038c5745
Adapt subscriptionPaymentUpdater to include pending payments as pending payments! Pending payments of credit cards are payments already authorized, ready to be captured
...
This is problably what will happen with subscriptions credit cards where payments will be authorized by the customer and the confirmation process on process_payments! will just capture the payment
2020-03-02 17:30:12 +00:00
luisramos0
6877485c90
Extract AuthorizeResponsePatcher from stripeSCA gateway
2020-03-02 17:30:12 +00:00
luisramos0
95c1b7f7a6
Extract PaymentIntentValidator from StripeSCA gateway
2020-03-02 17:30:12 +00:00
luisramos0
3fcf286516
Extract PostCheckoutActions from checkout controller
2020-03-02 17:30:12 +00:00
luisramos0
e2cdb01a28
Improve readability of stripe sca gateway code
2020-03-02 17:30:12 +00:00
luisramos0
08e729673f
Move stripe sca gateway error messages to translatable keys
2020-03-02 17:30:12 +00:00
luisramos0
c0bf09131f
Make order.pending_payments include payments in pending state so that these payments (pending is the state after authorization for credit cards) are also processed as part of the normal order workflow
2020-03-02 17:30:12 +00:00
luisramos0
19042e0d37
Make checkout controller able to receive a redirect from stripe with a payment_intent as parameter
2020-03-02 17:30:12 +00:00
luisramos0
4b3b4e00ff
Add authorize action to the stripe_sca gateway and make it fetch the redirect url if provided
...
Change the purchase action to only capture the alrteady authorized payment intent
2020-03-02 17:30:12 +00:00
luisramos0
e3ffe8fe6b
Add Checkout Stripe redirect logic to get users redirected to stripe authentication pages provided by the stripe API
2020-03-02 17:30:12 +00:00
luisramos0
d91578ab80
Rename checkout payment redirect to checkout paypal redirect
2020-03-02 17:30:12 +00:00
luisramos0
873dcc373f
Small refactoring to make next commit easier
2020-03-02 17:30:12 +00:00
luisramos0
1289c3f1a2
Fix rubocop issues in credit_cards_controller
2020-03-02 17:29:30 +00:00
Luis Ramos
c37218fdc5
Merge pull request #4719 from luisramos0/stripe_card_to_pm
...
Make StripeSCA payment method work with existing credit cards (the ones saved through the Stripe Charges API)
2020-03-02 17:22:07 +00:00
Luis Ramos
dad21a52b2
Merge pull request #4672 from luisramos0/stripe_sca_method
...
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Pau Pérez Fabregat
97a65d760f
Merge pull request #4527 from luisramos0/subs_logs
...
Improve Subscriptions logging
2020-03-02 15:48:45 +01:00
Transifex-Openfoodnetwork
63e92197f5
Updating translations for config/locales/pt_BR.yml
2020-03-02 09:40:20 +11:00
Transifex-Openfoodnetwork
fd534bf629
Updating translations for config/locales/pt_BR.yml
2020-03-02 09:37:10 +11:00
Eduardo
64d83bfc4d
fix ampersand problem using ng-bind-html
2020-03-01 17:54:36 -03:00
Matt-Yorkley
a0999f5d58
Check #persisted? before calling #touch
...
Rails 4 now throws a fatal error if calling #touch on an object that hasn't been saved yet: c63cfc8722/activerecord/lib/active_record/persistence.rb (L957)
Fixes:
41) Stock::Package#shipping_methods does not return shipping methods not used by the package's order distributor
Failure/Error: distributors.each(&:touch)
ActiveRecord::ActiveRecordError:
can not touch on a new record object
# ./app/models/spree/shipping_method_decorator.rb:81:in `touch_distributors'
# ./spec/models/stock/package_spec.rb:39:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:17:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:32:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:7:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:44:in `block (3 levels) in <module:Stock>'
42) Stock::Package#shipping_categories returns shipping categories that are not shipping categories of the order's products
Failure/Error: distributors.each(&:touch)
ActiveRecord::ActiveRecordError:
can not touch on a new record object
# ./app/models/spree/shipping_method_decorator.rb:81:in `touch_distributors'
# ./spec/models/stock/package_spec.rb:39:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:17:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:32:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:7:in `block (2 levels) in <module:Stock>'
# ./spec/models/stock/package_spec.rb:50:in `block (3 levels) in <module:Stock>'
2020-03-01 18:40:15 +01:00
Matt-Yorkley
847a349a6b
Fix geocoding in Rails 4 🎉
...
Responsibility for geocoding has moved from the `gmaps4rails` gem using `acts_as_taggable`, to the `geocoding` gem using `geocoded_by`. We already use this in the Address model.
2020-02-29 13:08:06 +01:00
Matt-Yorkley
7dbe0bd6b9
Use new branch of ofn-qz gem
2020-02-28 15:27:11 +01:00
Matt-Yorkley
5c526bf5cc
Move definitions into constants and use #freeze
2020-02-28 13:08:17 +01:00
Matt-Yorkley
a9e6622639
Update product import #assign_attributes calls
...
For some reason some of the superfluous attributes being assigned here have started throwing fatal errors in Rails 4 instead of being silently ignored...
2020-02-28 13:08:17 +01:00
Luis Ramos
ddebd47e32
Merge pull request #4862 from Matt-Yorkley/3-0-paypal
...
[Spree 2.1] Re-introduce Paypal gem
2020-02-28 11:25:16 +00:00
Luis Ramos
56c6ef5e79
Merge pull request #4853 from Matt-Yorkley/3-0-base-controller
...
[Spree 2.1] Fix headers in api/base_controller spec
2020-02-28 11:21:16 +00:00
Matt-Yorkley
eef1574ebe
Call #permit on params object in before_filter
2020-02-28 12:18:53 +01:00
Matt-Yorkley
95996dc11e
Un-comment :credit_cards in routes
2020-02-28 12:18:53 +01:00
Matt-Yorkley
78e430613f
Fix spree routes helper in payment_redirect.rb
2020-02-28 12:18:53 +01:00
Luis Ramos
4f3247c196
Revert "Temporarily remove broken specs"
...
This reverts commit c0dc999e0d .
2020-02-28 12:18:53 +01:00
Luis Ramos
427d3b7641
Revert "Comment spree_paypal express in all.js temporarily"
...
This reverts commit 26ba37b117 .
2020-02-28 12:18:53 +01:00
Luis Ramos
61439a3750
Re-add paypal controller code
2020-02-28 12:18:53 +01:00
Matt-Yorkley
1f59bc8bef
Use new branch of the paypal gem
...
This uses the `2-1-0-stable` branch of the paypal gem. It's the 2-1-stable branch plus a couple of old OFN modifications (from 2-0-stable), plus a minor modification to the gemspec to allow it to be used with spree_core `2.1.0`
2020-02-28 12:18:53 +01:00
Matt-Yorkley
cc1ab1bdb9
Fix issue with broken SQL fragments in scopes and nested subqueries
...
It looks like there are some issues with prepared statements here, where the resulting SQL contains something like: `WHERE "enterprise_roles"."user_id" = $1` in a subquery. The "$1" part is being lost somehow and isn't present if it's used in nested subqueries.
Example fixed spec (there are lots like this one):
59) Spree::Admin::ReportsController Supplier Bulk Coop where I have granted P-OC to the distributor only shows product line items that I am supplying
Failure/Error: produced_line_items.select("spree_line_items.id"))
ActiveRecord::StatementInvalid:
PG::ProtocolViolation: ERROR: bind message supplies 0 parameters, but prepared statement "" requires 1
: SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises" INNER JOIN "enterprise_roles" ON "enterprise_roles"."enterprise_id" = "enterprises"."id" WHERE (enterprise_roles.user_id = 947)) OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles" WHERE "order_cycles"."coordinator_id" IN (SELECT "enterprises"."id" FROM "enterprises" INNER JOIN "enterprise_roles" ON "enterprises"."id" = "enterprise_roles"."enterprise_id" WHERE "enterprise_roles"."user_id" = $1)))))
# ./app/services/permissions/order.rb:28:in `visible_line_items'
# ./lib/open_food_network/reports/line_items.rb:16:in `list'
# ./lib/open_food_network/bulk_coop_report.rb:54:in `table_items'
# ./app/controllers/spree/admin/reports_controller.rb:264:in `order_grouper_table'
# ./app/controllers/spree/admin/reports_controller.rb:101:in `bulk_coop'
# ./spec/controllers/spree/admin/reports_controller_spec.rb:168:in `block (5 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# PG::ProtocolViolation:
# ERROR: bind message supplies 0 parameters, but prepared statement "" requires 1
# ./app/services/permissions/order.rb:28:in `visible_line_items'
2020-02-28 12:16:55 +01:00
Luis Ramos
e5232c6b79
Merge pull request #4863 from Matt-Yorkley/3-0-gemfile-lock-fixed
...
[Spree 2.1] Fix Gemfile.lock
2020-02-28 11:15:24 +00:00
Luis Ramos
95415cddbd
Merge pull request #4858 from Matt-Yorkley/3-0-embedded
...
[Spree 2.1] Fix embedded response headers
2020-02-28 11:12:16 +00:00
Matt-Yorkley
789ecbb8f2
Fix Gemfile.lock
2020-02-28 12:06:44 +01:00
Luis Ramos
0e607003c1
Fix problem in order cycles spec where miliseconds were not matching
2020-02-28 11:06:16 +00:00
Luis Ramos
1d0392e644
Merge pull request #4848 from Matt-Yorkley/3-0-test-locales
...
[Spree 2.1] Add 'pt' to list of available locales in test suite
2020-02-28 11:04:23 +00:00
Matt-Yorkley
02d46b7c51
Fix test in order_cycles_spec.rb
2020-02-28 11:51:09 +01:00
Matt-Yorkley
8672124f31
Add 'pt' to list of available locales in test suite
...
Fixes several errors such as:
104) UserRegistrationsController via ajax sets user.locale from cookie on create
Failure/Error: I18n.locale = spree_current_user.andand.locale || cookies[:locale] || I18n.default_locale
I18n::InvalidLocale:
"pt" is not a valid locale
# ./app/helpers/i18n_helper.rb:14:in `set_locale'
# ./spec/controllers/user_registrations_controller_spec.rb:56:in `block (3 levels) in <top (required)>'
2020-02-28 11:44:33 +01:00
Pau Pérez Fabregat
9440363a22
Merge pull request #4821 from luisramos0/3_val_issues
...
[Spree 2.1] Fix creation of enterprises/users in specs
2020-02-28 11:34:27 +01:00
Pau Pérez Fabregat
19dd5d0af3
Merge pull request #4855 from luisramos0/3-0-ship-method-services
...
[Spree 2.1] Fix ShippingMethod.services query
2020-02-28 11:31:53 +01:00
Pau Pérez Fabregat
3d453eb5ee
Merge pull request #4861 from luisramos0/3-0-merge-master
...
[Spree 2.1] Merge master into 3-0-stable
2020-02-28 11:28:56 +01:00
Pau Pérez Fabregat
83065a798e
Merge pull request #4814 from luisramos0/rubop_rules
...
Add new cops (disabled) to rubocop config
2020-02-28 11:15:34 +01:00
Pau Pérez Fabregat
de9f14c305
Merge pull request #4849 from Matt-Yorkley/3-0-private-method
...
[Spree 2.1] Make private method #total_units public
2020-02-28 11:00:12 +01:00
Pau Pérez Fabregat
455241859e
Merge pull request #4850 from Matt-Yorkley/3-0-shipments
...
[Spree 2.1] Fix expectations in order_shipment_spec
2020-02-28 10:58:58 +01:00
Luis Ramos
bf47d34434
Merge branch 'master' into 3-0-merge-master
2020-02-28 09:52:01 +00:00
Matt-Yorkley
b661b3ee40
Merge pull request #4823 from luisramos0/require_specs
...
Add some require statements to specs
2020-02-28 10:46:29 +01:00
Pau Pérez Fabregat
d03d1c0cc2
Merge pull request #4832 from Matt-Yorkley/3-0-more_strong_params
...
[Spree 2.1] Add strong_params to admin/enterprise_relationships_controller.rb
2020-02-28 10:41:05 +01:00
Pau Pérez Fabregat
6854301025
Merge pull request #4828 from Matt-Yorkley/3-0-strong_params
...
[Spree 2.1] Strong params
2020-02-28 10:40:52 +01:00
Pau Pérez Fabregat
dc9ebd620a
Merge pull request #4833 from Matt-Yorkley/3-0-moar_params
...
[Spree 2.1] Add strong params to admin/column_preferences_controller.rb
2020-02-28 10:30:54 +01:00
Matt-Yorkley
7124c6bb73
Fix embedded response headers
...
Rails 4 adds an extra layer of "default" headers that override any that are missing (or deleted). This was breaking embedded shopfront responses.
Fixes:
74) setting response headers for embedded shopfronts with embedded shopfronts enabled with a valid whitelist allows iframes on certain pages when enabled in configuration
Failure/Error: expect(response.headers['X-Frame-Options']).to be_nil
expected: nil
got: "SAMEORIGIN"
# ./spec/requests/embedded_shopfronts_headers_spec.rb:54:in `block (4 levels) in <top (required)>'
75) setting response headers for embedded shopfronts with embedded shopfronts enabled with www prefix matches the URL structure in the header
Failure/Error: expect(response.headers['X-Frame-Options']).to be_nil
expected: nil
got: "SAMEORIGIN"
# ./spec/requests/embedded_shopfronts_headers_spec.rb:75:in `block (4 levels) in <top (required)>'
2020-02-27 20:53:09 +01:00
Luis Ramos
b528903aa8
Remove spec covering html format in SchedulesController#index, this is not used anywhere
2020-02-27 19:05:36 +00:00
Luis Ramos
bd0245229b
Move enterprise logo and promo_image setting in factories to after creation fixes a problem with enterprise_roles in the enterprise validation
2020-02-27 18:32:56 +00:00
Matt-Yorkley
38215c2a88
Delete some dead code
...
This feature for assigning defaults via the UI was previously removed
2020-02-27 19:28:25 +01:00
Luis Ramos
b1714d73ef
Capitalize 'Method' in the flash message to make specs pass
2020-02-27 18:01:24 +00:00
Luis Ramos
ade52dd07d
Make ship methods services query work with rails 4, bool_or now results in a boolean and not in t or f as before
2020-02-27 17:40:32 +00:00
Matt-Yorkley
d280bf0d4d
Update all locales with the latest Transifex translations
2020-02-27 11:42:02 +01:00
Matt-Yorkley
0fa73e3b02
Fix headers in api/base_controller spec
...
The headers in the request were not being populated correctly in the test, so the #api_key method was not functioning as intended.
Fixes:
48) Api::BaseController cannot make a request to the API with an invalid API key
Failure/Error: expect(json_response).to eq( "error" => "Invalid API key (fake_key) specified." )
expected: {"error"=>"Invalid API key (fake_key) specified."}
got: {"products"=>[]}
(compared using ==)
Diff:
@@ -1,2 +1,2 @@
-"error" => "Invalid API key (fake_key) specified.",
+"products" => [],
# ./spec/controllers/api/base_controller_spec.rb:40:in `block (3 levels) in <top (required)>'
2020-02-27 11:23:48 +01:00
Eduardo
4c3916a93d
redirect to shops list when an enterprise is not found
2020-02-26 19:25:38 -03:00
Luis Ramos
677f31ffa8
Make payment source_views/gateway work with nil credit card
...
This will happen if user deletes a saved credit card used previously. In this case, the admin payment details page will render empty details and the payment amount
2020-02-26 11:55:17 +00:00
Luis Ramos
5848a46149
Add missing template to render stripeSCA payment and add spec to verify it's presence
2020-02-26 11:38:42 +00:00
Matt-Yorkley
c758cb5508
Fix expectations in order_shipment_spec
...
Some depreacted calls to #find_by_* had previously been updated elsewhere, but the spec was still checking if the object received the #find_by_shipping_method_id message.
Fixes:
85) OrderShipment#select_shipping_method when order has a shipment when shipping_method_id is not valid for the order returns nil
Failure/Error: expect(shipment.shipping_rates).to receive(:find_by_shipping_method_id).with(invalid_shipping_method_id) { nil }
(#<ActiveRecord::Associations::CollectionProxy []>).find_by_shipping_method_id(1312)
expected: 1 time with arguments: (1312)
received: 0 times
# ./spec/models/concerns/order_shipment_spec.rb:53:in `block (5 levels) in <top (required)>'
2020-02-26 11:50:51 +01:00
Matt-Yorkley
82052e459d
Make private method #total_units public
...
This method is being called by another class as if it were public.
Fixes 2 instances of this error:
90) OpenFoodNetwork::OrdersAndFulfillmentsReport::SupplierTotalsReport generates the report
Failure/Error: delegate :supplier_name, :product_name, :line_items_name, :total_units, to: :context
NoMethodError:
private method `total_units' called for #<OpenFoodNetwork::OrdersAndFulfillmentsReport:0x00007f8db5d67168>
# ./lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb:8:in `total_units'
# ./lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb:48:in `block in columns'
# ./lib/open_food_network/order_grouper.rb:41:in `block in build_table'
# ./lib/open_food_network/order_grouper.rb:41:in `map'
# ./lib/open_food_network/order_grouper.rb:41:in `build_table'
# ./lib/open_food_network/order_grouper.rb:47:in `block in build_table'
# ./lib/open_food_network/order_grouper.rb:43:in `each'
# ./lib/open_food_network/order_grouper.rb:43:in `build_table'
# ./lib/open_food_network/order_grouper.rb:47:in `block in build_table'
# ./lib/open_food_network/order_grouper.rb:43:in `each'
# ./lib/open_food_network/order_grouper.rb:43:in `build_table'
# ./lib/open_food_network/order_grouper.rb:47:in `block in build_table'
# ./lib/open_food_network/order_grouper.rb:43:in `each'
# ./lib/open_food_network/order_grouper.rb:43:in `build_table'
# ./lib/open_food_network/order_grouper.rb:56:in `table'
# ./spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report_spec.rb:19:in `block (2 levels) in <top (required)>'
# ./spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report_spec.rb:23:in `block (2 levels) in <top (required)>'
2020-02-26 11:35:00 +01:00
Matt-Yorkley
167c8543aa
Fix #create_enterprise_user
...
User was not being associated to enterprises passed in attributes
2020-02-26 10:46:41 +01:00
Luis Ramos
03c91dfac1
Merge pull request #4780 from luisramos0/bulk_prod_errors
...
Fix javascript logic that parses server errors in the bulk product edit page
2020-02-25 18:49:54 +00:00
Luis Ramos
60e12063cd
Merge pull request #4758 from luisramos0/fix_incomplete_stripe
...
Make the payment methods filter handle misconfigured stripe payment methods
2020-02-25 18:47:09 +00:00
Pau Pérez Fabregat
e5b57af315
Merge pull request #4815 from openfoodfoundation/transifex
...
Transifex
2020-02-25 13:37:30 +01:00
Pau Pérez Fabregat
a396a7f0af
Merge pull request #4818 from luisramos0/delete_dead_code
...
Delete dead code after PRs 4512 and 4508
2020-02-25 13:32:23 +01:00
Luis Ramos
6b6cdf07fb
Remove inactive confirm
...
The new version of jquery is picking up a confirm in the ship action that was not being triggered in the previous version
The orders_spec was not expecting this confirm to appear so we are removing here to keep the behaviour and the spec green
2020-02-25 11:56:23 +00:00
Transifex-Openfoodnetwork
d084789c56
Updating translations for config/locales/nb.yml
2020-02-25 19:57:08 +11:00
Transifex-Openfoodnetwork
dafac32e70
Updating translations for config/locales/nb.yml
2020-02-25 19:53:59 +11:00
Maikel Linke
8432dab142
Remove unused Javascript manifest
...
It reduces compilation from 25s to 24s.
2020-02-25 11:43:53 +11:00
Maikel Linke
0b0263a605
Remove unused stylesheet manifest
...
Compiling assets with application.css: 40s
Compiling assets without application.css: 25s
2020-02-25 11:43:39 +11:00
Transifex-Openfoodnetwork
6ca39f3aa5
Updating translations for config/locales/fr_CA.yml
2020-02-25 09:10:13 +11:00
Transifex-Openfoodnetwork
234a9ef1b4
Updating translations for config/locales/en_CA.yml
2020-02-25 08:41:07 +11:00
Luis Ramos
24a1327805
Merge pull request #4785 from openfoodfoundation/dependabot/bundler/stripe-5.15.0
...
Bump stripe from 5.11.0 to 5.15.0
2020-02-24 20:12:39 +00:00
Luis Ramos
33d77d57f4
Merge pull request #4776 from luisramos0/remove_assets_group
...
Remove the assets group from the gemfile (taken from spree upgrade branch)
2020-02-24 20:12:01 +00:00
dependabot-preview[bot]
51dd55c5b9
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 3.0.4 to 3.1.5. **This update includes a security fix.**
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/v3.1.5/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.4...v3.1.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 19:14:38 +00:00
Transifex-Openfoodnetwork
0571b657aa
Updating translations for config/locales/en_FR.yml
2020-02-25 04:39:02 +11:00
Transifex-Openfoodnetwork
e4958baddc
Updating translations for config/locales/en_FR.yml
2020-02-25 04:35:52 +11:00
Transifex-Openfoodnetwork
c985747297
Updating translations for config/locales/fr.yml
2020-02-25 04:31:33 +11:00
Maikel Linke
17ea2cd510
Clean up JS assets comments
2020-02-24 11:22:47 +11:00
Maikel Linke
325c427219
Remove style from pasted HTML in editor
2020-02-24 11:22:47 +11:00
Maikel Linke
a3e87d893a
Remove obsolete angular-sanitize
...
Our TextAngular module supplies that code.
2020-02-24 11:22:47 +11:00
Maikel Linke
480a629349
Bump textAngular to latest v1.5.16
...
I'm not sure which version we had previously. This update should come
with lots of minor improvements even though we didn't have anyone
complain.
2020-02-24 11:22:47 +11:00
Luis Ramos
03fac6f285
Avoid subquery with too many columns error by specifying the selected column
2020-02-23 20:05:13 +00:00
Matt-Yorkley
90d1a5e605
Add strong params to admin/column_preferences_controller.rb
...
Fixes failures such as:
119) Admin::ColumnPreferencesController bulk_update json where I don't own the preferences submitted prevents me from updating the column preferences
Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s
ActiveModel::ForbiddenAttributesError:
{"action_name"=>"enterprises_index", "column_preferences"=>[{"id"=>1, "user_id"=>2716, "action_name"=>"enterprises_index", "column_name"=>"name", "visible"=>false}, {"id"=>nil, "user_id"=>2716, "action_name"=>"enterprises_index", "column_name"=>"producer", "visible"=>true}, {"id"=>nil, "user_id"=>2716, "action_name"=>"enterprises_index", "column_name"=>"status", "visible"=>true}], "format"=>"json", "controller"=>"admin/column_preferences", "action"=>"bulk_update"}
# ./app/controllers/application_controller.rb:16:in `print_params'
# ./spec/controllers/admin/column_preferences_controller_spec.rb:28:in `block (5 levels) in <top (required)>'
# ------------------
# --- Caused by: ---
# ActiveModel::ForbiddenAttributesError:
# ActiveModel::ForbiddenAttributesError
# ./app/models/model_set.rb:24:in `block in collection_attributes='
2020-02-23 14:52:06 +01:00
Matt-Yorkley
fccc8037f0
Add strong_params to enterprise_relationships_controller.rb
...
Fixes specs such as:
31)
As an Administrator
I want to manage relationships between enterprises
as a site administrator creating a relationship
Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s
ActiveModel::ForbiddenAttributesError:
{"enterprise_relationship"=>{"parent_id"=>284, "child_id"=>285, "permissions_list"=>["add_to_order_cycle", "edit_profile", "create_variant_overrides"]}, "action"=>"create", "controller"=>"admin/enterprise_relationships"}
# ./app/controllers/application_controller.rb:16:in `print_params'
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
# ------------------
# --- Caused by: ---
# ActiveModel::ForbiddenAttributesError:
# ActiveModel::ForbiddenAttributesError
# ./app/controllers/admin/enterprise_relationships_controller.rb:10:in `create'
2020-02-23 14:26:14 +01:00
Transifex-Openfoodnetwork
f5ffdfc258
Updating translations for config/locales/en_NZ.yml
2020-02-23 22:32:56 +11:00
Matt-Yorkley
f77194875c
Add strong parameters to orders_controller.rb
2020-02-22 16:24:30 +01:00
Matt-Yorkley
bd6b409708
Add strong parameters to user_registrations_controller.rb
2020-02-22 16:24:30 +01:00
Matt-Yorkley
eae7dc7f2e
Temporarily add extra debugging to help with strong parameters
2020-02-22 16:24:28 +01:00
Matt-Yorkley
f5bc120fb1
Remove without_protection: true argument from #create calls
...
Needed for using Strong Parameters in Rails 4
2020-02-22 14:35:10 +01:00
Matt-Yorkley
3896644a04
Remove attr_accessible declarations
...
Needed for using Strong Parameters in Rails 4
2020-02-22 14:03:16 +01:00
Matt-Yorkley
74965eb635
Remove protected_attributes gem
...
This starts the move towards using Strong Parameters in Rails 4
2020-02-22 13:41:46 +01:00
Luis Ramos
e64d21d81d
Move user enterprises definition in tests to after creation fixes a problem with enterprise_roles
2020-02-22 12:06:33 +00:00
Luis Ramos
1dc7b5793c
Fix Enterprise validation and factory so that users are added after the validation
2020-02-22 12:06:33 +00:00
Luis Ramos
10c6e5ad9b
Rebuild rubocop todo after latest rebase
2020-02-22 11:53:35 +00:00
Luis Ramos
f06a4fb1d0
This configuration is no longer needed as this is the default behaviour in rails 4
2020-02-22 11:53:35 +00:00
Luis Ramos
7640c7b606
Make all timestamps nullable, non-nullable timestamps are not required to maketimestamps work properly
2020-02-22 11:53:35 +00:00
Luis Ramos
26ba37b117
Comment spree_paypal express in all.js temporarily
2020-02-22 11:53:35 +00:00
Luis Ramos
2108a282c8
Add some require statements to specs
2020-02-22 11:49:52 +00:00
Matt-Yorkley
8b54281254
Add missing method removed from order model in Spree 2.1
...
It looks like #price_adjustments was refactored/removed in Spree 2.1, but we still call the method in order_decorator
2020-02-22 11:06:51 +00:00
Matt-Yorkley
e9e4168102
Fix ActiveModel::MissingAttributeError in order_cycle_permissions.rb
...
Failure/Error: variant_ids_by_supplier_id(permissions.all_incoming_editable_variants.all)
ActiveModel::MissingAttributeError:
missing attribute: product_id
# ./app/serializers/api/admin/order_cycle_serializer.rb:36:in `editable_variants_for_incoming_exchanges'
# (eval):9:in `_fast_attributes'
# ./app/controllers/spree/admin/base_controller_decorator.rb:98:in `render_as_json'
# ./app/controllers/admin/order_cycles_controller.rb:28:in `block (2 levels) in show'
# ./app/controllers/admin/order_cycles_controller.rb:25:in `show'
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
# ------------------
# --- Caused by: ---
# ActiveModel::MissingAttributeError:
# missing attribute: product_id
# ./app/serializers/api/admin/order_cycle_serializer.rb:36:in `editable_variants_for_incoming_exchanges'
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b9db6df952
Replace current_spree_user method
...
This wasn't working before but now seems to be fixed
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b3e7f9a07e
Fix deprecated arguments used in #sanitize
...
Failure/Error: d = sanitize(object.description, tags: "p, b, strong, em, i, a, u", attributes: "href, target")
ArgumentError:
You should pass :tags as an Enumerable
# ./app/serializers/api/product_serializer.rb:26:in `description_html'
# (eval):10:in `_fast_attributes'
# ./app/services/products_renderer.rb:24:in `products_json'
# ./app/controllers/api/order_cycles_controller.rb:14:in `products'
# ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
2020-02-22 11:06:51 +00:00
Matt-Yorkley
04b760f221
Fix changed order of arguments for TestCase#process
...
DEPRECATION WARNING: TestCase#process now expects the HTTP method as second argument: process(action, http_method, params, session, flash). (called from api_process at /home/user/Github/openfoodnetwork/spec/support/controller_hacks.rb:22)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
df1299b290
Fix user not yet loaded in prepend_before_filter
2020-02-22 11:06:51 +00:00
Matt-Yorkley
c0ecdb9e3a
Fix deprecated #includes in join without reference
...
DEPRECATION WARNING: It looks like you are eager loading table(s) (one of: variant_overrides, enterprises, enterprise_roles) that are referenced in a string SQL snippet. For example:
Post.includes(:comments).where("comments.title = 'foo'")
Currently, Active Record recognizes the table in the string, and knows to JOIN the comments table to the query, rather than loading comments in a separate query. However, doing this without writing a full-blown SQL parser is inherently flawed. Since we don't want to write an SQL parser, we are removing this functionality. From now on, you must explicitly tell Active Record when you are referencing a table from a string:
Post.includes(:comments).where("comments.title = 'foo'").references(:comments)
If you don't rely on implicit join references you can disable the feature entirely by setting `config.active_record.disable_implicit_join_references = true`. (called from collection at /home/user/Github/openfoodnetwork/app/controllers/admin/variant_overrides_controller.rb:77)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
6c22d655c8
Temporarily remove additional email validation on Spree::Order
...
A new custom email validator class was added to Spree::Order, and currently it fails every time (breaking lots of specs). This ugly hack disables it for now.
2020-02-22 11:06:51 +00:00
Matt-Yorkley
3615dcd355
Fix namespacing in cookies test
...
NameError: uninitialized constant ActionDispatch::Cookies::SignedCookieJar::MAX_COOKIE_SIZE
# ./spec/requests/large_request_spec.rb:8
2020-02-22 11:06:51 +00:00
Matt-Yorkley
49bc3308be
Fix broken references to url_helpers
2020-02-22 11:06:51 +00:00
Matt-Yorkley
fd11d4fa5b
Fix broken html encoding of injected json in admin views
2020-02-22 11:06:51 +00:00
Matt-Yorkley
e3ae65fad5
Update rubocop_todo
2020-02-22 11:06:51 +00:00
Matt-Yorkley
ae11cb9954
Update rubocop_styleguide for Rails 4
2020-02-22 11:06:51 +00:00
Matt-Yorkley
98fdbb8621
Update deprecated #scoped calls
...
Model#scoped is now deprecated. Model#where(nil) in Rails 4 returns the same result as Model#scoped in Rails 3
2020-02-22 11:06:51 +00:00
Matt-Yorkley
241e9221b4
Replace deprecated :restrict option in address_decorator.rb
...
DEPRECATION WARNING: The :restrict option is deprecated. Please use :restrict_with_exception instead, which provides the same functionality. (called from block in <top (required)> at /home/user/Github/openfoodnetwork/app/models/spree/address_decorator.rb:4)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
9fd4863a13
Fix missing roles error in spec workflow #create_enterprise_user
2020-02-22 11:06:51 +00:00
Matt-Yorkley
6541b55872
Fix default_association deprecated syntax in OrderCycle and Schedule
2020-02-22 11:06:51 +00:00
Matt-Yorkley
aff8911309
Update database_cleaner to >1.0 to fix transaction issues in test suite
2020-02-22 11:06:51 +00:00
Matt-Yorkley
39459b4a63
Temporarily fix root_path missing error in many controllers
2020-02-22 11:06:51 +00:00
Matt-Yorkley
7aef5af71c
Fix report types spec
2020-02-22 11:06:51 +00:00
Matt-Yorkley
0a9d63dd2f
Fix deprecated syntax on associations
2020-02-22 11:06:51 +00:00
Matt-Yorkley
5cc223e8f4
Update routes loading for Rails 4
2020-02-22 11:06:51 +00:00
Matt-Yorkley
a12ec8c5d9
Move filter parameters to initializer for Rails 4
2020-02-22 11:06:51 +00:00
Matt-Yorkley
046d8e0b87
Explicitly configure shoulda-matchers in spec_helper
...
This is apparently needed in Rails 4
2020-02-22 11:06:51 +00:00
Matt-Yorkley
16d56a8cbd
Routes using match must specify a request method in Rails 4
2020-02-22 11:06:51 +00:00
Matt-Yorkley
a8b8269a02
Update deprecated #find_or_initialize_by_* methods
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b80929022b
Remove unused newrelic_rpm gem
2020-02-22 11:06:51 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
Matt-Yorkley
30558485de
Update deprecated #find_or_create_by_* methods
2020-02-22 11:06:51 +00:00
Matt-Yorkley
6dd982532c
Update deprecated/changed Rubocop rule names
2020-02-22 11:06:51 +00:00
Matt-Yorkley
418e9d23fe
Add missing eager_load setting in test.rb
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b8e608abc2
Remove deprecated #whiny_nils
2020-02-22 11:06:51 +00:00
Matt-Yorkley
6eef2555f1
Fix i18n available locales error
...
For some reason the locales defined in config/environment/test.rb are `en,es`, but in the used application.yml they were `en,es,en-GB`. This seems to trigger errors in the test environment ("en-GB is not a valid locale") if the two lists don't match..?
2020-02-22 11:06:51 +00:00
Matt-Yorkley
5603b70379
Fix html escaping of characters in AMS rendering causing fatal javascript errors
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b03ef140f7
Enable sass
2020-02-22 11:06:51 +00:00
Matt-Yorkley
8ffdd806bf
Enable rails-i18n 4.0
2020-02-22 11:06:25 +00:00
Matt-Yorkley
1fa2d05c0c
Fix AuthenticationHelper#spree_current_user
...
`current_spree_user`: method not found...
2020-02-22 11:05:24 +00:00
Matt-Yorkley
5b8552f541
Fix ActiveRecord::Relation issue
...
Rails 4 now returns an Activerecord::Relation when using `SomeModel.all`. To get all the objects (as in Rails 3) we need to use `SomeModel.all.to_a`. See: https://stackoverflow.com/a/22417170
2020-02-22 11:05:24 +00:00
Matt-Yorkley
6f62c2cf27
Fix SCSS import file error
2020-02-22 11:05:24 +00:00
luisramos0
2f69d2a7e7
Remove devise email validation regexp, it's not needed in this version
2020-02-22 11:05:24 +00:00
luisramos0
2dc78d2f50
Remove spree_auth_devise and upgrade devise to 3.0.1
2020-02-22 11:05:24 +00:00
luisramos0
d1248c76fa
Temporarily disable caching classes in test to fix karma rake task
...
This fixes the error "can't modify immutable index" in lib/tasks/karma.rake:25:in `application_spec_files'
2020-02-22 11:05:24 +00:00
luisramos0
4ca9a19d8a
Temporarily remove broken fontawesome and spree_paypal_express assets
2020-02-22 11:05:24 +00:00
luisramos0
1ef9209183
Remove the assets group in the gemfile (removed in rails 4)
2020-02-22 11:05:24 +00:00
luisramos0
9c369caae2
Temporarily comment part of Enterprise.relate_to_owners_enterprises so that most specs pass for now
2020-02-22 11:05:24 +00:00
luisramos0
b23ce20488
Add migration from spree v2.1
2020-02-22 11:05:24 +00:00
luisramos0
18ca9980c9
Temporarily comment Enterprise.ensure_owner_is_manager otherwise all specs erroring out with 'Enterprise roles invalid'
2020-02-22 11:05:24 +00:00
luisramos0
c0dc999e0d
Temporarily remove broken specs
2020-02-22 11:05:24 +00:00
luisramos0
8fe3a8aea4
Setting secret key in config/initializers/secret_token.rb
2020-02-22 11:05:24 +00:00
luisramos0
8e747e54a0
Setting eager loading on each env configuration
2020-02-22 11:05:24 +00:00
luisramos0
8dbe4accaf
Upgrade to the spree branch 2-1-0-stable and rails 4.0.0
2020-02-22 11:05:24 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
luisramos0
404e7c1f37
Make credit card cloner clone the payment method even if the customer is not given
...
This makes the payments without saving card work again in the frontoffice as well as the payments taken by the seller in the backoffice
2020-02-21 14:11:13 +00:00
Luis Ramos
1bdeda4a21
Delete dead code after PRs 4512 and 4508
2020-02-21 12:25:07 +00:00
Luis Ramos
47916f823f
Add spec to credit card cloner. No customer given.
2020-02-21 10:56:32 +00:00
Luis Ramos
ab4add1954
Fix CreditCardCloner basic spec
2020-02-21 10:56:32 +00:00
Luis Ramos
10fff31dca
Fix stripe_sca spec
2020-02-21 10:56:32 +00:00
Luis Ramos
7fb85092ce
Remove duplicate customers stubs
2020-02-21 10:56:32 +00:00
Luis Ramos
7584e96759
Make customer stub always return the same customer id
...
I cant make stripe customers stub return different customer_ids based on the stripe_account header
2020-02-21 10:56:32 +00:00
Luis Ramos
f8ab64d71e
Move specs around in stripe_sca_spec so we can re-use the cloning stubs when storing a new card and when re-using a new card
2020-02-21 10:56:32 +00:00
Luis Ramos
ccb4c77d1f
Adapt credit card cloner to not clone card if it's a card to be used only once
...
Adapt stripe_sca specs to new cloner logic
2020-02-21 10:56:32 +00:00
luisramos0
5ef1510fc7
Adapt CreditCard cloner to clone not 'cards of the platform account to payment_methods of the connected accounts' but instead 'cards or payment_methods of the platform account to payment_methods of the connected accounts'
...
This process mimicks the existing process of generating a token on the connected account from a card on the platform account. In the Payment Intents API we need to create a payment method in the connected account, a token is not enough
2020-02-21 10:56:32 +00:00
luisramos0
1afd712ff4
Make StripeSCA store cards (and delete them) on the Stripe platform account and not the Stripe Connected account (the sellers accounts)
...
This is important so that cards can be re-used across sellers in OFN
2020-02-21 10:56:32 +00:00
luisramos0
699110258b
Add spec for credit_card_cloner
2020-02-21 10:56:32 +00:00
luisramos0
3fb1df9bb3
Rename CardCloner to CreditCardCloner because it's dependent on Spree:CreditCard attributes
2020-02-21 10:56:32 +00:00
luisramos0
14c03ead31
Extract CardCloner to separate class
2020-02-21 10:56:32 +00:00
luisramos0
4480c2f0f0
Add logic to stripe_sca gateway to handle cards stored in the platform account with the stripe Charges API: card_*
2020-02-21 10:56:32 +00:00
luisramos0
b3ac5d8f41
Improve code readability a little
2020-02-21 10:52:56 +00:00
luisramos0
6fb74c88cd
Fix a typo
2020-02-21 10:52:56 +00:00
luisramos0
38fd028a9f
Fix some rubocop issues from previous commit
2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63
Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions
...
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
2020-02-21 10:52:56 +00:00
luisramos0
66440f9e4c
Add missing translations for new payment method stripe sca
2020-02-21 10:52:56 +00:00
luisramos0
b8457ebece
Make profile storer a bit easier to read
2020-02-21 10:52:56 +00:00
Luis Ramos
668fd1c7c0
Add spec for profile storer to cover happy path for both response attribute cases: existin stripe integration and new stripe sca
2020-02-21 10:52:55 +00:00
Luis Ramos
aff934c814
Remove unnecessary test setup code
2020-02-21 10:52:55 +00:00
Luis Ramos
6bb04f6cc6
Adapt stripe_sca_spec to actual stripe SCA API
2020-02-21 10:52:55 +00:00
luisramos0
0e815439b3
Duplicate stripe_connect_spec and adapt to new stripe_sca
...
stripe_connect_spec will be deleted at some point when all users are migrated to the sca api
2020-02-21 10:52:55 +00:00
luisramos0
c7b01c37af
Fix a problem in credit cards controller spec and test case where stripe_account_id must be included in the stripe api call
2020-02-21 10:52:55 +00:00
luisramos0
ac8f3c811f
Fix rubocop issues in some stripe integration related files
2020-02-21 10:52:55 +00:00
luisramos0
1b820ea85c
Fix rubocop issues in credit_cards_controller
2020-02-21 10:52:55 +00:00
luisramos0
ec7b91bb68
Make ProfileStorer a bit easier to read
2020-02-21 10:52:29 +00:00
luisramos0
c773cde191
Add admin payment template for stripe sca and respective js code to make it work
2020-02-21 10:52:29 +00:00
luisramos0
db1065a69e
Make saving a card on checkout work with the payment intents api by making profile storer work with the slightly different api responses from stripe
2020-02-21 10:52:29 +00:00
luisramos0
9fa4bad0b4
Add stripe SCA checkotu payment template and move stripe object definition to it and the other stripe template
...
We need to set the stripe object with the stripe account id to work with the payment intents api but we cannot set it to work with the stripe charges api
This makes the two payment methods incompatible: a given enterprise cannot use both the old stripe integration and this new one at the same time.
2020-02-21 10:52:29 +00:00
luisramos0
a52c4b542c
Make destroy stored cards work for stripe SCA by setting stripe account id before making the call to the stripe api
...
This account id cannot be sent when dealing with the old StripeConnect gateway
2020-02-21 10:52:29 +00:00
luisramos0
283abf9a88
Remove dead code from Stripe connect gateway
...
Update Source is dead since a74c502fd9
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
2020-02-21 10:52:29 +00:00
luisramos0
5724c3bb0a
Add code from ActiveMerchant v1.98.0 that supports the Stripe Payment Intents API
...
This commit can be reverted once we upgrade to v1.98.0
2020-02-21 10:52:29 +00:00
Transifex-Openfoodnetwork
49ba83da6d
Updating translations for config/locales/en_GB.yml
2020-02-21 05:32:39 +11:00
Transifex-Openfoodnetwork
19d1497c4b
Updating translations for config/locales/en_GB.yml
2020-02-21 05:29:31 +11:00
Luis Ramos
06200c9d3c
Add new cops (disabled) to rubocop config
2020-02-20 18:04:43 +00:00
Luis Ramos
2412658e51
Update db/schema timestamp according to last change
2020-02-20 11:41:49 +00:00
Luis Ramos
0c4f22f847
Fix images/new.js path and add simple spec to verify the page loads correctly
...
Testing the file upload would be a bit more complicated
2020-02-20 11:18:22 +00:00
Luis Ramos
1803ea3c38
Add traling breakline to case where errors come in a array
2020-02-20 10:06:10 +00:00
Pau Pérez Fabregat
93fda02e43
Merge pull request #4803 from openfoodfoundation/dependabot/bundler/rubocop-0.80.0
...
Bump rubocop from 0.79.0 to 0.80.0
2020-02-20 09:34:10 +01:00
Pau Pérez Fabregat
77958f9afe
Merge pull request #4796 from openfoodfoundation/dependabot/bundler/i18n-js-3.6.0
...
Bump i18n-js from 3.5.1 to 3.6.0
2020-02-20 09:32:02 +01:00
Maikel Linke
82e402f31a
Update translations from Transifex
2020-02-20 16:20:06 +11:00
Maikel Linke
03fa3e2269
Find last payment deterministically
2020-02-20 15:59:57 +11:00
Maikel Linke
11fbe7d5c9
Show last payment method in order confirmations
2020-02-20 15:59:57 +11:00
Maikel Linke
799c1f08de
Optimise finding last payment
...
Suggested by Rubocop.
2020-02-20 15:59:56 +11:00
Maikel Linke
6b66458bfd
Replace andand with new Ruby syntax
2020-02-20 15:59:56 +11:00
Maikel Linke
3e0a5bac6a
Move helper to service for re-use
2020-02-20 15:59:56 +11:00
Maikel Linke
2c2023df03
Show last payment method in order confirmation
...
If we had multiple failed payments and then a successful payment, the
order confirmation was displaying the payment method of the first failed
payment. That was confusing and is now changed to the last payment
method.
2020-02-20 15:59:56 +11:00
Maikel Linke
7306d379a5
Display payment method literally
...
Don't allow for HTML and potentially bad scripts. But this also prevents
accidental display errors. If someone wrote, "We only take <cash>", it
would mess with the site.
2020-02-20 15:59:56 +11:00
Maikel Linke
e15c61d862
Add spec for order confirmation view
2020-02-20 15:59:56 +11:00
Maikel
35aeb98d45
Merge pull request #4792 from openfoodfoundation/transifex
...
Transifex
2020-02-20 10:43:45 +11:00
Luis Ramos
d99cba3b6e
Merge pull request #4709 from mkllnk/4172-js-pluralize
...
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
dependabot-preview[bot]
4c6fd96bcc
Bump rubocop from 0.79.0 to 0.80.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.79.0 to 0.80.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.79.0...v0.80.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 19:18:53 +00:00
Luis Ramos
1eba17f048
Make select column explicit to avoid too many columns sql error
2020-02-18 18:32:52 +00:00
dependabot-preview[bot]
ff088c6203
Bump stripe from 5.11.0 to 5.15.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 5.11.0 to 5.15.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.11.0...v5.15.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 12:01:10 +00:00
Luis Ramos
a1cb6928db
Merge pull request #4793 from openfoodfoundation/dependabot/bundler/webmock-3.8.2
...
Bump webmock from 3.8.1 to 3.8.2
2020-02-18 11:59:14 +00:00
Luis Ramos
40a5b60dcb
Merge pull request #4794 from openfoodfoundation/dependabot/bundler/oauth2-1.4.4
...
Bump oauth2 from 1.4.3 to 1.4.4
2020-02-18 11:58:58 +00:00
Luis Ramos
2711736004
Use Array#join and make code simpler
2020-02-18 10:49:41 +00:00
Luis Ramos
18c165e893
Merge pull request #4784 from CSCI-462-01-2020/Issue4731
...
Add Order Cycle Button Tooltips
2020-02-17 19:32:39 +00:00
Luis Ramos
0aaa04295b
Improve and unit test errorsParser
2020-02-17 11:21:21 +00:00
Luis Ramos
7639e9a38d
Extrac ErrorsParser to separate class and make it handle the rails error structure with keys
2020-02-17 11:21:21 +00:00
Transifex-Openfoodnetwork
d783bd771f
Updating translations for config/locales/ar.yml
2020-02-15 09:33:06 +11:00
Transifex-Openfoodnetwork
9dd9d14107
Updating translations for config/locales/ar.yml
2020-02-15 09:29:56 +11:00
Transifex-Openfoodnetwork
e942266dd7
Updating translations for config/locales/pt_BR.yml
2020-02-15 07:05:18 +11:00
dependabot-preview[bot]
c8f78904d6
Bump i18n-js from 3.5.1 to 3.6.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.5.1...v3.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-14 19:24:49 +00:00
Transifex-Openfoodnetwork
a982fd1e2b
Updating translations for config/locales/tr.yml
2020-02-14 22:27:33 +11:00
Transifex-Openfoodnetwork
7e8b2f6be5
Updating translations for config/locales/tr.yml
2020-02-14 22:24:23 +11:00
Transifex-Openfoodnetwork
921c7bbc3a
Updating translations for config/locales/tr.yml
2020-02-14 22:21:12 +11:00
Transifex-Openfoodnetwork
eaff6b0c68
Updating translations for config/locales/nb.yml
2020-02-14 19:26:01 +11:00
Transifex-Openfoodnetwork
e1ab424481
Updating translations for config/locales/nb.yml
2020-02-14 19:22:51 +11:00
Luis Ramos
00e57c8a55
Add module definition in the recently moved service and adapt all it's usages to refer to the new namespace
2020-02-13 20:17:09 +00:00
Luis Ramos
2e74e64e22
Move Product Reset Strategy to the catalog domain
2020-02-13 20:17:09 +00:00
Luis Ramos
fc5d623465
Add new domain structure Catalog
2020-02-13 20:17:06 +00:00
Transifex-Openfoodnetwork
e59c9720fc
Updating translations for config/locales/en_GB.yml
2020-02-14 06:53:13 +11:00
dependabot-preview[bot]
b25f0007f0
Bump oauth2 from 1.4.3 to 1.4.4
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.3...v1.4.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-13 19:19:44 +00:00
dependabot-preview[bot]
65c5cdd52f
Bump webmock from 3.8.1 to 3.8.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.1...v3.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-13 19:16:18 +00:00
Transifex-Openfoodnetwork
a2873ea553
Updating translations for config/locales/fr.yml
2020-02-14 05:05:51 +11:00
Transifex-Openfoodnetwork
3a593ff255
Updating translations for config/locales/fr.yml
2020-02-14 05:02:42 +11:00
Transifex-Openfoodnetwork
92e1193ffb
Updating translations for config/locales/en_FR.yml
2020-02-14 05:01:02 +11:00
Transifex-Openfoodnetwork
016968dcb9
Updating translations for config/locales/fr.yml
2020-02-14 04:59:33 +11:00
Luis Ramos
9d8608f210
Merge pull request #4630 from Matt-Yorkley/product_counts
...
Show counts including all variants in order cycle exchanges
2020-02-13 11:33:58 +00:00
Luis Ramos
323ca906bc
Merge pull request #4759 from pacodelaluna/order-admin-products
...
Order admin products
2020-02-13 11:33:05 +00:00
Luis Ramos
c43b34e0fa
Merge pull request #4760 from luisramos0/checkout_ctrl
...
Merge Spree::CheckoutController with CheckoutController and clean it up
2020-02-13 11:31:15 +00:00
Luis Ramos
bc7f0e0962
Update all locales with the latest Transifex translations
2020-02-13 11:19:07 +00:00
Luis Ramos
cf4f7c562a
Merge pull request #4778 from openfoodfoundation/transifex
...
Transifex
2020-02-13 11:08:01 +00:00
François Turbelin
4c7bd4d6a8
Fix mess with order
2020-02-13 06:38:13 +01:00
François Turbelin
523b266308
Put back created_at desc as default order
2020-02-13 06:38:13 +01:00
François Turbelin
212413c8b3
Avoid mutable q params
2020-02-13 06:38:13 +01:00
François Turbelin
b248dc598e
Cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
e7b74b99ba
Refactor SortingOptions JS
2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4
Set default value at backend side
2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93
Fix specs and cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
3dcb66014e
Factorize column sorter partial
2020-02-13 06:38:13 +01:00
François Turbelin
06971b7198
Add sortable name column for Admin Products
2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7
Filter Admin products by name asc
2020-02-13 06:38:13 +01:00
Luis Ramos
38374a9835
Merge pull request #4761 from openfoodfoundation/dependabot/bundler/unicorn-5.5.3
...
Bump unicorn from 5.5.2 to 5.5.3
2020-02-12 20:56:19 +00:00
Luis Ramos
8d6a8ee214
Merge pull request #4763 from mkllnk/rails4-form-rendering
...
Future proof form rendering in admin orders
2020-02-12 20:56:00 +00:00
blainebillings
fec653186a
Add Order Cycle Button Tooltips
2020-02-11 10:10:39 -05:00
Transifex-Openfoodnetwork
ebe7456b66
Updating translations for config/locales/tr.yml
2020-02-11 21:48:53 +11:00
Transifex-Openfoodnetwork
8187669a25
Updating translations for config/locales/tr.yml
2020-02-11 21:45:44 +11:00
Transifex-Openfoodnetwork
a6aa0df53b
Updating translations for config/locales/fr_BE.yml
2020-02-10 03:32:33 +11:00
Transifex-Openfoodnetwork
116695b1d9
Updating translations for config/locales/en_NZ.yml
2020-02-08 18:53:00 +11:00
Transifex-Openfoodnetwork
387ac40dc9
Updating translations for config/locales/en_NZ.yml
2020-02-08 18:49:51 +11:00
luisramos0
66320b5055
Remove the assets group from the gemfile, it will disappear in rails 4
2020-02-07 12:29:02 +00:00
luisramos0
858d2cc6c2
Add doc to Spree::CheckoutController to make it more obvious why this controller exists
2020-02-07 11:50:23 +00:00
luisramos0
43280da187
Dup params to avoid nasty effects of a mutated params object in the controller
2020-02-07 10:26:04 +00:00
luisramos0
3b399b899c
Extract methods in subscription_placement_job to fix rubocop complexity issues
2020-02-07 10:06:59 +00:00
luisramos0
01d69c89aa
Add some log messages to help debug problems in subscription placement and subscription confirmation processes
2020-02-07 10:06:58 +00:00
luisramos0
a2801e40a2
Improve readability of proxy_order_syncer and add some log messages
2020-02-07 10:06:58 +00:00
luisramos0
abd4f0b923
Add custom_data column to paper_trail versions table so we can track a specific list of ids in a model
...
Activate paper_trail in order_cycles and schedules and track each others ids
An alternative way of doing this would be to use a gem for paper_trail associations but this way we avoid adding a new dependency to the app
2020-02-07 10:06:58 +00:00
Luis Ramos
e1eface5f8
Merge pull request #4542 from luisramos0/logger
...
Add timestamp to log entries
2020-02-07 10:02:55 +00:00
Luis Ramos
5cd14253d0
Merge pull request #4770 from openfoodfoundation/dependabot/bundler/webmock-3.8.1
...
Bump webmock from 3.8.0 to 3.8.1
2020-02-07 09:31:19 +00:00
Maikel
be691df7ac
Merge pull request #4769 from openfoodfoundation/transifex
...
Transifex
2020-02-07 18:09:31 +11:00
Maikel Linke
7783b28ca2
Update concurrency spec after refactor
...
In order to make the spec fail if the controller was not thread safe, it
uses breakpoints. One of those breakpoints was set for a method that has
now been removed.
I changed the method that is used for the breakpoint and changed `allow`
to `expect` so that this spec will fail if we remove that method as
well. Future version of Rspec will check if a mocked method actually
exists but our version just mocks it anyway. This is one way how specs
can become invalid after refactoring.
2020-02-07 17:46:42 +11:00
Maikel
6d51856821
Merge pull request #4734 from openfoodfoundation/dependabot/bundler/oauth2-1.4.3
...
Bump oauth2 from 1.4.2 to 1.4.3
2020-02-07 16:48:42 +11:00
dependabot-preview[bot]
890704b75c
Bump webmock from 3.8.0 to 3.8.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-06 19:17:54 +00:00
Transifex-Openfoodnetwork
922484b2e7
Updating translations for config/locales/en_GB.yml
2020-02-07 05:02:38 +11:00
Luis Ramos
3e7288648b
Merge pull request #4762 from openfoodfoundation/dependabot/bundler/roo-2.8.3
...
Bump roo from 2.8.2 to 2.8.3
2020-02-06 14:44:21 +00:00
luisramos0
f0f537ff8f
Fix path of spree-select2.js pointing to the file in ofn rather the file in spree_backend
2020-02-06 11:21:47 +00:00
Transifex-Openfoodnetwork
b7f920c4b6
Updating translations for config/locales/ca.yml
2020-02-06 21:12:27 +11:00
Pau Pérez Fabregat
be19d50639
Merge pull request #4768 from openfoodfoundation/transifex
...
Transifex
2020-02-06 11:11:23 +01:00
Transifex-Openfoodnetwork
0ceb8ab6c4
Updating translations for config/locales/ca.yml
2020-02-06 21:09:16 +11:00
Pau Pérez Fabregat
e387c7db83
Merge pull request #4548 from luisramos0/improve_truncate_data
...
Improve truncate data process
2020-02-06 11:01:36 +01:00
Pau Pérez Fabregat
d5df48f3c0
Merge pull request #4737 from openfoodfoundation/transifex
...
Transifex
2020-02-06 11:00:46 +01:00
Pau Pérez Fabregat
c9abdac2e0
Merge pull request #4722 from mkllnk/code-climate-rubocop
...
Bump Code Climate's Rubocop version to their latest
2020-02-06 10:32:46 +01:00
Transifex-Openfoodnetwork
ff08d9f210
Updating translations for config/locales/nb.yml
2020-02-06 09:39:52 +11:00
luisramos0
e5c9468d09
Fix rubocop issues in navigation_helper
2020-02-05 22:16:20 +00:00
luisramos0
8aed173127
Uncomment events in order edit page and remove unused spree autocomplete js code
2020-02-05 20:04:15 +00:00
luisramos0
61ecca7257
Move template loading to directive of customer search override
2020-02-05 20:04:15 +00:00
luisramos0
7eba657b2f
Add missing templates from spree_backend
2020-02-05 20:04:15 +00:00
luisramos0
784de340d1
Disable adaptive menu when running tests, this is what spree_backend was doing before
2020-02-05 20:04:15 +00:00
luisramos0
9191628f29
Bring custom form_builder initializer from spree_backend
2020-02-05 20:04:15 +00:00
luisramos0
88410b1efd
Add missing general config routes from spree_backend
2020-02-05 20:04:12 +00:00
luisramos0
afea032361
Add return_authorizations route from spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
3decb4056c
Remove repeated include spree_paypal_express and add require css select2
2020-02-05 16:02:43 +00:00
luisramos0
8e9b08feca
Remove jquery-alerts from head html
2020-02-05 16:02:43 +00:00
luisramos0
694995ea5d
Prefix root_path with main_app so that ofn's route is used. The spree root path is no longer defined, we dont need it
2020-02-05 16:02:43 +00:00
luisramos0
22de7252d0
Fix route in login nav and bring reports and properties resource route from spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
2acf8e5125
Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice
2020-02-05 16:02:43 +00:00
luisramos0
e1f61e645d
Remove dependency to spree_backend and add dependencies still required: jquery-ui-rails and select2-rails
2020-02-05 16:02:43 +00:00
luisramos0
687d827ceb
Add required css require for select2
2020-02-05 16:02:43 +00:00
luisramos0
2885e38113
Re-activate/re-add click events that were registered in spree_backend code before
2020-02-05 16:02:43 +00:00
luisramos0
9f3ca58b55
Add empty admin/spree_backend.js
...
This file is required by spree_paypal_express that we still need after leaving spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
ffe3228848
Remove spree_backend dependencies from all.js and all.css and fix some dependencies path problems
2020-02-05 16:02:43 +00:00
luisramos0
834231eb8f
Add js code needed for the zones admin page
2020-02-05 16:02:43 +00:00
luisramos0
68f5aabd3f
Add js code needed where calculators are used: ship methods and payment methods config pages
2020-02-05 16:02:43 +00:00
luisramos0
7e7ea92833
Add js code needed in the states admin page
2020-02-05 16:02:43 +00:00
luisramos0
ebf22ceb19
Add js and css code for image settings from spree_backend
2020-02-05 16:02:43 +00:00
Luis Ramos
9313a57d19
Merge pull request #4511 from luisramos0/backend_ctrl_search
...
Bring spree_backend search controller to OFN
2020-02-05 15:54:30 +00:00
Luis Ramos
c38c7c35bc
Add spec for user default address setter
2020-02-05 14:49:17 +00:00
luisramos0
2663f74767
Add specs for new services
2020-02-05 14:49:17 +00:00
luisramos0
b41de52012
Moved checkout services into a specific folder under app/services
2020-02-05 14:49:17 +00:00
luisramos0
214eb43122
Add frozen string literal magic comment
2020-02-05 14:49:17 +00:00
luisramos0
01fc4e0513
Add Spree::CheckoutController only to redirect to CheckoutController
...
I have not managed to make the spree checkout route, that paypal express uses, go to CheckoutController directly. According to the rails docs "to: '/checkout#edit'" should do it, but it doesnt work here.
2020-02-05 14:49:17 +00:00
luisramos0
6ce50a5fa5
Extract paypal redirect logic to service class
2020-02-05 14:49:17 +00:00
luisramos0
4fbd2cfa52
Extract UserDefaultAddress logic into separate class to take more 30 lines out of CheckoutController
2020-02-05 14:49:17 +00:00
luisramos0
383b28e170
Add order and current_user to checkout_form_data_adapter where they are required
...
Also re-add order.state condition to update_result: in some tests, the order state is complete but no completion data (completed?) is present
2020-02-05 14:49:17 +00:00
luisramos0
bf55a15f81
Extract checkout params adaptation logic into a service class
2020-02-05 14:49:17 +00:00
luisramos0
eb7e6dc5b8
Remove spree checkout controller spec, it is no longer necessary
2020-02-05 14:49:17 +00:00
luisramos0
139ecfe604
Remove rubocop exceptions resolved so far in checkout controller
2020-02-05 14:49:17 +00:00
luisramos0
43a6798db2
Move methods around in checkout controller into a more logical organisation: first the filters code and then support code for the update action
2020-02-05 14:49:17 +00:00
luisramos0
06d6579486
Refactor construct_saved_card_attributes to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
76df526002
Remove dead code from construct_saved_card_attributes
2020-02-05 14:49:17 +00:00
luisramos0
06569ea24c
Refactor load_order to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
25431f851b
Refactor object_params to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
bab2420bb3
Break up default address methods to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
0b2acb3a76
Extracted two methods from checkout_workflow to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
27db9e604f
Extract respond_to_update_succeeded from update_succeeded
2020-02-05 14:49:17 +00:00
luisramos0
c4e58ebb9e
Extract update_succeeded from checkout#update
2020-02-05 14:49:17 +00:00
luisramos0
9a0ee254af
Extract checkout_workflow from checkout#update
2020-02-05 14:49:17 +00:00
luisramos0
5ce3e1e0d2
Fix some rubocop issues in checkout controller
2020-02-05 14:49:17 +00:00
luisramos0
4b345d928c
Remove old code to detect Phantom Fees, no bugsnag events detected at all
2020-02-05 14:49:17 +00:00
luisramos0
52b1e6c71a
Move all logic required in Spree::CheckoutController to CheckoutController
2020-02-05 14:49:17 +00:00
Matt-Yorkley
140e0b9cb1
Refactor #exchangeLoadedVariants
2020-02-05 15:11:34 +01:00
Matt-Yorkley
b3f05d1a98
Use "Variants" instead of "Products" in order cycle exchanges UI
2020-02-05 15:11:34 +01:00
Matt-Yorkley
9644b145cc
Remove num_of_products
2020-02-05 15:11:34 +01:00
Matt-Yorkley
6f644936b0
Show counts including all variants in order cycle exchanges
2020-02-05 15:10:26 +01:00
Matt-Yorkley
b86759d7a7
Fix form rendering in admin orders
...
ActionView::Template::Error: Nil location provided. Can't build URI.
0) Account and Billing Settings updating as an admin user loads the page
Failure/Error: = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
2020-02-05 16:37:23 +11:00
luisramos0
b0f2e01c70
Delete extra inventory_units that are for some unknown reason connected to shipments of orders to delete but not to orders to delete
2020-02-05 16:30:14 +11:00
Maikel
747be81aec
Link to new release template
2020-02-05 15:21:26 +11:00
Maikel
fd124daf50
Add task to notify instance managers of upcoming changes
2020-02-05 14:58:57 +11:00
Transifex-Openfoodnetwork
ef33d27e6c
Updating translations for config/locales/en_FR.yml
2020-02-05 06:55:27 +11:00
Transifex-Openfoodnetwork
3a01e00d7b
Updating translations for config/locales/fr.yml
2020-02-05 06:51:14 +11:00
Luis Ramos
81103f3f71
Merge pull request #4742 from CSCI-462-01-2020/Issue4109
...
Edit new_resource partial
2020-02-04 19:44:16 +00:00
dependabot-preview[bot]
9d1e3f0318
Bump roo from 2.8.2 to 2.8.3
...
Bumps [roo](https://github.com/roo-rb/roo ) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/roo-rb/roo/releases )
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roo-rb/roo/compare/v2.8.2...v2.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 19:23:42 +00:00
dependabot-preview[bot]
67adf3c801
Bump unicorn from 5.5.2 to 5.5.3
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.2 to 5.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 19:22:39 +00:00
Luis Ramos
a8b48a561f
Merge pull request #4733 from lin-d-hop/master
...
Fixing incorrect payment and balance calculation
2020-02-04 18:11:48 +00:00
Luis Ramos
c7038f6ac9
Merge pull request #4620 from luisramos0/spree_backend_css
...
Bring basic CSS rules from spree backend
2020-02-04 18:06:15 +00:00
Luis Ramos
ea75714561
Merge pull request #4635 from luisramos0/main_app_routes
...
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
luisramos0
b7d19dd34c
Remove unused route from Spree.routes
2020-02-04 14:55:34 +00:00
luisramos0
44d1b3f00c
Remove unused search/users controller action
2020-02-04 14:55:34 +00:00
luisramos0
f8376c0aeb
Remove unused route search_customer_addresses
2020-02-04 14:55:34 +00:00
luisramos0
88464d58c2
Fix some rubocop issues and extract ransack hash to reduce repetition
2020-02-04 14:55:34 +00:00
luisramos0
962779bba1
Merge search controller with decorator
2020-02-04 14:54:51 +00:00
luisramos0
1ae73dd6ae
Add search_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 14:54:51 +00:00
luisramos0
f48ab57782
Add explicit css import statements where they are needed
2020-02-04 14:52:44 +00:00
luisramos0
8b6ebfb351
Add imports for new css files from spree_backend
2020-02-04 14:52:44 +00:00
luisramos0
9c0788c3e0
Bring shared css rules from spree_backend
2020-02-04 14:52:17 +00:00
luisramos0
f61258d0b4
Bring components css from spree_backend
...
pagination and navigation rules were merged
2020-02-04 14:52:17 +00:00
luisramos0
289f62f115
Bring and require date picker css from spree_backend
2020-02-04 14:52:17 +00:00
luisramos0
c3a98d5a4f
Bring css dependencies from spree_backend
...
These dependencies are in spree_core so we dont need to bring them to ofn right now
2020-02-04 14:52:17 +00:00
Luis Ramos
d8374e9caa
Merge pull request #4614 from luisramos0/base_admin_js
...
Bring some basic js functions and dependencies from spree_backend
2020-02-04 14:48:38 +00:00
luisramos0
0648f23e94
Move css dependencies to specific css files and add some required dependencies from spree_backend
2020-02-04 14:47:51 +00:00
luisramos0
e37cb2d63f
Remove underscope from select2 css file name
2020-02-04 14:47:51 +00:00
luisramos0
ee64238bdd
Add jquery.adaptivemenu require but commeent out the activation for now because it is already called in spree_backend
...
This can be reverted when spree_backend is removed
2020-02-04 14:47:51 +00:00
luisramos0
d3130e111f
Remove on click events
...
These events can only be added to OFN when spree_backend is removed otherwise the evetns will be registered twice
2020-02-04 14:47:51 +00:00
luisramos0
93f4eee887
Make newly imported js files compatible with the karma build
2020-02-04 14:47:51 +00:00
luisramos0
408ada9097
Remove unnecessary build exception
2020-02-04 14:47:51 +00:00
luisramos0
e14ebd9503
Add required variables from spree_backend
2020-02-04 14:47:51 +00:00
luisramos0
289b99c30e
Bring and require equalize from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
f85c36a17e
Bring and require select2 from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
4715df3258
Bring and require jquery.horizontalNav.js from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
b20be101cc
Bring and require spin from spree_backend and respective progress indicator js and css
2020-02-04 14:47:26 +00:00
luisramos0
d424987587
Bring and require jquery.vAlign.js from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
a0575430dd
Require spree.js from spree_core for some basic functions like Spree.url
2020-02-04 14:46:57 +00:00
luisramos0
c1e6344b18
Merge spree js function and override
2020-02-04 14:46:57 +00:00
luisramos0
ed0198382f
Bring spree_backend admin.js.erb, rename it to base.js.erb and remove requires that are not used in ofn
2020-02-04 14:46:57 +00:00
blainebillings
577fb88843
Move Create and Cancel References to Actions Namespace
2020-02-04 09:39:01 -05:00
Pau Pérez Fabregat
2b879221b2
Merge pull request #4756 from kristinalim/fix/4489-flaky_spec_for_editing_oc
...
4489 Flaky spec when editing outgoing exchanges in OC
2020-02-04 15:38:37 +01:00
blainebillings
22db2e99f0
Merge branch 'Issue4109' of https://github.com/CSCI-462-01-2020/openfoodnetwork into Issue4109
2020-02-04 09:38:19 -05:00
blainebillings
ef4aa488c3
Moves Create and Cancel References to Actions Namespace
2020-02-04 09:34:28 -05:00
Pau Pérez Fabregat
57775f49bc
Merge pull request #4739 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.1.6
...
Bump rack-mini-profiler from 1.1.4 to 1.1.6
2020-02-04 15:29:20 +01:00
Pau Pérez Fabregat
e8a12d9897
Merge pull request #4738 from openfoodfoundation/dependabot/bundler/oj-3.10.2
...
Bump oj from 3.10.1 to 3.10.2
2020-02-04 15:28:40 +01:00
Pau Pérez Fabregat
f3b8d5b868
Merge pull request #4741 from openfoodfoundation/dependabot/bundler/bugsnag-6.13.0
...
Bump bugsnag from 6.12.2 to 6.13.0
2020-02-04 15:28:00 +01:00
Pau Pérez Fabregat
246235b921
Merge pull request #4667 from Matt-Yorkley/rails-4-prep
...
Rails 4 prep
2020-02-04 15:20:28 +01:00
Luis Ramos
0ded41afee
Merge pull request #4513 from luisramos0/backend_ctrl_orders
...
Bring spree_backend orders controller to OFN
2020-02-04 11:51:54 +00:00
luisramos0
d32e106bf0
Add partials needed in the orders edit page
2020-02-04 11:51:13 +00:00
luisramos0
bbb3748d3c
Simplify orders events logic
2020-02-04 11:51:13 +00:00
luisramos0
08dd992344
Merge orders_helper with decorator
2020-02-04 11:51:13 +00:00
luisramos0
914244a1ee
Bring orders helper from spree_backend
2020-02-04 11:51:13 +00:00
luisramos0
e5f089610c
Bring admin orders routes from spree_backend
2020-02-04 11:51:13 +00:00
luisramos0
6e26841817
Fix load_order before filter and remove unused open and close adjustments actions
2020-02-04 11:50:44 +00:00
luisramos0
ab60c4a9dd
Remove unnecessary index action override because this is no longer a decorator
...
Remove useless todo comment
2020-02-04 11:50:44 +00:00
luisramos0
7009cd89e0
Fix rubocop issues in customer details controller and update rubocop manual todo accordingly
2020-02-04 11:50:44 +00:00
luisramos0
b93af37ea9
Merge customer details decorator with controller
2020-02-04 11:50:03 +00:00
luisramos0
76b6a85509
Merge spree/admin/orders_controller and its decorator and fix a few rubocop issues
2020-02-04 11:50:03 +00:00
luisramos0
a1d4b4ee98
Add orders_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 11:50:03 +00:00
luisramos0
51bca7ce2f
Add customer_details_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 11:50:03 +00:00
Luis Ramos
70147f908a
Merge pull request #4611 from luisramos0/taxonomies_js
...
Bring js code to make taxonomies admin work without spree_backend
2020-02-04 11:47:27 +00:00
Luis Ramos
c4bf4f001f
Merge pull request #4509 from luisramos0/backend_ctrl_payments
...
Bring spree_backend payments controller to OFN
2020-02-04 11:46:23 +00:00
Matt-Yorkley
7d71f21753
Add frozen_string_literal comment to new class
2020-02-04 11:11:24 +01:00
Matt-Yorkley
285c78a5e4
Remove use of #pluck and ensure subquery does not include all columns
2020-02-04 11:10:13 +01:00
luisramos0
6e78ae762a
Make it work even if preferred_enterprise_id is null
2020-02-04 10:01:18 +00:00
luisramos0
9a2ad16926
Make explicit the dependency to font-awesome css rules
2020-02-04 09:34:59 +00:00
luisramos0
afec21eb3d
Move imports to where they are needed
2020-02-04 09:34:59 +00:00
luisramos0
651ee720c6
Remove underscore from new jstree css file
2020-02-04 09:34:40 +00:00
luisramos0
2e6c5e1fad
Add dependencies from spree_backend required by jstree
2020-02-04 09:34:40 +00:00
luisramos0
87366ae7fc
Remove usage of jConfirm so that we dont have to bring dependency jquery.alerts from spree_backend
2020-02-04 09:33:58 +00:00
luisramos0
27aea0b277
Bring js code from spree_backend to make taxons admin work
2020-02-04 09:33:58 +00:00
luisramos0
d4edc9f20d
Bring jstress css from spree_backend
2020-02-04 09:33:58 +00:00
luisramos0
6c7991be75
Bring jquery.jstree from spree_backend
2020-02-04 09:33:34 +00:00
luisramos0
3f81352df5
Bring jquery.cookie from spree_backend
2020-02-04 09:33:34 +00:00
Kristina Lim
9d0e26ae28
Wait for products panel to show in outgoing exchanges feature spec
2020-02-04 16:20:47 +08:00
Luis Ramos
d80554a14a
Merge pull request #4744 from luisramos0/oc_pag_bug
...
Make pagination optional in the ExchangeProductsController
2020-02-03 17:19:06 +00:00
luisramos0
a5fe5fb448
Remove usage of deleted const DEFAULT_PAGE
...
If params[:page] is not in the request, the results will not be paginated now
2020-02-03 15:04:34 +00:00
luisramos0
4c51d60bfd
Make pagination optional in the ExchangeProductsController
2020-02-03 13:11:26 +00:00
blainebillings
9218008530
Edit new_resource Partial
2020-02-02 11:22:54 -05:00
myersca1
f36c5b8938
Edit new_resource partial
2020-02-02 11:19:10 -05:00
dependabot-preview[bot]
67199fd2d6
Bump bugsnag from 6.12.2 to 6.13.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.12.2 to 6.13.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.2...v6.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-31 19:15:09 +00:00
Transifex-Openfoodnetwork
18d17ec674
Updating translations for config/locales/fr_CA.yml
2020-02-01 04:02:53 +11:00
Transifex-Openfoodnetwork
3981ee7ec1
Updating translations for config/locales/en_CA.yml
2020-02-01 03:54:02 +11:00
Luis Ramos
a0475ee8a4
Merge pull request #4613 from luisramos0/autocomplete
...
Bring remaining variants autocomplete (and related) JS code from spree_backend
2020-01-31 16:08:50 +00:00
Luis Ramos
4cdc604f45
Merge pull request #4718 from luisramos0/variant_count
...
Make Order Cycle exchange tab summary not count inventory variants that are hidden
2020-01-31 16:03:21 +00:00
Luis Ramos
dbf44c41b2
Merge pull request #4657 from luisramos0/pi-xls
...
Remove Product import code for xls suppport
2020-01-31 12:12:25 +00:00
Maikel Linke
9535c5647f
Make pluralisation code an independent lib
...
I considered moving the code to a service but I think that this code
can be completely independent of the Open Food Network use case. It
would be easy to move to a gem. The downcasing may need reconsidering
for general use.
2020-01-31 09:48:32 +11:00
Maikel Linke
6f8bb793e1
Add unit names commonly used in French
2020-01-31 09:48:32 +11:00
Maikel Linke
2476050f29
Remove usage count comments
2020-01-31 09:48:32 +11:00
Maikel Linke
1cce106977
Use our unit name pluralization in Ruby
...
This code will be used for the shop front and reports.
2020-01-31 09:48:32 +11:00
Maikel Linke
98b55287f1
Pluralize common variant unit names
...
This adds the most popular unit names as singular and plural to our
locale for translation. The added Javascript performs a reverse lookup
to find the right singular/plural form of a unit name in that language.
2020-01-31 09:48:32 +11:00
dependabot-preview[bot]
25c4aed368
Bump rack-mini-profiler from 1.1.4 to 1.1.6
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.1.4 to 1.1.6.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.4...v1.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-30 19:28:45 +00:00
dependabot-preview[bot]
c5a6ef673c
Bump oj from 3.10.1 to 3.10.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-30 19:26:07 +00:00
Transifex-Openfoodnetwork
79ba15fe9a
Updating translations for config/locales/en_GB.yml
2020-01-31 03:53:48 +11:00
Kristina Lim
f797745848
Update all locales with the latest Transifex translations
2020-01-30 23:01:02 +08:00
Luis Ramos
25fae17677
Update Copyright to include year 2020
2020-01-30 14:44:31 +00:00
Kristina Lim
8ae6048202
Merge pull request #4720 from openfoodfoundation/transifex
...
Transifex
2020-01-30 22:40:47 +08:00
Luis Ramos
768631a90a
Merge pull request #4616 from luisramos0/orders_js
...
Bring some JS and CSS code from spree_backend related to orders admin
2020-01-30 11:37:07 +00:00
luisramos0
d472ceafcc
Add required dependencies from spree_backend
2020-01-30 11:36:09 +00:00
luisramos0
9a52a127a4
Add js code needed in the product images page
2020-01-30 11:36:09 +00:00
luisramos0
c20a41111c
Bring some css needed in payments list and product edit page and add image for the credit cards in the payments page as well
2020-01-30 11:36:09 +00:00
luisramos0
fd26500ca4
Add orders css for the orders edit page
2020-01-30 11:36:09 +00:00
luisramos0
4f0e441407
Bring and require responsive-tables js and css from spree_backend
2020-01-30 11:36:09 +00:00
Luis Ramos
37a5d1d036
Merge pull request #4628 from luisramos0/be_fontawesome
...
Bring fontawesome font and associated css from spree_backend
2020-01-30 11:21:35 +00:00
Luis Ramos
c4f7588601
Merge pull request #4608 from luisramos0/power_tip
...
Bring powertip from spree_backend, including js and css
2020-01-30 11:20:37 +00:00
Luis Ramos
6509c6f7b5
Merge pull request #4588 from luisramos0/base_helper
...
Bring base helper from spree_backend
2020-01-30 11:18:35 +00:00
Kristina Lim
5aadd444aa
Merge pull request #4721 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.4.2
...
Bump rubocop-rails from 2.4.1 to 2.4.2
2020-01-30 19:04:24 +08:00
Kristina Lim
278284583f
Merge pull request #4735 from mkllnk/4729-init-taxon-dropdown
...
Activate Foundation's dropdowns after tab switch
2020-01-30 19:00:30 +08:00
luisramos0
e192207f4e
Fix bug in before filters migration, needs to load payment for the show action
2020-01-30 10:27:26 +00:00
Maikel Linke
b63042236d
Activate Foundation's dropdowns after tab switch
...
If the dropdown doesn't exist during page load, Foundation misses it. We
need to initialise it again.
2020-01-30 17:02:23 +11:00
dependabot-preview[bot]
48a75c956f
Bump oauth2 from 1.4.2 to 1.4.3
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.2...v1.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-29 19:24:24 +00:00
lin-d-hop
baf1ecb436
Fixing incorrect payment and balance calculation
...
Corrections and added specs
2020-01-29 16:06:06 +00:00
Transifex-Openfoodnetwork
32f7a74df7
Updating translations for config/locales/en_NZ.yml
2020-01-29 15:43:31 +11:00
luisramos0
3e68dc5bb2
Extract some methods from base_helper to zones_helper to make it explicit they are only used in the zones admin pages
2020-01-28 18:05:30 +00:00
luisramos0
919242d9ec
Fix rubocop issues in spree/admin/base_helper
2020-01-28 18:05:15 +00:00
luisramos0
844731061c
Add needed generic partials
2020-01-28 18:04:36 +00:00
luisramos0
109f2866ae
Merge base_helper with decorator
2020-01-28 18:04:36 +00:00
luisramos0
76eafa8415
Bring base_helper from spree_backend
2020-01-28 18:04:36 +00:00
luisramos0
947914724a
Add frozen string literal magic comment
2020-01-28 18:02:58 +00:00
luisramos0
b5004f1cbf
Add specs for ExchangeProductsRenderer#exchange_variants
2020-01-28 18:02:58 +00:00
luisramos0
4596399bc2
Extract logic from controller to renderer service
...
Re-using the filter_visible method for both products and variants
2020-01-28 18:02:58 +00:00
luisramos0
685abccb61
Make variant count consider oc config and not count variants that are hidden in the inventory of the coordinator of the OC
2020-01-28 18:02:58 +00:00
Luis Ramos
5e61ba8136
Merge pull request #4587 from luisramos0/navigation_helper
...
Bring navigation helper from spree_backend
2020-01-28 17:58:18 +00:00
luisramos0
f3447e3a96
Move dependency statement to powertip.css
2020-01-28 14:07:46 +00:00
luisramos0
3d0a31e838
Bring dependencies from spree_backend required by powertip
2020-01-28 14:07:46 +00:00
luisramos0
26bb8cc337
Bring powertip from spree_backend, including js and css
2020-01-28 14:07:45 +00:00
luisramos0
9254928656
Remove underscore from product_autocomplete css file
2020-01-28 13:53:04 +00:00
luisramos0
228997c35b
Add handlebars dependency from spree_backend
2020-01-28 13:53:04 +00:00
luisramos0
667f44336d
Remove unused split logic from variant autocomplete, the split functionality is not used in ofn because we only have one stock location
2020-01-28 13:53:04 +00:00
luisramos0
0a136ff2fb
Comment out click event registration as this will duplicate events until the spree_backend code is there
...
These can be activated when spree_backend is removed
2020-01-28 13:53:04 +00:00
luisramos0
3f3577e73c
Remove encoding tag from admin/spree/orders js files
2020-01-28 13:53:04 +00:00
luisramos0
cf1664bed3
Bring some variant autocomplete styling from spree_backend
2020-01-28 13:53:04 +00:00
luisramos0
b8aee4e857
Bring address_states as is from spre_backend
2020-01-28 13:53:04 +00:00
luisramos0
cfe3435851
Bring shipments.js as is from spree_backend
2020-01-28 13:53:04 +00:00
luisramos0
53e342ba1a
Bring variant_autocomplete from spree_backend as is
2020-01-28 13:53:04 +00:00
luisramos0
6bdb14248c
Require lodash.underscore to support _. calls in js
...
spree_backend relies on Underscore.js 1.4.4, from Jan 2013, in some auto complete functions, here we will be depending on Lo-Dash 2.4.1, from Dec 2013
2020-01-28 13:53:03 +00:00
luisramos0
8e27291b15
require handlebars extensions from spree_core to allow translations inside handlebar templates
2020-01-28 13:52:19 +00:00
Luis Ramos
a6ade31604
Merge pull request #4607 from luisramos0/legacy_browsers_support
...
Remove unused js dependencies (jquery-migrate-1.0.0 and timeago) and bring some legacy browsers support dependencies from spree_backend
2020-01-28 12:49:38 +00:00
Luis Ramos
b348552cdf
Merge pull request #4651 from mkllnk/remove-unused-presenter
...
Remove unused presenter
2020-01-28 09:52:01 +00:00
Maikel Linke
ec67736dff
Bump Code Climate's Rubocop version to their latest
...
Our used version is still higher than that.
2020-01-28 17:12:28 +11:00
Maikel
bd8af40afb
Merge pull request #4691 from Matt-Yorkley/codeclimate-scss
...
Disable two codeclimate SCSS rules
2020-01-28 11:00:46 +11:00
dependabot-preview[bot]
54d2228a03
Bump rubocop-rails from 2.4.1 to 2.4.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-27 19:33:28 +00:00
Transifex-Openfoodnetwork
3b0bec3c0f
Updating translations for config/locales/en_FR.yml
2020-01-27 23:37:03 +11:00
Transifex-Openfoodnetwork
2a3e8db560
Updating translations for config/locales/fr.yml
2020-01-27 23:36:31 +11:00
Transifex-Openfoodnetwork
d6d3e5fb5a
Updating translations for config/locales/ar.yml
2020-01-27 09:51:47 +11:00
Luis Ramos
d7bb063a30
Merge pull request #4716 from CSCI-462-01-2020/Issue4412
...
Change in English locale to add "end" term
2020-01-25 10:22:29 +00:00
Luis Ramos
c7d8e96beb
Merge pull request #4699 from mkllnk/4696-rescue-checkout
...
Rescue unknown checkout errors
2020-01-24 18:11:38 +00:00
luisramos0
a6d4774a93
Bring font-awesome from spree_backend
2020-01-24 17:52:11 +00:00
luisramos0
7cd710622e
Bring fontawesome css from spree_backend
2020-01-24 17:52:11 +00:00
Pau Pérez Fabregat
529265697c
Merge pull request #4715 from openfoodfoundation/transifex
...
Transifex
2020-01-24 13:31:08 +01:00
Pau Pérez Fabregat
690f18c58c
Merge pull request #4653 from Matt-Yorkley/db2fog_region
...
Db2fog region
2020-01-24 13:30:11 +01:00
Luis Ramos
1b9c020bee
Merge pull request #4650 from tomekr/docker-rspec-fix
...
Docker rspec fix
2020-01-24 12:24:50 +00:00
Luis Ramos
af3ac703a5
Merge pull request #4717 from openfoodfoundation/dependabot/bundler/ddtrace-0.32.0
...
Bump ddtrace from 0.31.1 to 0.32.0
2020-01-24 12:23:51 +00:00
dependabot-preview[bot]
1d8fce09b6
Bump ddtrace from 0.31.1 to 0.32.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.31.1 to 0.32.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.31.1...v0.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-23 19:17:08 +00:00
luisramos0
904c85c5be
Move css import to ie hacks file where it's needed
2020-01-23 19:01:52 +00:00
Transifex-Openfoodnetwork
c129af88d4
Updating translations for config/locales/en_FR.yml
2020-01-24 05:53:03 +11:00
Transifex-Openfoodnetwork
ca1e6744ad
Updating translations for config/locales/fr.yml
2020-01-24 05:52:29 +11:00
Unknown
a101c5c507
Change in English locale to add "end"
...
The "end" term is used in the _date_range_form, but there is no entry in the English locale. Added so that it can start being translated with Transifex.
2020-01-23 12:56:07 -05:00
Transifex-Openfoodnetwork
d9672a0032
Updating translations for config/locales/en_GB.yml
2020-01-24 02:55:07 +11:00
Matt-Yorkley
7e7eb67e0a
Merge pull request #4714 from luisramos0/fix_permissions_load_problem
...
Add require to fix loading issue. Some other Permissions module was being loaded
2020-01-23 15:56:27 +01:00
luisramos0
a5f222b067
Bring css_browser_selector_dev from spree_backend and respective hacks
2020-01-23 14:45:35 +00:00
luisramos0
0ec39106b1
Bring modernizr from spree_backend
2020-01-23 14:45:35 +00:00
luisramos0
c59afd4951
Remove jquery-migrate-1.0.0, we already have jquery-migrate 1.2.1 (jquery-migrate-min) through gemfile jquery-migrate-rails
2020-01-23 14:45:35 +00:00
luisramos0
2c59b522de
Reorganize admin/all.js in meaningful groups
2020-01-23 14:45:35 +00:00
luisramos0
337fbf1be9
Remove unused JS dependency timeago, we use momentjs now
2020-01-23 14:45:35 +00:00
luisramos0
1548eaeb7e
Add frozen_string_literal magic comment
2020-01-23 14:42:19 +00:00
luisramos0
ee3c9563d8
Add all submenus entries to the main tabs list so that the main menu keeps selected when user selects the submenus
2020-01-23 14:31:25 +00:00
luisramos0
4b0ddcda01
Add require to fix loading issue. Some other Permissions module was being loaded
2020-01-23 11:42:10 +00:00
Luis Ramos
f5adf6a9d7
Merge pull request #4697 from mkllnk/4457-line-item-spec
...
Stabilise spec by not creating noise data
2020-01-23 11:35:34 +00:00
Matt-Yorkley
86231672a6
Merge pull request #4703 from openfoodfoundation/daniellemoorhead-patch-1
...
Updated shopfront message placeholder for home tab
2020-01-23 12:32:08 +01:00
Luis Ramos
e47bd019a1
Merge pull request #4656 from mkllnk/config
...
Use strings for all environment variables
2020-01-23 11:07:17 +00:00
Matt-Yorkley
0011caccc6
Update all locales with the latest Transifex translations
2020-01-23 11:45:58 +01:00
Matt-Yorkley
ad5a599ddf
Merge pull request #4710 from openfoodfoundation/transifex
...
Transifex
2020-01-23 11:37:10 +01:00
Luis Ramos
43d7609b81
Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs
...
Remove tabs from cart and checkout
2020-01-23 10:19:50 +00:00
Transifex-Openfoodnetwork
56d17bca6a
Updating translations for config/locales/nb.yml
2020-01-23 19:43:37 +11:00
Transifex-Openfoodnetwork
7f4e53f411
Updating translations for config/locales/fr.yml
2020-01-23 19:41:23 +11:00
Transifex-Openfoodnetwork
bd16b80d5f
Updating translations for config/locales/en_FR.yml
2020-01-23 19:38:34 +11:00
Transifex-Openfoodnetwork
c8a1f9b93c
Updating translations for config/locales/fr.yml
2020-01-23 19:38:12 +11:00
Maikel
9a8cd60d5a
Merge pull request #4694 from Matt-Yorkley/rails-4-prep-routes
...
Rails 4 prep: spree routes
2020-01-23 17:42:37 +11:00
Maikel
4d11dced39
Merge pull request #4687 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.1
...
Bump ddtrace from 0.31.0 to 0.31.1
2020-01-23 16:35:38 +11:00
Maikel Linke
bd67d63b63
Restore payment error feedback
2020-01-23 16:20:07 +11:00
Maikel Linke
6763012ee9
Rescue unknown checkout errors
2020-01-23 16:20:07 +11:00
Maikel
de2f09db75
Merge pull request #4698 from openfoodfoundation/transifex
...
Transifex
2020-01-23 15:59:36 +11:00
Luis Ramos
494cb00774
Merge pull request #4585 from luisramos0/backend_partial_calc_fields
...
Bring spree_backend calculator fields partial to OFN
2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458
Merge pull request #4633 from luisramos0/fix_prod_link_bug
...
Fix bug in frontoffice order details where the product image was a broken link
2020-01-22 20:25:24 +00:00
luisramos0
766303b332
Add required payment_helper from spree_backend
2020-01-22 20:22:28 +00:00
luisramos0
74226fbdf8
Fix one rubocop issue and update rubocop todo manual for the new controller
2020-01-22 20:22:28 +00:00
luisramos0
dc5374e284
Merge filter_payment_methods and load_data
2020-01-22 20:21:21 +00:00
luisramos0
f6ecf57737
Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller
2020-01-22 20:21:21 +00:00
luisramos0
940953b043
Add missing translations for payments
2020-01-22 20:21:21 +00:00
luisramos0
fbc5887fa6
Bring payments routes from spree_backend
2020-01-22 20:21:21 +00:00
luisramos0
61ce849546
Merge spree/admin/payments_controller with its decorator and fix a few rubocop issues
2020-01-22 20:21:21 +00:00
luisramos0
afddaed9fc
Add empty but needed payments templates for check payment method
2020-01-22 20:21:21 +00:00
luisramos0
12158d73fa
Add payments_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-01-22 20:21:21 +00:00
Matt-Yorkley
5f3abbf00e
Refactor BaseController
2020-01-22 12:17:23 +01:00
Matt-Yorkley
a02c58e231
Add join_table to enterprise groups relation
...
has_and_belongs_to_many relationships now require a join_table
2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4
Fix subquery errors triggered by #warn_invalid_order_cycles
2020-01-22 12:17:23 +01:00
Matt-Yorkley
57ca1d54bb
Fix issue with each_serializer not being called in some cases in Rails 4.
2020-01-22 12:17:23 +01:00
Matt-Yorkley
444747c8b2
Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout).
2020-01-22 11:30:43 +01:00
Danni M
95f51e2db9
Updated shopfront message placeholder
...
Change required now that there is a home tab instead of a green shopfront message.
>An optional message to welcome customers and explain how to shop with you. If text is entered here it will be displayed in a home tab when customers first arrive at your shopfront.
2020-01-22 14:24:20 +11:00
Transifex-Openfoodnetwork
0463e05296
Updating translations for config/locales/pt_BR.yml
2020-01-22 10:35:12 +11:00
Transifex-Openfoodnetwork
f176e2ba91
Updating translations for config/locales/pt_BR.yml
2020-01-22 10:32:03 +11:00
luisramos0
cccff6b500
Remove unused methods from navigation helper
2020-01-21 22:51:23 +00:00
luisramos0
b4e6c5307e
Convert orders submenu partial to haml
2020-01-21 22:51:23 +00:00
luisramos0
fb4f96eb4a
Remove unused submenu entries from _tabs partial and convert hash syntax
2020-01-21 22:51:23 +00:00
luisramos0
27572cbe68
Remove alias_method klass_for_with_sym_fallback
2020-01-21 22:49:55 +00:00
luisramos0
8a912d6f02
Remove redundant method tab_with_cancan_check
...
This was introduced to work with previous versions of spree
2020-01-21 22:49:55 +00:00
luisramos0
cd7f97b01d
Fix rubocop issues in nav helper
2020-01-21 22:49:55 +00:00
luisramos0
1b18595d94
Merge navigator_helper with decorator
2020-01-21 22:49:55 +00:00
Maikel Linke
30888a9e59
Stabilise spec by not creating noise data
...
We were using a more complex order factory that created more data than
we needed. The order contained a second line item and therefor the
manifest had two items as well. Sometimes we would pick the wrong one.
2020-01-22 09:49:37 +11:00
luisramos0
8987121058
Add navigation helper from spree_backend
2020-01-21 22:48:44 +00:00
Luis Ramos
6bb4f2477c
Merge pull request #4586 from luisramos0/states_erb
...
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
2020-01-21 22:47:28 +00:00
Matt-Yorkley
cca824f207
Ensure routes declared with match specify a method
2020-01-20 17:32:00 +01:00
Matt-Yorkley
147f7d4850
Separate non-report routes from reports route list for clarity
2020-01-20 17:30:46 +01:00
Matt-Yorkley
8024dcec64
Merge double Spree routes declarations into one
...
The app has a lot of problems with this in Rails 4
2020-01-20 17:27:26 +01:00
Matt-Yorkley
dfee9b6c6b
Relax two codeclimate SCSS rules
2020-01-20 15:08:20 +01:00
Luis Ramos
1c3fd26eef
Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs
...
Mobile: shop tabs
2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429
Update shop tab button styling in mobile
2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb
Remove old green box styling from shopfront messages
2020-01-19 15:57:01 +01:00
dependabot-preview[bot]
094c175a64
Bump ddtrace from 0.31.0 to 0.31.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.31.0 to 0.31.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/v0.31.1/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.31.0...v0.31.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-17 19:14:25 +00:00
Luis Ramos
dd9f2a063f
Merge pull request #4682 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.9
...
Bump mini_racer from 0.2.4 to 0.2.9
2020-01-17 13:36:02 +00:00
Luis Ramos
4973bcb9b6
Merge pull request #4677 from openfoodfoundation/dependabot/bundler/oj-3.10.1
...
Bump oj from 3.10.0 to 3.10.1
2020-01-17 13:14:15 +00:00
Maikel
9ee701bec1
Merge pull request #4683 from openfoodfoundation/dependabot/bundler/webmock-3.8.0
...
Bump webmock from 3.7.6 to 3.8.0
2020-01-17 09:14:50 +11:00
Maikel
e2469ded9a
Merge pull request #4680 from openfoodfoundation/transifex
...
Transifex
2020-01-17 09:03:10 +11:00
dependabot-preview[bot]
eaa914a360
Bump webmock from 3.7.6 to 3.8.0
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.6 to 3.8.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-16 19:19:26 +00:00
dependabot-preview[bot]
ea2fa9913d
Bump mini_racer from 0.2.4 to 0.2.9
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.4 to 0.2.9.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.4...v0.2.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-16 19:15:52 +00:00
Matt-Yorkley
b69b5ea81a
Merge pull request #4678 from mkllnk/4490-tag-rules-spec
...
4490 tag rules spec
2020-01-16 14:28:37 +01:00
Luis Ramos
18b3a8122d
Merge pull request #4508 from luisramos0/backend_ctrl_prods_vars
...
Bring spree_backend products and variants controllers to OFN
2020-01-16 13:01:31 +00:00
luisramos0
1e203ae419
Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend
2020-01-16 11:59:36 +00:00
luisramos0
70a24b25e2
Update rubocop manual todo and Remove some unnecessary comments
2020-01-16 11:59:36 +00:00
luisramos0
f7490ae28b
Remove unused stock and destroy actions and bring product routes from spree_backend
2020-01-16 11:58:59 +00:00
luisramos0
836abbec92
Fix rubocop issues in variant controller
2020-01-16 11:58:59 +00:00
luisramos0
d153237b69
Merge variants decorator with controller
2020-01-16 11:58:59 +00:00
luisramos0
56b6bf82bb
Fix some rubocop issues
2020-01-16 11:58:59 +00:00
luisramos0
0d44f298fe
Merge spree/admin/products_controller with its decorator
2020-01-16 11:58:59 +00:00
luisramos0
ff3611f52a
Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-01-16 11:58:59 +00:00
luisramos0
7fa9b4699c
Add products_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-01-16 11:58:59 +00:00
luisramos0
138248e1c9
Product import only works with csv right now. Here we remove dead code
...
This can be reverted if we start suppporting xls and ods in the future
2020-01-16 09:59:27 +00:00
Transifex-Openfoodnetwork
3dadb7f91c
Updating translations for config/locales/en_GB.yml
2020-01-16 20:12:18 +11:00
Transifex-Openfoodnetwork
dd5c867298
Updating translations for config/locales/en_GB.yml
2020-01-16 20:09:10 +11:00
Transifex-Openfoodnetwork
918a0f053d
Updating translations for config/locales/ar.yml
2020-01-16 18:25:27 +11:00
Transifex-Openfoodnetwork
2171125e85
Updating translations for config/locales/ar.yml
2020-01-16 18:22:18 +11:00
Transifex-Openfoodnetwork
5d0cb3549a
Updating translations for config/locales/ar.yml
2020-01-16 18:19:07 +11:00
Maikel Linke
12fde5b9fc
Update all locales with the latest Transifex translations
2020-01-16 15:28:57 +11:00
Maikel Linke
6b18d4a60c
Avoid false positives in specs
...
When switching from one tab to another, a `have_no_selector` check could
match because the new tab hasn't loaded yet. Now we use that check after
we verified other content on the new tab.
2020-01-16 15:10:25 +11:00
Maikel Linke
4d53f47d88
Leave tag rules spec in clean state
2020-01-16 15:10:25 +11:00
Maikel Linke
3a9aaf6764
Wait for the first enterprise tab to be loaded
2020-01-16 15:10:25 +11:00
Maikel Linke
42aa15767e
DRY navigating to Tag Rules section
2020-01-16 15:10:25 +11:00
Maikel
0da6275d41
Merge pull request #4675 from Matt-Yorkley/rails-4-prep-3
...
Rails 4 prep continued
2020-01-16 15:08:11 +11:00
Maikel
52d2d1d23c
Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2
...
Rails 4 prep: admin dashboard route
2020-01-16 14:16:32 +11:00
Maikel
4dfc020eaa
Merge pull request #4666 from openfoodfoundation/transifex
...
Transifex
2020-01-16 12:10:12 +11:00
Maikel
8ef52f97e5
Merge pull request #4665 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.7
...
Bump selenium-webdriver from 3.142.6 to 3.142.7
2020-01-16 12:09:29 +11:00
Maikel
68a7f547b1
Merge pull request #4664 from openfoodfoundation/dependabot/bundler/test-unit-3.3.5
...
Bump test-unit from 3.3.4 to 3.3.5
2020-01-16 12:08:51 +11:00
Maikel
7a0f2d47a3
Merge pull request #4660 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.4
...
Bump activerecord-import from 1.0.3 to 1.0.4
2020-01-16 12:06:15 +11:00
Luis Ramos
4affd01b7b
Merge pull request #4627 from luisramos0/mini_racer
...
Update libv8 and keep it only in Gemfile.lock as a dependency of mini_racer
2020-01-15 22:25:25 +00:00
Luis Ramos
0432c73f19
Merge pull request #4510 from luisramos0/backend_ctrl_resource
...
Bring spree_backend resource controller to OFN
2020-01-15 22:22:24 +00:00
dependabot-preview[bot]
6163661610
Bump oj from 3.10.0 to 3.10.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-15 19:15:31 +00:00
Matt-Yorkley
103902c006
Replace deprecated arguments in #find_by
...
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')
ActiveRecord::StatementInvalid:
PG::UndefinedColumn: ERROR: column enterprises.select does not exist
LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
: SELECT "enterprises".* FROM "enterprises" WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
# ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
# ./app/models/product_import/spreadsheet_data.rb:43:in `each'
2020-01-15 16:39:33 +01:00
Matt-Yorkley
d2933e35f1
Explicitly require Spree::Admin::BaseHelper
...
NameError: undefined method `preference_field_tag' for module `Spree::Admin::BaseHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:11:in `<module:BaseHelper>'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:3:in `<module:Admin>'
2020-01-15 13:07:50 +01:00
Matt-Yorkley
0b5e341ae7
Explicitly require Spree::Admin::NavigationHelper
...
NameError: undefined method `klass_for' for module `Spree::Admin::NavigationHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/navigation_helper_decorator.rb:18:in `<module:NavigationHelper>'
2020-01-15 13:07:46 +01:00
Matt-Yorkley
7d36c3b5aa
Make some private methods public in orders_and_fulfillments_report.rb
...
Fixes errors for "call to private method ..."
2020-01-15 13:05:36 +01:00
Matt-Yorkley
d511763733
Replace deprecated #in? method
2020-01-15 12:57:38 +01:00
Matt-Yorkley
a059c11d0f
Update post/delete calls in credit_cards_controller_spec.rb
...
ActionController::UrlGenerationError:
No route matches {:action=>"new_from_token", :cc_type=>"visa", :controller=>"spree/credit_cards", :exp_month=>12, :exp_year=>2020, :format=>:json, :last4=>4242, :token=>"tok_234bd2c22"}
# ./spec/controllers/spree/credit_cards_controller_spec.rb:36:in `block (5 levels) in <top (required)>'
# ./spec/controllers/spree/credit_cards_controller_spec.rb:36:in `block (4 levels) in <top (required)>'
2020-01-15 12:57:38 +01:00
Matt-Yorkley
cecc19ae1d
Add recommended paper_trail config
...
DEPRECATION WARNING: PaperTrail.track_associations has not been set. As of PaperTrail 5, it defaults to false. Tracking associations is an experimental feature so we recommend setting PaperTrail.config.track_associations = false in your config/initializers/paper_trail.rb . (called from block (3 levels) in <top (required)> at /home/user/Github/openfoodnetwork/spec/controllers/admin/column_preferences_controller_spec.rb:10)
2020-01-15 12:57:38 +01:00
Matt-Yorkley
d4311a848e
Fix default_scope deprecated syntax
2020-01-15 12:57:38 +01:00
Transifex-Openfoodnetwork
d64573f7fd
Updating translations for config/locales/nb.yml
2020-01-15 22:29:37 +11:00
Transifex-Openfoodnetwork
a9fe6ec1b5
Updating translations for config/locales/nb.yml
2020-01-15 22:26:30 +11:00
Transifex-Openfoodnetwork
f14bbc5ed9
Updating translations for config/locales/nb.yml
2020-01-15 22:23:20 +11:00
Matt-Yorkley
5ba8efec2c
Fix enterprise group spec
...
EnterpriseGroup.by_position now returns an ActiveRecord::Relation in Rails 4, so in this test case it doesn't respond as an array
2020-01-15 11:19:14 +01:00
Luis Ramos
3bf38b7c08
Merge pull request #4549 from luisramos0/arelize_order_permissions
...
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
2020-01-14 14:24:34 +00:00
Transifex-Openfoodnetwork
a591e0736f
Updating translations for config/locales/en_CA.yml
2020-01-14 23:41:38 +11:00
Luis Ramos
3080eb9dfd
Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api
...
Removing duplicate API method soft_delete for both products and variants
2020-01-14 11:32:10 +00:00
Transifex-Openfoodnetwork
ed98a16eec
Updating translations for config/locales/fr.yml
2020-01-14 20:18:13 +11:00
Transifex-Openfoodnetwork
7a924bd9ca
Updating translations for config/locales/fr.yml
2020-01-14 20:15:05 +11:00
Transifex-Openfoodnetwork
7639e19184
Updating translations for config/locales/en_FR.yml
2020-01-14 20:13:12 +11:00
Transifex-Openfoodnetwork
71aff7e1d2
Updating translations for config/locales/fr.yml
2020-01-14 20:11:56 +11:00
dependabot-preview[bot]
2506667bca
Bump selenium-webdriver from 3.142.6 to 3.142.7
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-13 19:37:48 +00:00
Luis Ramos
f87a553230
Merge pull request #4648 from openfoodfoundation/dependabot/bundler/rubocop-0.79.0
...
Bump rubocop from 0.68.1 to 0.79.0
2020-01-13 19:35:50 +00:00
Luis Ramos
3171b60d6f
Merge pull request #4580 from Matt-Yorkley/order_capture
...
Use asynchronous requests for order capture and ship actions
2020-01-13 17:14:40 +00:00
Matt-Yorkley
94afc70ea7
Refactor conditionals in contact tab view
2020-01-13 17:14:22 +01:00
Matt-Yorkley
d14d6fe865
Refactor open order cycle checks
2020-01-13 17:11:27 +01:00
Matt-Yorkley
0546acd6f9
Refactor #shop_tabs use and remove #first_visible_tab
2020-01-13 17:05:28 +01:00
Matt-Yorkley
aedaec8365
Improve layout of orders closed message
2020-01-13 17:05:28 +01:00
Matt-Yorkley
d508e7772c
Fix angular templates bug
...
Angular controller data was being partially preserved when switching back and forth between tab templates, causing the ProductsCtrl to hold duplicate datasets when it is re-initialized after going from the shop tab to another tab, then back again.
2020-01-13 17:05:28 +01:00
Matt-Yorkley
43eef0c8c6
Adjust layout for fullwidth enterprise image
2020-01-13 17:05:28 +01:00
Matt-Yorkley
e658893e70
Fix ancient display bug where the order cycle selection popover shows over the top of the floating navigtion bar
2020-01-13 17:05:28 +01:00
Matt-Yorkley
e7d88f0df9
Move "orders closed" message to "shop" tab and adjust "home" tab message display logic
2020-01-13 17:05:28 +01:00
Matt-Yorkley
56223bb960
Improve about tab mobile and tablet display
2020-01-13 17:05:28 +01:00
Matt-Yorkley
17cf099f99
Always keep one shop tab open (don't toggle closed)
2020-01-13 17:05:28 +01:00
Matt-Yorkley
49aacf879f
Change row nesting to fix product list layout display issues
2020-01-13 17:05:28 +01:00
Matt-Yorkley
c8c4f3e746
Improve mobile display
2020-01-13 17:05:28 +01:00
Matt-Yorkley
219f6ad78e
Select first visible tab on page load if none are specified in the URL
2020-01-13 17:05:27 +01:00
Matt-Yorkley
48f329a716
Rework layout and CSS
2020-01-13 17:05:26 +01:00
Luis Ramos
516398fbd6
Merge pull request #4638 from luisramos0/fix_cart_s2
...
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
2020-01-13 14:16:56 +00:00
Luis Ramos
4a1b74c136
Merge pull request #4634 from luisramos0/remove_dead_code
...
Remove some dead code
2020-01-13 11:09:04 +00:00
luisramos0
5fccd5fe58
Add rubocop exception for application controller class length and fix one line length issue
2020-01-12 19:42:07 +00:00
Matt-Yorkley
b9edea7c0e
Rename 'admin/overview#index' route from :admin to :admin_dashboard
...
Fixes issues with route declarations in Rails 4
2020-01-12 13:11:33 +01:00
Transifex-Openfoodnetwork
b9053f9fd2
Updating translations for config/locales/en_NZ.yml
2020-01-12 18:37:55 +11:00
dependabot-preview[bot]
f297cff8c7
Bump test-unit from 3.3.4 to 3.3.5
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.4...3.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 19:17:47 +00:00
Luis Ramos
7563d38b4b
Merge pull request #4658 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.0
...
Bump ddtrace from 0.30.0 to 0.31.0
2020-01-10 10:52:04 +00:00
Luis Ramos
83523a676f
Merge pull request #4659 from openfoodfoundation/dependabot/bundler/webdrivers-4.2.0
...
Bump webdrivers from 4.1.3 to 4.2.0
2020-01-10 10:51:10 +00:00
Maikel Linke
abcfb5ce8d
Update Rubocop config for new version
...
- A couple of cops moved into a different namespace.
- The target ruby version doesn't have to be specified, it's read from
.ruby-version which has been updated to Ruby 2.3.
- Some files were missing in the todo lists.
2020-01-10 08:59:44 +11:00
Maikel Linke
8ee6d1c320
Add rubocop-rails gem
...
The rails cops used to be in the rubocop gem itself but moved into their
own gem recently. Our style guide refers to these cops though.
2020-01-10 08:59:44 +11:00
dependabot-preview[bot]
1bc19ad6a4
Bump rubocop from 0.68.1 to 0.79.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.1 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.79.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 08:59:44 +11:00
Maikel
191b8064ed
Merge pull request #4629 from openfoodfoundation/dependabot/bundler/unicorn-5.5.2
...
Bump unicorn from 5.5.1 to 5.5.2
2020-01-10 08:29:17 +11:00
dependabot-preview[bot]
e28274db14
Bump activerecord-import from 1.0.3 to 1.0.4
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.3...v1.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-09 19:16:47 +00:00
Luis Ramos
02dec1d6cd
Merge pull request #4649 from tomekr/4623-remove-additional-footeer-links
...
Remove duplicate footer links
2020-01-09 18:04:30 +00:00
Luis Ramos
df04c837a5
Merge pull request #4631 from Matt-Yorkley/oc_buttons
...
Increase space for buttons in savebar layout
2020-01-09 17:56:01 +00:00
Luis Ramos
7a6c085b63
Merge pull request #4625 from openfoodfoundation/dependabot/bundler/roo-2.8.2
...
Bump roo from 2.7.1 to 2.8.2
2020-01-09 17:55:24 +00:00
dependabot-preview[bot]
a4317b70f4
Bump webdrivers from 4.1.3 to 4.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases )
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md )
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.3...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-08 19:16:43 +00:00
dependabot-preview[bot]
cb90fb052d
Bump ddtrace from 0.30.0 to 0.31.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.30.0 to 0.31.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.30.0...v0.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-08 19:15:48 +00:00
Matt-Yorkley
14bcba081d
Adapt shopfront_helper to show/hide panels and display new tabs
2020-01-08 14:50:27 +01:00
Matt-Yorkley
fa0b365b28
Move "shop messages" and product list from main view into new "Home" and "Shop" tabs
2020-01-08 13:26:21 +01:00
Matt-Yorkley
673c587c3b
Move tab templates to their own directory for clarity
2020-01-08 13:26:21 +01:00
Luis Ramos
18e5f9ba64
Merge pull request #4647 from jeduardo824/remove-groups-tab
...
remove group link from shop menu when there are no groups
2020-01-08 11:44:51 +00:00
Luis Ramos
e9a5b889de
Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428
...
Select by default single Hub/Shop option on creation of payment/shipping method
2020-01-08 11:44:16 +00:00
Luis Ramos
cc57b0c200
Merge pull request #4609 from openfoodfoundation/dependabot/bundler/excon-0.71.1
...
[Security] Bump excon from 0.62.0 to 0.71.1
2020-01-08 09:49:13 +00:00
Maikel
a8040e986d
Merge pull request #4626 from openfoodfoundation/dependabot/bundler/i18n-js-3.5.1
...
Bump i18n-js from 3.5.0 to 3.5.1
2020-01-08 17:58:53 +11:00
Maikel
2269f824c0
Merge pull request #4637 from openfoodfoundation/transifex
...
Transifex
2020-01-08 17:56:37 +11:00
Maikel Linke
bec73adc89
Restore file logging for custom format logger
...
The new custom logger was directed to stdout instead of a file.
2020-01-08 15:06:19 +11:00
luisramos0
23ec66e338
Add timestamp to Rails logger in staging and prod so that info in logs can be accurately compared with data in the DB
2020-01-08 15:05:55 +11:00
Maikel Linke
b14193b6b7
Use strings for all environment variables
...
Figaro complained:
WARNING: Use strings for Figaro configuration. 25 was converted to "25".
WARNING: Use strings for Figaro configuration. 4 was converted to "4".
Those numbers have been converted to strings in our example config.
2020-01-08 12:14:23 +11:00
Eduardo
c45a3c2303
remove group tabs from shop view when there are no groups
2020-01-07 11:24:46 -03:00
Matt-Yorkley
e06449aee3
Allow specifying an alternate region for db2fog backups
2020-01-07 12:29:42 +01:00
Matt-Yorkley
f4f05922ae
Update outdated link to gem documentation
2020-01-07 12:26:24 +01:00
Maikel Linke
3204d0b37c
Remove unused presenter
...
The usage of this presenter got removed seven years ago:
c5d031a6d7
2020-01-07 17:30:42 +11:00
Tomek Rabczak
8df0e2c66e
Move db:test:prepare task after db:reset is run
2020-01-06 16:37:52 -06:00
Tomek Rabczak
0ec0d3fd81
Install Chrome and Chromedriver
2020-01-06 16:37:23 -06:00
Tomek Rabczak
8a0ffe1890
Add imagemagick and unzip packages
2020-01-06 16:37:02 -06:00
Tomek Rabczak
1327d80446
fixup: Revert non en.yml locale changes as they are generated via transifex
2020-01-06 16:33:36 -06:00
Tomek Rabczak
43a3ac0a7b
Remove no longer used locales
2020-01-06 13:56:35 -06:00
Tomek Rabczak
b948312de7
Remove additional footer links
2020-01-06 13:47:54 -06:00
Transifex-Openfoodnetwork
7063de4734
Updating translations for config/locales/fr_CA.yml
2020-01-04 06:22:08 +11:00
Transifex-Openfoodnetwork
56c1a9cca2
Updating translations for config/locales/fr_CA.yml
2020-01-04 06:19:02 +11:00
Transifex-Openfoodnetwork
9555bfcc93
Updating translations for config/locales/fr.yml
2020-01-04 06:17:34 +11:00
Transifex-Openfoodnetwork
e455a47135
Updating translations for config/locales/fr.yml
2020-01-04 06:14:27 +11:00
Transifex-Openfoodnetwork
e15e71a3a7
Updating translations for config/locales/en_CA.yml
2020-01-04 06:07:34 +11:00
Matt-Yorkley
91d959b7d6
Remove "previous" button from order cycle savebar
2020-01-03 16:25:26 +01:00
luisramos0
108f57a705
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
2020-01-02 16:58:11 +00:00
Transifex-Openfoodnetwork
af42159e09
Updating translations for config/locales/en_GB.yml
2020-01-03 01:37:14 +11:00
Transifex-Openfoodnetwork
8e55c39ca0
Updating translations for config/locales/en_GB.yml
2020-01-03 01:34:04 +11:00
luisramos0
6cfb060184
Update all locales with the latest Transifex translations
2020-01-02 10:37:13 +00:00
Luis Ramos
0cfb7269c8
Merge pull request #4596 from openfoodfoundation/transifex
...
Transifex
2020-01-02 10:34:20 +00:00
luisramos0
cbec495620
Fix some rubocop issues in order_and_distributor_report
2019-12-29 19:01:44 +00:00
luisramos0
55eea21bb0
Adapt order_and_distributor_report to the new editable_orders query
2019-12-29 19:01:44 +00:00
luisramos0
f63c7cf54f
Extract visible_orders_where_values to a private method
2019-12-29 19:01:44 +00:00
luisramos0
13633e8bea
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
...
The | operators here were converting the relations to long lists of IDs, in our current particular issue, an IN clause with 100k order_ids
2019-12-29 19:01:44 +00:00
luisramos0
4658b7a533
Fix rubocop issues in app/controllers/application_controller
2019-12-28 19:10:02 +00:00
luisramos0
d0f33e7c8a
Avoid code in devise that is not needed and simply return the root path
...
This fixes a broken spec with error "No route matches {:controller=>"home"}"
2019-12-28 18:47:14 +00:00
luisramos0
55bb328d48
Prefix all calls to root_url with main_app
2019-12-28 18:46:50 +00:00
luisramos0
a8a6fce385
Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped
2019-12-28 18:45:57 +00:00
luisramos0
60677a2414
Make login nav use main_app router
2019-12-28 18:41:16 +00:00
luisramos0
093edb66d3
Remove unused view
...
This was introduced in 2013 and removed in 2014, see log below:
git log -Saddress_form_simple
commit 510333288c
Author: Maikel Linke <mkllnk@web.de >
Date: Sun Mar 2 13:05:15 2014 +1100
first steps of new design
commit 2e1de9a6d3
Author: Rohan Mitchell <rohan@rohanmitchell.com >
Date: Fri Aug 23 13:12:36 2013 +1000
Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210 ), fix nil state error
2019-12-28 18:25:28 +00:00
luisramos0
fb25ddd219
Remove reference to user banners, this code is not used in OFN.
2019-12-28 18:13:04 +00:00
luisramos0
1295d33fa7
Fix bug in frontoffice order details where the product image was a link to nowhere
2019-12-28 17:54:28 +00:00
luisramos0
d54850f097
Move ActionCallBacks out of the spree namespace
2019-12-27 17:04:40 +00:00
luisramos0
f8451a2511
Bring needed action_callbacks from spree_backend
2019-12-27 17:04:31 +00:00
luisramos0
1a88549954
Update rubocop todo lists
2019-12-27 17:04:23 +00:00
luisramos0
f79182253a
Fix some rubocop issues
2019-12-27 17:03:39 +00:00
luisramos0
8cfd7c610b
Use nested module instead of class Spree::Admin::
2019-12-27 17:03:39 +00:00
luisramos0
486b5e9edc
Merge resource_decorator into resource controller
2019-12-27 17:03:39 +00:00
luisramos0
8fe3abfd45
Add resource_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-12-27 17:03:39 +00:00
Luis Ramos
0e7dafea46
Merge pull request #4560 from kshlyk/fix_billing_addres_in_pdf_invoice
...
Billing address in pdf invoice fixed
2019-12-27 16:45:06 +00:00
Matt-Yorkley
4c9cc7460a
Increase space for buttons in savebar layout
2019-12-27 17:08:37 +01:00
dependabot-preview[bot]
c9e3f58aed
Bump unicorn from 5.5.1 to 5.5.2
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.1 to 5.5.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-26 19:16:30 +00:00
Luis Ramos
4136306abf
Updating mini_racer and libv8 at the same time
2019-12-26 11:01:09 +00:00
Luis Ramos
9f1eaf0b66
Merge pull request #4512 from luisramos0/backend_ctrl_base
...
Bring spree_backend base controller to OFN
2019-12-24 12:01:07 +00:00
dependabot-preview[bot]
4771612adb
Bump i18n-js from 3.5.0 to 3.5.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.5.0...v3.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-23 19:21:17 +00:00
dependabot-preview[bot]
7ce3dfe365
Bump roo from 2.7.1 to 2.8.2
...
Bumps [roo](https://github.com/roo-rb/roo ) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/roo-rb/roo/releases )
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roo-rb/roo/compare/v2.7.1...v2.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-23 19:17:19 +00:00
Luis Ramos
6f13707b9d
Merge pull request #4556 from openfoodfoundation/dependabot/bundler/stripe-5.11.0
...
Bump stripe from 4.24.0 to 5.11.0
2019-12-23 16:19:05 +00:00
Luis Ramos
64cb104434
Merge pull request #4577 from openfoodfoundation/dependabot/bundler/oj-3.10.0
...
Bump oj from 3.7.12 to 3.10.0
2019-12-23 16:14:33 +00:00
Luis Ramos
1606f9900f
Merge pull request #4507 from luisramos0/backend_ctrl_reports
...
Bring spree_backend reports controller to OFN
2019-12-23 16:14:07 +00:00
Luis Ramos
9f0e8b0b2e
Merge pull request #4558 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.4
...
Bump mini_racer from 0.1.15 to 0.2.4
2019-12-23 16:13:10 +00:00
Luis Ramos
d796e96470
Merge pull request #4575 from Matt-Yorkley/admin_orders
...
Fix route on "continue" button on admin adjustments page
2019-12-23 16:12:28 +00:00
Luis Ramos
ba7f78ef60
Merge pull request #4515 from luisramos0/backend_ctrl_adjustments
...
Bring spree_backend adjustments controller to OFN
2019-12-23 16:05:04 +00:00
Maikel
988e146240
Merge pull request #4564 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.1.4
...
Bump rack-mini-profiler from 1.0.0 to 1.1.4
2019-12-20 17:42:04 +11:00
cyrillefr
e6d9ec7bd7
Small fixes for default single Hub/Shop options issue
...
- removed mode variable
- reverted html template accordingly
- added a more specific helper
- fixed some short variable names
2019-12-19 21:08:34 +01:00
Transifex-Openfoodnetwork
3acc53a389
Updating translations for config/locales/ar.yml
2019-12-20 04:33:09 +11:00
Transifex-Openfoodnetwork
9c9fc999de
Updating translations for config/locales/ar.yml
2019-12-20 04:30:00 +11:00
Transifex-Openfoodnetwork
d824c84ce6
Updating translations for config/locales/fr.yml
2019-12-19 19:14:24 +11:00
Transifex-Openfoodnetwork
1a301f3dbb
Updating translations for config/locales/fr.yml
2019-12-19 19:11:16 +11:00
Transifex-Openfoodnetwork
fad4f3b22a
Updating translations for config/locales/en_FR.yml
2019-12-19 19:08:18 +11:00
Transifex-Openfoodnetwork
6080c99850
Updating translations for config/locales/fr.yml
2019-12-19 19:08:07 +11:00
Transifex-Openfoodnetwork
2944acff8a
Updating translations for config/locales/nb.yml
2019-12-19 09:52:35 +11:00
dependabot-preview[bot]
2068a59b72
[Security] Bump excon from 0.62.0 to 0.71.1
...
Bumps [excon](https://github.com/excon/excon ) from 0.62.0 to 0.71.1. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-18 19:33:23 +00:00
Luis Ramos
3063439ed1
Merge pull request #4541 from Matt-Yorkley/new_fee_errors
...
Handle validation messages when saving new fees
2019-12-18 13:35:45 +00:00
Matt-Yorkley
6bed05c721
Add missing feature test for order "Ship" button
2019-12-18 14:15:48 +01:00
Matt-Yorkley
a3ee6674ea
Use asynchronous requests for order capture and ship actions
2019-12-18 14:15:46 +01:00
cyrillefr
e59077e63e
Select by default single Hub/Shop option on creation of payment/shipping method
...
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
2019-12-18 10:45:00 +01:00
Transifex-Openfoodnetwork
f9f8d85841
Updating translations for config/locales/fr.yml
2019-12-18 04:37:36 +11:00
Transifex-Openfoodnetwork
0042690e18
Updating translations for config/locales/en_FR.yml
2019-12-18 04:35:31 +11:00
Transifex-Openfoodnetwork
5f1111b52b
Updating translations for config/locales/fr.yml
2019-12-18 04:34:28 +11:00
Luis Ramos
25ded0d23c
Merge pull request #4471 from luisramos0/paginate_exc_prods
...
Paginate Exchange Products API endpoint
2019-12-17 15:25:15 +00:00
Luis Ramos
a5458150ca
Merge pull request #4455 from luisramos0/oc_prods
...
In the OC edit page, load products only when each products tab is opened by user
2019-12-17 13:40:19 +00:00
Pau Pérez Fabregat
96eebbabf3
Merge pull request #4590 from luisramos0/capybara
...
Upgrade capybara and webdrivers
2019-12-17 10:55:59 +01:00
luisramos0
c58e6fa964
Upgrade capybara
2019-12-16 15:25:45 +00:00
luisramos0
fbe8f5195c
Upgrade webdrivers to latest
2019-12-16 15:25:36 +00:00
luisramos0
9648693329
Fix a problem in states/new template where erb instead of haml was referenced
2019-12-15 21:42:52 +00:00
luisramos0
9df9061ec1
Bring missing translation from spree and use root namespace for translations instead of the spre namespace
2019-12-15 21:39:26 +00:00
luisramos0
67526df420
Convert calculator fields partial to haml
2019-12-15 21:32:31 +00:00
luisramos0
766f8ab407
Add partial needed in payment and shipping methods
2019-12-15 21:24:50 +00:00
luisramos0
f587bbb7d5
Remove unnecessary helper
2019-12-15 21:03:53 +00:00
luisramos0
2793693a7c
Improve if clause readability
2019-12-15 21:03:53 +00:00
luisramos0
07e2317369
Replace deprecated URI.unescape with CGI.unescape
2019-12-15 21:03:53 +00:00
luisramos0
042162eda8
Delete unused method
2019-12-15 21:03:53 +00:00
luisramos0
795f13d73a
Remove spree alerts feature that would check spree website for security alerts
...
This is not something we need running such an old version of spree
2019-12-15 21:03:53 +00:00
luisramos0
f1814f1b67
Fix most rubocop issues in spree/admin/base_controller
2019-12-15 21:03:53 +00:00
luisramos0
4ab7b78cb8
Merge base_controller with its decorator
2019-12-15 21:03:53 +00:00
luisramos0
11631c3a33
Add base_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-12-15 21:03:53 +00:00
Konstantin Shlyk
0212381362
fix for api/variants_controller_spec
2019-12-14 21:43:38 +03:00
Konstantin Shlyk
e6ca6bacac
soft_delete api method deleted for products and variants
2019-12-14 01:05:35 +03:00
dependabot-preview[bot]
59df45b8cf
Bump oj from 3.7.12 to 3.10.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.12 to 3.10.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-13 19:17:46 +00:00
Luis Ramos
5892e85869
Merge pull request #4559 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.6
...
Bump selenium-webdriver from 3.141.0 to 3.142.6
2019-12-13 18:05:03 +00:00
luisramos0
c59326743b
Remove sales total report
2019-12-13 16:44:46 +00:00
luisramos0
cb3397fd1a
Convert reports index and sales_total views from erb to haml
2019-12-13 16:44:46 +00:00
luisramos0
2bd4de3e29
Add sales total report view
2019-12-13 16:44:46 +00:00
luisramos0
b2c5be775e
Fix some rubocop issues
2019-12-13 16:44:46 +00:00
luisramos0
d22212ccfa
Merge spree/admin/reports_controller with its decorator
2019-12-13 16:44:44 +00:00
luisramos0
dd600cd163
Add reports_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-12-13 15:20:03 +00:00
Matt-Yorkley
f189ca8004
Fix route on "continue" button on admin adjustments page
2019-12-13 13:51:41 +01:00
Luis Ramos
db7146014c
Rename exchange products file names to increase clarity
2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae
Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form
2019-12-13 12:24:16 +00:00
Maikel
0f588dbe0b
Merge pull request #4561 from openfoodfoundation/transifex
...
Transifex
2019-12-13 17:02:32 +11:00
dependabot-preview[bot]
9c14d8ff36
Bump rack-mini-profiler from 1.0.0 to 1.1.4
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.0.0 to 1.1.4.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.0.0...v1.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-12 19:14:17 +00:00
luisramos0
a104bf8efd
Add feature spec to validate load all and select all exchange products
2019-12-12 18:49:11 +00:00
luisramos0
a039ef13f4
Add spec for exchange products controller pagination
2019-12-12 18:49:11 +00:00
luisramos0
7ad8951375
DRY exchange products templates by extracting header and footer content to partial templates
2019-12-12 18:49:11 +00:00
luisramos0
99e59595b4
Add spinner when loading all products in an exchange
2019-12-12 18:48:36 +00:00
luisramos0
3264355f12
Add some basic test coverage to exchange_products_controller and exchange_products_renderer
2019-12-12 18:48:36 +00:00
luisramos0
7e3b6e2b5d
Fix select all checkbox state in both incoming and outgoing exchanges by using the total count of variants to see if all variants are selected or not, even if not all variants are loaded
2019-12-12 18:48:36 +00:00
luisramos0
a9598c5d97
Only show load more and load all if not all products are loaded already
2019-12-12 18:48:36 +00:00
luisramos0
3e5b7ebbf1
Show exchange products list only after first page of products is loaded
2019-12-12 18:48:36 +00:00
luisramos0
1a9c3007b0
Make select all work again in incoming exchanges by loading alll products before triggering the select all process
2019-12-12 18:48:35 +00:00
luisramos0
2f7fd1482a
Add link to load all products at the top of the list of products and include summary of number of products loaded already
2019-12-12 18:48:35 +00:00
luisramos0
0416521772
Add load all prouducts button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
cfe3f72d0e
Add load more button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
00478cc57c
Add count variants endpoint and use it instead of loading exchange products
2019-12-12 18:48:35 +00:00
luisramos0
d5e42ee1e5
Paginate exchange products results
...
This commit breaks the OC page when there are more than 100 products in an exchange
2019-12-12 18:48:35 +00:00
luisramos0
9451f1b66d
Remove funky panel open listener code and initialize the panel data with a ng-init in the panel template
2019-12-12 18:44:45 +00:00
luisramos0
ff584f9be9
Adapt exchange products routes to make api/exchanges/products (without exchange_id) also go to exchange_products#index
2019-12-12 18:44:45 +00:00
luisramos0
a589ba38da
Rename exchanges_products_controller to better exchange_products_controller
2019-12-12 18:44:45 +00:00
luisramos0
a4a2f98b6e
Rename Product service to more appropriate ExchangeProduct
2019-12-12 18:44:45 +00:00
luisramos0
f5ddbfbac3
Make Product service more simple, there's no need to keep the data structure, that is already kept in the controller
2019-12-12 18:44:45 +00:00
luisramos0
a66a4c3edb
Remove unnecessary passing of scopes around in controllers
2019-12-12 18:44:45 +00:00
luisramos0
8179252924
Replace the use of this with
2019-12-12 18:44:45 +00:00
luisramos0
0bec492208
Fix some rubocop issues
2019-12-12 18:44:45 +00:00
luisramos0
5cf50f0adf
Convert the manipulation of arrays into active record relations: let the DB do the matching job
2019-12-12 18:44:45 +00:00
luisramos0
197fb36524
Extract ExchangeProductsRenderer from ExchangesProductsController
2019-12-12 18:44:45 +00:00
luisramos0
62e6f09d94
Make exchange products more simple
2019-12-12 18:44:45 +00:00
luisramos0
79b2460664
Make simple create and edit OC load exchange products on init
...
Simple create makes a new type of call to exchange products with no exchange_id and no prder_cycle_id, it simply lists supplied products for a given enterprise
2019-12-12 18:44:44 +00:00
luisramos0
66f3656bb5
Register products panel listeners after OrderCycle is loaded instead of using recurrent timeouts
...
Also, use this same approach for the case where a new distributor or new supplier is added to the list of exchanges
2019-12-12 18:44:44 +00:00
luisramos0
6b087adab8
Add route to process requests to exchanges/products without exchange id
...
This is needed when products for an exchange that is not yet saved are requested
2019-12-12 18:44:44 +00:00
luisramos0
3653b88da6
Make exchanges_products_controller more independent of the exchange field
2019-12-12 18:44:44 +00:00
luisramos0
3223bf930d
Make total number of products in exchange work again.
...
Currently we are just loading the products from the server and count them.
This can be improved easily in two ways:
- we can switch this to a specific product count call to the server so that we dont load all products all the time
- or we paginate the products result and fetch the total_number from the payload of the first page.
2019-12-12 18:44:44 +00:00
luisramos0
2b3bc6d1ff
Remove supplied products from enterprise serializer and from UI side
...
This list of products s now loaded in a specific call to ExchangeProducts and for each specific exchange
2019-12-12 18:44:44 +00:00
luisramos0
24d7672abb
Use new exchange products endpoint for outgoing exchanges and make the exchange products panel work for outgoing exchanges
2019-12-12 18:44:44 +00:00
luisramos0
89628c27f3
Move exchange products endpoint to api namespace and make it work for outgoing exchanges
2019-12-12 18:44:44 +00:00
luisramos0
9adbdc377d
Add new admin/exchange/products endpoint that replaces Enterprise/for_order_cycle#supplied_products
2019-12-12 18:44:44 +00:00
luisramos0
883cd81058
Load enterprise supplied products when the exchange products panel is opened for the first time
2019-12-12 18:44:44 +00:00
Transifex-Openfoodnetwork
0d7d029255
Updating translations for config/locales/en_GB.yml
2019-12-13 02:07:44 +11:00
Kristina Lim
ce31a059bf
Merge pull request #4553 from openfoodfoundation/transifex
...
Transifex
2019-12-12 22:46:22 +08:00
Luis Ramos
17bac20c65
Merge pull request #4550 from luisramos0/fix_of_report
...
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
2019-12-12 14:15:19 +00:00
Pau Pérez Fabregat
066243057f
Merge pull request #4545 from coopdevs/fix-db-backups
...
Make whenever properly read the S3 bucket
2019-12-12 11:39:54 +01:00
Transifex-Openfoodnetwork
ea40547fd7
Updating translations for config/locales/fr_CA.yml
2019-12-12 10:22:26 +11:00
Transifex-Openfoodnetwork
0ebc6d4b1e
Updating translations for config/locales/en_CA.yml
2019-12-12 09:28:07 +11:00
Transifex-Openfoodnetwork
62c2e4709a
Updating translations for config/locales/en_CA.yml
2019-12-12 09:25:01 +11:00
Konstantin Shlyk
c5229dd763
billing address in pdf invoice fixed
2019-12-11 23:10:51 +03:00
dependabot-preview[bot]
99d4190814
Bump selenium-webdriver from 3.141.0 to 3.142.6
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:35:45 +00:00
dependabot-preview[bot]
f086c02e13
Bump mini_racer from 0.1.15 to 0.2.4
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.1.15 to 0.2.4.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.1.15...v0.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:35:03 +00:00
dependabot-preview[bot]
b726f961fc
Bump stripe from 4.24.0 to 5.11.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.24.0 to 5.11.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.24.0...v5.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:33:30 +00:00
Transifex-Openfoodnetwork
4c17cf0087
Updating translations for config/locales/fr.yml
2019-12-12 04:29:14 +11:00
Transifex-Openfoodnetwork
9fe143cf94
Updating translations for config/locales/en_FR.yml
2019-12-12 04:26:13 +11:00
Transifex-Openfoodnetwork
e2d783c385
Updating translations for config/locales/fr.yml
2019-12-12 04:26:05 +11:00
Transifex-Openfoodnetwork
81cb162884
Updating translations for config/locales/nb.yml
2019-12-12 03:34:25 +11:00
Transifex-Openfoodnetwork
c7b6dd2677
Updating translations for config/locales/nb.yml
2019-12-12 03:31:14 +11:00
Transifex-Openfoodnetwork
d1fd73fd2b
Updating translations for config/locales/ar.yml
2019-12-12 03:16:38 +11:00
Transifex-Openfoodnetwork
b0221d264e
Updating translations for config/locales/ar.yml
2019-12-12 03:13:31 +11:00
Transifex-Openfoodnetwork
0f64badc74
Updating translations for config/locales/ar.yml
2019-12-12 03:10:21 +11:00
Luis Ramos
7ccfdc8d21
Merge pull request #4546 from kshlyk/fix_cart_link_on_mobile
...
Cart link in header on mobile leads to cart page instead of checkout …
2019-12-11 13:45:56 +00:00
Luis Ramos
4799293996
Merge pull request #4518 from Matt-Yorkley/ruby-2.3.7
...
Bump Ruby to 2.3.7
2019-12-11 13:29:01 +00:00
Luis Ramos
58a93c27ae
Merge pull request #4539 from luisramos0/subs_s3
...
Make weight calculator work for SubscriptionLineItems
2019-12-11 11:20:53 +00:00
luisramos0
0202b59634
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
...
Something makes the query run much slower with these includes
2019-12-10 21:18:17 +00:00
Luis Ramos
9f351607d1
Merge pull request #4538 from mkllnk/4537-paginated-product-order
...
Make product order deterministic
2019-12-10 18:00:45 +00:00
Maikel
c45e3c9cca
Merge pull request #4543 from openfoodfoundation/transifex
...
Transifex
2019-12-10 20:10:23 +11:00
Luis Ramos
71bf3f5f71
Merge pull request #4514 from luisramos0/backend_ctrl_overview
...
Bring spree_backend overview controller to OFN
2019-12-09 23:36:32 +00:00
Konstantin Shlyk
ef142de5f2
Cart link in header on mobile leads to cart page instead of checkout page
2019-12-09 22:58:00 +03:00
luisramos0
f64e8bf50e
Make user aware of server side errors when saving subscription products and unit test products_panel_controller
2019-12-09 17:49:38 +00:00
Pau Perez
e8d68e3b89
Make whenever properly read the S3 bucket
...
For unknown reasons the magic
[Figaro](https://github.com/laserlemon/figaro ) does to turn keys in
`config/application.yml` into ENV vars that can be read through Ruby's
`ENV[]` is not working in `config/schedule.rb`.
As a result, the `db2fog` tasks are not translated into cron entries
which led to not having automatic backups.
2019-12-09 17:16:11 +01:00
luisramos0
1b29d474d0
Add specs to cover case where updating subscriptions products quantity fails
2019-12-09 15:11:32 +00:00
Luis Ramos
baae58ecb6
Merge pull request #4288 from luisramos0/oc_serializer_spec
...
Add spec for api/admin/order_cycle_serializer
2019-12-09 11:16:04 +00:00
Pau Pérez Fabregat
6411871ecb
Merge pull request #4540 from openfoodfoundation/dependabot/bundler/ddtrace-0.30.0
...
Bump ddtrace from 0.29.1 to 0.30.0
2019-12-09 09:48:27 +01:00
Transifex-Openfoodnetwork
22833ae79b
Updating translations for config/locales/it.yml
2019-12-09 19:28:13 +11:00
Transifex-Openfoodnetwork
ac20b0e7fb
Updating translations for config/locales/it.yml
2019-12-09 19:25:06 +11:00
luisramos0
e9e6aa77d8
Make weight calculator work for SubscriptionLineItems by making it test if line_item responds to final_weight_volume field (final_weight_volume_present?)
...
We also add logic to weight_per_variant so that we use variant.unit_value if final_weight_volume is not available but variant_unit is weight
Adapt some test case to test unit_value (in grams) instead of weight (in kgs)
2019-12-08 17:36:21 +00:00
Matt-Yorkley
29e30c388e
Make error message translatable
2019-12-07 15:48:46 +01:00
Matt-Yorkley
54a40fe79c
Handle validation messages when saving new fees
2019-12-07 14:51:17 +01:00
dependabot-preview[bot]
7840118dea
Bump ddtrace from 0.29.1 to 0.30.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.29.1 to 0.30.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.29.1...v0.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-06 19:18:08 +00:00
luisramos0
5e27bd6d6d
Add for now very basic spec to api/admin/order_cycle_serializer
2019-12-06 16:41:54 +00:00
Maikel Linke
d4512904ea
Make product order deterministic
...
When products are sorted by name and two products have the same name,
their order is undefined. With pagination, two pages can have a
different order of products with the same name which then means that two
pages can return the same product.
Sorting by product id makes sure that the result is always in the same
order, for every page.
2019-12-05 15:37:10 +11:00
Maikel
52dc288470
Merge pull request #4530 from openfoodfoundation/transifex
...
Transifex
2019-12-05 11:01:30 +11:00
Luis Ramos
302de04e73
Merge pull request #4526 from kristinalim/fix/3149-fix_tool_tips_in_orders_list
...
3149 Fix tooltips in orders list
2019-12-04 10:38:28 +00:00
Transifex-Openfoodnetwork
41767936d6
Updating translations for config/locales/ca.yml
2019-12-03 22:50:13 +11:00
Transifex-Openfoodnetwork
0ccf30202e
Updating translations for config/locales/ca.yml
2019-12-03 22:47:06 +11:00
Transifex-Openfoodnetwork
00f36e4686
Updating translations for config/locales/ca.yml
2019-12-03 22:43:57 +11:00
Maikel
4d77f30bc0
Merge pull request #4506 from openfoodfoundation/dependabot/bundler/ddtrace-0.29.1
...
Bump ddtrace from 0.29.0 to 0.29.1
2019-12-03 20:39:58 +11:00
Maikel
f38b1b95f0
Merge pull request #4525 from kristinalim/fix/4489-flaky_spec_for_editing_oc
...
4489 Improve waiting in feature spec for edit Order Cycle page
2019-12-03 20:36:37 +11:00
Luis Ramos
97ef93b840
Merge pull request #4516 from openfoodfoundation/transifex
...
Transifex
2019-12-02 17:50:26 +00:00
Luis Ramos
6db15a0a20
Merge pull request #4524 from Matt-Yorkley/packing_reports
...
Packing reports performance
2019-12-02 17:32:52 +00:00
Luis Ramos
c8395a487a
Merge pull request #4523 from luisramos0/permissions_improve
...
Replace pluck with select in permissions to avoid extra queries and extract Permissions::Orders from Permissions
2019-12-02 16:31:04 +00:00
Kristina Lim
852adfd436
Improve waiting in feature spec for order cycle page
2019-12-02 20:06:43 +08:00
luisramos0
1e948735fb
Fix major performance problem by inverting the logic, instead of looking for line_items that are hidden, it looks for line items that are not editable using a merge statement that performs much better
...
Also, remove unnecessary if clause, merge will return an empty relation if no items are found, no need to test for empty.
The test report runs in a little over one minute instead of 8minutes
2019-11-30 22:38:03 +00:00
luisramos0
0ef4247914
Convert Report::LineItems to class and memoize orders so it's only executed once (this improves the report in 3secs for the case I am testing)
2019-11-29 21:51:54 +00:00
Kristina Lim
2673a6efee
Fix Angular tracking of row in orders list
...
The tooltip content for the order in index n in page x was being used
for the order in index n in page y.
This was because ng-repeat was tracking the items/rows by index.
As far as ng-repeat is aware, rows with the same index in any page
were the same items/rows, so it didn't bother relinking the ofn-with-tip
directive.
2019-11-30 03:53:20 +08:00
Kristina Lim
6ffe7f1a99
Set width and enable wrapping for tooltips
2019-11-30 03:53:16 +08:00
Matt-Yorkley
6d1fb63a21
Eager-load option_values on line_item objects instead of variants in packing reports.
2019-11-29 20:16:48 +01:00
Matt-Yorkley
9bcd303f4f
Remove shipping_category N+1 from packing reports
2019-11-29 20:16:48 +01:00
Matt-Yorkley
38c327dae0
Improve N+1 issues around #suppliers_of_products_distributed_by
...
There's still some real mess here with repeating queries, but resolving it is out of scope for this quick PR
2019-11-29 20:16:03 +01:00
Matt-Yorkley
51177b833e
Remove customer_code N+1 from packing reports
2019-11-29 17:09:12 +01:00
luisramos0
cc3368704a
Fix rubocop issues in reports_controller_decorator and in report line_items
2019-11-29 13:54:30 +00:00
Pau Pérez Fabregat
2d53fbbe8c
Merge pull request #4520 from kristinalim/fix/4238-flaky_spec_in_api_taxons_index
...
4238 Do not assume order in spec for taxons list
2019-11-29 13:23:51 +01:00
luisramos0
3959f16d65
Switch some more references from Permissions to Permissions::Order
2019-11-29 12:22:50 +00:00
Pau Pérez Fabregat
fb28826d92
Merge pull request #4522 from kristinalim/fix/4239-flaky_spec_in_bulk_product_clone
...
4239 Do one thing at a time in feature spec for product cloning
2019-11-29 13:22:42 +01:00
luisramos0
beaa8ffa27
Use more specific selector to avoid ambigous column error
2019-11-29 11:45:22 +00:00
luisramos0
da6d035a1d
Rename some reports permissions to order_permissions
2019-11-29 11:23:17 +00:00
luisramos0
5cb77c443b
Fix rubocop issues
2019-11-29 10:53:40 +00:00
luisramos0
8d16f496f4
Move Permissions::Order specs to its specific spec file
2019-11-29 10:49:59 +00:00
luisramos0
82b274e522
Make selector more specific to avoid sql error 'ambiguos column'
2019-11-29 10:49:58 +00:00
luisramos0
484cdd1e07
Make managed_and_related_enterprises public so they can be used by other permissions classes
2019-11-29 10:49:27 +00:00
luisramos0
bb2e6324bd
Rename order permissions to just order
2019-11-29 10:49:27 +00:00
luisramos0
89056e13ed
Extract order permissions to a separate class
2019-11-29 10:48:58 +00:00
luisramos0
df0458743b
Replace pluck with select in permissions to avoid extra queries
2019-11-28 23:37:49 +00:00
luisramos0
ba1ad0a6dd
Rename decorator to controller so that the rubocop exception for the index action keeps being seen by code climate
2019-11-28 16:47:02 +00:00
luisramos0
4e7b397c5a
Bring orders adjustments route from spree_backend
2019-11-28 16:26:22 +00:00
luisramos0
842e191c5f
Remove toggle_state action that is not used in OFN
2019-11-28 16:20:35 +00:00
Kristina Lim
1476859c83
Do one thing at a time in feature spec for product cloning
2019-11-28 22:05:17 +08:00
Kristina Lim
c6fb7dafec
Do not assume order in test for taxons list
2019-11-28 20:33:42 +08:00
Transifex-Openfoodnetwork
80069731ed
Updating translations for config/locales/en_NZ.yml
2019-11-28 20:52:48 +11:00
Matt-Yorkley
feaa928674
Bump Ruby to 2.3.7 🎉
2019-11-28 10:42:13 +01:00
Maikel Linke
dfa3d40665
Create release task template recognised by Github
2019-11-28 15:58:14 +11:00
Maikel
00c2b95a0e
Add issue template for release tasks
2019-11-28 15:53:34 +11:00
Maikel Linke
4a82a26830
Update all locales with the latest Transifex translations
2019-11-28 15:17:38 +11:00
Transifex-Openfoodnetwork
f1831fc6bb
Updating translations for config/locales/en_AU.yml
2019-11-28 13:47:28 +11:00
Transifex-Openfoodnetwork
4c91a5571a
Updating translations for config/locales/en_AU.yml
2019-11-28 13:47:08 +11:00
Transifex-Openfoodnetwork
ccb7a305bc
Updating translations for config/locales/de_DE.yml
2019-11-28 13:45:01 +11:00
Transifex-Openfoodnetwork
0c87afefce
Updating translations for config/locales/de_DE.yml
2019-11-28 13:41:53 +11:00
Maikel
d546817f0a
Merge pull request #4486 from openfoodfoundation/transifex
...
Transifex
2019-11-28 10:36:06 +11:00
Luis Ramos
e0e833b2f3
Merge pull request #4454 from luisramos0/sort_products
...
Sort products alphabetically in OC edit page
2019-11-27 22:27:42 +00:00
luisramos0
c8d359a0da
Merge spree/admin/overview_controller with its decorator
2019-11-27 22:08:46 +00:00
luisramos0
210757641c
Add overview_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-11-27 22:08:06 +00:00
luisramos0
68bf599a1a
Merge spree/admin/adjustments_controller with decorator
2019-11-27 21:59:15 +00:00
luisramos0
a10966b66b
Add adjustments_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-11-27 21:59:15 +00:00
dependabot-preview[bot]
08003f2003
Bump ddtrace from 0.29.0 to 0.29.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.29.0 to 0.29.1.
- [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.29.0...v0.29.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-27 19:17:20 +00:00
Luis Ramos
7cc034c2bc
Merge pull request #4136 from mkllnk/4018-synchronise-checkout
...
Lock variants during checkout to avoid race condition
2019-11-27 15:40:28 +00:00
luisramos0
15bcde36cb
Remove order by filter on outgoing exchanges list of products
...
The products are now coming from the server already sorted
2019-11-26 17:59:30 +00:00
Transifex-Openfoodnetwork
6e69960ee9
Updating translations for config/locales/nb.yml
2019-11-25 22:54:56 +11:00
Transifex-Openfoodnetwork
a7a03b04a9
Updating translations for config/locales/nb.yml
2019-11-25 22:51:50 +11:00
Pau Pérez Fabregat
5759dcee48
Merge pull request #4463 from jonleighton/docker-ruby-version
...
Use .ruby-version when building Docker container
2019-11-25 10:43:55 +01:00
Pau Pérez Fabregat
a9672011a5
Merge pull request #4479 from openfoodfoundation/dependabot/bundler/ddtrace-0.29.0
...
Bump ddtrace from 0.28.0 to 0.29.0
2019-11-25 09:42:48 +01:00
Pau Pérez Fabregat
808aa188ab
Merge pull request #4478 from openfoodfoundation/dependabot/bundler/rspec-retry-0.6.2
...
Bump rspec-retry from 0.6.1 to 0.6.2
2019-11-25 09:42:06 +01:00
Transifex-Openfoodnetwork
ad7fc61228
Updating translations for config/locales/en_GB.yml
2019-11-24 05:29:07 +11:00
Transifex-Openfoodnetwork
3e32e5c16e
Updating translations for config/locales/ar.yml
2019-11-24 03:48:31 +11:00
Transifex-Openfoodnetwork
f67a2120f4
Updating translations for config/locales/ar.yml
2019-11-24 03:45:25 +11:00
Matt-Yorkley
a4ee562387
Update all locales with the latest Transifex translations
2019-11-23 12:57:35 +01:00
Matt-Yorkley
165f4f9201
Merge pull request #4485 from openfoodfoundation/transifex
...
Transifex
2019-11-23 12:48:27 +01:00
Matt-Yorkley
0d1740ba4a
Merge pull request #4430 from Matt-Yorkley/variant_option_types
...
Variant option_values
2019-11-23 12:37:34 +01:00
Matt-Yorkley
cbb3f202ca
Eager-load option_values in OpenFoodNetwork::ScopeVariantsForSearch
2019-11-23 10:58:18 +01:00
Matt-Yorkley
ff076fd7be
Eager-load option_values in Api::ProductsController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
d30192207b
Eager-load option_values in ProducerMailer
2019-11-23 10:58:18 +01:00
Matt-Yorkley
19afc1a6da
Eager-load option_values in Api::VariantsController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
4ef682915c
Eager-load option_values in Admin::EnterprisesController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
e693e8ac37
Eager-load option_values in Admin::BulkLineItemsController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
07fe8e8390
Eager-load option_values in various reports
2019-11-23 10:58:18 +01:00
Matt-Yorkley
6e58ffa927
Enable variant option_values to be successfully eager-loaded
2019-11-23 10:58:18 +01:00
Transifex-Openfoodnetwork
8a8e612fd3
Updating translations for config/locales/fr.yml
2019-11-23 06:03:21 +11:00
Transifex-Openfoodnetwork
1e8ad4748a
Updating translations for config/locales/fr.yml
2019-11-23 06:00:16 +11:00
Transifex-Openfoodnetwork
4c346549f5
Updating translations for config/locales/en_FR.yml
2019-11-23 05:58:47 +11:00
Transifex-Openfoodnetwork
427e44aee9
Updating translations for config/locales/fr.yml
2019-11-23 05:57:03 +11:00
Transifex-Openfoodnetwork
8dfc62b206
Updating translations for config/locales/ar.yml
2019-11-23 02:57:34 +11:00
Transifex-Openfoodnetwork
ef4a99eadc
Updating translations for config/locales/ar.yml
2019-11-23 02:54:27 +11:00
Transifex-Openfoodnetwork
8337e43e64
Updating translations for config/locales/ar.yml
2019-11-23 02:51:17 +11:00
Luis Ramos
689eb88332
Merge pull request #4450 from luisramos0/return_auth
...
Move return authorizations from spree_backend to OFN
2019-11-22 14:33:45 +00:00
Matt-Yorkley
698210c849
Create release-template.md
2019-11-22 14:48:50 +01:00
luisramos0
e2087bcc8c
Bring return authorizations view from spree_backend
2019-11-22 13:39:36 +00:00
luisramos0
b066b87141
Bring return authorizations controller from spree_backend
2019-11-22 13:39:04 +00:00
Matt-Yorkley
d88a766de4
Merge pull request #4461 from openfoodfoundation/dependabot/bundler/i18n-js-3.5.0
...
Bump i18n-js from 3.4.2 to 3.5.0
2019-11-22 14:37:10 +01:00
Matt-Yorkley
6c7910c8fa
Merge pull request #4477 from openfoodfoundation/transifex
...
Transifex
2019-11-22 14:30:05 +01:00
Transifex-Openfoodnetwork
f83d469833
Updating translations for config/locales/en_CA.yml
2019-11-22 08:25:52 +11:00
Transifex-Openfoodnetwork
1cea5327e9
Updating translations for config/locales/en_CA.yml
2019-11-22 08:13:47 +11:00
dependabot-preview[bot]
6df7ec9dbd
Bump ddtrace from 0.28.0 to 0.29.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.28.0 to 0.29.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.28.0...v0.29.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-21 19:20:49 +00:00
dependabot-preview[bot]
0f7357166d
Bump rspec-retry from 0.6.1 to 0.6.2
...
Bumps [rspec-retry](https://github.com/noredink/rspec-retry ) from 0.6.1 to 0.6.2.
- [Release notes](https://github.com/noredink/rspec-retry/releases )
- [Changelog](https://github.com/NoRedInk/rspec-retry/blob/master/changelog.md )
- [Commits](https://github.com/noredink/rspec-retry/compare/v0.6.1...v0.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-21 19:17:49 +00:00
Transifex-Openfoodnetwork
26c854df5b
Updating translations for config/locales/en_FR.yml
2019-11-21 21:18:34 +11:00
Transifex-Openfoodnetwork
a43ef174f6
Updating translations for config/locales/nb.yml
2019-11-21 21:13:56 +11:00
Transifex-Openfoodnetwork
99f8bf039a
Updating translations for config/locales/fr.yml
2019-11-21 21:12:07 +11:00
Transifex-Openfoodnetwork
bdb2c6efb3
Updating translations for config/locales/nb.yml
2019-11-21 21:10:49 +11:00
Transifex-Openfoodnetwork
21512e9722
Updating translations for config/locales/fr.yml
2019-11-21 21:09:00 +11:00
Luis Ramos
008921c201
Merge pull request #4447 from luisramos0/clickable_steps
...
Clickable steps on the OC edit page
2019-11-20 21:16:07 +00:00
Luis Ramos
0882887abe
Merge pull request #4452 from luisramos0/ready_for
...
Make "Ready for" field show a red border when added to the list of outgoing exchanges
2019-11-20 21:14:25 +00:00
Luis Ramos
0eb4574b37
Merge pull request #4422 from luisramos0/the_poc
...
New Order Cycles edit page with steps
2019-11-20 21:11:23 +00:00
Maikel
b54edff4cc
Merge pull request #4470 from luisramos0/oc_perms
...
Improve readability of OC permissions...
2019-11-20 11:38:38 +11:00
Maikel
0d6911f41c
Merge pull request #4467 from openfoodfoundation/transifex
...
Transifex
2019-11-20 08:04:54 +11:00
Luis Ramos
498acaefbc
Merge pull request #4469 from Matt-Yorkley/shipping_selection
...
Fix shipping_rate fetching in customer_totals_report
2019-11-19 09:39:13 +00:00
Maikel Linke
50093c325a
Move checkout locking to its own service
...
It gives this complex logic more space and allows for better structure
and more comments at the right places.
2019-11-19 18:18:01 +11:00
Maikel Linke
4288428c70
Separating concurrency spec as it's entirely different
2019-11-19 18:18:01 +11:00
Maikel Linke
dc122a9450
Fix infinite loop in spec
...
The spec was setting the order's state to "complete" but didn't save
that state to the database. The new locking mechanism is was reloading
the order which loaded the cart state again. And since the order.next
method was mocked to just return true, the controller was trying to do
that in an infinite loop.
2019-11-19 18:18:01 +11:00
Maikel Linke
ec1b5a7a92
Test concurrent checkouts
...
When two people tried to buy the same item at the same time, it was
possible to oversell the item and end up with negative stock.
Parallel checkouts could also lead to other random failures. This spec
is testing that scenario by starting two threads which would run into a
race condition unless they use effective synchronisation. The added spec
fails if the synchronisation is removed from the CheckoutController.
2019-11-19 18:18:01 +11:00
Maikel Linke
df2306cf82
Lock variants during checkout to avoid race condition
...
It was possible that several people bought the same variant even though
there wasn't enough stock for everybody. That resulted in negative
stock.
2019-11-19 18:18:01 +11:00
Matt-Yorkley
585135d27e
Fix shipping_method querying in customer totals reports
2019-11-18 15:14:10 +00:00
Matt-Yorkley
06fabe491d
Add failing shipping_methods spec
2019-11-18 15:06:54 +00:00
luisramos0
052cc2848f
Make visible_variants_for_incoming_exchanges_from and editable_variants_for_incoming_exchanges_from a bit easier to read
2019-11-18 13:25:38 +00:00
Transifex-Openfoodnetwork
b5b9d42764
Updating translations for config/locales/nb.yml
2019-11-18 19:04:54 +11:00
Transifex-Openfoodnetwork
d8e2239438
Updating translations for config/locales/nb.yml
2019-11-18 19:01:46 +11:00
Transifex-Openfoodnetwork
403ca3e538
Updating translations for config/locales/nb.yml
2019-11-18 18:58:37 +11:00
Transifex-Openfoodnetwork
ed65c80869
Updating translations for config/locales/ar.yml
2019-11-17 02:51:01 +11:00
Transifex-Openfoodnetwork
ca6ec9ee68
Updating translations for config/locales/ar.yml
2019-11-17 02:47:54 +11:00
Transifex-Openfoodnetwork
04fa4d3587
Updating translations for config/locales/fr.yml
2019-11-16 22:49:18 +11:00
Transifex-Openfoodnetwork
eedbcb6f1e
Updating translations for config/locales/fr.yml
2019-11-16 22:46:21 +11:00
Transifex-Openfoodnetwork
61e3798533
Updating translations for config/locales/en_FR.yml
2019-11-16 22:44:43 +11:00
Transifex-Openfoodnetwork
bca978aacc
Updating translations for config/locales/en_CA.yml
2019-11-16 15:06:46 +11:00
Transifex-Openfoodnetwork
190cb1dede
Updating translations for config/locales/en_NZ.yml
2019-11-16 07:30:50 +11:00
Luis Ramos
9c8c71bd08
Merge pull request #4443 from openfoodfoundation/dependabot/bundler/roadie-rails-1.3.0
...
Bump roadie-rails from 1.1.1 to 1.3.0
2019-11-15 16:48:23 +00:00
Luis Ramos
2b37592280
Merge pull request #4449 from luisramos0/properties
...
Move properties and product properties from spree_backend to OFN
2019-11-15 08:57:32 +00:00
luisramos0
8546e11ffc
Update all locales with the latest Transifex translations
2019-11-14 13:34:29 +00:00
Luis Ramos
76659d63d8
Merge pull request #4464 from openfoodfoundation/transifex
...
Transifex
2019-11-14 13:32:04 +00:00
Transifex-Openfoodnetwork
4d9cbf5d16
Updating translations for config/locales/nb.yml
2019-11-15 00:07:13 +11:00
Transifex-Openfoodnetwork
2166791554
Updating translations for config/locales/nb.yml
2019-11-15 00:04:04 +11:00
Luis Ramos
879e2f5c3a
Merge pull request #4444 from openfoodfoundation/dependabot/bundler/wkhtmltopdf-binary-0.12.5
...
Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
2019-11-14 12:07:34 +00:00
Luis Ramos
471ec2023e
Merge pull request #4426 from Matt-Yorkley/customer_totals
...
Orders and Fulfilment reports
2019-11-14 12:07:16 +00:00
Luis Ramos
5026afc011
Merge pull request #4141 from Matt-Yorkley/oc_performance
...
OC performance
2019-11-14 11:24:16 +00:00
Jon Leighton
172a79acc7
Use .ruby-version when building Docker container
...
The Ruby version was updated, but the Dockerfile wasn’t. This meant that
the Docker environment was broken. This change should prevent similar
breakage in the future by making .ruby-version the source of truth about
the correct version.
2019-11-14 15:44:49 +11:00
Maikel
7c9cdccb49
Merge pull request #4460 from openfoodfoundation/transifex
...
Transifex
2019-11-13 10:29:22 +11:00
dependabot-preview[bot]
179ec6a3e9
Bump i18n-js from 3.4.2 to 3.5.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.2...v3.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-12 19:34:42 +00:00
Transifex-Openfoodnetwork
19fbdb1848
Updating translations for config/locales/ar.yml
2019-11-13 05:24:53 +11:00
Transifex-Openfoodnetwork
c9b53022f2
Updating translations for config/locales/ar.yml
2019-11-13 05:21:47 +11:00
Pau Pérez Fabregat
a00b770229
Merge pull request #4459 from coopdevs/temporarily-disable-flaky-spec
...
Temporarily disable flaky line item spec
2019-11-12 13:59:02 +01:00
Pau Perez
16f570b8f7
Temporarily disable flaky line item spec
...
This is causing almost all PRs to fail in CI and blocking our delivery
pipe. We're already working on a solution in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4458 .
2019-11-12 13:23:04 +01:00
Luis Ramos
49bd21f29a
Merge pull request #4456 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.2
...
Bump i18n-js from 3.4.1 to 3.4.2
2019-11-12 12:09:34 +00:00
luisramos0
f1c055805f
Use $timeout instead of setTimeout which makes it possible to remove apply()
2019-11-12 12:06:44 +00:00
luisramos0
5cadb0d16f
Make ready for field show with red borders immediatly after exchange is added to the list
2019-11-12 12:06:44 +00:00
luisramos0
6875e9a41e
Make view a bit simpler by removing unnecessary string interpolation
2019-11-12 12:05:40 +00:00
luisramos0
b6f1d6e395
Make OC edit page steps clickable when editing an OC
2019-11-12 12:05:40 +00:00
luisramos0
6e51be095b
Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically
2019-11-12 12:04:42 +00:00
luisramos0
1c7237869a
Refactor products_scope to make it more simple
2019-11-12 12:04:42 +00:00
luisramos0
14433e7764
Fix some rubocop issues in admin/order_cycles_controller
2019-11-12 12:02:36 +00:00
luisramos0
5fdb86ae43
Make simple create redirect to OC list but normal create to jump to incoming settings
2019-11-12 12:00:48 +00:00
luisramos0
6615469f8b
Fix 3 more specs in OC edit pages
2019-11-12 12:00:48 +00:00
luisramos0
d281837dd9
Remove useless spec now that we have 3 steps in OC edit process
2019-11-12 12:00:48 +00:00
luisramos0
7c63e59ae9
Add OC imcoming and outgoing abilities to managers, this fixes a few OC feature specs
2019-11-12 12:00:48 +00:00
luisramos0
7c19fe418e
Adapt OC specs to new page flow with 3 steps (these specs are not green yet)
2019-11-12 12:00:48 +00:00
luisramos0
46d0023018
Adapt OC spec to new page flow with 3 steps
2019-11-12 12:00:48 +00:00
luisramos0
43cf249184
Make NoDistributors warning only appear on simple_create and simple_edit and outgoing settings
2019-11-12 12:00:48 +00:00
luisramos0
537dbd3dc0
Fix angular specs by moving specs to the same place as the code was moved previously
...
Quite a few copy pasted specs were also removed
2019-11-12 12:00:48 +00:00
luisramos0
7c54781d90
Restructure OC page controllers so that methods related to exchanges are only loaded on the incoming and outgoing settings pages
2019-11-12 12:00:48 +00:00
luisramos0
3b4241c70d
Remove more copy pasted code by adding new AdminOrderCycleCtrl with common code from create and edit OC controllers
2019-11-12 12:00:48 +00:00
luisramos0
a290e83501
Move more copy pasted code to basic OC controller
2019-11-12 12:00:48 +00:00
luisramos0
6e0019227b
Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers
2019-11-12 12:00:48 +00:00
luisramos0
7845b6c6fb
Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl
...
Same for AdminOrderCycleOutgoingCtrl
2019-11-12 12:00:48 +00:00
luisramos0
e03e3ae50a
Fix the simple edit OC and the new OC page flows
2019-11-12 12:00:48 +00:00
luisramos0
305d7b1125
Adapted navigation between OC edit pages by adding new previous and next buttons
2019-11-12 12:00:48 +00:00
luisramos0
5ef751d409
Add wizard to OC new and edit pages
2019-11-12 12:00:48 +00:00
luisramos0
683232dd10
Improve page titles and fix broken translation
2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226
Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page
2019-11-12 12:00:48 +00:00
Matt-Yorkley
1a5eea3303
Refactor #all_incoming_editable_variants
2019-11-12 11:59:39 +00:00
Matt-Yorkley
a1146aed1b
Refactor #sort_by_supplier_id
2019-11-12 11:59:39 +00:00
Matt-Yorkley
ab30307b1a
Simplify #active_outgoing_variants
2019-11-12 11:59:39 +00:00
Matt-Yorkley
35b68239b0
Tidy up AR query syntax
2019-11-12 11:59:39 +00:00
Matt-Yorkley
9e09a3b379
Memoize #active_outgoing_variants result
2019-11-12 11:59:39 +00:00
Matt-Yorkley
77105e265e
Memoize more repeated queries in #managed_enterprises
2019-11-12 11:59:38 +00:00
Matt-Yorkley
e73f2d682c
Remove N+1 in editable_variants_for_incoming_exchanges
2019-11-12 11:59:13 +00:00
Matt-Yorkley
f4d71ae352
Fix order_cycle_permissions tests not running locally
2019-11-12 11:59:13 +00:00
Matt-Yorkley
c2823b3ffe
Memoize #user_manages_coordinator_or result
2019-11-12 11:59:13 +00:00
Matt-Yorkley
c1366fced5
DRY some more variant queries
2019-11-12 11:59:13 +00:00
Matt-Yorkley
170bc94d92
Refactor order_cycle_serializer
2019-11-12 11:59:13 +00:00
Matt-Yorkley
2a5403e23f
Clean up "visible and editable" variants
2019-11-12 11:59:13 +00:00
Matt-Yorkley
dc540444a2
Remove pointless code
2019-11-12 11:59:13 +00:00
Matt-Yorkley
ca5ecc4696
Refactor "active outgoing variants"
2019-11-12 11:59:13 +00:00
Matt-Yorkley
5082a133a1
Refactor adjustment fetching into new service and module
2019-11-12 11:57:54 +00:00
Matt-Yorkley
1f8e0ae637
Improve SupplierTotalsByDistributorReport
2019-11-12 11:57:19 +00:00
Matt-Yorkley
24e66b635b
Improve DistributorTotalsBySupplierReport
2019-11-12 11:57:19 +00:00
Matt-Yorkley
891db4b81b
Move methods to helper
2019-11-12 11:57:19 +00:00
Matt-Yorkley
8a57977b44
Increase eager-loading and adjustment calculations
2019-11-12 11:57:19 +00:00
Matt-Yorkley
77e70fd7d3
Eager-load adjustments and calculate in place
2019-11-12 11:57:19 +00:00
Matt-Yorkley
7b5e5f4039
Clean up OpenFoodNetwork::Permissions
2019-11-12 11:57:19 +00:00
Pau Pérez Fabregat
ed15bc422e
Merge pull request #4453 from luisramos0/rubo
...
run rubocop --auto-correct
2019-11-12 10:30:21 +01:00
dependabot-preview[bot]
030747cff8
Bump i18n-js from 3.4.1 to 3.4.2
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.1...v3.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-11 19:15:49 +00:00
Luis Ramos
3e318e5c4e
Merge pull request #4425 from Matt-Yorkley/admin_eager_loading
...
Eager-load variant associations in admin ProductsController
2019-11-11 15:29:45 +00:00
Luis Ramos
3eb4caeb3e
Merge pull request #4408 from luisramos0/poc_oc
...
Remove dead code from OC edit page code
2019-11-11 14:55:37 +00:00
luisramos0
555ae12b35
Add exceptions to some unresolved rubocop issues
2019-11-10 19:40:41 +00:00
luisramos0
553d4ebaa0
Fix a few rubocop issues in reports code
2019-11-10 19:27:41 +00:00
luisramos0
73ee14cc7c
Fix long line in injection helper
2019-11-10 19:21:08 +00:00
luisramos0
c9177feb19
Fix a few more rubocop issues manually
2019-11-10 19:14:12 +00:00
luisramos0
71ea281424
Regenerate rubocop todo files after last large fix of issues
2019-11-10 19:07:16 +00:00
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
Matt-Yorkley
5e99ecd9cc
Merge pull request #4446 from luisramos0/remove_listen
...
Remove unused dependency listen
2019-11-10 10:03:19 +00:00
Matt-Yorkley
c94713c1ef
Merge pull request #4451 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.0.0
...
Bump rack-mini-profiler from 0.10.7 to 1.0.0
2019-11-09 19:28:54 +00:00
Maikel
6864c0d3c3
Merge pull request #4448 from luisramos0/rubo_kanp
...
Update rubocop todo lists and regenrate knapsack report
2019-11-09 10:59:14 +11:00
Maikel
5591525160
Merge pull request #4445 from openfoodfoundation/dependabot/bundler/test-unit-3.3.4
...
Bump test-unit from 3.3.3 to 3.3.4
2019-11-09 10:40:41 +11:00
luisramos0
4d00b79d8d
Add new knapsack report so build jobs are more balanced
2019-11-08 20:43:49 +00:00
dependabot-preview[bot]
e3007db324
Bump rack-mini-profiler from 0.10.7 to 1.0.0
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 0.10.7 to 1.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v0.10.7...v1.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-08 19:18:25 +00:00
luisramos0
de1d7f2877
Remove references to prototype (inexistent in OFN) in model properties
2019-11-08 17:49:35 +00:00
luisramos0
215f2897f3
Bring Property model from spree core
2019-11-08 17:48:49 +00:00
luisramos0
2d240f23a8
Converted erb properties views to haml and added lazy lookups for translations
2019-11-08 17:31:43 +00:00
luisramos0
f8b0ad29df
Bring properties views from spree_backend
2019-11-08 17:18:26 +00:00
luisramos0
af1eff9427
Bring properties and product_properties controllers from spree_backend
2019-11-08 17:18:04 +00:00
luisramos0
05ddebd78e
Update rubocop todo lists with payment_methods_controler exceptions
2019-11-08 17:05:51 +00:00
Luis Ramos
fd6639c7d1
Merge pull request #4415 from lin-d-hop/delivery-report
...
Update end date on delivery report
2019-11-08 16:58:27 +00:00
Luis Ramos
314ecf6d90
Merge pull request #4372 from luisramos0/images
...
Move Images from spree_backend to OFN
2019-11-08 16:21:33 +00:00
Luis Ramos
ea8eb0ee14
Merge pull request #4371 from luisramos0/payment_methods
...
Move Payment methods from spree_backend to OFN
2019-11-08 14:26:21 +00:00
luisramos0
9bb940ae43
Remove unused dependency listen, it was used in guard but guard was deleted
2019-11-08 12:49:06 +00:00
Luis Ramos
9e713e449f
Merge pull request #4441 from openfoodfoundation/dependabot/bundler/rubocop-0.68.1
...
Bump rubocop from 0.57.2 to 0.68.1
2019-11-08 12:35:11 +00:00
Matt-Yorkley
34f4bbe06c
Eager-load variant associations in admin ProductsController
2019-11-08 10:44:47 +00:00
Maikel Linke
babe2247a5
Put new violations on the todo list
2019-11-08 19:08:36 +11:00
Maikel Linke
3295aedeee
Update Rubocop config for new version
2019-11-08 19:08:36 +11:00
dependabot-preview[bot]
eaaf082572
Bump rubocop from 0.57.2 to 0.68.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.57.2 to 0.68.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.57.2...v0.68.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-08 19:08:36 +11:00
Maikel Linke
f8803888f2
Update Rubocop config to pass local run
2019-11-08 19:08:36 +11:00
Maikel
032fbc7348
Merge pull request #4440 from openfoodfoundation/transifex
...
Transifex
2019-11-08 17:44:02 +11:00
Matt-Yorkley
b64633d2d8
Merge pull request #4434 from coopdevs/remove-duplicate-feature-spec
...
Don't test existence of a field used in next spec
2019-11-08 00:43:57 +00:00
Transifex-Openfoodnetwork
bc46b2bccb
Updating translations for config/locales/en_FR.yml
2019-11-08 07:28:30 +11:00
Transifex-Openfoodnetwork
fc8bd530e6
Updating translations for config/locales/en_GB.yml
2019-11-08 07:13:52 +11:00
Transifex-Openfoodnetwork
8e6079ad5b
Updating translations for config/locales/en_GB.yml
2019-11-08 07:10:42 +11:00
dependabot-preview[bot]
f29922312d
Bump test-unit from 3.3.3 to 3.3.4
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.3...3.3.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-07 19:20:30 +00:00
dependabot-preview[bot]
1b8863b63d
Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
...
Bumps [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem ) from 0.12.4 to 0.12.5.
- [Release notes](https://github.com/zakird/wkhtmltopdf_binary_gem/releases )
- [Changelog](https://github.com/zakird/wkhtmltopdf_binary_gem/blob/master/CHANGELOG )
- [Commits](https://github.com/zakird/wkhtmltopdf_binary_gem/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-07 19:19:47 +00:00
dependabot-preview[bot]
5def2f6f5f
Bump roadie-rails from 1.1.1 to 1.3.0
...
Bumps [roadie-rails](https://github.com/Mange/roadie-rails ) from 1.1.1 to 1.3.0.
- [Release notes](https://github.com/Mange/roadie-rails/releases )
- [Changelog](https://github.com/Mange/roadie-rails/blob/master/Changelog.md )
- [Commits](https://github.com/Mange/roadie-rails/compare/v1.1.1...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-07 19:18:56 +00:00
Transifex-Openfoodnetwork
b5e69c883b
Updating translations for config/locales/fr.yml
2019-11-07 23:50:03 +11:00
Transifex-Openfoodnetwork
5f0ad3fd71
Updating translations for config/locales/fr.yml
2019-11-07 23:46:53 +11:00
Pau Perez
a6ba956355
Update all locales with the latest Transifex translations
2019-11-07 12:47:10 +01:00
Luis Ramos
76cffe4c7f
Merge pull request #4301 from Matt-Yorkley/ruby-2.2.10
...
Use Ruby 2.2.10
2019-11-07 10:17:54 +00:00
Pau Perez
5095df251e
Don't test existence of a field used in next spec
...
If the next example doesn't find the quick_search field it will fail so
no need to duplicate it with the consequent costly test setup.
2019-11-06 18:28:59 +01:00
Pau Pérez Fabregat
26477a8d4b
Merge pull request #4421 from openfoodfoundation/transifex
...
Transifex
2019-11-06 18:04:23 +01:00
Luis Ramos
52ab6c52bf
Merge pull request #4057 from luisramos0/remove_spree_api_2
...
Remove dependency to spree_api - step 2 - routes and views
2019-11-06 13:23:32 +00:00
Luis Ramos
413e93fe40
Merge pull request #4431 from Matt-Yorkley/fix_migration_clash
...
Fix migration mismatch
2019-11-06 09:49:15 +00:00
Matt-Yorkley
9e1b2eb4ca
Fix migration mismatch
...
It looks like this was probably changed whilst resolving a merge conflict somewhere. The number doesn't match the last migration file, and it's breaking the ofn-install CI build (as well as migrations on fresh servers).
2019-11-05 22:58:14 +00:00
Luis Ramos
1ceae6cf8d
Merge pull request #4225 from HugsDaniel/4106-edit-product-missing-translations
...
Add missing translations on product edit page
2019-11-05 19:30:08 +00:00
Transifex-Openfoodnetwork
5183d93601
Updating translations for config/locales/en_DE.yml
2019-11-05 23:45:05 +11:00
Luis Ramos
247854b7fe
Merge pull request #4423 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.1
...
Bump i18n-js from 3.4.0 to 3.4.1
2019-11-04 11:47:13 +00:00
dependabot-preview[bot]
85bd803785
Bump i18n-js from 3.4.0 to 3.4.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-01 19:39:31 +00:00
luisramos0
75dfde2552
In the Edit OC page, the list of supplied products should only include checkboxes for normal variants: removed html to display product checkbox and also master variants
...
Two rules we can use to make this more simple: all products have variants (at least what is called the standard variant) and master variants cannot be added to OCs
2019-11-01 17:18:48 +00:00
luisramos0
10f0906689
Remove obsolete view, this code is now in app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml
2019-11-01 17:18:48 +00:00
Transifex-Openfoodnetwork
c6543edc85
Updating translations for config/locales/en_GB.yml
2019-11-02 01:42:11 +11:00
Transifex-Openfoodnetwork
a91d0973d4
Updating translations for config/locales/en_GB.yml
2019-11-02 01:39:02 +11:00
Kristina Lim
61c581ae52
Update all locales with the latest Transifex translations
2019-11-01 20:38:13 +08:00
Luis Ramos
db8e2891d4
Merge pull request #4417 from Matt-Yorkley/shopfront_patchination
...
Ensure variants returned in #variant_relation are DISTINCT
2019-11-01 12:16:01 +00:00
Luis Ramos
a947d8df6c
Merge pull request #4397 from luisramos0/delete_option_types_page
...
Remove option types menu entry
2019-11-01 12:14:59 +00:00
Maikel
818d41ffac
Merge pull request #4418 from AndrewCleve/readme-grammar-fix
...
Improve readability of README.md
2019-11-01 16:48:12 +11:00
Maikel
14f67053c8
Merge pull request #4400 from coopdevs/task-to-remove-enterprise-limit
...
Task to remove limit of ent. that can be created
2019-11-01 15:57:12 +11:00
luisramos0
76e32b126f
Add a few more missing translation keys for product images and variants display as and display name
2019-11-01 10:40:02 +11:00
luisramos0
c234cfb890
Add missing translation in the new variant page
2019-11-01 10:40:02 +11:00
luisramos0
38bda1697d
Add missing translations in the product variants list page
2019-11-01 10:40:02 +11:00
luisramos0
5fb9ebc594
Add missing translations for variants edit page
2019-11-01 10:40:02 +11:00
luisramos0
acbd4b076d
Move product page tabs to a separate translations key namespace
2019-11-01 10:40:01 +11:00
luisramos0
123f7aa68e
Use root translation keys for basic actions
2019-11-01 10:39:09 +11:00
luisramos0
2c4af84a81
Move product seo translation keys to specific namespace
2019-11-01 10:39:09 +11:00
luisramos0
34ed16ff30
Add missing translation keys to product properties list
2019-11-01 10:39:09 +11:00
Hugo Daniel
0b20b80219
Add missing translations on product edit page
2019-11-01 10:38:06 +11:00
Luis Ramos
bef745378e
Merge pull request #4395 from luisramos0/delete_prototypes
...
Delete prototypes tables and all references in pages
2019-10-31 20:06:38 +00:00
lin-d-hop
472aef0904
Fixing spec
2019-10-31 18:28:13 +00:00
luisramos0
a6cb5903d6
Delete prototypes tables and all references in pages
2019-10-31 13:23:42 +00:00
Luis Ramos
d1b36aded0
Merge pull request #4359 from daningenthron/daningenthron/required-fields-new-order-cycle
...
Add asterisks to required fields in New Order Cycle form
2019-10-31 12:50:48 +00:00
Luis Ramos
9c3c74aa93
Merge pull request #4394 from luisramos0/fix_product_sub_menu
...
Merge duplicated product_sub_menu partials
2019-10-31 12:48:27 +00:00
Matt-Yorkley
67a5a1cdc2
Fix incorrectly ordered entries with duplicate product names in OC and custom taxon ordering applied
2019-10-31 12:14:14 +00:00
Matt-Yorkley
9723e2cd49
Add failing spec for taxon ordering issue
2019-10-31 12:07:16 +00:00
Pau Pérez Fabregat
4af014df6b
Merge pull request #4342 from JacksonBates/edit-button-new-window
...
makes edit button action open a new tab
2019-10-31 11:45:11 +01:00
Pau Pérez Fabregat
be6c64db75
Merge pull request #4354 from agustinariq/3832-WYSIWYG-highlight-links
...
#3832 - Added color to links in WYSIWYG editor
2019-10-31 11:44:11 +01:00
AndrewCleve
1aebc30128
Improve readability of README.md
...
Made minor changes to grammar to improve consistency and readability.
2019-10-30 19:43:38 -07:00
lin-d-hop
c1f427b0e3
Modifications for variable consistency etc
2019-10-30 19:06:49 +00:00
Matt-Yorkley
f8209ac7d5
Ensure results in #products_relation are DISTINCT
2019-10-30 19:04:28 +00:00
Matt-Yorkley
6d50176e6b
Ensure results in #variants_relation are DISTINCT
2019-10-30 17:13:52 +00:00
Pau Pérez Fabregat
d6d2c19dc7
Merge pull request #4398 from Matt-Yorkley/db_indexes
...
Add order_cycle_id and distributor_id indexes to spree_orders table
2019-10-30 16:36:23 +01:00
Pau Pérez Fabregat
f897478736
Merge pull request #4402 from coopdevs/task-to-remove-unused-enterprise
...
Task to remove an unused enterprise
2019-10-30 16:34:28 +01:00
Pau Pérez Fabregat
064b86da5d
Merge pull request #4407 from luisramos0/fix_sample_data
...
Add tax category to sample products
2019-10-30 15:37:53 +01:00
Pau Pérez Fabregat
f7b58300f9
Merge pull request #4362 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.3
...
Bump activerecord-import from 1.0.2 to 1.0.3
2019-10-30 15:13:47 +01:00
luisramos0
0fe4edfbf5
Make product_tag_rules_filterer_spec a bit more flexible and not test for the order of the elements
2019-10-30 11:06:25 +00:00
luisramos0
f45eb35eb1
Make user_registrations_controller_spec keep I18n.locale as it was before the spec, so that other specs wont fail
2019-10-30 10:43:46 +00:00
Luis Ramos
1a0e99dce2
Merge pull request #4414 from openfoodfoundation/dependabot/bundler/fuubar-2.5.0
...
Bump fuubar from 2.4.1 to 2.5.0
2019-10-30 10:12:19 +00:00
lin-d-hop
c477f8c230
Update end date on delivery report to ensure all of todays orders are included
2019-10-29 19:47:38 +00:00
dependabot-preview[bot]
d7caf91de1
Bump fuubar from 2.4.1 to 2.5.0
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-29 19:30:45 +00:00
Luis Ramos
1e2ab27cda
Merge pull request #4327 from kristinalim/feature/4315-prefill_dates_in_orders_and_fulfillment_report
...
4315 Set default date range for Orders and Fulfillment report
2019-10-29 11:11:59 +00:00
Luis Ramos
3e7bd7dc19
Merge pull request #4376 from luisramos0/ghosts
...
Remove product from Order Cycles if product supplier changes
2019-10-28 21:17:48 +00:00
luisramos0
c60261a847
Make taxonomies edit page use api route instead of spree_api route that is now gone.
2019-10-28 16:01:23 +00:00
luisramos0
11fea650d6
Remove inexistent routes api/enterprises/managed and api/enterprises/acessible
...
The :managed endpoint was delete here 1d92d6cc33
2019-10-28 16:01:23 +00:00
luisramos0
92f1fa3b52
Remove dead route api/orders/managed
2019-10-28 16:01:23 +00:00
luisramos0
ad52022927
Add feature spec to cover api api generation in admin user edit form
2019-10-28 16:01:22 +00:00
luisramos0
9cffe48c70
Do not use Spree.t in spree admin users
2019-10-28 16:01:22 +00:00
luisramos0
d006ded439
Convert spree admin users api fields partial from erb to haml
2019-10-28 16:01:22 +00:00
luisramos0
b2e5ff46a8
Bring missing admin user edit form api_fields partial from spree_api and insert into the form (there was a deface override in spree_api injecting it before)
2019-10-28 16:01:22 +00:00
luisramos0
f46e0a2a31
Remove outdated comment, action managed has already been removed
2019-10-28 16:01:22 +00:00
luisramos0
dd66df6379
Remove dead routes api/order_cycles, these endpoints were removed in PR 4059 because they were unused, implemented in rabl and not correctly named for the future
2019-10-28 16:01:22 +00:00
luisramos0
d7b9dc1190
Fix some rubocop issues
2019-10-28 16:00:36 +00:00
luisramos0
5b6efaf687
Delete now unused rabl template authorise_api
2019-10-28 16:00:36 +00:00
luisramos0
8aab9bacbe
Delete now irrelevant authorize_api endpoint and logic
...
OFN API is now authenticating all users, if no session and no key is provided an anonymous user will be created so that user can access public endpoints, authorization is then done at each individual endpoint. This makes this spree api auth call irrelevant
2019-10-28 16:00:36 +00:00
luisramos0
66fdbe4379
Remove spree_api dependency. Spree_api will keep being a dependency until we remove spree_backend as a dependency but now ofn works without spree_api
2019-10-28 16:00:36 +00:00
luisramos0
abcc22c34b
Merge Spree::Api::BaseController with Api::BaseController. All api controllers inherit from Api::BaseController now. We can probably simplify this controller even more now
2019-10-28 16:00:36 +00:00
luisramos0
0d34b607c3
Move spree/api/base_controller#find_product to api/product_controller where it is used exclusively
...
Also, product_scope stops being an override
2019-10-28 16:00:36 +00:00
luisramos0
f840179573
Remove .json from Spree.routes.orders_api. This path is only used to compose the order shipments path and thus cannot have the .json
2019-10-28 16:00:36 +00:00
luisramos0
b5a521476b
Remove unused method from api/base_controller
2019-10-28 16:00:36 +00:00
luisramos0
7c64777a50
Remove requires_authentication check from api/base_controller. OFN api does not require auth, it always generates an anonymous user for public endpoints
2019-10-28 16:00:36 +00:00
luisramos0
c98b4b276b
Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes AND move spree/api/orders route to ofn api/orders route
2019-10-28 16:00:36 +00:00
luisramos0
f1138709aa
Add spree_api translation keys, mostly from api standard errors and api fields in admin/users
2019-10-28 16:00:36 +00:00
luisramos0
b29983ac60
Add AMS versions of the error responses in api/base_controller and cover not_found case with a unit test
2019-10-28 16:00:36 +00:00
luisramos0
91188c5724
Adapt api/base_controller_spec from spree/api/base_controller_spec
2019-10-28 16:00:36 +00:00
luisramos0
bf291ec318
Move spree/api/base_controller_spec to api/base_controller_spec
2019-10-28 16:00:36 +00:00
luisramos0
5846593637
Remove dependency to spree_api rabl responders, we should only use AMS from now on
2019-10-28 16:00:36 +00:00
Luis Ramos
688dad2334
Merge pull request #4384 from chaserx/4378_display_customer_name_on_orders_table
...
adds the full_name of the customer ordering beneath email
2019-10-28 15:52:54 +00:00
Luis Ramos
6d419d60ae
Merge pull request #4405 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.2
...
Bump bugsnag from 6.12.1 to 6.12.2
2019-10-28 11:37:30 +00:00
luisramos0
0dc8ae1561
Merging find_product and find_variant into one single method
...
This fixes rubocop issue, class has too many lines
2019-10-27 20:09:42 +00:00
luisramos0
f396f6bebd
Add tax category to sample products
2019-10-27 19:59:35 +00:00
luisramos0
07fcc8f361
Refactor ExchangeVariantDeleter.new.delete out of update_product_only_attributes into correct place update_product
...
Also extracted find_product from update_attributes and find_variant out of create_or_update_variant to make code simpler
2019-10-27 19:13:57 +00:00
Pau Pérez Fabregat
237cd5438b
Merge pull request #4373 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.0
...
Bump i18n-js from 3.3.0 to 3.4.0
2019-10-25 13:47:25 +02:00
Pau Pérez Fabregat
4e366d0f2e
Merge pull request #4390 from Matt-Yorkley/3831_flaky_spec
...
Fix flaky product import spec
2019-10-25 13:42:54 +02:00
dependabot-preview[bot]
fb3af77d0b
Bump bugsnag from 6.12.1 to 6.12.2
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.12.1 to 6.12.2.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.1...v6.12.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-24 19:19:06 +00:00
Luis Ramos
1fa6e4bea8
Merge pull request #4385 from chaserx/4304_fixes_missing_translation
...
adds missing :spree to i18n scopes
2019-10-24 17:06:50 +01:00
Luis Ramos
498a2b7462
Merge pull request #4386 from andrewjprice/missing-translations-inventory-page
...
Missing translations inventory page
2019-10-24 17:06:43 +01:00
Pau Perez
80edfe469c
Task to remove limit of ent. that can be created
...
It does so by updating a user's enterprise_limit attribute to the
maximum integer the database supports.
This is used at least in Katuma to remove the limitation of the number
of enterprises a user can create. This is the agreement the community
reached for the pricing plans.
Eventually, this logic could be triggered with a button from the UI but
for now this is for internal usage only.
2019-10-24 15:53:43 +02:00
Pau Perez
b2616d317f
Task to remove an unused enterprise
...
Note this task is still rather naive and only covers the simple case
where an enterprise was created but never used and thus, does not have
any associated entities like orders.
This is enough for the case I have at hand where a hub's manager created
an enterprise while he wanted to create a user account #ux. He ended up
with an enterprise named after him and now he asked us to clean that up.
2019-10-24 15:23:54 +02:00
Matt-Yorkley
0ac0bdc381
Update all locales with the latest Transifex translations
2019-10-23 21:20:11 +01:00
Matt-Yorkley
1a756cbc6b
Merge pull request #4387 from openfoodfoundation/transifex
...
Transifex
2019-10-23 21:17:20 +01:00
Matt-Yorkley
34466c8218
Add order_cycle_id and distributor_id indexes to spree_orders table
2019-10-23 18:29:34 +01:00
Matt-Yorkley
00e869f40c
Merge pull request #4393 from mkllnk/4392-rescue-network-fails
...
Avoid asking the cloud if an image exists
2019-10-23 16:55:49 +01:00
luisramos0
42cd9a5152
Remove menu entry option types because this page is not really usable
...
We keep the underlying data structures because option types and option values are used internally to keep units in OFN: weight, volume and items, but otherwise, custom option types are no longer possible in OFN
2019-10-23 12:57:47 +01:00
luisramos0
cc342387cc
Make all calls to content_for use dash not equals when setting content_for
2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3
Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial
2019-10-23 12:26:18 +01:00
Transifex-Openfoodnetwork
e849c4867b
Updating translations for config/locales/nb.yml
2019-10-23 18:58:07 +11:00
Maikel Linke
ada34d27ca
Avoid asking the cloud if an image exists
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4392
Amazon's DNS is failing at the moment and some users can't access the
admin panel because of this error.
While `exists?` asks the storage server if the file is actually there,
`file?` just checks if we have the file name stored in the database
and the file should be there. It's much faster and less error prone.
2019-10-23 11:36:20 +11:00
Dan Ingenthron
40c329ba68
Distinguish between simple create form and full interface in OC feature spec
2019-10-22 17:41:38 -05:00
Dan Ingenthron
3c7af90dfa
Revert I18n change and reflect correct required fields on OC form
2019-10-22 17:41:38 -05:00
Dan Ingenthron
241e581779
Add required fields to order cycle spec
2019-10-22 17:41:38 -05:00
Dan Ingenthron
85dede84cc
Update order cycle forms & en.yml to include asterisks
2019-10-22 17:41:37 -05:00
Transifex-Openfoodnetwork
0288dfc992
Updating translations for config/locales/ar.yml
2019-10-23 07:18:46 +11:00
luisramos0
3372339907
Fix default stock translation by using t filter instead of t function
2019-10-22 17:29:04 +01:00
Matt-Yorkley
f7bb609546
Fix flaky product import spec
2019-10-22 12:02:11 +01:00
Luis Ramos
02c0b89fa0
Merge pull request #4345 from Matt-Yorkley/shopfront_pagination
...
Shopfront pagination
2019-10-21 16:02:12 +01:00
luisramos0
f57c9d4a25
Fix rubocop issue in product_set.update_product_only_attributes: method has too many lines
2019-10-21 15:20:53 +01:00
luisramos0
783c3c9e90
Add spec to product set to cover case where product and variants attributes are both provided and the product supplier is not, in that case, ExchangeVariantDeleter would not execute and update_product_only_attributes would return nil cancelling update_product_variants from being executed. Now, update_product_only_attributes always returns true if product.save suceeeds, no matter what ExchangeVariantDeleter returns
2019-10-21 14:45:27 +01:00
luisramos0
44753d0320
Add spec coverage for case in product_set where variants_attributes are used
2019-10-21 13:27:21 +01:00
luisramos0
dd7d5803ba
Add new context to spec so that some basic setup can be shared with new specs that will be added, it's mostly indentation here
2019-10-21 13:01:39 +01:00
Luis Ramos
c9e23154d8
Merge pull request #4352 from tkusuki/fix-translation-in-enterprise-welcome-email
...
Add missing translation in non English enterprise welcome email
2019-10-21 11:41:53 +01:00
Rachel Arnould
279b633513
Add welcome board to the contributing page
2019-10-21 12:19:01 +02:00
Transifex-Openfoodnetwork
9d0ac79983
Updating translations for config/locales/pt_BR.yml
2019-10-21 11:29:14 +11:00
Andrew
deb17f47a7
Add default_stock to en.yml and _products_variants
2019-10-19 16:33:31 -07:00
Chase Southard
61ee0f04a6
adds missing :spree to i18n scopes
2019-10-19 13:55:11 -04:00
Chase Southard
353804a3fa
adds the full_name of the customer ordering beneath email
2019-10-19 12:32:59 -04:00
Andrew
598426a5e9
Add Save Changes button translation
2019-10-18 22:18:54 -07:00
Matt-Yorkley
7b0c55e15a
Ensure producer properties are included in properties results
2019-10-18 21:15:13 +01:00
Matt-Yorkley
cbe2477d04
Fix property filters and improve test coverage
2019-10-18 21:15:13 +01:00
Matt-Yorkley
c730958fe4
Restrict search params passed to ProductsRenderer
2019-10-18 21:15:13 +01:00
Matt-Yorkley
37e5e1923c
Improve filter buttons UX
2019-10-18 21:15:13 +01:00
Matt-Yorkley
542c1bf684
#slice :params in controller and rename to :args in service context
2019-10-18 21:15:13 +01:00
Matt-Yorkley
06c896b93b
Add spec for Api::ProductSerializer
2019-10-18 21:15:13 +01:00
Matt-Yorkley
6433d69d02
Add comments on scoping ProductsRenderer results
2019-10-18 21:15:13 +01:00
Matt-Yorkley
bf8c632fce
Refactor ProductsCtrl request params
2019-10-18 21:15:13 +01:00
Matt-Yorkley
b3c89a9d6c
Move OpenFoodNetwork::ProductsRenderer (lib) to ProductsRenderer (service) and refactor
2019-10-18 21:15:13 +01:00
Matt-Yorkley
d45403f1d4
Add specs for Api::OrderCyclesController
2019-10-18 21:15:13 +01:00
Matt-Yorkley
f2affe80cd
Reduce assignment branching and complexity for ProductsRenderer#products
2019-10-18 21:15:13 +01:00
Matt-Yorkley
573a69477f
Fix filters not updating on OC change
2019-10-18 21:15:13 +01:00
Matt-Yorkley
c6ce516129
Fix prices not updating with new exchange fees when changing OC
2019-10-18 21:15:13 +01:00
Matt-Yorkley
2539b84b33
Fix product.meta_keywords not searchable
2019-10-18 21:15:13 +01:00
Matt-Yorkley
dd6d0d25da
Fix problematic feature specs
2019-10-18 21:15:13 +01:00
Matt-Yorkley
c54cff10d4
Adjust API endpoint params
2019-10-18 21:15:13 +01:00
Matt-Yorkley
ab330e882e
Remove product cache
2019-10-18 21:15:11 +01:00
luisramos0
a50ae3f8ce
Clarify the API of product_set class by making all other methods to private
2019-10-18 10:37:23 +01:00
luisramos0
9f3b4100c3
Improve code by incorporating code review feedback
2019-10-18 10:26:03 +01:00
luisramos0
b625ea0c61
Extract to class ExchangeVariantDeleter
2019-10-17 19:13:45 +01:00
luisramos0
8857404ddf
Remove product variants from all Order Cycles if supplier is changed
2019-10-17 19:12:24 +01:00
luisramos0
49f98422fd
Remove product from Order Cycles if supplier changes as with a new supplier the rules/permissions to add a product to an Order Cycle may be different
2019-10-17 17:47:15 +01:00
Maikel Linke
20cabe6f12
Update from Transifex
2019-10-17 17:11:10 +11:00
Maikel
fe849b8dfd
Merge pull request #4367 from openfoodfoundation/transifex
...
Transifex
2019-10-17 17:07:23 +11:00
Luis Ramos
167b44c30f
Merge pull request #4365 from kristinalim/fix/4308-eager_load_associations_in_orders_and_fulfillment_reports
...
4308 Eager-load associations in Orders and Fulfillment reports
2019-10-16 21:39:30 +01:00
Luis Ramos
ad247e2116
Merge pull request #4268 from luisramos0/add_order_endpoint
...
Add api/orders/{order_number} API endpoint
2019-10-16 21:22:27 +01:00
Luis Ramos
e46875376e
Merge pull request #4168 from mkllnk/4160-product-report-filters
...
4160 Fix product report filters
2019-10-16 14:47:55 +01:00
Jackson Bates
4d49dc3689
adds line breaks to methods for readability
2019-10-16 23:01:38 +11:00
Luis Ramos
d7223c508a
Merge pull request #4289 from luisramos0/spree_be_config_general
...
Move general_settings, mail_methods and image_settings from spree_backend to OFN
2019-10-16 12:08:36 +01:00
Kristina Lim
a91a23aa39
Eager-load associations for Orders and Fulfillment report subtypes
2019-10-16 19:06:35 +08:00
luisramos0
04bf5a8742
Convert images views from erb to haml
2019-10-16 11:58:08 +01:00
Jackson Bates
8d30dc997f
adds better description to specs and refactors editProductUrl and confirm_unsaved_changes
2019-10-16 21:55:52 +11:00
luisramos0
6bc0d505e4
Fix some rubocop issues
2019-10-16 10:40:16 +01:00
luisramos0
9a0f1adfd2
Reorganize/simplify before filters
2019-10-16 10:40:09 +01:00
Luis Ramos
370f66e36b
Merge pull request #4364 from kristinalim/refactor/4308-refactor_orders_and_fulfillment_report_types
...
4308 Refactor Orders and Fulfillment report subtypes
2019-10-16 10:30:24 +01:00
Luis Ramos
f7cdcf02e0
Merge pull request #4343 from openfoodfoundation/dependabot/bundler/oauth2-1.4.2
...
Bump oauth2 from 1.4.1 to 1.4.2
2019-10-16 10:29:25 +01:00
luisramos0
1eafb1a3fe
Bring specs from spree_backend to payment methods controller spec
2019-10-15 18:49:35 +01:00
luisramos0
cf40bfa58e
Simbolize keys in opts hash in xero report so that opts access works again
2019-10-15 18:05:40 +01:00
Matt-Yorkley
8e03f402b1
Use Ruby 2.2.10
2019-10-15 14:59:24 +01:00
Pau Pérez Fabregat
1ee43fb495
Merge pull request #4358 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.0
...
Bump rspec-rails from 3.8.2 to 3.9.0
2019-10-15 10:25:23 +02:00
dependabot-preview[bot]
5a84a3688b
Bump i18n-js from 3.3.0 to 3.4.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.3.0...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-15 04:57:00 +00:00
Transifex-Openfoodnetwork
e139d24639
Updating translations for config/locales/en_CA.yml
2019-10-15 12:06:18 +11:00
luisramos0
ec3c3aa644
Bring images views from spree_backend
2019-10-15 00:02:40 +01:00
luisramos0
0f128f43f9
Merge images controller decorator with the controller brought from spree_backend
2019-10-15 00:02:16 +01:00
luisramos0
ea9f3ad6a0
Bring images controller from spree_backend so we can merge it with ofn's decorator
2019-10-15 00:00:54 +01:00
luisramos0
e48ac64d37
Prepare spec to integrate some specs coming from spree_backend
2019-10-14 23:17:43 +01:00
luisramos0
1c257cca3f
Merge payment methods controller brought from spree_backend with its decorator that was in OFN
2019-10-14 23:14:09 +01:00
luisramos0
c51e4d657a
Bring payment method controller from spree_backend
2019-10-14 23:09:23 +01:00
Luis Ramos
0dfe749496
Merge pull request #4356 from kristinalim/fix/4256-set_dalli_value_max_size
...
4256 Configure dalli store value max bytes from env variable
2019-10-14 18:41:00 +01:00
Luis Ramos
d6eade6fa3
Merge pull request #4363 from jonleighton/fix-docker-setup
...
Fix error during first run of docker-compose
2019-10-14 13:38:04 +01:00
Luis Ramos
109aed684e
Merge pull request #4344 from openfoodfoundation/dependabot/bundler/ddtrace-0.28.0
...
Bump ddtrace from 0.27.0 to 0.28.0
2019-10-14 12:39:52 +01:00
Luis Ramos
35d76ac991
Merge pull request #4298 from luisramos0/variant_edit
...
Make unit description visible in the variant edit page even for products which variant_unit is items
2019-10-13 19:54:41 +01:00
Luis Ramos
1ab9e9d7a5
Merge pull request #4299 from luisramos0/drop_order_ship_method_id
...
Remove unused field orders.shipping_method_id
2019-10-13 19:54:13 +01:00
Luis Ramos
e5e716e150
Merge pull request #4336 from openfoodfoundation/dependabot/bundler/rubyzip-1.3.0
...
[Security] Bump rubyzip from 1.2.2 to 1.3.0
2019-10-13 19:53:48 +01:00
Luis Ramos
b6510c3ab6
Merge pull request #4262 from daningenthron/daningenthron/default-shipping-category
...
Prefill shipping category forms with default values
2019-10-13 19:52:43 +01:00
Transifex-Openfoodnetwork
a158a986c6
Updating translations for config/locales/en_US.yml
2019-10-11 13:06:17 +11:00
Kristina Lim
c7643db66f
Remove unnecessary Orders and Fulfillment lines in .rubocop_manual_todo.yml
2019-10-10 21:05:06 +08:00
Kristina Lim
eb8c22aa06
Disable violated cops in Order and Fulfillment report subtypes
2019-10-10 21:01:46 +08:00
Kristina Lim
d0656485d7
Make report_klass in OrdersAndFulfillmentsReport compact
2019-10-10 21:01:46 +08:00
Kristina Lim
640cc1b6d3
Address Metrics/LineLength in Orders and Fulfillments reports
2019-10-10 21:01:45 +08:00
Kristina Lim
d65d17a9f3
Freeze report type string in Order and Fulfillment reports
2019-10-10 21:01:45 +08:00
Kristina Lim
bbea00e431
Delegate methods in Orders and Fulfillment report to report object
2019-10-10 21:01:45 +08:00
Kristina Lim
3cecba70e8
Refactor and memoize report object in Orders and Fulfillment report
2019-10-10 21:01:44 +08:00
Kristina Lim
8bbff09066
Refactor report class in Orders and Fulfillment report
2019-10-10 21:01:44 +08:00
Kristina Lim
a7a89d7ccb
Add attr reader for report type in Orders and Fulfillment report
2019-10-10 21:01:44 +08:00
Kristina Lim
3ccf76ff5f
Add smoke test for Customer Totals report
2019-10-10 21:01:34 +08:00
Kristina Lim
6004208496
Move specific logic for Customer Totals report to class
2019-10-10 20:05:35 +08:00
Kristina Lim
3ce9c712cf
Add smoke test for Distributor Totals by Supplier report
2019-10-10 20:05:35 +08:00
Kristina Lim
bfb0032fd2
Move specific logic for Distributor Totals by Supplier report to class
2019-10-10 20:05:29 +08:00
Kristina Lim
fe37516ead
Add smoke test for Supplier Totals by Distributor report
2019-10-10 19:58:49 +08:00
Kristina Lim
289b75e143
Move specific logic for Supplier Totals by Distributor report to class
2019-10-10 19:57:41 +08:00
Kristina Lim
09f0f8c33f
Move "order_cycle_supplier_totals" report type to constant
2019-10-10 19:54:29 +08:00
Kristina Lim
8bc1718978
Add smoke test for Supplier Totals report
2019-10-10 19:50:28 +08:00
Kristina Lim
cbfce69a6d
Move specific logic for Supplier Totals report to class
2019-10-10 19:48:59 +08:00
Kristina Lim
4e0ecdd44c
Rename params in OrdersAndFulfillmentsReport to options
2019-10-10 15:57:51 +08:00
Jon Leighton
23ab9a4bed
Fix error during first run of docker-compose
...
Prior to this commit, the db container would create a database named
“ofn” (the same as $POSTGRES_USER).
Then, when the web container started, it would run `rake db:reset`. This
would load the Rails environment, which ends up requiring some model
files, which eventually end up trying to connect to the
“open_food_network_dev” database, which doesn’t exist. Therefore setting
up the database fails, and it’s impossible to boot the web container.
As a side note, I’m not convinced that bootstrapping the database as
part of the container’s command is the best strategy (if for no other
reason that this will wipe my database every time I run `docker-compose
up`). But this commit doesn’t change that.
What it does is add the $POSTGRES_DB environment variable so that the db
container creates the “open_food_network_dev” database (which is blank).
Then, when `rake db:reset` runs, it’ll successfully connect to this
(empty) database while loading the environment, before deleting and recreating it.
Note that I had to manually delete the `openfoodnetwork_postgres` volume
in order to reset my local state, after making this change.
2019-10-10 12:17:22 +11:00
Maikel Linke
f623446e3e
Avoid additional query in inventory reports
2019-10-10 11:11:14 +11:00
Maikel Linke
6944fe1e46
Make order cycle filter chainable with other filters
2019-10-10 10:06:36 +11:00
Maikel Linke
7c9e3d7f06
Spec combination of all variant filters
2019-10-10 10:06:36 +11:00
dependabot-preview[bot]
614dc5d255
Bump activerecord-import from 1.0.2 to 1.0.3
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.2...v1.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-09 21:47:12 +00:00
Matt-Yorkley
da7456e6e0
Remove old shop/products route, action, and spec
2019-10-09 17:27:00 +01:00
Matt-Yorkley
f134cd9473
Extract tag_rule filtering into separate service
2019-10-09 17:26:58 +01:00
Dan Ingenthron
bdcadf9fc6
Update changes to reflect new non-Spree shipping method controller
2019-10-08 18:37:16 -05:00
Dan Ingenthron
9b7139fd45
Add default shipping category during object creation; revert forms
2019-10-08 18:37:16 -05:00
Dan Ingenthron
543e275d2e
Add custom shipping category to pass package spec
2019-10-08 18:37:16 -05:00
Dan Ingenthron
560fa6b949
Update shipping category factory with default
2019-10-08 18:37:16 -05:00
Dan Ingenthron
dbf34da87b
Rubocop fixes
2019-10-08 18:37:16 -05:00
Dan Ingenthron
d6022062e1
Use default for create product spec; auto-fill field
2019-10-08 18:37:16 -05:00
Dan Ingenthron
b082d3301b
Add prechecked category to shipping method spec
2019-10-08 18:37:16 -05:00
Dan Ingenthron
48cd542138
Service spec
2019-10-08 18:37:15 -05:00
Dan Ingenthron
e2d341c9c2
Add default category to seeds
2019-10-08 18:37:15 -05:00
Dan Ingenthron
89873a2640
Add and auto-check default category in shipping method create
2019-10-08 18:37:15 -05:00
Dan Ingenthron
b4be2cc2d4
Add default shipping category service and update create product form
2019-10-08 18:37:15 -05:00
Dan Ingenthron
35f89a9750
Update spec to prefill shipping category in Create form
2019-10-08 18:37:15 -05:00
Dan Ingenthron
592a53b6f5
Remove blank option from shipping category dropdown
2019-10-08 18:37:15 -05:00
dependabot-preview[bot]
eab9d42eb0
Bump rspec-rails from 3.8.2 to 3.9.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-08 20:56:10 +00:00
Kristina Lim
cf05369ca9
Configure dalli store value max bytes from env variable
2019-10-08 17:58:43 +08:00
Matt-Yorkley
e96252f2ed
Add tag_rules logic to main query before pagination
2019-10-08 10:11:24 +01:00
Matt-Yorkley
06e1f56ae9
Extract filter list fetching into a separate endpoint
2019-10-08 10:11:24 +01:00
Matt-Yorkley
fe0de98821
Add pagination in Angular and views
2019-10-08 10:11:22 +01:00
luisramos0
5077b0e625
Update all locales with the latest Transifex translations
2019-10-08 10:02:54 +01:00
Luis Ramos
1299c0b5eb
Merge pull request #4339 from openfoodfoundation/transifex
...
Transifex
2019-10-08 09:40:54 +01:00
luisramos0
a2bc61cb4d
Remove unused field orders.shipping_method_id
2019-10-08 09:09:19 +01:00
Pau Pérez Fabregat
057572a445
Merge pull request #4321 from luisramos0/fix_pt_br
...
Delete old pt-BR translations file (it's now correctly called pt_BR)
2019-10-08 08:49:12 +02:00
Pau Pérez Fabregat
3403ab4162
Merge pull request #4340 from openfoodfoundation/sigmundpetersen-patch-1
...
Delete ISSUE_TEMPLATE.md
2019-10-08 08:48:47 +02:00
Thais Kusuki
d997b8f5ee
Change translations from enterprise_mailer to lazy lookup
2019-10-07 23:29:11 -03:00
agustina
cf3f321632
Added color to links in WYSIWYG editor
2019-10-07 12:15:37 -03:00
Luis Ramos
9a036d18b7
Merge pull request #4271 from luisramos0/no_obsolete_master
...
Remove logic related to master variants in Exchanges and migrate data
2019-10-07 15:22:53 +01:00
luisramos0
f2b57057cd
Add migration to delete all master variants from exchanges and replace them with standard variants
2019-10-07 14:53:44 +01:00
luisramos0
95bc8fa984
Remove logic from OrderCycleDistributedProducts related to obsolete master variants in OCs, this is a condition that will never happen now since we ensure products always have a standard variants
...
A migration will be added as well to clean up any very old master variants available in order cycles
2019-10-07 14:53:44 +01:00
Luis Ramos
54c44c33eb
Merge pull request #4324 from Matt-Yorkley/reports_memoize
...
Reports memoization
2019-10-07 13:20:03 +01:00
Luis Ramos
8a732568e7
Merge pull request #4325 from kristinalim/feature/4312-remove_find_variant_in_orders_and_fulfillment_report
...
4312 Use association instead of OrderAndFulfillmentsReport#find_variant
2019-10-07 11:38:37 +01:00
Thais Kusuki
797a3ad091
Add missing translation in non English enterprise welcome email
2019-10-05 12:50:12 -03:00
Pau Pérez Fabregat
f4523f0305
Merge pull request #4350 from luisramos0/docker
...
Update ruby version in dockerfile and in getting started
2019-10-04 16:21:22 +02:00
Transifex-Openfoodnetwork
56a7a49ea2
Updating translations for config/locales/es.yml
2019-10-04 21:23:11 +10:00
Transifex-Openfoodnetwork
7d1ae3bf67
Updating translations for config/locales/es.yml
2019-10-04 21:20:03 +10:00
Transifex-Openfoodnetwork
b9aa4e11da
Updating translations for config/locales/ca.yml
2019-10-04 21:19:57 +10:00
Matt-Yorkley
01d1e8243c
Add pagination to ProductsRenderer
2019-10-04 10:38:43 +01:00
Matt-Yorkley
a1a5c3b7fe
Add new Angular OrderCycleResource
2019-10-04 10:38:41 +01:00
Matt-Yorkley
bc826f73a1
Add temporary placeholder for API endpoint
2019-10-03 18:11:40 +01:00
Luis Ramos
96428c11c6
Merge pull request #4334 from Matt-Yorkley/products_renderer
...
Products renderer
2019-10-03 13:47:04 +01:00
Luis Ramos
c15660da0e
Merge pull request #4269 from luisramos0/spree_be_config
...
Move shipping_methods and shipping categories from spree_backend to OFN
2019-10-03 13:45:17 +01:00
Jackson Bates
7c264af0c2
updates specs for new edit button behaviour
2019-10-03 22:32:43 +10:00
Transifex-Openfoodnetwork
9ea05b0794
Updating translations for config/locales/de_DE.yml
2019-10-03 20:48:44 +10:00
luisramos0
c5b939c8ee
Update ruby version in dockerfile and in getting started
2019-10-02 23:45:23 +01:00
luisramos0
c5a17bcde0
Fix rubocop issues in feature specs related to configuration
2019-10-02 21:26:10 +01:00
luisramos0
b712ec7f13
Transpec feature specs brought from spre_backend
2019-10-02 21:26:09 +01:00
luisramos0
32a7f13dd2
Bring feature specs for configuration pages from spree_backend
2019-10-02 21:26:09 +01:00
luisramos0
713769b497
Fix rubocop issues in mail_methods_controller_spec
2019-10-02 21:26:09 +01:00
luisramos0
495de37620
Fix more rubocop issues in image_settings_controller_spec
2019-10-02 21:26:09 +01:00
luisramos0
05d24cf11a
Transpec image_setting_controller_spec
2019-10-02 21:26:09 +01:00
luisramos0
edd84530af
Fix simle rubocopo issues in image_settings ctrl spec
2019-10-02 21:26:09 +01:00
luisramos0
6677543de0
bring 2 specs from spree_backend to cover image_settings page and mail_methods page
2019-10-02 21:26:09 +01:00
luisramos0
30aa31252b
Fix simple rubocop issues in helpers
2019-10-02 21:26:09 +01:00
luisramos0
b83d74a609
Bring general_settings_helper from spree_backend
2019-10-02 21:26:09 +01:00
luisramos0
d31b50be3d
Bring spree/admin configuration routes to ofn
2019-10-02 21:26:09 +01:00
luisramos0
42e3f2f2f4
Convert spree/admin/mail_methods from erb to haml
2019-10-02 21:25:23 +01:00
luisramos0
96737da128
Add spree_backend mail methods views that are missing in ofn
2019-10-02 21:25:23 +01:00
luisramos0
7f9f0d840c
Merge decorators into controllers and remove decorators
2019-10-02 21:25:23 +01:00
luisramos0
686840e262
Fix basic rubocop issues in recently added controllers from spree_backend
2019-10-02 21:25:23 +01:00
luisramos0
2377b833ee
Bring general settings and image settings controllers that are overrides in ofn to ofn so we can merge them with their decorators in a second step
2019-10-02 21:25:23 +01:00
luisramos0
3f3c33bce6
Fix basic rubocop issues in newly added controller
2019-10-02 21:25:23 +01:00
luisramos0
e35eff95bb
Add mail_methods controller from spree_backend related to config
2019-10-02 21:25:23 +01:00
Luis Ramos
e6408161db
Merge pull request #4291 from luisramos0/spree_be_config_taxons
...
Move taxons and taxonomies from spree_backend to OFN
2019-10-02 21:13:12 +01:00
Luis Ramos
4540b32d3a
Merge branch 'master' into spree_be_config_taxons
2019-10-02 15:35:15 +01:00
Luis Ramos
9f8d2fddbc
Merge pull request #4292 from luisramos0/spree_be_config_tax
...
Move tax_rates, tax categories and tax settings from spree_backend to OFN
2019-10-02 15:33:32 +01:00
Luis Ramos
14047c620a
Merge branch 'master' into spree_be_config_tax
2019-10-02 15:31:25 +01:00
Luis Ramos
2be1c231f7
Merge pull request #4290 from luisramos0/spree_be_config_zones
...
Move zones, countries and states from spree_backend to OFN
2019-10-02 14:30:59 +01:00
Luis Ramos
c34646724c
Merge pull request #4254 from luisramos0/swagger
...
Update API swagger docs to reflect current API state
2019-10-02 10:31:13 +01:00
Luis Ramos
b731635270
Merge pull request #4303 from luisramos0/missing_translation
...
Add missing translation for order.shipment.state "on hand" (with a space between on and hand)
2019-10-02 10:27:33 +01:00
Transifex-Openfoodnetwork
c9a62fad4c
Updating translations for config/locales/nb.yml
2019-10-02 16:50:07 +10:00
Transifex-Openfoodnetwork
70169d477c
Updating translations for config/locales/nb.yml
2019-10-02 16:47:01 +10:00
Transifex-Openfoodnetwork
d95646ea98
Updating translations for config/locales/en_NZ.yml
2019-10-02 14:29:29 +10:00
Transifex-Openfoodnetwork
d50bf928e1
Updating translations for config/locales/de_DE.yml
2019-10-02 10:58:44 +10:00
Luis Ramos
3f7aff4b8b
Merge pull request #4305 from luisramos0/new_product_translations
...
Make translations in new product page relative and specific to the page
2019-10-01 22:38:49 +01:00
dependabot-preview[bot]
de9476a8a5
Bump ddtrace from 0.27.0 to 0.28.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.27.0 to 0.28.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.27.0...v0.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-01 21:12:18 +00:00
Sigmund Petersen
5fded022d4
Update README.md
...
Slack invite link changed
2019-10-01 23:09:47 +02:00
dependabot-preview[bot]
bce41a2247
Bump oauth2 from 1.4.1 to 1.4.2
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.1...v1.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-01 21:04:45 +00:00
Pau Pérez Fabregat
1f644f4020
Merge pull request #4281 from Matt-Yorkley/memcached-apm
...
Add memcached APM
2019-10-01 18:46:22 +02:00
Matt-Yorkley
cc11d4e5f0
Remove unused user parameter from OrdersAndFulfillmentsReport
2019-10-01 15:59:51 +01:00
Pau Pérez Fabregat
5ecac77aa5
Merge branch 'master' into memcached-apm
2019-10-01 16:58:01 +02:00
Matt-Yorkley
a5d2579c69
Pluck line_item ids instead of all line_items
2019-10-01 15:51:45 +01:00
Matt-Yorkley
112adb11db
Pass permissions object into OrdersAndFulfillMentsReport
2019-10-01 15:51:43 +01:00
Transifex-Openfoodnetwork
5fdc11bdc7
Updating translations for config/locales/fr.yml
2019-10-01 23:59:19 +10:00
Matt-Yorkley
c038b485b1
Rename service and methods to remove use of "shop" term
2019-10-01 14:43:47 +01:00
Jackson Bates
4c4bdd78e7
makes edit button action open a new tab
2019-10-01 22:13:28 +10:00
Luis Ramos
19eb93012c
Merge pull request #4326 from kristinalim/feature/4310-remove_shipments_count
...
4310 Do not count order shipments in Order#shipping_method
2019-10-01 11:17:42 +01:00
Luis Ramos
d998ec8453
Merge pull request #4331 from openfoodfoundation/dependabot/bundler/uglifier-4.2.0
...
Bump uglifier from 4.1.20 to 4.2.0
2019-10-01 11:11:35 +01:00
Luis Ramos
0c93665030
Merge pull request #4335 from Matt-Yorkley/remove_deprecations
...
Remove deprecation warnings from VariantStock methods
2019-10-01 10:59:57 +01:00
Luis Ramos
c4d298d732
Merge branch 'master' into remove_deprecations
2019-10-01 10:57:10 +01:00
dependabot-preview[bot]
36883bc051
[Security] Bump rubyzip from 1.2.2 to 1.3.0
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.2 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases )
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md )
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.2...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-01 09:55:53 +00:00
Luis Ramos
8c252fc160
Merge pull request #4341 from openfoodfoundation/dependabot/bundler/webmock-3.7.6
...
Bump webmock from 3.7.5 to 3.7.6
2019-10-01 10:53:54 +01:00
Pau Pérez Fabregat
c2f8803d72
Merge pull request #4297 from luisramos0/inv_levels
...
Remove all usages of Spree Config track_inventory_levels
2019-10-01 10:35:20 +02:00
dependabot-preview[bot]
07967275d8
Bump webmock from 3.7.5 to 3.7.6
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.5 to 3.7.6.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.5...v3.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-30 22:02:54 +00:00
Sigmund Petersen
c7db1b7fc0
Delete ISSUE_TEMPLATE.md
...
This ISSUE_TEMPLATE.md file is the old way of handling templates on Github. OFN is now using the new method for handling templates, so this file can be removed.
This template still comes up as 'Default template' when opening an issue from the Zenhub board. This gives 2 almost equal template choices which is confusing.
2019-09-30 21:18:51 +02:00
Rachel Arnould
fa57d71a23
Merge pull request #4332 from openfoodfoundation/RachL-patch-2
...
Update story template
2019-09-30 20:06:12 +02:00
Rachel Arnould
be5e7bd18d
Merge pull request #4330 from openfoodfoundation/RachL-patch-1
...
Update bug template
2019-09-30 20:05:51 +02:00
Transifex-Openfoodnetwork
5cfc2613ac
Updating translations for config/locales/en_GB.yml
2019-10-01 04:01:28 +10:00
Transifex-Openfoodnetwork
903eb23122
Updating translations for config/locales/en_GB.yml
2019-10-01 03:58:19 +10:00
Luis Ramos
d162e8c087
Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card
...
Translation: "Add new credit card"
2019-09-30 13:27:25 +01:00
Luis Ramos
75a56c2be5
Merge pull request #4293 from jasonk357/4031-change-user-email-alert
...
Improve user email change flash alert message
2019-09-30 13:19:40 +01:00
Luis Ramos
07a5963554
Merge pull request #4311 from mkllnk/rails3-deprecations
...
Replace deprecated validates_presence_of
2019-09-30 13:19:25 +01:00
luisramos0
a6888cf0be
Update all locales with the latest Transifex translations
2019-09-30 13:15:45 +01:00
Luis Ramos
ef35db6db2
Merge pull request #4296 from luisramos0/subs_line_items
...
Make subscription line items handle soft deleted variants
2019-09-30 13:07:10 +01:00
Rachel Arnould
375d4fbffd
Add workaround item
2019-09-30 11:02:36 +02:00
Matt-Yorkley
6153789055
Eager-load serialized objects in variant query
2019-09-29 20:44:48 +01:00
Matt-Yorkley
032741c54f
Refactor ProductsRenderer variants queries
...
This removes another N+1 and allows pagination applied to the inital query to also affect the returned variants
2019-09-29 17:41:58 +01:00
Matt-Yorkley
e9acf6e0de
Refactor #load_products and memoize
2019-09-29 14:30:04 +01:00
Matt-Yorkley
d5e90c3c6c
Extract #load_products logic into a new service
2019-09-29 00:10:47 +01:00
Kristina Lim
bb56e9a5b9
Set default date range for Orders and Fulfillment report
2019-09-28 02:39:41 +08:00
Matt-Yorkley
7e7429446d
Remove deprecation warnings from VariantStock methods
2019-09-27 17:28:16 +01:00
Matt-Yorkley
535e389fb4
Query variant stock including overrides
...
This allows the results to be properly filtered and paginated whilst showing the correct stock, and removes a big N+1
2019-09-27 17:25:52 +01:00
Matt-Yorkley
cecebb82f4
Move distributed products relation out from OrderCycleDistributedProducts
2019-09-27 17:25:50 +01:00
Pau Pérez Fabregat
49665ae360
Merge pull request #4167 from luisramos0/last_dedeface
...
Move app_wrapper deface to spree/layouts/admin view
2019-09-27 09:21:28 +02:00
Pau Pérez Fabregat
7e5c194515
Merge pull request #4295 from coopdevs/enable-datadog-analytics
...
Enable trace & search analytics in Datadog
2019-09-27 09:17:03 +02:00
Matt-Yorkley
fe0b3172c7
Move scoper to method
2019-09-27 01:52:45 +01:00
Matt-Yorkley
5b27ed6b9f
Remove unnecessary #deleted? check
...
It should be included in te default product scope
2019-09-27 01:52:29 +01:00
Matt-Yorkley
bef4741e31
Enable analytics in all APM services
2019-09-26 22:38:20 +01:00
Rachel Arnould
d604328bfb
Update story template
2019-09-26 21:25:01 +02:00
dependabot-preview[bot]
2af3de51c7
Bump uglifier from 4.1.20 to 4.2.0
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.20...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 19:21:05 +00:00
Rachel Arnould
d0c77a8dc4
Update bug template
2019-09-26 21:20:50 +02:00
Kristina Lim
8fc4ca6f65
Do not use OrderAndFulfillmentsReport#find_variant
2019-09-26 11:45:05 +08:00
Kristina Lim
721a0d3a98
Do not count order shipments in Order#shipping_method
2019-09-26 11:01:06 +08:00
JASON KNOEPFLER
c46fe7b675
encapsulate new unconfirmed email logic
2019-09-25 19:41:33 -07:00
luisramos0
bb372984e1
Deleting old pt-BR translations file, it's now called pt_BR with underscore
2019-09-25 11:26:06 +01:00
Luis Ramos
2489a2f5f5
Merge pull request #4294 from openfoodfoundation/transifex
...
Transifex
2019-09-25 11:22:58 +01:00
Transifex-Openfoodnetwork
a6698230fe
Updating translations for config/locales/en_NZ.yml
2019-09-25 20:13:57 +10:00
luisramos0
50731e929e
Remove some attributes from test as they are already verified subsequently
2019-09-25 09:54:33 +01:00
luisramos0
baa09b88f7
Fix issue with nil current_order where shipping_method serializer requires a current_order to calculate the shipping fees
2019-09-25 09:52:10 +01:00
Luis Ramos
2f3509bf9b
Merge pull request #4287 from luisramos0/mini_racer
...
Replace therubyracer with mini_racer.
2019-09-24 19:48:50 +01:00
Dan Ingenthron
e8f9ace8e6
Correct translation key on add card link
2019-09-24 13:42:31 -05:00
Luis Ramos
04270b6cec
Merge pull request #4286 from luisramos0/transpec
...
Finish transpec
2019-09-24 19:33:26 +01:00
Matt-Yorkley
1155931ea9
Merge pull request #4280 from luisramos0/knapsack
...
Update knapsack report
2019-09-24 19:26:27 +01:00
Maikel Linke
efd450606e
Replace deprecated validates_presence_of
...
This syntax has been deprecated in Rails 3:
https://guides.rubyonrails.org/3_0_release_notes.html#patches-and-deprecations
2019-09-24 19:16:05 +10:00
luisramos0
2f60a85593
Improve spec/controllers/api/orders_controller_spec, make it more readable
2019-09-23 23:50:42 +01:00
luisramos0
78cf35807a
Improve preloading of order query to avoid N+1 queries
2019-09-23 23:50:39 +01:00
luisramos0
f3bc038c05
Make translations in new product page relative and specific to the page
2019-09-23 17:02:30 +01:00
luisramos0
7817a40a35
Add missing translation for shipment state on hand with space between on and hand
2019-09-23 16:33:59 +01:00
Transifex-Openfoodnetwork
a18f6f5b8f
Updating translations for config/locales/fr_CA.yml
2019-09-24 01:01:41 +10:00
Transifex-Openfoodnetwork
403653381c
Updating translations for config/locales/en_CA.yml
2019-09-24 00:59:20 +10:00
luisramos0
eb85dccac1
Remove single letter variable names
2019-09-22 21:07:32 +01:00
luisramos0
f32454b404
Add feature spec to validate unit_description is editable for products with unit items, regression for #3649
2019-09-22 21:02:32 +01:00
luisramos0
591efecde6
Make unit description field visible in the variant edit page even for products which variant_unit is items
2019-09-22 16:42:03 +01:00
luisramos0
24afa21885
Revert "Change products controller to clear variants unit description if variant_unit is items"
...
This reverts commit 1a4e83d633 .
2019-09-22 16:31:26 +01:00
luisramos0
cd6d34663e
Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0
2019-09-22 15:25:24 +01:00
luisramos0
c66e5fe1e9
Make subscription line items handle soft deleted variants
...
This ensures subscription list page works. The variant can be removed from the subscription by the user in the edit subscription page
2019-09-22 14:59:59 +01:00
JASON KNOEPFLER
4ec8fcd3a6
Assign flash message var from conditional return
2019-09-21 08:10:58 -07:00
Pau Perez
88893a2968
Enable trace & search analytics in Datadog
...
This will enrich the quality of the reported traces for all web
frameworks in our stack. That means not only memcached as we did in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4266 but
PostgreSQL and Rails too.
After enabling, the Trace Search & Analytics page populates which allows
us to search traces and add APM queries to dashboards.
2019-09-21 14:09:27 +02:00
JASON KNOEPFLER
62599e8dfc
Edit user email feature spec
2019-09-20 15:28:25 -07:00
Transifex-Openfoodnetwork
b97c428f72
Updating translations for config/locales/pt_BR.yml
2019-09-21 04:00:00 +10:00
Transifex-Openfoodnetwork
42b074f02e
Updating translations for config/locales/pt_BR.yml
2019-09-21 03:56:52 +10:00
JASON KNOEPFLER
07e0951490
Change users#update email change flash alert
2019-09-20 10:35:25 -07:00
luisramos0
fc433ff8f0
Refactor ship methods controller destroy action: remove single action before_filter
2019-09-20 16:29:36 +01:00
luisramos0
8e33437fbb
MErge ship method controller decorator with the controller that came from spree
2019-09-20 15:59:24 +01:00
luisramos0
a5103c737d
Fix rubocop issues in ship methods controller from spree
2019-09-20 15:58:05 +01:00
luisramos0
37c8f42244
Bring shipping methods and categories controllers from spree_backend
2019-09-20 15:56:24 +01:00
luisramos0
0e8765636b
Bring tax_settings from spree_backend to ofn
2019-09-20 15:46:33 +01:00
luisramos0
6855e5c8f4
Fix rubocop issues in feature spec
2019-09-20 15:43:55 +01:00
luisramos0
a96b56239c
Transpec feature specs brought from spre_backend
2019-09-20 15:43:55 +01:00
luisramos0
4f9eee2682
Fix feature specs added from spree_backend in the configuration area
2019-09-20 15:43:55 +01:00
luisramos0
44761315c2
Bring feature specs for configuration pages from spree_backend
2019-09-20 15:43:55 +01:00
luisramos0
0d18b1a032
Bring spree/admin configuration routes to ofn
2019-09-20 15:43:55 +01:00
luisramos0
cc0dabcd1e
Convert spree/admin/tax_rates from erb to haml
2019-09-20 15:36:58 +01:00
luisramos0
e79c672263
Convert spree/admin/tax_categories from erb to haml
2019-09-20 15:36:54 +01:00
luisramos0
bc6f7934e0
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 15:35:49 +01:00
luisramos0
89029f46f9
Fix basic rubocop issues in newly added controller
2019-09-20 15:32:34 +01:00
luisramos0
144369e55f
Add tax related controllers from spree_backend related to config
2019-09-20 15:31:30 +01:00
luisramos0
3833cbbf73
Fix rubocop issues in feature spec
2019-09-20 15:24:26 +01:00
luisramos0
5b703a02cd
Transpec feature spec brought from spree_backend
2019-09-20 15:24:26 +01:00
luisramos0
1d4aebd3f9
Fix feature spec added from spree_backend
2019-09-20 15:24:15 +01:00
luisramos0
845a764320
Bring taxonomies feature spec from spree_backend
2019-09-20 15:24:06 +01:00
luisramos0
c66579a22f
Fix simple rubocop issues in helper
2019-09-20 15:24:06 +01:00
luisramos0
9291bf5c82
Bring taxons_helper from spree
2019-09-20 15:24:06 +01:00
luisramos0
4781ab93ef
Bring spree/admin configuration routes to ofn
2019-09-20 15:24:06 +01:00
luisramos0
def9ab7c47
Convert spree/admin/taxons from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2a68d34fb0
Convert spree/admin/taxonomies from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2ce56aef2c
Add spree_backend views related to admin/configuration taxonomies that are missing in ofn
2019-09-20 15:23:45 +01:00
luisramos0
20f965731d
Fix basic rubocop issues in recently added controller from spree_backend
2019-09-20 15:14:34 +01:00
luisramos0
8378dce752
Bring taxons config controller that is overriden in ofn to ofn so we can merge them with their decorator in a second step
2019-09-20 15:13:45 +01:00
luisramos0
d7a4e3a896
Add taxonomies controller from spree_backend
2019-09-20 15:12:38 +01:00
luisramos0
7d9de0ca70
Fix rubocop issues in feature specs
2019-09-20 15:07:34 +01:00
luisramos0
f9c6f09cd4
Transpec feature specs brought from spre_backend
2019-09-20 15:06:02 +01:00
luisramos0
4a83eca832
Fix feature specs added from spree_backend in the configuration area
2019-09-20 15:05:21 +01:00
luisramos0
4954db64b3
Bring feature specs for configuration pages from spree_backend
2019-09-20 15:04:45 +01:00
luisramos0
b2c4b97d94
Bring spree/admin configuration routes to ofn
2019-09-20 15:02:01 +01:00
luisramos0
32c1eecece
Convert spree/admin/zones from erb to haml
2019-09-20 15:01:06 +01:00
luisramos0
6d8c7a4bee
Fix minor detail in states and countries views
2019-09-20 14:57:48 +01:00
luisramos0
bd2045cad7
Convert spree/admin/states from erb to haml
2019-09-20 14:55:36 +01:00
luisramos0
e1c3d2442a
Convert spree/admin/countries from erb to haml
2019-09-20 14:55:10 +01:00
luisramos0
3df65d0463
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 14:54:55 +01:00
luisramos0
822a17f732
Fix basic rubocop issues in newly added controllers
2019-09-20 14:50:38 +01:00
luisramos0
ffde0307e2
Add controllers from spree_backend related to config
2019-09-20 14:50:01 +01:00
luisramos0
9e57807dc2
Replace therubyracer with mini_racer.
...
This is being replaced to increase the reliability and speed of asset compilation.
2019-09-20 11:22:07 +01:00
luisramos0
052bac196b
Fix problem in spec/features/consumer/shopping/shopping_spec introduced with transpec
2019-09-20 10:33:40 +01:00
luisramos0
00e789b95b
Force use of expect over should in spec expectations
2019-09-20 10:29:56 +01:00
luisramos0
a004822019
Transpec spec/features/consumer/shopping/shopping_spec
2019-09-20 10:16:08 +01:00
luisramos0
49f7b4c8e2
Transpec spec/features/consumer/shopping/cart_spec.rb
2019-09-20 10:11:02 +01:00
luisramos0
8b503b51ca
Fix typo in spec name
2019-09-20 10:03:52 +01:00
luisramos0
4e431ecf18
Transpec spec/features/consumer/shopping/products_spec.rb
2019-09-20 10:02:27 +01:00
luisramos0
81f8b127db
Transpec spec/features/consumer/authentication_spec.rb and spec/features/consumer/producers_spec.rb
2019-09-20 09:53:23 +01:00
luisramos0
f9f81086fd
Transpec features/consumer/shopping/variant_overrides_spec
2019-09-20 09:02:43 +01:00
Luis Ramos
9807b432f9
Merge pull request #4272 from openfoodfoundation/dependabot/bundler/webmock-3.7.5
...
Bump webmock from 3.7.4 to 3.7.5
2019-09-20 08:42:12 +01:00
luisramos0
6b0f3cd4f3
Transpec spec/performance/shop_controller_spec
2019-09-19 20:36:33 +01:00
luisramos0
3c412b7b7d
Transpec spec/controllers/api/taxonomies_controller_spec, spec/controllers/api/taxons_controller_spec and spec/models/enterprise_spec
2019-09-19 20:34:30 +01:00
luisramos0
c4e6c0af2b
Transpec features/consumer/registration_spec
2019-09-19 20:18:24 +01:00
Matt-Yorkley
e6387197ec
Add memcached APM
2019-09-19 19:48:16 +01:00
Luis Ramos
746c4f03f6
Merge pull request #4261 from jasonk357/3979-malformed-referer-error
...
Guard against malformed request referer
2019-09-19 17:29:18 +01:00
Kristina Lim
3535c4d564
Merge pull request #4240 from Matt-Yorkley/backorder_to_the_future_2
...
Disentangle on_demand and backordered
2019-09-20 00:05:27 +08:00
luisramos0
37abdb7727
Update knapsack report
2019-09-19 16:58:06 +01:00
luisramos0
bdb3dd5aaf
Fix long lines in app/serializers
2019-09-19 16:32:09 +01:00
luisramos0
25fbab2e37
Use memoized order method
2019-09-19 16:32:09 +01:00
luisramos0
4d37aaac64
Use have_http_status and remove check for error message, that's something for the base_controller test to test
2019-09-19 16:32:09 +01:00
luisramos0
19e28cb14a
Make spec/controllers/api/orders_controller_spec more simple assuming adjustments will always come in the same order
2019-09-19 16:32:09 +01:00
luisramos0
a44a251d96
Remove duplicated attributes tag from all serializers to create consistency
2019-09-19 16:32:09 +01:00
luisramos0
2921ee19e1
Add api/order/{order_number} ednpoint and its new order detailed serializer
2019-09-19 16:32:09 +01:00
luisramos0
6796d91a07
Add some basic attributes to address and order serializers that will be used in the order show api endpoint
2019-09-19 16:32:09 +01:00
luisramos0
69afcf7510
Improve readability in order permissions
2019-09-19 16:32:09 +01:00
dependabot-preview[bot]
47056e3cc1
Bump webmock from 3.7.4 to 3.7.5
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.4 to 3.7.5.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.4...v3.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-19 13:10:20 +00:00
Kristina Lim
311ee92e84
Update all locales with the latest Transifex translations
2019-09-19 17:08:17 +08:00
Kristina Lim
241e97d938
Merge pull request #4241 from openfoodfoundation/transifex
...
Transifex
2019-09-19 16:58:57 +08:00
Pau Pérez Fabregat
85b1ba8eae
Merge pull request #4263 from coopdevs/index-frequent-spree-orders-query
...
Index spree_orders on various columns
2019-09-19 10:12:54 +02:00
Pau Pérez Fabregat
baa4783141
Merge pull request #4260 from jasonk357/4184-delivery-report-default-range
...
Add default date range to Delivery Report
2019-09-19 09:58:06 +02:00
Transifex-Openfoodnetwork
ce40fcaf7b
Updating translations for config/locales/fr.yml
2019-09-19 07:44:00 +10:00
Luis Ramos
40438de7fe
Merge pull request #4250 from Matt-Yorkley/ruby-2.1.9
...
Bump Ruby version from 2.1.5 to 2.1.9
2019-09-18 11:39:15 +01:00
Luis Ramos
29dcd96fca
Merge pull request #4265 from openfoodfoundation/dependabot/bundler/simplecov-0.17.1
...
Bump simplecov from 0.17.0 to 0.17.1
2019-09-18 10:25:54 +01:00
Pau Pérez Fabregat
7fd6a7e654
Merge pull request #4270 from openfoodfoundation/dependabot/bundler/webmock-3.7.4
...
Bump webmock from 3.7.3 to 3.7.4
2019-09-18 10:11:11 +02:00
dependabot-preview[bot]
8f2a80f199
Bump webmock from 3.7.3 to 3.7.4
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.3 to 3.7.4.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.3...v3.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-17 19:21:37 +00:00
Pau Perez
ea41405209
Index spree_orders on various columns
...
The following query
```sql
SELECT spree_orders . *
FROM spree_orders
WHERE spree_orders . user_id = ?
AND spree_orders . completed_at IS ?
AND spree_orders . created_by_id = ?
ORDER BY created_at DESC LIMIT ?
```
performs quite badly even though LIMIT is always 1 because:
* ORDER BY requires sorting by a column which is not indexed therefore
a sequential scan is performed.
* Although `completed_at` is indexed, `user_id` and `created_by_id` are
not causing a sequential scan.
To make it worse this query is executed very often in the following
controllers among others also related to checkout:
* CartController#populate
* EnterprisesController#Shop
* LineItemsController#bought
* ShopController#products
* ShopController#order_cycle
In some cases this query alone accounts for 66.8% of the total time
of the endpoint.
Results
See by yourself. We move from 56.643ms to 0.077ms. Pretty neat.
```
openfoodnetwork=> explain analyze SELECT "spree_orders".* FROM "spree_orders" WHERE "spree_orders"."user_id" = 1 AND "spree_orders"."completed_at" IS NULL AND "spree_orders"."created_by_id" = 1 ORDER BY created_at DESC LIMIT 1;
QUERY PLAN
--------------------------------------------------------------------------------------------------------------------------
Limit (cost=11753.03..11753.04 rows=1 width=195) (actual time=56.580..56.580 rows=0 loops=1)
-> Sort (cost=11753.03..11753.04 rows=1 width=195) (actual time=56.578..56.578 rows=0 loops=1)
Sort Key: created_at DESC
Sort Method: quicksort Memory: 25kB
-> Seq Scan on spree_orders (cost=0.00..11753.02 rows=1 width=195) (actual time=56.571..56.571 rows=0 loops=1)
Filter: ((completed_at IS NULL) AND (user_id = 1) AND (created_by_id = 1))
Rows Removed by Filter: 256135
Planning time: 0.252 ms
Execution time: 56.643 ms
(9 rows)
openfoodnetwork=> CREATE INDEX ON spree_orders (completed_at, user_id, created_by_id, created_at);
CREATE INDEX
openfoodnetwork=> explain analyze SELECT "spree_orders".* FROM "spree_orders" WHERE "spree_orders"."user_id" = 1 AND "spree_orders"."completed_at" IS NULL AND "spree_orders"."created_by_id" = 1 ORDER BY created_at DESC LIMIT 1;
mit (cost=8.45..8.46 rows=1 width=195) (actual time=0.030..0.030 rows=0 loops=1)
-> Sort (cost=8.45..8.46 rows=1 width=195) (actual time=0.029..0.029 rows=0 loops=1)
Sort Key: created_at DESC
Sort Method: quicksort Memory: 25kB
-> Index Scan using spree_orders_completed_at_user_id_created_by_id_created_at_idx on spree_orders (cost=0.42..8.44 rows=1 width=195) (actual time=0.021..0.021 rows=0 loops=1)
Index Cond: ((completed_at IS NULL) AND (user_id = 1) AND (created_by_id = 1))
Planning time: 0.199 ms
Execution time: 0.077 ms
```
2019-09-17 17:02:14 +02:00
luisramos0
2683efdd3c
Add missing update to db/schema by running db:migrate
...
This was missed in PR 4242
2019-09-17 15:27:56 +01:00
Luis Ramos
ed1c154b78
Merge pull request #4252 from luisramos0/remove_clear_ship_address
...
On checkout of pickup orders, set ship_address to shipping_address_from_distributor instead of empty Spree::Address.default
2019-09-17 13:18:20 +01:00
Pau Pérez Fabregat
4aba2730f7
Merge pull request #4230 from openfoodfoundation/dependabot/bundler/ddtrace-0.27.0
...
Bump ddtrace from 0.26.0 to 0.27.0
2019-09-17 13:11:12 +02:00
Pau Pérez Fabregat
07ae51560e
Merge pull request #4259 from openfoodfoundation/dependabot/bundler/webmock-3.7.3
...
Bump webmock from 3.7.2 to 3.7.3
2019-09-17 09:32:21 +02:00
dependabot-preview[bot]
3c5c842bbf
Bump simplecov from 0.17.0 to 0.17.1
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-16 21:08:17 +00:00
Luis Ramos
e7e4508555
Merge pull request #4242 from Matt-Yorkley/another_cartastrophe
...
Soft-delete price objects
2019-09-16 17:18:39 +01:00
Luis Ramos
9a3b5d0700
Merge pull request #4257 from daningenthron/daningenthron/payment-method-translation
...
Fix typo on 'no payment methods' translation keys
2019-09-16 13:18:46 +01:00
Luis Ramos
46353be9a3
Merge pull request #4237 from coopdevs/unobfuscate-bulk-management-action
...
Add implicit #bulk_management including filter
2019-09-15 12:15:11 +01:00
JASON KNOEPFLER
91a52ead58
Guard against malformed request referer
2019-09-14 09:13:44 -07:00
JASON KNOEPFLER
0f55049eda
OrderCycleManagementReport sets default date range before querying for orders
2019-09-13 17:15:57 -07:00
Luis Ramos
83f1a7a9a9
Merge pull request #4258 from coopdevs/fix-test-example-name
...
Fix test example name
2019-09-13 23:04:45 +01:00
dependabot-preview[bot]
fac118fce2
Bump webmock from 3.7.2 to 3.7.3
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.2 to 3.7.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.2...v3.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-13 19:19:34 +00:00
Dan Ingenthron
5270cdaa32
Fixed typo on 'no payment methods' translation keys
...
Modified to remove edits to translation files. These will be updated via Transifex webhook.
2019-09-13 13:43:13 -05:00
luisramos0
caebcdf184
Add correct schemas for EnterpriseShopfront and Variant (not Api::Admin::VariantSerializer but Api::VariantSerializer)
2019-09-13 15:33:54 +01:00
luisramos0
c66a659e8e
Fix /products payloads: product, variants and variant overrides
2019-09-13 14:55:18 +01:00
luisramos0
b8b107dd2d
Fix api_key header name
2019-09-13 14:27:39 +01:00
Luis Ramos
ecf336fe51
Merge pull request #4244 from luisramos0/fix_truncate_data
...
Adapt db truncate task to ofn v2 by removing db tables from v1
2019-09-13 13:09:07 +01:00
Matt-Yorkley
a3efd13d46
Update existing Spree::InventoryItem records: change backordered state to on_hand.
2019-09-13 13:05:15 +01:00
Matt-Yorkley
2ff0169016
Replace hard-deleted prices with empty (0.00) price records
2019-09-13 12:55:24 +01:00
Pau Perez
08d37bbed7
Fix test example name
...
The name wasn't reflecting the method being tested.
2019-09-13 12:55:34 +02:00
Transifex-Openfoodnetwork
b71443ccd8
Updating translations for config/locales/ca.yml
2019-09-13 20:45:12 +10:00
Transifex-Openfoodnetwork
8fd3d9e03c
Updating translations for config/locales/es.yml
2019-09-13 20:42:43 +10:00
Transifex-Openfoodnetwork
787727872f
Updating translations for config/locales/ca.yml
2019-09-13 20:42:04 +10:00
Pau Pérez Fabregat
5bf72ae780
Merge pull request #4234 from coopdevs/remove-hidden-integrity-check
...
Remove integrity check for deleted variants in OCs
2019-09-13 11:27:41 +02:00
Pau Pérez Fabregat
290d00f17d
Merge pull request #4232 from coopdevs/remove-guard
...
Remove Guard and Guard-related gems
2019-09-13 11:25:29 +02:00
Pau Perez
3d7bbbbb19
Remove unused Guardfile
2019-09-13 08:25:54 +02:00
luisramos0
3d32987227
Fix taxonomies to represent the endpoints in OFN
2019-09-12 19:52:13 +01:00
luisramos0
902e51e580
Add api/customers endpoints
2019-09-12 19:11:53 +01:00
luisramos0
743cb3b33a
Add update product image endpoint and delete enterprise fees endpoint
2019-09-12 18:02:06 +01:00
luisramos0
74e49787f4
Add the remaining missing enterprises endpoints
2019-09-12 15:16:35 +01:00
luisramos0
afa8f97627
Add post and put on enterprises and fix details in shipments endpoints
2019-09-12 13:42:40 +01:00
luisramos0
6e677fecce
Remove now inexistent endpoints /new
2019-09-12 13:19:43 +01:00
luisramos0
889a3e6d9d
Improve file layout and move Order model to correct place
2019-09-12 13:15:40 +01:00
luisramos0
664be47ac3
Add endpoints for /orders/shipments
2019-09-12 13:08:39 +01:00
Sigmund Petersen
fd77f48aca
Merge pull request #4253 from openfoodfoundation/RachL-patch-1
...
Update Slack invite link
2019-09-12 09:17:37 +02:00
Rachel Arnould
9a31b99de6
Update missing second link
2019-09-11 15:52:44 +02:00
luisramos0
0e4b5ad9ec
Remove now gone orders/{order_number} endpoint and its models, may be readded in the near future but the models may be different as these docs refer to the now gone spree_api order rabl representation
2019-09-11 11:35:01 +01:00
luisramos0
5634f4af18
Move orders endpoints above in the file as they are the most important endpoints
2019-09-11 11:34:57 +01:00
luisramos0
0dede39617
Make list of /products/{product_id}/variants endpoints correct according to current code
2019-09-11 11:15:55 +01:00
Transifex-Openfoodnetwork
d98e302047
Updating translations for config/locales/nb.yml
2019-09-11 19:47:09 +10:00
luisramos0
377b4a3755
Do not add ng-controller if main_ng_ctrl_name is not set
2019-09-11 10:36:19 +01:00
luisramos0
0c809b2911
Remove now unused override app_wrapper
2019-09-11 10:35:39 +01:00
luisramos0
33472014f1
Do not add main_ng_app_name if it is not defined
2019-09-11 10:32:30 +01:00
luisramos0
d038c27f1f
Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller
2019-09-11 10:32:30 +01:00
luisramos0
3d718d9738
Move admin layout body contents to a separate partial
2019-09-11 10:32:29 +01:00
Luis Ramos
500ef901fd
Merge pull request #4164 from luisramos0/little_de_deface
...
Remove some unused deface overrides and move some others to their views
2019-09-11 10:26:56 +01:00
Matt-Yorkley
a15db65e69
Reload tested variant and price objects
2019-09-11 04:32:19 +01:00
Matt-Yorkley
64a501ee20
Don't index new deleted_at column for spree_prices
2019-09-11 04:29:02 +01:00
Matt-Yorkley
95fcff8bb1
Add migration to remove broken variants from open carts
2019-09-11 04:29:00 +01:00
luisramos0
a2e6b84db2
List the actual actions available in the api/products endpoint
2019-09-10 17:22:52 +01:00
luisramos0
d319f97733
Remove now unexisting endpoints zones, states and countries
2019-09-10 12:36:34 +01:00
Luis Ramos
c0bf7e2e75
Merge pull request #4236 from mkllnk/4222-checkout-paypal-error-handling
...
4233 Add missing Spree route for Paypal
2019-09-10 12:24:21 +01:00
Luis Ramos
1d177a164b
Merge pull request #4247 from mkllnk/4243-inventory-pagination
...
4243 Restore old pagination API for inventory products
2019-09-10 11:35:04 +01:00
Rachel Arnould
d846c31db9
Update Slack invite link
...
Updated Slack invite link in README
2019-09-10 09:51:59 +02:00
Maikel Linke
efd01f8c9e
Move new inventory spec to existing variant overrides spec
...
I decided to not share the same data setup with the other parts of the
spec because we don't need as much data and it's slow to create.
2019-09-10 10:05:23 +10:00
luisramos0
fb65c64c68
Keep the ship_address clearing logic (this time reusing the OrderUpdate method) thus making the restart_checkout process work for these cases (because order.ship_address is not empty)
...
OrderUpdater#shipping_address_from_distributor uses order.address_from_distributor to set order.ship_address when order is not delivery: this will clear the ship address as it was done previously without setting an empty address like Spree::Address.default
2019-09-09 22:05:20 +01:00
Transifex-Openfoodnetwork
b8d8ee4edc
Updating translations for config/locales/en_GB.yml
2019-09-10 05:14:09 +10:00
Luis Ramos
936784404e
Merge pull request #4112 from luisramos0/convert_shipments_rabl
...
Convert spree/api/shipments views from rabl to ams
2019-09-09 18:34:02 +01:00
Matt-Yorkley
11ea852211
Add migration to reset negative stock levels to zero
2019-09-09 17:49:58 +01:00
Matt-Yorkley
4656c35f71
Don't change on_demand variant's stock when updating shipments
2019-09-09 17:49:58 +01:00
Matt-Yorkley
254315b79e
Don't mark on_demand items and shipments as "backordered"
2019-09-09 17:49:56 +01:00
luisramos0
cc7461e692
Remove clear_ship_address from checkout_controller because it is setting an empty address on order.ship_address which is breaking the reset_checkout process in some cases.
...
This logic is already repeated in the before_save hook in the OrderUpdater where the distributor address is put into the ship_address on order.finalize
In cases the order is not to be finalized we keep the ship_address sent from the client as we may need it to make the order workflow work properly
2019-09-09 17:48:17 +01:00
luisramos0
c4d5eec7fd
Covering restart_checkout code with more tests to clarify behaviour with different order.ship_address objects
...
The edge case here is when ship_address is present but empty, on the checkout_controller we are going to move from using an empty ship_address to using a non-empty one. We keep the original case where this spec was testing with a nil order.ship_address
2019-09-09 17:48:04 +01:00
Luis Ramos
2dc85463ce
Merge pull request #4226 from HugsDaniel/4090-missing-translations-order
...
Add missing translations for orders
2019-09-09 15:16:47 +01:00
Matt-Yorkley
aa3bd93ad0
Bump Ruby version to 2.1.9
2019-09-09 12:22:20 +01:00
Maikel Linke
24c8bb95cb
Restore old pagination API for products
...
It's still used by the inventory page. This is an easy fix that I can
deploy without risk. A rewrite of the inventory pagination should
follow.
2019-09-09 14:53:04 +10:00
Maikel Linke
2e361baeaa
Ignore block length cop for feature and scenario
...
They are typically long and that's okay, same with `describe` and `it`.
2019-09-09 14:53:04 +10:00
luisramos0
a98a0bd264
Adapt db truncate task to ofn v2 by removing db tables from v1
2019-09-08 14:05:49 +01:00
luisramos0
b4de8ef899
Make enterprises/index_spec a bit more resilient
2019-09-08 12:17:36 +01:00
luisramos0
f0586af1c7
Re-organized api/orders resource routes
2019-09-08 12:17:36 +01:00
luisramos0
e9b5551c0f
Adpat shipment controller to move out of Spree namespace
2019-09-08 12:17:36 +01:00
luisramos0
7cec24f1d4
Move shipments route, controller and ctrl spec from spree/api to api
2019-09-08 12:17:36 +01:00
luisramos0
26f5ece7c0
Add a few relevant attributes to shipment serializer and fix some details in shipment controller spec
2019-09-08 12:15:33 +01:00
luisramos0
a21a4aba5d
Convert spree/api/shipments from rabl to AMS and adapt its spec
2019-09-08 12:15:33 +01:00
Matt-Yorkley
f413ce2a27
Soft-delete price objects
2019-09-06 17:50:19 +01:00
Transifex-Openfoodnetwork
5847b1a51e
Updating translations for config/locales/en_ZA.yml
2019-09-07 01:50:35 +10:00
Transifex-Openfoodnetwork
f51ebc63c3
Updating translations for config/locales/en_AU.yml
2019-09-07 01:47:27 +10:00
Pau Pérez Fabregat
908e1dfcaf
Merge pull request #4202 from coopdevs/remove-skylight
...
Remove Skylight
2019-09-06 17:09:14 +02:00
Matt-Yorkley
5bc2c96248
Add specs for existing on_demand behaviour
2019-09-06 15:47:59 +01:00
Pau Perez
ab8c7bad76
Remove Skylight
...
Since we adopted Skylight to get response times across endpoints and
instances, we failed to get accurate numbers. Our Rails version is not
supported and thus Skylight fails to provide data for the slowest
endpoints, the ones we care about the most. Even with a supported one we
could potentially hit any limits on tracing and have the same problem.
Recently, we started paying for Datadog's APM and the experience,
although it's still early, has been better. It makes it possible to
correlate between services and other metrics which helps spotting the
underlying issues.
Therefore, having two agents running on the server consumes system
resources so we better get rid of Skylight's one.
2019-09-06 16:25:33 +02:00
Pau Perez
55883a0efc
Add implicit #bulk_management including filter
...
OFN it's hard enough. No need to abuse implicitness making things very
hard to follow.
I've spent around 20min trying to find out where this controller action
was implemented until I realized Rails renders the matching view if no
controller action is defined.
Making it git-greppable makes it a bit easier next time.
2019-09-06 16:02:44 +02:00
Pau Pérez Fabregat
2e519957ec
Merge pull request #4231 from openfoodfoundation/dependabot/bundler/webmock-3.7.2
...
Bump webmock from 3.7.1 to 3.7.2
2019-09-06 13:31:55 +02:00
Pau Pérez Fabregat
cd5b3c7393
Merge pull request #4229 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.1
...
Bump bugsnag from 6.12.0 to 6.12.1
2019-09-06 13:08:47 +02:00
Maikel Linke
eb9f02f3bd
Add missing Spree route for Paypal
2019-09-06 19:07:41 +10:00
Maikel Linke
a1f3e8205f
Add spec for failing Paypal checkout
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4233
2019-09-06 19:05:59 +10:00
Pau Perez
410e23085e
Remove integrity check for deleted variants in OCs
...
We have no way to see the output of this weird RSpec integrity check
thus, it's pointless. It only adds unnecessary load the server.
However, the issue it checks seems to still be happening although
not very often. UK's server has 70 occurrences the last one being from
early 2019 while FR's server returns 10.
2019-09-06 10:30:26 +02:00
Pau Perez
e2b3ee7b3f
Remove Guard and Guard-related gems
...
Guard and the other Guard-related gems should be removed from our
Gemfile. We think is not worth the extra dependencies given the effort
it requires to keep them up-to-date.
This came up in a PR that was upgrading Guard: #4213 .
2019-09-06 10:11:17 +02:00
Maikel Linke
242767dc73
Give variables meaningful names in checkout spec
2019-09-06 12:27:15 +10:00
Maikel Linke
8e8c77c5bd
Convert specs to RSpec 3.8.0 syntax with Transpec
...
This conversion is done by Transpec 3.4.0 with the following command:
transpec spec/features/consumer/shopping/checkout_spec.rb
* 43 conversions
from: obj.should
to: expect(obj).to
* 8 conversions
from: obj.should_not
to: expect(obj).not_to
* 3 conversions
from: == expected
to: eq(expected)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2019-09-06 11:32:44 +10:00
Luis Ramos
e3ce2a7486
Merge pull request #4104 from luisramos0/convert_taxons_to_ams
...
Convert spree/api/taxons views from rabl to AMS
2019-09-06 00:04:10 +01:00
dependabot-preview[bot]
8524f49589
Bump webmock from 3.7.1 to 3.7.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.1 to 3.7.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.1...v3.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-05 19:17:24 +00:00
dependabot-preview[bot]
36f9cd9cbf
Bump ddtrace from 0.26.0 to 0.27.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.26.0 to 0.27.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.26.0...v0.27.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-05 19:16:35 +00:00
dependabot-preview[bot]
0fab4a3a8e
Bump bugsnag from 6.12.0 to 6.12.1
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.12.0 to 6.12.1.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.0...v6.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-05 19:15:41 +00:00
Luis Ramos
722884d8d8
Merge pull request #3895 from luisramos0/fees_based_on_final_weight
...
Make weight calculator use line_item.final_weight_volume rather than variant.weight
2019-09-05 19:24:56 +01:00
Pau Pérez Fabregat
23740ef908
Merge pull request #4227 from openfoodfoundation/2.4.0-minus-pr-4204
...
Revert PR #4204
2019-09-05 17:19:15 +02:00
Pau Pérez Fabregat
ba04208999
Merge pull request #4224 from kristinalim/feature/4210-fetch_and_scope_variants_once_in_products_renderer
...
4210 Fetch and scope variants for shop in ProductsRenderer only once
2019-09-05 17:12:31 +02:00
Kristina Lim
590ce67f38
Fetch and scope variants for shop in ProductsRenderer only once
2019-09-05 22:42:50 +08:00
Matt-Yorkley
e11ea929c3
Merge pull request #4223 from Matt-Yorkley/integrity
...
Lower integrity checker job interval
2019-09-05 15:36:12 +01:00
Hugo Daniel
f88d54b862
Add missing translations for orders
2019-09-05 15:13:10 +02:00
Matt-Yorkley
fc9f61ecf8
Revert PR #4204
...
Temporarily reverting these changes for a quick release
2019-09-05 13:23:59 +01:00
Matt-Yorkley
6d283ac839
Lower integrity checker job interval from hourly to daily
2019-09-05 12:54:37 +01:00
Luis Ramos
725807f66d
Merge pull request #4155 from coopdevs/fix-styling-in-stripe-tests
...
Fix Rubocop violations in Stripe connect tests
2019-09-03 15:58:34 +01:00
Pau Pérez Fabregat
149df6569c
Merge pull request #4212 from openfoodfoundation/dependabot/bundler/webmock-3.7.1
...
Bump webmock from 3.6.2 to 3.7.1
2019-09-03 11:16:01 +02:00
Pau Pérez Fabregat
7daa7032aa
Merge pull request #4215 from openfoodfoundation/transifex
...
Transifex
2019-09-03 11:11:51 +02:00
Pau Pérez Fabregat
8b7119beea
Merge pull request #4200 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.0
...
Bump bugsnag from 6.11.1 to 6.12.0
2019-09-03 11:02:51 +02:00
Transifex-Openfoodnetwork
201e87bf12
Updating translations for config/locales/en_US.yml
2019-09-03 12:29:10 +10:00
Transifex-Openfoodnetwork
0fffd6b4e3
Updating translations for config/locales/en_US.yml
2019-09-03 12:26:02 +10:00
Matt-Yorkley
c516d40d4a
Update all locales with the latest Transifex translations
2019-09-02 22:24:53 +01:00
Luis Ramos
07d4528276
Merge pull request #4174 from openfoodfoundation/dependabot/bundler/delayed_job_active_record-4.1.4
...
Bump delayed_job_active_record from 4.1.3 to 4.1.4
2019-09-02 22:24:04 +01:00
Luis Ramos
4ace780431
Merge pull request #4187 from openfoodfoundation/dependabot/bundler/knapsack-1.18.0
...
Bump knapsack from 1.17.2 to 1.18.0
2019-09-02 22:23:15 +01:00
dependabot-preview[bot]
b69c3fd826
Bump webmock from 3.6.2 to 3.7.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 19:23:28 +00:00
dependabot-preview[bot]
51df8de64f
Bump knapsack from 1.17.2 to 1.18.0
...
Bumps [knapsack](https://github.com/ArturT/knapsack ) from 1.17.2 to 1.18.0.
- [Release notes](https://github.com/ArturT/knapsack/releases )
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ArturT/knapsack/compare/v1.17.2...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 16:16:32 +00:00
Matt-Yorkley
d4a5829858
Merge pull request #4081 from Matt-Yorkley/products_pagination
...
Bulk Edit Products pagination
2019-09-02 17:14:14 +01:00
Matt-Yorkley
ff5fe66994
Fix route after big API refactor merge resolution
2019-09-02 16:29:03 +01:00
Matt-Yorkley
37e50a68e4
Fix timezone date parsing from Angular form fields
2019-09-02 16:29:00 +01:00
Matt-Yorkley
a72c662b97
Update per_page dropdown UX
2019-09-02 14:35:00 +01:00
Matt-Yorkley
ff2db0c5f8
Update spec routes, namespacing, and test content
...
Resolving new issues after a big merge
2019-09-02 14:35:00 +01:00
Matt-Yorkley
e9c60a33b9
Hide search in dropdown for per_page options
2019-09-02 14:35:00 +01:00
Matt-Yorkley
8e059d3c69
Define a limit on paginated queries with no supplied value for per_page
2019-09-02 14:35:00 +01:00
Matt-Yorkley
806ba94a2e
Clarify dependency on kaminari gem
2019-09-02 14:35:00 +01:00
Matt-Yorkley
4bec583bff
Refactor import_date_scope
2019-09-02 14:35:00 +01:00
Matt-Yorkley
90256f9c28
Add defaults and pages tests
2019-09-02 14:35:00 +01:00
Matt-Yorkley
eb284c1742
Use constants for defaults
2019-09-02 14:35:00 +01:00
Matt-Yorkley
b614e17f48
Add test coverage for #bulk_products endpoint and test all filtering functions
2019-09-02 14:34:54 +01:00
Pau Perez
1a450733a3
Use ApiHelper to DRY calls to JSON.parse in spec
2019-09-02 15:32:56 +02:00
Pau Perez
ffde7a38df
Add spacing to increase readability
2019-09-02 15:32:56 +02:00
Pau Perez
8b4b0621db
Fix Rubocop violations in Stripe connect tests
2019-09-02 15:32:56 +02:00
Matt-Yorkley
5259eaae5f
Merge pull request #4204 from Matt-Yorkley/cartastrophe
...
Cartastrophe averted :)
2019-09-02 12:26:08 +01:00
Matt-Yorkley
b0ad0fccfa
Add some defaults to avoid returning zero values when not supplied in query
2019-09-02 12:00:32 +01:00
Matt-Yorkley
2a83ad8689
Improve UX and consistency in orders pagination and page changing
2019-09-02 11:59:13 +01:00
Matt-Yorkley
c127110192
Make import_date query modification conditional
2019-09-02 11:59:13 +01:00
Matt-Yorkley
0470725112
Refactor pagination data hash
2019-09-02 11:57:32 +01:00
Matt-Yorkley
0623bab084
Don't respond to a successful update by querying 500 arbitrary products
2019-09-02 11:56:00 +01:00
Matt-Yorkley
4a0df684c7
Adjust specs
2019-09-02 11:56:00 +01:00
Matt-Yorkley
7dccb5ba90
Changing per_page should also reset the query
2019-09-02 11:56:00 +01:00
Matt-Yorkley
5a4be24df0
Add "filter results" button
2019-09-02 11:56:00 +01:00
Matt-Yorkley
5cb5967977
Fix cleared filters submitting "0" as value in queries
2019-09-02 11:56:00 +01:00
Matt-Yorkley
aeb8d30dae
Fix server-side import_date filtering
2019-09-02 11:56:00 +01:00
Matt-Yorkley
1822fd97a6
Tidy up filters
2019-09-02 11:54:28 +01:00
Matt-Yorkley
4ff3e9fe10
Update Angular loading conditionals
2019-09-02 11:54:28 +01:00
Matt-Yorkley
a63994440d
Add pagination to UI
2019-09-02 11:54:28 +01:00
Matt-Yorkley
f6d0de1454
Improve pagination data in bulk products
2019-09-02 11:54:28 +01:00
Matt-Yorkley
9b0e27a9d1
Add new ProductResource
2019-09-02 11:46:42 +01:00
Matt-Yorkley
415d88f302
Fix indentation in bulk product controller
2019-09-02 11:46:42 +01:00
Pau Pérez Fabregat
f9c98ea9a1
Merge pull request #4199 from openfoodfoundation/transifex
...
Transifex
2019-09-02 12:33:12 +02:00
Pau Pérez Fabregat
369a5a8a2f
Merge pull request #4101 from luisramos0/remove_variants_rabl
...
Convert spree/api/products and spree/api/variants views from rabl to AMS
2019-09-02 12:14:26 +02:00
Matt-Yorkley
62341c6381
Unit test access to associated objects after soft-delete
2019-08-31 10:06:47 +01:00
Luis Ramos
fa1becb791
Merge pull request #4063 from luisramos0/dead_code
...
Remove dead code under views/spree/shared
2019-08-30 22:39:01 +01:00
Matt-Yorkley
50a1704994
Make prices soft-deletable
2019-08-30 20:11:32 +01:00
Matt-Yorkley
302538c370
Add failing spec for cart issue
2019-08-30 15:32:45 +01:00
Maikel
0f80b6ce12
Merge pull request #4197 from kristinalim/fix/4195-fix_invalid_date_in_firefox
...
4195 Specify API date format when converting date to string in JS
2019-08-30 08:36:17 +10:00
dependabot-preview[bot]
69fb8b2afe
Bump bugsnag from 6.11.1 to 6.12.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.11.1 to 6.12.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.11.1...v6.12.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-29 19:17:20 +00:00
Transifex-Openfoodnetwork
1df8fc903e
Updating translations for config/locales/en_ZA.yml
2019-08-30 04:22:54 +10:00
Transifex-Openfoodnetwork
9a2dcb89af
Updating translations for config/locales/en_ZA.yml
2019-08-30 04:22:46 +10:00
Transifex-Openfoodnetwork
1661591f6c
Updating translations for config/locales/ca.yml
2019-08-29 23:12:46 +10:00
Transifex-Openfoodnetwork
6dde720039
Updating translations for config/locales/es.yml
2019-08-29 23:10:30 +10:00
Transifex-Openfoodnetwork
a54b725d6d
Updating translations for config/locales/ca.yml
2019-08-29 23:09:39 +10:00
Luis Ramos
265e76e8ca
Merge pull request #4074 from HugsDaniel/defacepocalypse
...
[Defacepocalypse] De-deface product properties index
2019-08-28 22:18:18 +01:00
luisramos0
192bff4fed
Move taxons and taxonomies api routes to api out of spree routes
2019-08-28 22:06:56 +01:00
luisramos0
92a270165e
Add missing api taxonomies controller only for the required jstree action
2019-08-28 22:06:56 +01:00
luisramos0
9f5c9916ba
Add back required api actions (create, update and destroy) and add AMS serializers for the jstree action
2019-08-28 22:06:56 +01:00
luisramos0
d08de4bdf9
Add extra fields to taxon serializer to be used in the api
2019-08-28 22:06:56 +01:00
luisramos0
45bdb85bf3
Add missing method and skip_authorization_check to taxons controller
2019-08-28 22:06:56 +01:00
luisramos0
ece0652ca3
Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes
2019-08-28 22:06:56 +01:00
luisramos0
7a652fd67b
Adapt api/taxons controller to new namespace outside Spree: remove Spree module and add Spree namespace to Taxons and Taxonomy classes
2019-08-28 22:06:56 +01:00
luisramos0
4ca8feeef1
Move api/taxons route and controller out of spree namespace into /api and move the ctrl spec as well
2019-08-28 22:06:56 +01:00
luisramos0
367932a767
Make spree/api/taxons_controller use AMS serializer instead of rabl
2019-08-28 22:06:56 +01:00
luisramos0
e591658f48
Keep only used api/taxons index action, delete all others as not required right now
2019-08-28 22:06:56 +01:00
Kristina Lim
1516069888
Specify API date format when converting date to string in JS
2019-08-29 02:44:14 +08:00
Luis Ramos
cd263b761c
Merge pull request #4055 from luisramos0/remove_spree_api
...
Remove dependency to spree_api - step 1 - controllers and routes
2019-08-28 15:34:08 +01:00
Maikel
c952ad16ad
Merge pull request #4163 from luisramos0/swagger
...
Add swagger.yaml to codebase
2019-08-28 14:46:51 +10:00
Maikel
ca09c58f26
Merge pull request #3985 from jonleighton/string-to-text
...
Convert several fields from string to text
2019-08-28 11:53:49 +10:00
Maikel Linke
e876a25d59
Fix flaky proxy order spec
2019-08-28 10:48:57 +10:00
Maikel Linke
2a780151be
Update all locales with the latest Transifex translations
2019-08-28 09:54:31 +10:00
Maikel
9d2009d2af
Merge pull request #4188 from openfoodfoundation/transifex
...
Transifex
2019-08-28 09:43:02 +10:00
Maikel
f887533dda
Merge pull request #4157 from mkllnk/4138-update-products
...
4138 Avoid infinite loop when updating products
2019-08-28 09:42:28 +10:00
Transifex-Openfoodnetwork
bef3f154d6
Updating translations for config/locales/fr_CA.yml
2019-08-28 09:12:59 +10:00
Transifex-Openfoodnetwork
6fb775d5ed
Updating translations for config/locales/en_CA.yml
2019-08-28 09:05:39 +10:00
Transifex-Openfoodnetwork
b5a8563725
Updating translations for config/locales/en_GB.yml
2019-08-27 23:28:34 +10:00
Transifex-Openfoodnetwork
1a9ade6de9
Updating translations for config/locales/en_GB.yml
2019-08-27 23:25:26 +10:00
Maikel Linke
48df853ff5
Skip cascading callbacks when touching distributors
2019-08-27 10:44:19 +10:00
Maikel Linke
2137a2addb
Add spec for current bug
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4138
2019-08-27 10:44:19 +10:00
Transifex-Openfoodnetwork
e6a7239716
Updating translations for config/locales/en_AU.yml
2019-08-27 10:09:05 +10:00
Transifex-Openfoodnetwork
25bed92f2e
Updating translations for config/locales/en_AU.yml
2019-08-27 10:08:32 +10:00
Maikel
909cd407dd
Merge pull request #4149 from openfoodfoundation/transifex
...
Transifex
2019-08-27 09:58:31 +10:00
Luis Ramos
f2d25748b1
Merge pull request #4078 from HugsDaniel/defacepocalypse-variants
...
[Defacepocalypse] De-deface variants
2019-08-25 22:51:15 +01:00
Luis Ramos
6396e6e970
Merge pull request #4152 from openfoodfoundation/dependabot/bundler/stripe-4.24.0
...
Bump stripe from 4.19.0 to 4.24.0
2019-08-25 22:49:47 +01:00
Luis Ramos
e52f813dae
Merge pull request #4159 from luisramos0/fix_prod_set
...
Add bugsnag notifications to both product_set and products_controller when stock update fails
2019-08-25 22:49:06 +01:00
Luis Ramos
9ab2eec30c
Merge pull request #4185 from kristinalim/fix/4176-fix_saving_of_shipping_method
...
4176 Fix saving of shipping method when automatically advancing subscription order state
2019-08-25 22:48:39 +01:00
Luis Ramos
f96b37dae3
Merge pull request #4162 from luisramos0/checkout_cache
...
Checkout is not refreshing products cache
2019-08-25 21:52:55 +01:00
Kristina Lim
5b68b2f707
Fix ship method when advancing subscription order
2019-08-22 21:32:41 +08:00
Kristina Lim
ff634bd870
Test ship method when advancing subscription order
2019-08-22 21:30:21 +08:00
Hugo Daniel
7d21d88dc9
Force hide the select2 close cross
2019-08-22 10:32:07 +02:00
dependabot-preview[bot]
31b62d6296
Bump delayed_job_active_record from 4.1.3 to 4.1.4
...
Bumps [delayed_job_active_record](https://github.com/collectiveidea/delayed_job_active_record ) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/collectiveidea/delayed_job_active_record/releases )
- [Commits](https://github.com/collectiveidea/delayed_job_active_record/compare/v4.1.3...v4.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-20 19:14:59 +00:00
Transifex-Openfoodnetwork
5e68604f11
Updating translations for config/locales/nb.yml
2019-08-20 17:42:09 +10:00
Transifex-Openfoodnetwork
c4edd3a683
Updating translations for config/locales/fr.yml
2019-08-20 17:41:25 +10:00
Transifex-Openfoodnetwork
574781e901
Updating translations for config/locales/nb.yml
2019-08-20 17:39:01 +10:00
Transifex-Openfoodnetwork
8ea4f933da
Updating translations for config/locales/fr.yml
2019-08-20 17:38:12 +10:00
Transifex-Openfoodnetwork
1e9820f291
Updating translations for config/locales/fr.yml
2019-08-20 17:35:05 +10:00
Luis Ramos
34ed86cf2d
Merge pull request #4132 from Matt-Yorkley/import_launch
...
Product Import beta
2019-08-19 17:17:16 +01:00
luisramos0
8a4e5b445f
Delete unused frontend auth toekn script override and move the backend one to the head partial
2019-08-18 21:53:56 +01:00
luisramos0
2394eda2ac
Remove unused sidebar override
2019-08-18 21:47:21 +01:00
luisramos0
f97a3a030a
Remove unused nav_bar sessions route and override
2019-08-18 21:44:22 +01:00
luisramos0
ec645f8fa8
Remove unused login override of nav_bar
2019-08-18 21:43:18 +01:00
luisramos0
56a54db602
Remove admin login_nav override and move it to admin layout file
2019-08-18 21:39:19 +01:00
luisramos0
4c3d15b42b
Remove users menu entry override and file and add it directly to the tabs view together with all the other entries
2019-08-18 21:36:50 +01:00
luisramos0
5f4429646d
Move override to the view that is now in our code base (from spree_auth_devise originally)
2019-08-18 21:33:23 +01:00
luisramos0
f37db456f8
Delete dead overrides of spree frontend code
2019-08-18 21:32:53 +01:00
Kevin Christianson
2dfcedad56
Add swagger.yaml
2019-08-18 18:26:44 +01:00
Kristina Lim
706168f2f0
Refresh variant cache when changing stock movements
2019-08-18 16:22:12 +08:00
Kristina Lim
3ecb5c0c75
Flush background jobs in failing spec
2019-08-18 18:16:28 +10:00
luisramos0
249a3c4e18
Make product set raise error and inform the user something went wrong and keep bugsnag notification so we can get more information about what's going on
2019-08-17 19:19:46 +01:00
luisramos0
2b8ebba233
Fix some rubocop issues in product_set and admin/products_controller
2019-08-17 19:15:32 +01:00
luisramos0
758394464b
Add bugsnag notification to products_controller create and update when on_hand or on_demand update fails with exception
2019-08-17 19:15:32 +01:00
luisramos0
d3c624ae10
Add bugsnag notification to product_set create_variant when on_hand or on_demand update fails with exception
2019-08-17 19:15:31 +01:00
luisramos0
163c65849e
Make product set a bit more robust by not failing to update on_hand when variant is not valid. This will make the overall set update work
2019-08-17 19:14:25 +01:00
luisramos0
99ff714913
Enable cache on checkout spec to test cache after checkout
2019-08-16 20:17:14 +01:00
luisramos0
c2f302450f
Add spec to checkout to validate product is removed from shopfront just after all available quantity is checked out
2019-08-16 19:35:57 +01:00
luisramos0
9186bcd455
Dry out some code in checkout_spec
2019-08-16 19:35:08 +01:00
Transifex-Openfoodnetwork
3d074b530f
Updating translations for config/locales/nb.yml
2019-08-15 19:16:43 +10:00
Transifex-Openfoodnetwork
20783db373
Updating translations for config/locales/en_GB.yml
2019-08-15 19:14:53 +10:00
Luis Ramos
d5b37a5171
Merge pull request #4079 from HugsDaniel/defacepocalypse-payments
...
[Defacepocalypse] De-deface payments
2019-08-14 19:30:33 +01:00
luisramos0
b9ddb39edc
Re-add taxons jstree action to make taxonomies config page work again
2019-08-14 16:31:34 +01:00
Luis Ramos
3efe2f878d
Merge pull request #4156 from coopdevs/fix-styling-in-paypal-tests
...
Fix Rubocop violations in PayPal tests
2019-08-14 15:59:14 +01:00
Luis Ramos
064fee79b3
Merge pull request #4151 from Matt-Yorkley/datadog_apm
...
Enable (optional) APM with Datadog
2019-08-14 15:58:48 +01:00
Luis Ramos
d13f182801
Merge pull request #4154 from Matt-Yorkley/fix_deployments2
...
Adjust user creation syntax
2019-08-14 15:56:32 +01:00
Luis Ramos
ee34935223
Fix a typo in docker.md
2019-08-14 13:55:58 +01:00
Pau Perez
0b7ce0d6db
Fix Rubocop violations in PayPal tests
2019-08-14 13:33:53 +02:00
Matt-Yorkley
9dd02044a5
Fix "can't modify frozen string" error in validation callbacks
2019-08-14 10:24:30 +01:00
Matt-Yorkley
d8a7190f43
Adjust user creation syntax
...
#skip_confirmation! can't be chained...
2019-08-14 09:22:11 +01:00
Matt-Yorkley
e5e0fcc887
Enable DelayedJob APM
2019-08-14 08:20:47 +01:00
Pau Pérez Fabregat
53496ff9eb
Merge branch 'master' into transifex
2019-08-14 09:08:40 +02:00
Pau Pérez Fabregat
6635a89af7
Merge pull request #4153 from Matt-Yorkley/fix_deployments
...
Fix deployments
2019-08-14 08:59:23 +02:00
Transifex-Openfoodnetwork
c1248857b8
Updating translations for config/locales/en_CA.yml
2019-08-14 09:15:20 +10:00
Matt-Yorkley
8c95399292
Don't prompt if admin user already exists
2019-08-13 21:02:12 +01:00
Matt-Yorkley
14c1abb861
Skip confirmation email on initial admin user creation
2019-08-13 21:00:30 +01:00
dependabot-preview[bot]
e2d61f5e89
Bump stripe from 4.19.0 to 4.24.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.19.0 to 4.24.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.19.0...v4.24.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-13 19:18:17 +00:00
Transifex-Openfoodnetwork
5a1ef04c67
Updating translations for config/locales/en_ZA.yml
2019-08-14 04:57:27 +10:00
Transifex-Openfoodnetwork
e9e73ef0e4
Updating translations for config/locales/en_ZA.yml
2019-08-14 04:43:50 +10:00
Matt-Yorkley
be844253eb
Enable (optional) Rails APM with Datadog
2019-08-13 18:57:49 +01:00
Transifex-Openfoodnetwork
001e3688da
Updating translations for config/locales/en_GB.yml
2019-08-14 03:28:13 +10:00
luisramos0
b4ffd4dcc2
Update all locales with the latest Transifex translations
2019-08-13 18:25:23 +01:00
Transifex-Openfoodnetwork
e5a9606449
Updating translations for config/locales/en_GB.yml
2019-08-14 03:25:02 +10:00
Pau Pérez Fabregat
9eabbb8dab
Merge pull request #4140 from openfoodfoundation/transifex
...
Transifex
2019-08-13 12:00:48 +02:00
Hugo Daniel
1217811402
Refactor and remove empty lines
2019-08-13 11:03:04 +02:00
Pau Pérez Fabregat
d4f2fcb98a
Merge pull request #4126 from Matt-Yorkley/cart_dropdown
...
Cart dropdown now closes when clicking outside it.
2019-08-13 10:57:56 +02:00
Matt-Yorkley
0b2417849c
Merge pull request #4142 from mkllnk/seed-user
...
Seed user
2019-08-13 08:42:07 +01:00
Matt-Yorkley
3e8369c8f5
Merge pull request #4123 from Matt-Yorkley/navigation-css
...
Navigation css
2019-08-13 08:41:47 +01:00
Maikel Linke
cbaedcec92
Fix seeding of default user without asking
2019-08-13 09:47:54 +10:00
Hugo Daniel
bf2c1a0c1d
Add ng directive for setting on demand
2019-08-09 14:42:39 +02:00
Matt-Yorkley
0284eebf35
Fix cart dropdown positioning
2019-08-09 11:50:33 +01:00
Maikel Linke
e4ba515109
Seed admin user without asking by default
2019-08-09 14:16:01 +10:00
Maikel Linke
af1f6f6c6d
Skip confirmation when creating first admin user
2019-08-09 14:16:01 +10:00
Maikel Linke
b0e8ee42c1
Restore spree_auth_devise user seeding
2019-08-09 13:48:50 +10:00
Maikel
86aeb6a3c7
Merge pull request #4135 from coopdevs/remove-bugherd-tests
...
Remove bugherd specs
2019-08-09 12:53:23 +10:00
Matt-Yorkley
5d83414e9b
Disable rubocop for spree tabs helper
2019-08-08 20:09:35 +01:00
Transifex-Openfoodnetwork
9820d7de38
Updating translations for config/locales/ca.yml
2019-08-09 02:36:02 +10:00
Pau Pérez Fabregat
910eca810a
Merge pull request #4124 from Matt-Yorkley/order_email
...
Add SKU to order confirmation email
2019-08-08 18:35:20 +02:00
Transifex-Openfoodnetwork
6feaddf747
Updating translations for config/locales/es.yml
2019-08-09 02:33:35 +10:00
Transifex-Openfoodnetwork
10f6fb91f6
Updating translations for config/locales/ca.yml
2019-08-09 02:32:54 +10:00
Pau Pérez Fabregat
c7bd4b94b8
Merge pull request #4137 from openfoodfoundation/transifex
...
Transifex
2019-08-08 18:31:47 +02:00
Transifex-Openfoodnetwork
dd223a21f2
Updating translations for config/locales/nb.yml
2019-08-08 20:58:24 +10:00
Transifex-Openfoodnetwork
549366ff15
Updating translations for config/locales/fr.yml
2019-08-08 20:52:28 +10:00
Transifex-Openfoodnetwork
e92f60fb1c
Updating translations for config/locales/fr.yml
2019-08-08 20:49:20 +10:00
Pau Pérez Fabregat
92b05c76a3
Merge pull request #4068 from luisramos0/replace_oc_rabl
...
Convert order_cycle.rabl to Api::OrderCycleSerializer
2019-08-08 12:23:09 +02:00
Hugo Daniel
fa6fa0be64
Add missing translation
2019-08-08 11:11:32 +02:00
Kristina Lim
752efac7cf
Merge pull request #4051 from luisramos0/subs_unpause
...
Sync subscription (create/update orders) when subscription is unpaused
2019-08-08 01:09:09 +08:00
Pau Perez
2b1f1f748b
Remove bugherd specs
...
I don't think these are worth the time it takes to execute them every
time but most importantly I believe we are not using Bugherd anymore.
2019-08-07 16:49:32 +02:00
Pau Pérez Fabregat
798cd9e778
Merge pull request #4114 from kristinalim/fix/4103-add_specs
...
4103 Add specs for referencing of shipments to deleted variants
2019-08-07 12:52:11 +02:00
Matt-Yorkley
2f5b0a5afb
Remove product import FeatureFlag
2019-08-07 09:59:55 +01:00
Maikel
de2d4a5870
Merge pull request #4125 from Matt-Yorkley/variant_overrides
...
Variant overrides with on_demand
2019-08-07 10:25:32 +10:00
Matt-Yorkley
b3728568a8
Enable product import for non-superadmin users
...
This class_eval hack for premissions on the #tab method was really hard to find, and is obviously quite ugly, but refactoring it is maybe outside of the scope here...
2019-08-06 18:59:12 +01:00
Matt-Yorkley
6ba98b4b2c
Add beta notice to Product Import
2019-08-06 17:02:38 +01:00
Matt-Yorkley
d3d6921a0f
Use light grey colour with transparency.
2019-08-06 08:23:38 +01:00
Maikel
68393f1444
Merge pull request #4037 from luisramos0/subs_stock
...
Subscriptions - When editing subscriptions, check stock levels when changing orders in current OC
2019-08-06 15:16:00 +10:00
Maikel
229e6fa0a3
Merge pull request #4073 from luisramos0/kill_more_rabl
...
Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller
2019-08-06 15:00:33 +10:00
Matt-Yorkley
8a069787d1
Cart dropdown now closes when clicking outside it.
2019-08-05 21:48:37 +01:00
Matt-Yorkley
29ed38a6cc
Add unit tests for overriding #move
2019-08-05 17:01:56 +01:00
Matt-Yorkley
4c7d3a491a
Don't decrement variant stock if override is on_demand
2019-08-05 17:01:56 +01:00
Matt-Yorkley
b0f90cf43c
Add test for variant override with :on_demand
2019-08-05 17:01:54 +01:00
Pau Pérez Fabregat
02ec0634b3
Merge pull request #4120 from openfoodfoundation/dependabot/bundler/webmock-3.6.2
...
Bump webmock from 3.6.0 to 3.6.2
2019-08-05 15:13:31 +02:00
Pau Pérez Fabregat
64d21969f0
Merge pull request #4064 from luisramos0/convert_search_Rabl
...
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
2019-08-05 15:07:10 +02:00
Pau Pérez Fabregat
0995adeb59
Merge pull request #4085 from openfoodfoundation/dependabot/bundler/devise-encryptable-0.2.0
...
Bump devise-encryptable from 0.1.2 to 0.2.0
2019-08-05 15:01:46 +02:00
Pau Pérez Fabregat
073a3fe2b4
Merge pull request #4119 from openfoodfoundation/transifex
...
Transifex
2019-08-05 13:18:12 +02:00
Matt-Yorkley
c07df6a5a6
Fix table column alignments
2019-08-04 20:45:00 +01:00
Matt-Yorkley
a7d109833d
Add SKU to order confirmation email
2019-08-04 20:43:55 +01:00
Matt-Yorkley
0364a14073
Add navigation bottom border on mobile view
2019-08-04 16:56:43 +01:00
Matt-Yorkley
ddc8d33356
Update border colour on navigation bar
2019-08-04 16:56:03 +01:00
luisramos0
006c6e6b7b
Add comment to explain method in weight calculator
2019-08-02 21:02:33 +01:00
luisramos0
41aa4ff479
Improve code readability and fix rubocop complexity issue in weight calculator
2019-08-02 20:54:41 +01:00
luisramos0
0e8f167ab9
Fix spec in weight calculator tests
2019-08-02 20:44:11 +01:00
Kristina Lim
cd81dfaead
Move deleted variant to let block in feature spec
2019-08-02 21:52:36 +08:00
Kristina Lim
25073ada84
Move order to a let block in feature spec
2019-08-02 21:52:33 +08:00
Kristina Lim
15b6f9dd5e
Add specs testing edit order page still okay when variant deleted
...
Note that the wrapping example group also loads the edit order page
before this "before" block. This will be fixed in the next commit.
2019-08-02 21:45:39 +08:00
Kristina Lim
0377e02dc1
Add specs testing that shipments see deleted variants
2019-08-02 21:45:38 +08:00
dependabot-preview[bot]
f679708a4e
Bump webmock from 3.6.0 to 3.6.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.0...v3.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-01 19:15:26 +00:00
Transifex-Openfoodnetwork
0f748a3333
Updating translations for config/locales/en_GB.yml
2019-08-02 04:32:50 +10:00
Transifex-Openfoodnetwork
bdedaa06d8
Updating translations for config/locales/en_GB.yml
2019-08-02 04:29:40 +10:00
Pau Pérez Fabregat
6a41d9be87
Merge pull request #4092 from coopdevs/remove-admin-products-N+1
...
Remove N+1 while fetching distributors of OCs
2019-08-01 19:50:49 +02:00
luisramos0
4aa6c673ff
Adapt api products and variants controllers to new namespace outside of Spree
2019-08-01 18:34:19 +01:00
luisramos0
aa3c1aa0fe
Remove Spree module declaration from these files as they were moved out of the spree namespace
2019-08-01 14:30:11 +01:00
luisramos0
31bac9641f
Move api products and variants routes and ctrl out of spree namespace
2019-08-01 14:28:55 +01:00
Pau Perez
3616a27566
Update all locales with the latest Transifex translations
2019-08-01 15:07:09 +02:00
Hugo Daniel
60bdde6349
Convert variants/new from erb to haml and import new.js.erb
2019-08-01 11:23:44 +02:00
Hugo Daniel
5faf33fabe
Import variants/new.html.erb from spree_backend
2019-08-01 10:50:13 +02:00
Hugo Daniel
f3b1a5dd35
Convert variants/edit from erb to haml
2019-08-01 10:45:04 +02:00
Matt-Yorkley
5ae61017f5
Merge pull request #4091 from Matt-Yorkley/missing_css
...
Move CSS rule to SCSS and remove broken css file reference
2019-07-31 23:48:52 +01:00
Luis Ramos
61dffb8821
Merge pull request #4093 from openfoodfoundation/dependabot/bundler/redcarpet-3.5.0
...
Bump redcarpet from 3.4.0 to 3.5.0
2019-07-31 20:53:43 +01:00
Hugo Daniel
07ccbf7f98
Import variants/edit.html.erb from spree_backend
2019-07-31 16:55:47 +02:00
Luis Ramos
f9fabd088c
Merge pull request #4075 from HugsDaniel/defacepocalypse-payment-methods
...
[Defacepocalypse] De-deface payment methods index
2019-07-31 15:49:48 +01:00
Hugo Daniel
a3af6617a9
Convert payments/show from erb to haml
2019-07-31 16:20:32 +02:00
Hugo Daniel
9f7fb654c8
Import payments/show.html.erb from spree_backend
2019-07-31 16:16:26 +02:00
Hugo Daniel
b4a6686eac
Convert payments/_list from erb to haml
2019-07-31 16:15:38 +02:00
Hugo Daniel
ac13ff114c
Import payments/_list.html.erb from spree_backend
2019-07-31 16:09:48 +02:00
Hugo Daniel
af9187947f
Convert erb to haml
2019-07-31 16:02:48 +02:00
luisramos0
b7f7038934
Remove api/enterprises rabl template, it was only used as a member in the now removed rabl variants/products templates
2019-07-31 14:36:36 +01:00
Hugo Daniel
f0fdbf7cf4
Import payments/index from spree_backend
2019-07-31 14:33:38 +02:00
Hugo Daniel
74ab31c0e6
Import gateway.html.erb and convert to haml
2019-07-31 14:28:15 +02:00
luisramos0
6c054e6078
Add bulk_products and overridable to skip_authorization_check so these endpoints work with AMS
2019-07-31 12:18:27 +01:00
luisramos0
18974c68e1
Remove orphan price check from price model
...
This is a quick fix. This check is breaking product deletion in some situations and orphan Prices are not really a problem in the DB
2019-07-31 11:24:55 +01:00
luisramos0
78ab852141
Make spree/api/products_controller work with AMS
2019-07-31 11:23:43 +01:00
luisramos0
4497173213
Adapt spree/api/products_controller_spec to AMS serializer
2019-07-31 11:23:18 +01:00
luisramos0
4d74d246e8
Remove spree/api/products_controller index and new actions, not used
2019-07-31 10:32:45 +01:00
luisramos0
cc51537e93
Convert spree/api/products_controller from rabl to ams
2019-07-31 09:50:34 +01:00
luisramos0
07aececdcf
Remove unused route api/products managed
2019-07-31 09:50:31 +01:00
luisramos0
c3fbf9cdf9
Remove unused pagination from index and respective specs, fix spec for search by sku by adding sku to the serializer and adapt a few specs to pass with AMS attrivbutes,
2019-07-31 09:40:19 +01:00
luisramos0
180598c603
Convert spree/api/variants_controller to AMS by changing base_controller, using render json instad of respond with, deleting rabl templates and adapting specs
...
Delete unused pagination spec
2019-07-31 09:40:19 +01:00
luisramos0
69a5527e24
Update/regenarate .rubocop_todo.yml
2019-07-31 09:36:48 +01:00
luisramos0
e4a6b3880f
Fix some more simple rubocop issues
2019-07-31 09:36:48 +01:00
luisramos0
96ce4deb45
Transpec spec/support/api_helper.rb
2019-07-31 09:36:48 +01:00
luisramos0
a3c179bd3f
Fix some more simple rubocop issues
2019-07-31 09:36:48 +01:00
luisramos0
a57504ba1f
Bring api_helper.image from spree_api to support spree/api/products_controller_spec
2019-07-31 09:36:48 +01:00
luisramos0
25451eed6b
Bring api spec helpers from spree_api into ofn/api_helper
2019-07-31 09:36:48 +01:00
luisramos0
50765563f8
Bring spree/api_helpers from spree_api
2019-07-31 09:35:46 +01:00
luisramos0
2ae75ce13e
Add ControllerSetup from spree_api as it is used in spree/api/base_controller
2019-07-31 09:35:46 +01:00
luisramos0
18aa16650d
Remove dependency to Spree::ApiConfiguration, overall requires_authentication? is true, exceptions will be endpoint specific
2019-07-31 09:35:46 +01:00
luisramos0
314ed50e0f
Fix a rubocop issue in spree/api/products_controller
2019-07-31 09:34:20 +01:00
luisramos0
7346a49982
Move routes in ofn api namespace to separate routes file
2019-07-31 09:34:20 +01:00
luisramos0
5182286218
Add necessary spree api routes related to api keys for users and bring respective implementations from spree_api
2019-07-31 09:34:20 +01:00
luisramos0
a267848394
Remove unused api routes from views/spree/admin/shared/routes view
2019-07-31 09:32:33 +01:00
luisramos0
104bd31f9b
Add necessary spree api routes: taxons, variants and shipments
2019-07-31 09:32:33 +01:00
luisramos0
8bc9985edb
Transpec and fix rubocop issues in spree/api/variants_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
6dfc927730
Make spree/api/variant_controllers_spec pass
2019-07-31 09:32:33 +01:00
luisramos0
3771e26eba
Bring tests from spree/api/variants_controller_spec from spree_api
2019-07-31 09:32:33 +01:00
luisramos0
fd21d35aee
Transpec and fix rubocop issues in spree/api/shipments_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
1417b924d2
Bring and adapt tests from spree/api/shipments_controller_spec and mix them with exiting tests in OFN
2019-07-31 09:32:33 +01:00
luisramos0
2912c1b87d
Transpec and fix rubocop issues in spree/api/product_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
e746a0db7d
Bring tests from spree/api/products_controller_spec and add them to existing ones on the ofn side
...
Adapt these tests to have a green build
2019-07-31 09:32:33 +01:00
luisramos0
84a2886003
Improve auth code in spree/api/taxons_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
c668677b8a
Bring spree/api/taxons_controller_spec from spree_api, adapt it, transpec it and fix rubocop issues
2019-07-31 09:32:33 +01:00
luisramos0
2490cbfccb
Transpec and fix rubocop issues in spree/api/base_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
20a46a791c
Bring and adapt spree/api/base_controller_spec from spree_api
2019-07-31 09:32:33 +01:00
luisramos0
0e4fe08ac4
Fix logical problem in spree/api/base_controller and in spree/checkout_controller
...
See this stack overflow post for more info: https://stackoverflow.com/questions/39629976/ruby-return-vs-and-return
2019-07-31 09:32:33 +01:00
luisramos0
cf0f716534
Fix easy rubocop issues in spree/api/taxons_controller
2019-07-31 09:32:33 +01:00
luisramos0
b70cfa5968
Bring spree/api/taxons controller from spree_api as it is needed in OFN admin
2019-07-31 09:32:33 +01:00
luisramos0
f77beb50ff
Fix class scope in spree/api/products_controller, should not use Spree namespace here
...
Also, add missing dependency to spree/admin/products_controller_decorator
2019-07-31 09:32:33 +01:00
luisramos0
a941280982
Fix easy rubocop issues in spree/api/base_controller
2019-07-31 09:32:33 +01:00
luisramos0
9d40ee49e6
Bring spree/api/base_controller from spree_api
2019-07-31 09:32:33 +01:00
luisramos0
6abbdecb97
Fix the easy rubocop issues in the new spree api controllers
2019-07-31 09:32:33 +01:00
luisramos0
660ce92c27
Merge spree api controllers and its decorators
2019-07-31 09:32:33 +01:00
luisramos0
c5bcef6ae4
Delete unused spree/api/line_items_controller_decorator.rb
2019-07-31 09:32:33 +01:00
luisramos0
d26a0b6b73
Bring from spree_api the api controllers that are overriden in OFN so that we can merge the original and the override afterwards
2019-07-31 09:32:33 +01:00
luisramos0
9400516b56
Fix broken (was always green) bulk_product_update_spec updating image spec where the old src url was not stored and the expect command was wrong with !=
2019-07-30 20:37:26 +01:00
luisramos0
6ebfb02d0e
Update ImageSerializer with missing image size urls: mini/thumb_url, product/image_url that is used in the product image modal
2019-07-30 20:15:21 +01:00
Luis Ramos
75c7e0b939
Merge pull request #4089 from luisramos0/undeface-fix
...
Add doctype declaration in layouts/admin view
2019-07-30 19:29:17 +01:00
Luis Ramos
62eb2bba13
Merge pull request #4059 from luisramos0/kill_rabl
...
Convert 2 rabl templates to AMS and remove a few unused ones
2019-07-30 19:28:21 +01:00
Luis Ramos
3fa9e857a8
Merge pull request #4067 from luisramos0/oc_icon
...
Add icon to OC menu entry
2019-07-30 14:08:08 +01:00
luisramos0
11a77043eb
Switch from Spree::Api::BaseController to Api::BaseController so that AMS is activated
2019-07-30 12:20:14 +01:00
luisramos0
58b43c7bc9
Remove update_product_image.v1.rabl and switch controller from respond_with to render json to switch from rabl to AMS
2019-07-30 12:19:42 +01:00
dependabot-preview[bot]
7da10db055
Bump redcarpet from 3.4.0 to 3.5.0
...
Bumps [redcarpet](https://github.com/vmg/redcarpet ) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/vmg/redcarpet/releases )
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/vmg/redcarpet/compare/v3.4.0...v3.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-29 19:16:07 +00:00
luisramos0
be41271038
Make spelling coherent, as we have serializers with Z we get rid of the few serialisers with S we have
2019-07-29 19:57:12 +01:00
luisramos0
04e13e1136
Change css styling from id to class to make rubocop happy. Keeping id name as it may be needed in spree autocomplete css or js code
2019-07-29 19:46:12 +01:00
luisramos0
8868b7eb12
Fix rubocop issue: use nested class/module definition
2019-07-29 19:05:39 +01:00
Pau Perez
c85d00fcb8
Remove N+1 while fetching distributors of OCs
...
What used to be done as
```sql
SELECT "order_cycles".* FROM "order_cycles"
WHERE (order_cycles.orders_open_at <= '2019-07-29 17:45:20.137294'
AND order_cycles.orders_close_at >= '2019-07-29 17:45:20.137333')
SELECT DISTINCT "enterprises".* FROM "enterprises"
INNER JOIN "exchanges" ON "enterprises"."id" = "exchanges"."receiver_id"
WHERE "exchanges"."order_cycle_id" = 1
AND "exchanges"."incoming" = 'f'
(...)
SELECT DISTINCT "enterprises".* FROM "enterprises"
INNER JOIN "exchanges" ON "enterprises"."id" = "exchanges"."receiver_id"
WHERE "exchanges"."order_cycle_id" = 4
AND "exchanges"."incoming" = 'f'
```
it became
```sql
SELECT "order_cycles".* FROM "order_cycles"
WHERE (order_cycles.orders_open_at <= '2019-07-29 17:45:20.137294'
AND order_cycles.orders_close_at >= '2019-07-29 17:45:20.137333')
SELECT "exchanges".* FROM "exchanges"
WHERE "exchanges"."incoming" = 'f'
AND "exchanges"."order_cycle_id" IN (1, 2, 3, 4)
SELECT "enterprises".* FROM "enterprises"
WHERE "enterprises"."id" IN (3, 4, 5, 6)
```
I haven't got any perf numbers yet but each of the N+1 queries took as
long as the single `enterprises` query on my dev machine.
This should have a noticeable perf impact since the changed method
belongs to the `BaseController` seems to be executed in all HTML
requests as it gets called by
```ruby
before_filter :warn_invalid_order_cycles, if: :html_request?
```
2019-07-29 20:02:47 +02:00
luisramos0
2c6dab9c85
Add spec for Api::OrderCycleSerializer
2019-07-29 18:56:49 +01:00
Matt-Yorkley
7b2a146404
Move CSS rule to SCSS and remove broken css file reference
2019-07-29 18:16:36 +01:00
luisramos0
c45194473b
Add spec to cover inject_current_order_cycle
2019-07-29 18:14:00 +01:00
luisramos0
3c0e6eeee2
Make inject_current_order_cycle render {} instad of null if current_order_cycle is null
2019-07-29 18:13:29 +01:00
luisramos0
ca5a5bf301
Convert oc.rabl to oc serializer and use it in both haml file and controller
2019-07-29 18:13:29 +01:00
luisramos0
ddf68444fb
Move head scripts from admin layout to haed partial
2019-07-29 17:04:57 +01:00
luisramos0
4867649fc9
Remove dead code related to unused variable in spree: expand_variants
2019-07-29 17:04:57 +01:00
Pau Pérez Fabregat
35841066d1
Merge pull request #4086 from openfoodfoundation/transifex
...
Transifex
2019-07-29 17:33:19 +02:00
luisramos0
9bc81f236c
Add doctype declaration as it is defined in spree layouts/admin so that html5 mode is enabled, otherwise html 4 mode is used by browsers and the observed layout problems happen
2019-07-29 13:46:35 +01:00
luisramos0
e26a54d897
Fix indentation problem in layouts/admin view
...
We move most entries inside wrapper as it should be and the last ones "admin_footer_scripts" and Spree.api_key inside the body tag as it should be
2019-07-29 13:33:11 +01:00
Transifex-Openfoodnetwork
ed1d637eb5
Updating translations for config/locales/es.yml
2019-07-29 19:06:20 +10:00
Transifex-Openfoodnetwork
831284c5c8
Updating translations for config/locales/es.yml
2019-07-29 19:03:13 +10:00
Transifex-Openfoodnetwork
e45b8f6981
Updating translations for config/locales/ca.yml
2019-07-29 19:02:24 +10:00
Transifex-Openfoodnetwork
d0f8f985fb
Updating translations for config/locales/es.yml
2019-07-29 19:00:02 +10:00
Transifex-Openfoodnetwork
33eec61af8
Updating translations for config/locales/ca.yml
2019-07-29 18:59:14 +10:00
Transifex-Openfoodnetwork
00c324ae45
Updating translations for config/locales/fr.yml
2019-07-29 18:01:09 +10:00
Transifex-Openfoodnetwork
12a016d31d
Updating translations for config/locales/fr.yml
2019-07-29 17:57:59 +10:00
dependabot-preview[bot]
8c7a7348f4
Bump devise-encryptable from 0.1.2 to 0.2.0
...
Bumps [devise-encryptable](https://github.com/plataformatec/devise-encryptable ) from 0.1.2 to 0.2.0.
- [Release notes](https://github.com/plataformatec/devise-encryptable/releases )
- [Changelog](https://github.com/plataformatec/devise-encryptable/blob/master/Changelog.md )
- [Commits](https://github.com/plataformatec/devise-encryptable/compare/v0.1.2...v0.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-26 23:12:41 +00:00
Luis Ramos
af50bde088
Merge pull request #3786 from ja9-look/feature/sticky_header_on_scroll_mobile
...
sticky header for mobile
2019-07-26 11:22:33 +01:00
Luis Ramos
340b92e580
Merge pull request #3700 from luisramos0/2-0-without-auth-devise
...
Remove dependency to spree_auth_devise
2019-07-26 10:57:38 +01:00
luisramos0
f64653db14
Add icon to OC menu entry
2019-07-26 10:52:31 +01:00
Maikel
e6ef661f0d
Merge pull request #4066 from luisramos0/reorg_spec_serializers
...
Organizing spec/serializers - put each file in the correct place
2019-07-26 16:23:23 +10:00
Hugo Daniel
3c2b6f4ed1
Remove data-hooks
2019-07-25 14:38:09 +02:00
Hugo Daniel
ec6f6056a8
Remove data-hooks
2019-07-25 14:34:06 +02:00
Hugo Daniel
6a621f47aa
Remove data-hooks
2019-07-25 14:31:07 +02:00
Hugo Daniel
c464b21d76
Remove data-hooks
2019-07-25 14:27:53 +02:00
Hugo Daniel
c83d249147
Impor missing partials from spree to ofn and convert to haml
2019-07-25 14:23:24 +02:00
Kristina Lim
dae23d3c3b
Remove unused inclusion of $window in OffcanvasCtrl
2019-07-25 20:22:51 +08:00
Hugo Daniel
aae5ae9f1e
De-deface payments/new
2019-07-25 13:27:41 +02:00
Hugo Daniel
888e0e0bb4
Convert erb partials to haml
2019-07-25 13:22:55 +02:00
Hugo Daniel
a0b0fb05a6
Import payments/new from spree_backend to ofn
2019-07-25 13:22:32 +02:00
Hugo Daniel
a11562e4dd
Fix incorrect indentation in variants table
2019-07-25 12:05:50 +02:00
Hugo Daniel
2d872c25bf
Use Haml javascript tag to make autocomplete work
2019-07-25 11:20:51 +02:00
Hugo Daniel
986837d601
Import variants/_form.html.erb from spree_backend to ofn and de-deface it
2019-07-25 11:07:35 +02:00
Kristina Lim
def2693afc
Move offcanvas JS to Angular controller
2019-07-25 17:01:46 +08:00
Luis Ramos
55f26f0a3d
Merge pull request #4043 from luisramos0/bring_shipment
...
Bring spree/admin/orders/shipment and shipment_manifest partials from spree_backend and fix an authorization bug
2019-07-24 21:59:47 +01:00
Luis Ramos
7245d1eff4
Merge pull request #4049 from luisramos0/deface_admin_orders
...
De-deface admin orders adjustments page and customer details page
2019-07-24 21:59:08 +01:00
Hugo Daniel
353d6fbc5f
Import variants/index from spree_backend to ofn and convert to Haml
2019-07-24 16:57:11 +02:00
Hugo Daniel
87ef0215b8
De-deface payment_methods/index
2019-07-24 14:49:29 +02:00
Hugo Daniel
4b6a02cb92
Convert payment_methods/index from ERB to Haml
2019-07-24 14:39:59 +02:00
Hugo Daniel
196a301133
Import payment_methods/index.html.erb from spree_backend to ofn
2019-07-24 14:38:20 +02:00
Hugo Daniel
0a88738faa
Replace old ruby syntax with new
2019-07-24 14:37:00 +02:00
Hugo Daniel
4d6af57f79
De-deface product_properties/index
2019-07-24 13:17:45 +02:00
Hugo Daniel
110fd3ecdf
Convert erb to haml
2019-07-24 13:12:58 +02:00
Hugo Daniel
1cb065f829
Import product_properties/index.html.erb from spree_backend to ofn
2019-07-24 13:09:04 +02:00
Hugo Daniel
1cfa499b0e
De-deface _product_propery_fields
2019-07-24 13:01:50 +02:00
luisramos0
b9b8bc70dd
Remove stock location name from shipment header in the order edit page
2019-07-24 11:50:17 +01:00
Hugo Daniel
3fc0d4a666
Convert _product_properties_fields from ERB to Haml
2019-07-24 12:40:24 +02:00
Hugo Daniel
de6c96d138
Import product_properties/_product_properties_fields.html.erb from Spree to OFN
2019-07-24 12:38:29 +02:00
Kristina Lim
d42da8737e
Improve readability of selectors in page alert JS directive
2019-07-24 12:44:42 +08:00
Kristina Lim
6419edcb1f
Integrate styles/animations for page alert, top bar, tab bar, off canvas
2019-07-24 12:44:42 +08:00
Kristina Lim
fca82375e8
Render home page alert as :page_alert outside main content
2019-07-24 12:44:42 +08:00
Kristina Lim
ca0f746cf1
Fix animation and layout for offcanvas menu
...
Uses strategy from this forum comment:
http://foundation.zurb.com/forum/posts/547#comment_8840
2019-07-24 12:43:44 +08:00
Kristina Lim
a93cf46f50
Fix syntax of existing animations for offcanvas
2019-07-24 12:37:42 +08:00
luisramos0
ffb8edef0b
Fix rubocop css issues
2019-07-23 22:37:10 +01:00
luisramos0
74a030f6db
Organizing spec/serializers - put each file in the correct place acccording to its namespace
2019-07-23 22:17:28 +01:00
luisramos0
7a8b5e89be
Add specs to cover the most important new fields in api/admin/variant_serializer
2019-07-23 22:11:00 +01:00
luisramos0
90690cd238
Move api/admin/variant_serializer_spec to the correct folder under /spec
2019-07-23 22:03:40 +01:00
luisramos0
90c621ac07
Improve translations, css and add button aligment in subscriptions_line_items variant autocomplete
2019-07-23 21:38:29 +01:00
luisramos0
2d5eccbf97
Add :in_stock, :stock_location_id, :stock_location_name to admin variant serializer, these are needed for the variant_autocomplete js code from spree
2019-07-23 21:38:29 +01:00
luisramos0
7e6259da31
Replace admin/variants/search rabl template with existing admin variant serializer with a few added attributes
...
This commit fixes a bug as the image of the variatn was not being rendered, we need to fetch the image of the product, not the image of the variant.
2019-07-23 21:37:45 +01:00
Luis Ramos
1f75c7e5e4
Merge pull request #4047 from luisramos0/undeface
...
De-deface some admin configuration pages and the general admin layout and menu
2019-07-23 18:36:09 +01:00
luisramos0
11974689ef
Remove dead code under views/spree/shared
2019-07-23 16:42:00 +01:00
Kristina Lim
e1fce8304d
Update weight calculator and add specs
2019-07-23 23:24:00 +08:00
Kristina Lim
0d6ba90ea1
Round off fee from Calculator::Weight to nearest cent
2019-07-24 00:42:42 +10:00
luisramos0
a1e6e4c38f
Fix rubocop issues
2019-07-23 14:35:24 +01:00
Luis Ramos
77fb73f802
Merge pull request #4065 from coopdevs/get-latest-spree-revision
...
Brings in the latest Spree fork's Git commit
2019-07-23 14:28:49 +01:00
Pau Perez
9f7376a5ae
Brings in the latest Spree fork's Git commit
...
This successfully closes #3903 by bringing in the changes done in
https://github.com/openfoodfoundation/spree/pull/41 .
2019-07-23 14:56:33 +02:00
luisramos0
5739a82c19
Remove unused admin variants search rabl template
2019-07-23 12:30:00 +01:00
Luis Ramos
eae373ef4b
Merge pull request #4061 from openfoodfoundation/revert-3938-get-last-spree-fork-patch
...
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:06:10 +01:00
Luis Ramos
465332d5f9
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:05:41 +01:00
Luis Ramos
e98b89625f
Merge pull request #3938 from openfoodfoundation/get-last-spree-fork-patch
...
Handle soft deleted variants in order edit
2019-07-22 21:05:12 +01:00
luisramos0
cf61254c9e
Remove unnecesary rabl template
2019-07-22 18:42:20 +01:00
luisramos0
1d92d6cc33
Remove unused api endpoint order_cycles and also action enterprises/managed and respective views
2019-07-22 17:35:41 +01:00
luisramos0
6b32764c99
Remove unused taxon.rabl from views/json
2019-07-22 16:29:54 +01:00
Pau Perez
be4fbc4d23
Update Gemfile to get spree from a feature branch
...
This allows us to test
https://github.com/openfoodfoundation/spree/pull/41 . If it passes
testing I will then revert it back to the `2-0-4-stable` branch but
updating the target commit in the Gemfile.lock.
2019-07-22 15:40:31 +02:00
luisramos0
ea72a10b9a
Remove unused rabl files from views/json
2019-07-22 12:14:10 +01:00
luisramos0
9b567a6710
Remove injection_json that renders json partials, we only use ams serializers now, not rabl partials
2019-07-21 23:55:59 +01:00
luisramos0
a8ce31fa90
Replace views/json/_flash.rabl with an ams injector with serializer
2019-07-21 22:56:15 +01:00
luisramos0
4c964fea0d
Replace views/json/_current_user.rabl with an ams injector with serializer
2019-07-21 22:48:36 +01:00
luisramos0
6d7c41c04b
Bring db/default/users from spree_auth_devise, this is necessary to create the first user in the DB
2019-07-20 20:48:49 +01:00
Luis Ramos
a6a695660f
Merge pull request #4002 from luisramos0/more_rails4
...
Adapting queries in permissions to Rails 4
2019-07-19 15:17:01 +01:00
Luis Ramos
0058ef5e04
Merge pull request #4048 from idanceinbetween/4034
...
Add grey line below nav bar, change logo img max height 44px
2019-07-19 12:13:14 +01:00
Luis Ramos
4831bae9cb
Merge pull request #3953 from mkllnk/3727-first-credit-card-default
...
First stored credit card becomes default again
2019-07-19 12:12:09 +01:00
Luis Ramos
f7679780de
Merge pull request #4032 from luisramos0/subs_oc_date_issue
...
3544 Add date format to moment date conversion
2019-07-18 19:52:49 +01:00
luisramos0
f2ac354e00
Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it
2019-07-18 14:29:38 +01:00
Maikel
88ffa46ce7
Merge pull request #4045 from openfoodfoundation/transifex
...
Transifex
2019-07-18 16:35:41 +10:00
Maikel
869431c68d
Merge pull request #3926 from mkllnk/report-missing-payments
...
Add rake task to report lost payments
2019-07-18 15:01:14 +10:00
luisramos0
3d6fd10e59
Add warning about creation of orders when unpausing a subscription
2019-07-17 12:14:36 +01:00
luisramos0
81482683cf
Extract method in subs controller
2019-07-17 12:08:51 +01:00
luisramos0
57f1742f24
Save subscription form on subs unpause so that proxy orders and orders are synced
2019-07-17 12:08:48 +01:00
Maikel
a1f8530489
Merge pull request #3962 from luisramos0/first_view_spec
...
First 2 view specs in OFN
2019-07-17 10:57:58 +10:00
luisramos0
a75a0da981
Remove unused deface in spree/admin/orders/show, this action doesnt exist in ofn v2
2019-07-16 21:12:48 +01:00
luisramos0
5744240f91
Move customer_details/_form defaces to the view
2019-07-16 21:12:09 +01:00
luisramos0
873c56a642
Move customer_details/edit/replace_customer_search deface to view
2019-07-16 21:09:48 +01:00
luisramos0
f53a75660f
Convert spree/admin/orders/customer_details view from erb to haml
2019-07-16 21:05:19 +01:00
luisramos0
50dcbe0b57
Bring spree/admin/order/customer_details from spree_backend
2019-07-16 21:03:35 +01:00
luisramos0
f9861fee79
De-deface spree/admin/adjustments/_adjustments_table by moving deface content to the view
2019-07-16 21:01:08 +01:00
luisramos0
d8ae97f923
Move spree/admin/adjustments/_form/add_tax_rate deface to view
2019-07-16 20:53:24 +01:00
luisramos0
9f5db217fe
Convert spree/admin/adjustments views from erb to haml
2019-07-16 20:51:55 +01:00
luisramos0
c1c5dcac09
Bring spree/admin/adjustments pages from spree_backend
2019-07-16 20:51:55 +01:00
luisramos0
6064f096a7
Fix a pre-existing problem in orders_tab by moving the links in to the li elements
2019-07-16 20:16:32 +01:00
luisramos0
a62fa755f5
Remove page_title_classes as it is breaking the rendering of the classes attribute and it is no longer used
2019-07-16 20:16:32 +01:00
luisramos0
fa25991f0f
Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving
2019-07-16 20:16:32 +01:00
luisramos0
6f2be1dfa6
Fix issue in layouts/admin view, make classes compute correctly
2019-07-16 20:16:32 +01:00
luisramos0
c81a9fd032
Fix error in js tag in head
2019-07-16 20:16:32 +01:00
luisramos0
665d0cc86b
Fix error related to missing _hamlout method by replacing code with standard haml
2019-07-16 20:16:32 +01:00
luisramos0
a34d8a3f20
Revert "Move app_wrapper deface to spree/layouts/admin view"
...
This reverts commit bb18f6ecf3c1d0ecf7c010623215d161a6102f2b.
2019-07-16 20:16:32 +01:00
luisramos0
6e35701dd6
Remove unused add_enterprise_fees_to_admin_configurations_menu deface, this menu entry is already in the view
2019-07-16 20:16:32 +01:00
luisramos0
9991458d2a
Remove spree/admin/shared/_order_details defaces, these are only used in admin/order/show which is a view that is not used in ofn anymore, only admin/order/edit is used
2019-07-16 20:16:32 +01:00
luisramos0
a843fd73b7
Remove admin/shared/_order_tabs/add_customer_name, this is already in the order tabs view
2019-07-16 20:16:32 +01:00
luisramos0
9765b1e908
Move admin/shared/_head/replace_spree_title deface to head view
2019-07-16 20:16:32 +01:00
luisramos0
5ccadc1f7d
Convert spree/admin/shared/_head view from erb to haml
2019-07-16 20:16:32 +01:00
luisramos0
539805e2c2
Bring spree/admin/shared/head partial from spree_backend
2019-07-16 20:16:32 +01:00
luisramos0
fac64ef5bf
Remove layouts/spree_application/inside_head deface, this view is in spree_frontend which is not used in ofn anymore
2019-07-16 20:16:32 +01:00
luisramos0
a17a0a62bc
Move spree/layouts/bare_admin/add_login_nav deface to layout/bare_admin view
2019-07-16 20:16:32 +01:00
luisramos0
1e91de106f
Move admin html head deface to layout admin view and remove repeated (in shared/head partial) content type tag
2019-07-16 20:16:32 +01:00
luisramos0
73252132a6
Move add_i18n_script deface to layout/admin view
2019-07-16 20:16:32 +01:00
luisramos0
e3c383c61c
Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs view
2019-07-16 20:16:32 +01:00
luisramos0
aafb134be7
Move spree/layouts/admin/ tabs deface to spree/layout/admin view
2019-07-16 20:16:32 +01:00
luisramos0
70a1996435
Move add_currency_config deface to spree/layout/admin view
2019-07-16 20:16:31 +01:00
luisramos0
1712cb2617
Move app_wrapper deface to spree/layouts/admin view
...
In admin layout, only adds a div after the body tag.
2019-07-16 20:16:31 +01:00
luisramos0
25df057d05
Move spree/layouts/admin/add_analytics deface to spree/layouts/admin view
2019-07-16 20:16:31 +01:00
luisramos0
24a9991162
Convert views/spree/layouts/admin.html from erb to haml
2019-07-16 20:16:31 +01:00
luisramos0
156ff2da89
Bring spree/layouts/admin from spree_backend to de-deface it
2019-07-16 20:16:31 +01:00
luisramos0
e36b4ed01a
Move temp_controller_list deface to shipping_categories index view
2019-07-16 20:16:23 +01:00
idanceinbetween
41b775b173
Remove multiline
2019-07-16 20:10:18 +01:00
idanceinbetween
35570feba0
Comment out new changes
2019-07-16 20:04:50 +01:00
idanceinbetween
1d8cfe59a2
Change hex value to variable
2019-07-16 19:37:08 +01:00
idanceinbetween
abd3efe82a
Replace lightgray to hex
2019-07-16 19:32:19 +01:00
idanceinbetween
389b53cb71
Add grey line below nav bar, change logo img max height 44px
2019-07-16 19:14:10 +01:00
luisramos0
4f60273198
Move temperature_controlled_form_element deface to shipping_categories form view
2019-07-16 14:50:16 +01:00
luisramos0
856fa8685a
Convert spree/admin/shipping_categories views from erb to haml
2019-07-16 14:48:47 +01:00
luisramos0
9ac4c0ba30
Bring spree/admin/shipping categories from spree_backend so we can de-deface it
2019-07-16 14:46:26 +01:00
luisramos0
2709f237f5
Move image_format deface to image settings view
2019-07-16 14:44:38 +01:00
luisramos0
9db4edcd0d
Convert spree/admin/image_settings/edit.html from erb to haml
2019-07-16 14:43:20 +01:00
luisramos0
22c9f33f4c
Bring image_settings view from spree_backend
2019-07-16 14:39:14 +01:00
luisramos0
24ea2a4398
Move number_localization deface to general settings view
2019-07-16 14:28:47 +01:00
luisramos0
8178f5388c
Move legal settings deface to general settings view
2019-07-16 14:27:32 +01:00
luisramos0
c0c5e9d7dd
Move embedded_shopfronts deface to general settings view
2019-07-16 14:26:33 +01:00
luisramos0
19f8f5c6fa
Convert general_settings/edit.html from erb to haml
2019-07-16 14:15:51 +01:00
luisramos0
83a306c31b
Convert class attributes to . notation in haml
2019-07-16 14:09:48 +01:00
luisramos0
d6020cdb6f
Bring general_settings/edit.html.erb from spree_backend to de-deface it
2019-07-16 13:57:35 +01:00
luisramos0
3b467dbae8
Adapt line_item_syncer to the case where item is not added to the completed order because of insufficient stock and the subscription quantity is updated for that item afterwards
2019-07-16 12:08:08 +01:00
Kristina Lim
77c78f35d3
Update all locales with the latest Transifex translations
2019-07-16 18:53:24 +08:00
luisramos0
306390440a
Revert "Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item"
...
This reverts commit d153e58933 .
2019-07-16 11:00:21 +01:00
luisramos0
267131626e
Fix typo and add test case to cover out of stock case
2019-07-16 10:58:25 +01:00
Luis Ramos
2280b15664
Merge pull request #4035 from kristinalim/fix/4033-remove_line_item_adjustments_when_line_item_removed
...
4033 Remove line item adjustments when line item removed
2019-07-16 09:54:33 +01:00
Transifex-Openfoodnetwork
f843a0b4d9
Updating translations for config/locales/en_AU.yml
2019-07-16 17:08:24 +10:00
Transifex-Openfoodnetwork
965a274332
Updating translations for config/locales/en_AU.yml
2019-07-16 17:05:40 +10:00
Transifex-Openfoodnetwork
cb2a842746
Updating translations for config/locales/en_AU.yml
2019-07-16 17:05:17 +10:00
luisramos0
a6655623d0
New admin orders edit view spec and workaround (current_ability) to make view specs work
2019-07-15 21:59:36 +01:00
luisramos0
2a2d05ad39
First view spec in OFN testing the print invoice button display in the orders list page
2019-07-15 21:59:36 +01:00
luisramos0
e8127d81dc
Change how we display variant name in order edit page, use VariantAndLineItemNaming helper method
2019-07-15 18:37:19 +01:00
luisramos0
cd7906a57b
Move translations from Spree.t to root and add them to en.yml
2019-07-15 17:48:10 +01:00
luisramos0
02c573f146
Remove logic that hides item split, because the partial is now in the ofn codebase, we can now simply remove the split-item button
2019-07-15 17:11:41 +01:00
luisramos0
112017a158
Remove variants/split partial from orders/shipments partial
...
In OFN we have one shipment per order so it doesnt make sense to split items between shipments
2019-07-15 17:07:33 +01:00
luisramos0
4a07d67037
Convert spree/admin/orders/_shipment partial from erb to haml
2019-07-15 16:42:45 +01:00
luisramos0
54156dfd32
Convert spree/admin/orders/_shipment_manifest partial from erb to haml
2019-07-15 16:42:19 +01:00
luisramos0
ee20d35487
Fix authorization issue in shipment actions, authorization was being done on a struct (shipment manifest), now it's done on the shipment itself
...
This is similar to https://github.com/spree/spree/pull/5624
2019-07-15 15:38:46 +01:00
luisramos0
be18244abc
Bring views/spree/admin/orders/_shipment and views/spree/admin/orders/_shipment_manifest from spree backend
2019-07-15 15:37:24 +01:00
luisramos0
02099ebdae
Remove details about stock in line_item_syncer so that we avoid confusing the user with stock numbers, this way the user will know what is the problem and can check stock levels and the order for more details
2019-07-14 21:40:57 +01:00
luisramos0
d153e58933
Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item
2019-07-14 20:59:42 +01:00
luisramos0
c2a59a374c
Fix rubocop issues by simplifying method
2019-07-14 17:21:15 +01:00
luisramos0
2a1011921b
Reuse line_item_syncer.add_order_update_issue in line_item_syncer.update_item_quantities to add stock info to the update_quantity order issues
2019-07-14 16:43:46 +01:00
luisramos0
df27ee0d3e
Refactor line_item_syncer.add_order_update_issue out of line_item_syncer.create_new_items
2019-07-14 16:06:09 +01:00
luisramos0
c2851015ce
Fix deleting created item (destroy doesnt work before save) and add order_update_issue with message so that user can understand what happened
2019-07-14 15:58:00 +01:00
luisramos0
d0c246c345
Fix some rubocop issues
2019-07-14 12:28:32 +01:00
Kristina Lim
e58546a412
Move offcanvas menu content to separate partial
2019-07-14 13:52:47 +08:00
luisramos0
6aed9ba549
Make line_item_syncer delete new line items if stock is insufficient
2019-07-13 22:57:13 +01:00
luisramos0
4f2bc33ec3
Change line_item_syncer to verify stock if order is already complete, this will happen for orders in the current OC when a subscription is changed
2019-07-13 20:56:34 +01:00
luisramos0
0f3404ca27
Rename order_syncer.future_and_undated_orders to explicitly include completed orders from current OC: orders_in_order_cycles_not_closed
2019-07-12 22:20:09 +01:00
Kristina Lim
2c279fd02d
Remove line item adjustments if line item deleted
2019-07-13 03:58:01 +10:00
Kristina Lim
8a048cc155
Add proof line item adjustments remain after line item removal
2019-07-13 01:43:07 +08:00
Luis Ramos
b3c378e8c1
Merge pull request #4029 from Matt-Yorkley/js_render_blocking2
...
Js render blocking 2
2019-07-12 16:34:31 +01:00
Luis Ramos
39475be792
Merge pull request #4030 from Matt-Yorkley/line_item_errors
...
LineItems can always access soft-deleted variants
2019-07-12 16:33:36 +01:00
luisramos0
9e2e460ac5
Add date format to moment date conversion. This conversion was not working on firefox
2019-07-12 12:01:18 +01:00
luisramos0
18006ea9c8
Change devise config to speed up password encryption in tests
2019-07-12 10:12:53 +01:00
luisramos0
71b648e9fa
Add some tests to features/admin/users_spec from spree_auth_devise
2019-07-12 10:02:40 +01:00
luisramos0
eacd76bfa4
Add spec to features/admin/products_spec from spre_auth_devise
2019-07-11 19:47:17 +01:00
luisramos0
791ff842aa
Add some tests to models/spree/user_spec from spre_auth_devise
2019-07-11 19:39:31 +01:00
luisramos0
ac0123734a
Add some tests from spree/users_controller_spec from spree_auth_devise
2019-07-11 18:33:18 +01:00
luisramos0
7cab99efdf
Run transpec on users_controller
2019-07-11 18:07:23 +01:00
luisramos0
5378bb7b34
Add adapted version of spree/admin/users_controller_spec from spree_auth_devise
2019-07-11 17:45:56 +01:00
luisramos0
942824cd74
Improve comments in UserMailer
2019-07-11 16:37:30 +01:00
Pau Pérez Fabregat
bdeb56bfaf
Merge pull request #4028 from openfoodfoundation/transifex
...
Transifex
2019-07-11 17:28:38 +02:00
Matt-Yorkley
fb4e573cfa
Add a soft-deleted test in line_item_spec
2019-07-11 16:07:30 +01:00
Transifex-Openfoodnetwork
e65df31bc3
Updating translations for config/locales/nl_BE.yml
2019-07-12 00:29:50 +10:00
Transifex-Openfoodnetwork
ce1ac57522
Updating translations for config/locales/de_DE.yml
2019-07-11 23:53:17 +10:00
Transifex-Openfoodnetwork
09ff57d462
Updating translations for config/locales/en_BE.yml
2019-07-11 23:50:31 +10:00
Transifex-Openfoodnetwork
542cf0cf4f
Updating translations for config/locales/fr_BE.yml
2019-07-11 23:43:29 +10:00
Transifex-Openfoodnetwork
f4113745ce
Updating translations for config/locales/fr.yml
2019-07-11 23:11:32 +10:00
Transifex-Openfoodnetwork
6d197c53e0
Updating translations for config/locales/en_ZA.yml
2019-07-11 21:40:38 +10:00
Matt-Yorkley
b2c6e6271c
LineItems can always access soft-deleted variants
2019-07-11 11:33:34 +01:00
Luis Ramos
cdd36eeefc
Merge pull request #3674 from Matt-Yorkley/spree2/import_description
...
Allow import to proceed when updating a product and `description` is set
2019-07-10 21:09:30 +01:00
Matt-Yorkley
97148f6f57
Send embedded Stripe javascript to :injection_data
2019-07-10 19:28:20 +01:00
Matt-Yorkley
6219b3f0c3
Revert "Revert "Fix JS render-blocking in Darkswarm""
...
This reverts commit ffeca41e
2019-07-10 17:14:08 +01:00
Transifex-Openfoodnetwork
d66cac7a26
Updating translations for config/locales/ca.yml
2019-07-10 21:20:51 +10:00
Transifex-Openfoodnetwork
07c11b9b1f
Updating translations for config/locales/es.yml
2019-07-10 21:18:28 +10:00
Transifex-Openfoodnetwork
6a232a1f36
Updating translations for config/locales/ca.yml
2019-07-10 21:17:43 +10:00
Maikel
1a61357be8
Merge pull request #4024 from openfoodfoundation/transifex
...
Transifex
2019-07-10 11:17:12 +10:00
Maikel
b2eeb5d687
Merge pull request #4025 from openfoodfoundation/revert-3988-js_render_blocking
...
Revert "Fix JS render-blocking in Darkswarm"
2019-07-10 11:00:17 +10:00
Maikel
ffeca41ef4
Revert "Fix JS render-blocking in Darkswarm"
2019-07-10 10:24:25 +10:00
Transifex-Openfoodnetwork
68c0936766
Updating translations for config/locales/en_GB.yml
2019-07-10 04:39:47 +10:00
Luis Ramos
23b6267e30
Merge pull request #3916 from luisramos0/schedules_of_coordinator
...
OC schedules are now filtered to schedules of OCs with same coordinator
2019-07-09 14:21:34 +01:00
Luis Ramos
6872ccfb72
Merge pull request #3963 from luisramos0/hide_invoices
...
Hide invoices feature
2019-07-09 14:20:50 +01:00
luisramos0
b1b791e4ee
Update all locales with the latest Transifex translations
2019-07-09 14:19:35 +01:00
Luis Ramos
1779b759f7
Merge pull request #4017 from openfoodfoundation/transifex
...
Transifex
2019-07-09 14:15:38 +01:00
Transifex-Openfoodnetwork
3ebbf5a55d
Updating translations for config/locales/fr.yml
2019-07-09 22:42:05 +10:00
Luis Ramos
83ce2ac3dc
Merge pull request #3988 from Matt-Yorkley/js_render_blocking
...
Fix JS render-blocking in Darkswarm
2019-07-09 12:30:30 +01:00
Luis Ramos
aaf850a095
Merge pull request #4010 from luisramos0/fuubar_upgrade
...
Apply 2.1.1 hotfix to master
2019-07-09 12:24:54 +01:00
Luis Ramos
3e9bf8aa1f
Merge pull request #3964 from openfoodfoundation/hand-soft-deleted-products-in-orders-and-fulfillment-report
...
Handle soft deleted products in orders and fulfillment report
2019-07-09 12:19:28 +01:00
luisramos0
95832c96ac
Delete redundant spec, this case is now covered in a view spec
2019-07-09 09:15:38 +01:00
Jon Leighton
4398ea12b8
Convert several fields from string to text
...
See discussion here:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3751#issuecomment-503416955
Fixes #3192 .
I have also done a pass over the schema to identify other fields which
would benefit from being a text rather than a string. However, I ignored
all `spree_*` tables because I didn’t want to mess up the ‘default’
Spree schema.
2019-07-09 13:11:30 +10:00
Luis Ramos
8a700307d2
Merge pull request #3992 from Matt-Yorkley/cart_button_bug
...
Fix display bug in cart button on mobile menu
2019-07-08 18:33:36 +01:00
luisramos0
86accc227e
Convert erb files brought from spree_auth_devise to haml
2019-07-08 18:09:03 +01:00
Luis Ramos
1756ddd0e9
Merge pull request #3989 from Matt-Yorkley/preload_primary_font
...
Preload primary font to speed up page rendering
2019-07-08 17:43:15 +01:00
Luis Ramos
fe71781d70
Merge pull request #3791 from jazzdragon/1766-registration-scroll
...
1766 registration scroll
2019-07-08 15:10:35 +01:00
Luis Ramos
ec65951ef3
Merge pull request #3959 from jonleighton/issue-1848
...
Edit tooltip text to make it readable
2019-07-08 15:09:11 +01:00
luisramos0
1681e8a572
Remove unused auth config
2019-07-08 14:06:01 +01:00
luisramos0
e897eb0439
Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers
...
We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route
2019-07-08 13:59:26 +01:00
luisramos0
36e3362fc1
Adding missing translation that is now being used after being brought from spree_auth_devise
2019-07-08 13:23:18 +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
0101dcdd93
Remove unused Spree::Dash from controllers brought from spree_auth_devise
2019-07-08 13:10:52 +01:00
luisramos0
9416f61fb3
Remove spree/checkout_controller.completion_route only used in spree/checkout_controller.update which is never used in OFN. Checkout update happpens in the checkout_controller.update
2019-07-08 13:04:38 +01:00
luisramos0
8efd69c3d1
Remove unnecessary checkout registration code, it's not used in OFN
2019-07-08 12:57:17 +01:00
luisramos0
dcbdfbb081
Fix rubocop issues in multiple files copied from spree_auth_devise, mostly hash rockets
2019-07-08 11:22:56 +01:00
luisramos0
92968c5efe
Merge spree/users_sessions_controller into spree/users_sessions from spree_auth_devise
2019-07-07 22:06:18 +01:00
luisramos0
c8ac64566f
Merge spree/users_controller_decorator into spree/user_controller
2019-07-07 22:04:04 +01:00
Transifex-Openfoodnetwork
633c7737e4
Updating translations for config/locales/en_ZA.yml
2019-07-08 04:04:48 +10:00
luisramos0
05a72be273
Move handle_asynchronously :send_reset_password_instructions to after send_reset_password_instructions declaration
...
This was as it was before the merge of user_decorator and user, the declaration was in the original class and the handle_asynchronously part was in the decorator which was loaded after the main user class from spree_auth_devise, this commit restores the order and fixes a spec in authentication_spec
2019-07-07 17:53:12 +01:00
luisramos0
b1cd950051
Add missing translation keys from spree_auth_devise
2019-07-07 17:12:54 +01:00
luisramos0
f557996817
Add deface overrides from spree_auth_devise for the users menu tab, the admin top bar and the shared login bar (maybe dead code this last one)
2019-07-06 22:53:20 +01:00
luisramos0
1a64a737d4
Add ActionController::Metal frorm spree_auth_devise for api authentication
2019-07-06 10:50:48 +01:00
luisramos0
7c0087cb30
Remove reference to empty spree_auth css and js files from spree_auth_devise
2019-07-06 00:02:40 +01:00
luisramos0
17448699f9
Bring devise initializer from spree_auth_devise and fix spree initializer details
2019-07-05 22:45:59 +01:00
luisramos0
a413f22e12
Remove unnecessary dependency to spree/users helper
2019-07-05 22:37:07 +01:00
luisramos0
893952f46b
Merge user_mailer_decorator into user_mailer
2019-07-05 22:31:06 +01:00
luisramos0
061e3cd722
Add user mailer from spree_auth_devise
2019-07-05 22:29:51 +01:00
luisramos0
a83790951d
Add model auth_config from spree_auth_devise
2019-07-05 21:58:29 +01:00
luisramos0
4e33529845
Merge user_decorator.rb into user.rb
2019-07-05 21:58:28 +01:00
luisramos0
a2a8b330b7
Add User class from spree_auth_devise as is
2019-07-05 21:58:28 +01:00
luisramos0
9669016573
Add required views from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
2755cb9ec7
Add users_tab partial from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
fdcc4c2447
Remove dependency to spree auth devise
2019-07-05 21:58:07 +01:00
Pau Perez
f42bf72b32
Fix rubocop violations
...
It's not affordable to fix the failed Metrics cops in the scope of this
bug fix, but now, with a separate class, it'll be easier.
2019-07-05 18:19:58 +02:00
Pau Perez
8ab77b077b
Fix spec
...
This needs to be revisited. I'm not sure it's the most appropriate spec
as it seems to be testing just part of story.
2019-07-05 18:19:58 +02:00
Pau Perez
9b03833df0
Extract orders & fulfillments default report clasts
2019-07-05 18:19:58 +02:00
Pau Perez
fada30435f
DRY some procs from report
2019-07-05 18:19:58 +02:00
luisramos0
fc0ffda8ec
Bring routes and controllers from spree_auth_devise
2019-07-05 15:08:42 +01:00
Luis Ramos
397729ed3d
Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile
...
Display enterprise ID in profile
2019-07-05 11:14:43 +01:00
luisramos0
88312b8e4a
Make OrdersHelper.invoice_links simpler
2019-07-05 11:08:51 +01:00
luisramos0
9be3ff90f7
Make OrdersHelper.complete_order_links simpler
2019-07-05 11:06:49 +01:00
luisramos0
a5b5e5de32
Remove trailing backslash
2019-07-05 10:58:53 +01:00
luisramos0
e66dea7e03
Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.
2019-07-05 10:37:27 +01:00
Maikel
4c5ed2fa45
Merge pull request #3999 from openfoodfoundation/transifex
...
Transifex
2019-07-05 11:59:40 +10:00
Maikel
40c0e69f11
Merge pull request #4000 from Matt-Yorkley/v2_migrations
...
Fix failing migration by clearing schema cache
2019-07-05 10:56:26 +10:00
Transifex-Openfoodnetwork
f3837fb6af
Updating translations for config/locales/en_GB.yml
2019-07-05 05:08:46 +10:00
Pau Perez
db7b7bbde2
Fix finding supplier for a deleted product
2019-07-04 18:52:56 +02:00
luisramos0
ef61310bad
Fix long lines in order_cycle_permissions and permissions
2019-07-04 17:17:58 +01:00
luisramos0
91da0114e3
Upgrade fuubar to 241 to skip yanked 240
2019-07-04 16:09:36 +01:00
Pau Perez
ee301c5e2f
Address Code Climate (rubocop) issues
2019-07-04 17:01:06 +02:00
Pau Perez
4a67ffab25
Add a test case for reports with deleted products
2019-07-04 17:01:06 +02:00
Pau Perez
4d060815d0
Extract unscoping logic into method
...
DRYies out the code a bit.
2019-07-04 17:01:06 +02:00
Pau Perez
f91bd03c25
Add clarifying comment to report
2019-07-04 17:01:06 +02:00
Pau Perez
7de4ec2a90
Fix orders and fulfillments report
...
It bypasses the default_scope to retrieve deleted variants in the orders
and fulfillment report.
2019-07-04 17:01:06 +02:00
Pau Perez
812d8cac4a
Make complex method a bit more readable
2019-07-04 17:01:06 +02:00
Transifex-Openfoodnetwork
d1faed282f
Updating translations for config/locales/es.yml
2019-07-05 00:22:01 +10:00
Transifex-Openfoodnetwork
26195314eb
Updating translations for config/locales/ca.yml
2019-07-05 00:09:05 +10:00
François Turbelin
912483660f
Put the uid under the permalink
2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76
Apply last suggestions
2019-07-04 09:43:35 +02:00
luisramos0
dee1c3d139
Fix typo in order_cycle_permissions.rb
2019-07-03 22:58:33 +01:00
François Turbelin
101cff02c6
Add locale keys
2019-07-03 23:06:50 +02:00
luisramos0
bb9c54a445
Use enterprises.id instead of :id to remove ambiguous column errors
2019-07-03 22:03:40 +01:00
François Turbelin
5ce2af454e
Clean id field
2019-07-03 23:00:36 +02:00
luisramos0
e5f396f975
Fix Permissions.related_enterprises_granted by adding explicit reference to table
2019-07-03 20:18:01 +01:00
luisramos0
a57a93d414
Adapt permissions.rb and order_cycle_permissions to rails 4
2019-07-03 20:18:01 +01:00
luisramos0
a82b1d8129
Adapt exchange.involving scope to rails 4
2019-07-03 20:18:00 +01:00
luisramos0
5184fa540c
Adapt enterprise_relationship permitting and permitted_by scopes to rails 4
2019-07-03 20:18:00 +01:00
Luis Ramos
951787d456
Merge pull request #3987 from mkllnk/3978-optimise-products-cache
...
3978 Optimise products cache
2019-07-03 19:59:07 +01:00
Luis Ramos
b35743b6e4
Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment
...
Rescue checkout on shipping id conflict
2019-07-03 19:56:24 +01:00
Luis Ramos
4fc30ba50e
Merge pull request #3994 from openfoodfoundation/dependabot/bundler/knapsack-1.17.2
...
Bump knapsack from 1.17.1 to 1.17.2
2019-07-03 19:55:20 +01:00
François Turbelin
97a401a307
Display enterprise ID in profile
2019-07-03 18:10:59 +02:00
Pau Pérez Fabregat
232e3b8262
Merge pull request #3993 from openfoodfoundation/dependabot/bundler/simplecov-0.17.0
...
Bump simplecov from 0.16.1 to 0.17.0
2019-07-03 16:28:56 +02:00
Pau Pérez Fabregat
b3b66d5825
Merge pull request #3970 from mkllnk/444-feature-toggle-use-env
...
Toggle features via env instead of initializer
2019-07-03 16:27:01 +02:00
Pau Pérez Fabregat
1b532f995c
Merge pull request #3919 from mkllnk/db-mirror-script
...
Db mirror script
2019-07-03 16:24:01 +02:00
Pau Pérez Fabregat
f5544494f0
Merge pull request #3997 from mkllnk/remove-ng-test-script
...
Remove obsolete Javascript test script
2019-07-03 16:23:41 +02:00
Pau Pérez Fabregat
2de32b54ba
Merge pull request #3995 from mkllnk/how-to-not-archive-branches
...
Remove obsolete script to archive branches
2019-07-03 16:23:15 +02:00
Pau Pérez Fabregat
b6e2dadbb3
Merge pull request #3996 from mkllnk/remove-backup-script
...
Remove obsolete backup script
2019-07-03 16:22:36 +02:00
Matt-Yorkley
473e635d54
Merge pull request #3982 from luisramos0/mobile_bug
...
Fixes menu problem with long shop names
2019-07-03 13:30:41 +01:00
Transifex-Openfoodnetwork
3e11cdb5c1
Updating translations for config/locales/fr.yml
2019-07-03 22:14:43 +10:00
Transifex-Openfoodnetwork
842e8da2c3
Updating translations for config/locales/fr.yml
2019-07-03 22:11:35 +10:00
Matt-Yorkley
24f8e6d2ec
Fix failing migration by clearing schema cache
2019-07-03 12:59:10 +01:00
Maikel
568d58405d
Merge pull request #3986 from openfoodfoundation/transifex
...
Transifex
2019-07-03 18:46:14 +10:00
Maikel Linke
b23489fa40
Remove obsolete Javascript test script
...
This script has been replaced by a rake task a long time ago:
bundle exec rake karma:run # to run the specs once
bundle exec rake karma:start # to run the spec after each change
We don't need it any more and it doesn't work on my machine.
2019-07-03 14:50:33 +10:00
Maikel Linke
503658f930
Remove obsolete backup script
...
This script doesn't work anymore. It was written for old an Australian
production server. We have automatic backups now. And if we wanted to
take a backup manually, we should probably give it a meaningful name,
not using a script.
2019-07-03 14:46:56 +10:00
Maikel Linke
24bf5f0fea
Remove obsolete script to archive branches
...
Apparently, there was a practice to archive branches by tagging them
"archive/branch-name" and then deleting them. We don't practice that
anymore and I would suggest to not start doing it again. Our setup is a
bit different now.
We now use our own forks for feature branches and can have our own,
individual archiving practices in our forks. There is no need to have a
central graveyard of people's "work after progress".
The old feature branches we used to have in the central repository got
archived in another fork:
https://github.com/openfoodfoundation/openfoodnetwork-archive/
Branches associated to pull requests should be deleted after the pull
request has been closed. Github keeps a reference to those branches in
the pull request which is like an archive.
Special branches we still have and delete from time to time:
- transifex: Created for new translations, deleted afterwards.
- dependabot/*: Dependabot always creates pull requests. See above.
- 1-31-1-stable etc: They only live as long as they are supported.
I would also like to delete the old `archive/*` tags. They are in the
openfoodnetwork-archive repository and could confuse developers in the
main repository. Let's keep it clean.
2019-07-03 14:36:16 +10:00
Matt-Yorkley
9d86249bcb
Merge pull request #3954 from openfoodfoundation/improve-database-yml
...
DRY and make database.yml more flexible
2019-07-02 21:43:49 +01:00
Kristina Lim
3e37c8a3f1
Change underscores in CSS classes to hyphens
...
These were triggering a warning from scss-lint.
2019-07-03 04:43:35 +08:00
Kristina Lim
691d7d735b
Reduce padding between top bar menu items
2019-07-03 04:35:44 +08:00
Kristina Lim
6d1dd76590
Cap width of hub name in top bar and wrap
2019-07-03 04:30:06 +08:00
Kristina Lim
356e00bfbb
Add space for tab bar in medium and below screens
2019-07-03 04:02:28 +08:00
Kristina Lim
5534109122
Undo setting of margin for home tagline
2019-07-03 04:02:22 +08:00
Janine Luk
ac8790ecb3
sticky header for mobile
2019-07-03 03:57:11 +08:00
Matt-Yorkley
2eb8121644
Update Docker config
2019-07-02 20:36:21 +01:00
Matt-Yorkley
b685e0d3a7
Add ENV var for db host
2019-07-02 20:34:16 +01:00
Matt-Yorkley
1dd3d86a2b
Add prefixes to ENV vars
2019-07-02 20:34:16 +01:00
Pau Perez
7ee41902f2
DRY and make database.yml more flexible
...
This enables us to fix
https://github.com/openfoodfoundation/ofn-install/issues/387 and brings the
needed flexibility so things like
https://github.com/openfoodfoundation/openfoodnetwork/pull/3887 or any CI don't
require a custom version. That's what ENV vars are for!
For instance, I no longer need to mess with my LXC setup to connect to the DB.
I just need to have 2 env vars.
2019-07-02 20:34:16 +01:00
dependabot-preview[bot]
490ced4a92
Bump knapsack from 1.17.1 to 1.17.2
...
Bumps [knapsack](https://github.com/ArturT/knapsack ) from 1.17.1 to 1.17.2.
- [Release notes](https://github.com/ArturT/knapsack/releases )
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ArturT/knapsack/compare/v1.17.1...v1.17.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-02 19:21:44 +00:00
dependabot-preview[bot]
a682115fb1
Bump simplecov from 0.16.1 to 0.17.0
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-02 19:19:31 +00:00
Kristina Lim
653067f58c
Omit text for top bar items with icon in large
...
This affects only top bar menu items for:
* Language
* Profile
This does not update the "Log in" menu item, because the currently
selected icon might not be self explanatory.
2019-07-03 01:49:36 +08:00
Kristina Lim
06ed9c838e
Remove extra left padding from top bar menu items
2019-07-03 01:49:35 +08:00
Matt-Yorkley
726d87de6b
Fix display bug in cart button on mobile menu
2019-07-02 16:47:22 +01:00
Matt-Yorkley
fbb97c3db8
Fix JS render-blocking in Darkswarm
2019-07-02 13:43:20 +01:00
Matt-Yorkley
cea8cbd924
Preload primary font to speed up page rendering
2019-07-02 13:23:03 +01:00
Maikel Linke
73372a58ef
Remove unused and dangerous Exchange#eql? override
...
The `eql?` override has been added in very early commits but was
actually not used except in a test. It also caused performance problems
since each call to `eql?` would issue two database queries. A developer
would unknowingly trigger these when using `exchanges.uniq`. A mistake
that could have happened again in the future.
I moved the implementation to the test that was actually using it and
made a second test a bit more explicit.
2019-07-02 18:42:02 +10:00
Maikel Linke
287d6a926a
Document Exchange
2019-07-02 18:42:02 +10:00
Maikel Linke
04b07a1ff5
Further optimise querying affected exchanges
...
The implementation queried the database for each incoming variant that
was changed. This rewrite combines ActiveRecord relations so that it
creates only one query. This saves another 5-10% of execution time when
updating enterprise fees on production instances.
2019-07-02 18:42:01 +10:00
Maikel Linke
0da7c93bc6
Collect affected exchanges more efficiently
...
When an incoming exchange of an order cycle changes, the ProductsCache
queries all affected outgoing exchanges to update them. It was creating
a big collection of exchanges with duplicates and then calling `uniq`.
That call was hitting a custom implementation of `eql?` which is very
inefficient. And since `Exchange.eql?` is ignoring the order cycle id,
it was probably filtering too many exchanges from the collection.
Fixed bug: If two order cycles sell exactly the same variants to the
same shop, the two outgoing exchanges are seen as equal. When the
variants change, ProductsCache would only update one of those two
exchanges, leaving one order cycle out of sync. This case is very rare.
It only happens if there is a shop with two active order cycles selling
exactly the same.
The new uniqueness test looks only at the attributes that are later used
to refresh the cache. I measured a page speed improvement from 90
seconds to 3 seconds (30 times faster).
2019-07-02 18:29:50 +10:00
Maikel Linke
bfe41d4cbc
Extract method to simplify
2019-07-02 18:29:50 +10:00
Maikel Linke
3e6e0b73ee
Style products cache
...
The `private` modifier doesn't affect class methods. Class methods have
to be declared as private separately. Also using more guard clauses,
brackets and linebreaks.
2019-07-02 18:29:49 +10:00
Maikel
592a468448
Merge pull request #3960 from mkllnk/test-spec-stability
...
Remove retries from previously flaky specs
2019-07-02 13:50:16 +10:00
Transifex-Openfoodnetwork
f09b1fc1a8
Updating translations for config/locales/en_ZA.yml
2019-07-02 01:13:09 +10:00
Ecksi
bdbd869b06
Modify English tool tip text in yml file
...
Modify GB English tool tip text in yml file
Modify US English tool tip text in yml file
2019-06-28 10:59:50 +10:00
Maikel
8b42bd205a
Merge pull request #3977 from openfoodfoundation/transifex
...
Transifex
2019-06-27 09:29:09 +10:00
Transifex-Openfoodnetwork
6108a74fec
Updating translations for config/locales/fr.yml
2019-06-27 00:47:45 +10:00
Luis Ramos
5ecab7a0c2
Merge pull request #3971 from Matt-Yorkley/basket_errors
...
Avoid `undefined method 'order'` errors when removing lineitems from basket
2019-06-26 15:33:26 +01:00
Luis Ramos
d8785bdaba
Merge pull request #3932 from luisramos0/shpfront_message
...
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +01:00
Luis Ramos
00841cb537
Merge pull request #3923 from luisramos0/prod_image_error
...
User friendly error when creating a product with an image in an unsupported format
2019-06-26 15:30:18 +01:00
luisramos0
61c8859da8
Fix problem in array concatenation in orders helper and cover it with specs
2019-06-26 14:17:41 +01:00
luisramos0
e33ce235c4
Hide invoice links in order edit page if invoices are disabled
2019-06-26 14:17:41 +01:00
luisramos0
ec2f99a467
Refactor OrderHelper.order_links: extract some logic from order_links to make it more simple and pass rubocop tests
2019-06-26 14:17:41 +01:00
luisramos0
67b5f08b07
Refactor OrderHelper.order_links: extract links object to separate methods
2019-06-26 14:17:41 +01:00
luisramos0
95170bacd5
Show print invoices button in orders list page only if invoices are enabled in the backoffice
2019-06-26 14:17:25 +01:00
Maikel
eebc49f27c
Merge pull request #3887 from pacodelaluna/add-docker-configuration-for-dev-setup
...
Add docker configuration for quick local setup
2019-06-26 21:23:34 +10:00
luisramos0
8b0296eae6
Use a single query to get filter_schedules_by_enterprise_id
2019-06-26 11:38:03 +01:00
François Turbelin
b6120a9105
Fix docker-compose application yml file
2019-06-26 11:03:20 +02:00
Maikel Linke
5d3dbca9c3
Toggle features via env instead of initializer
...
A FeatureToggle could be switched via a class_eval in an initializer.
The initializer was installed via ofn-install. We want to get rid of
custom, untracked initializers. Here I'm changing the FeatureToggle
class to use environment variables instead.
This change needs to be followed up with a change in ofn-install to use
the new environment variable. It affects only Australian production.
2019-06-26 11:43:22 +10:00
Maikel Linke
5bbd63bcd8
Add spec for rescuing order saving shipment
2019-06-26 11:32:01 +10:00
Maikel Linke
980b4a86ab
Move shipment rescue to its own method
2019-06-26 10:48:51 +10:00
Luis Ramos
118ed79070
Merge pull request #3904 from luisramos0/subs_stock
...
Fix ofn-on-hand directive and fix usage of variant.on_hand in subscriptions order factory
2019-06-25 20:25:06 +01:00
François Turbelin
623d1e0285
Add missing file
2019-06-25 20:05:55 +02:00
François Turbelin
2dcced8810
Put back application example file as it was
2019-06-25 17:59:37 +02:00
Matt-Yorkley
5100ad6b51
Improve #line_items_for logic and add more tests
2019-06-25 15:33:42 +01:00
luisramos0
7e2bead54d
Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity
2019-06-25 14:50:03 +01:00
luisramos0
2b6e6c62dd
Simplify order_factory_spec by extracting copy pasted code to method
2019-06-25 14:50:03 +01:00
luisramos0
05a15d9441
Extract method to remove some copy pasted code in order_factory_spec
2019-06-25 14:50:03 +01:00
luisramos0
567196fe0e
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
...
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
luisramos0
7bd32d4967
Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account
...
This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb) , since then variant.on_hand does not return infinity if variant is on_demand
2019-06-25 14:47:47 +01:00
Luis Ramos
9b6f1a5e11
Merge pull request #3958 from Matt-Yorkley/pi_encoding
...
Improve handling of invalid characters in uploaded CSV files
2019-06-25 14:44:32 +01:00
François Turbelin
84389d1392
Fix setup script with new application YAML file
2019-06-25 14:38:38 +02:00
François Turbelin
da3b467d47
Use https to fetch Postgres repo
2019-06-25 14:09:59 +02:00
François Turbelin
ceffae2efc
Delete extra example file
2019-06-25 14:08:18 +02:00
Matt-Yorkley
f19a6f0dec
Add tests for class_eval on Spree::Calculator private method #line_items_for
2019-06-25 12:19:16 +01:00
Matt-Yorkley
0a155da273
Avoid undefined method 'order' errors when removing lineitems from basket
2019-06-25 11:13:56 +01:00
François Turbelin
c0d02c8d42
Fix errors while relauching container
2019-06-25 12:05:26 +02:00
François Turbelin
e68d72c0dd
Update DOCKER.md
2019-06-25 11:47:54 +02:00
Matt-Yorkley
034e8b180a
Use let for CSV data
2019-06-25 10:24:53 +01:00
Matt-Yorkley
ead0e1c08d
Store attributes list in constant
2019-06-25 10:20:59 +01:00
Matt-Yorkley
8dfb628d88
Add test for ignoring non-updatable description field in validations when updating
2019-06-25 10:19:05 +01:00
Matt-Yorkley
85b3d7dac5
Move attribute check to method
2019-06-25 10:19:05 +01:00
Matt-Yorkley
84040fd2a6
Allow import to proceed when updating a product and description is set
2019-06-25 10:19:05 +01:00
François Turbelin
5dcf456c90
Remove old Rake task for sample data
2019-06-25 11:18:48 +02:00
François Turbelin
79ec3d5a3f
Remove extra copy on Docker file
2019-06-25 11:18:48 +02:00
François Turbelin
e893197c49
Use example files instead of extra Docker ones
2019-06-25 11:18:48 +02:00
Matt-Yorkley
60e67ae1a4
Run all setup steps on startup
...
It's a bit dirty, but it works :)
2019-06-25 11:18:48 +02:00
Matt-Yorkley
53a0f70aa0
Add default login details via ENV vars
2019-06-25 11:18:48 +02:00
Matt-Yorkley
64d6ae445b
Change postgres repo from precise to bionic
2019-06-25 11:18:48 +02:00
Matt-Yorkley
5712f67673
Remove phantomjs from dependencies
2019-06-25 11:18:48 +02:00
François Turbelin
9c45444ea6
Clean database.docker.yml file
2019-06-25 11:18:48 +02:00
François Turbelin
4e41a73c4f
Enhance Dockerfile
2019-06-25 11:18:48 +02:00
François Turbelin
75267268d7
Update Postgres to 9.5
2019-06-25 11:18:48 +02:00
François Turbelin
7455053879
Update DOCKER.md file
2019-06-25 11:18:48 +02:00
François Turbelin
c5addb8c1d
Fix comment spacings, gloupsss
2019-06-25 11:18:48 +02:00
François Turbelin
e5d4b216ba
Add DOCKER.md file as documentation
2019-06-25 11:18:48 +02:00
François Turbelin
b4fe44510b
Tune up the Rake task
2019-06-25 11:18:48 +02:00
François Turbelin
9df5d78f27
Add a Rake task in order to setup dev env
2019-06-25 11:18:48 +02:00
François Turbelin
f9d72e10d5
Add Docker configuration
2019-06-25 11:18:48 +02:00
Maikel
723499332a
Merge pull request #3006 from mkllnk/i18n-error-detection
...
Raise error on missing translation keys
2019-06-25 16:13:15 +10:00
Maikel Linke
6a06e0ac3b
Raise error on missing translation keys
2019-06-25 15:06:56 +10:00
Luis Ramos
5600102729
Merge pull request #3876 from luisramos0/3804_insuf_stock
...
3804 Fix editing cart when variant on_demand but its on_hand value is zero or negative
2019-06-24 22:24:15 +01:00
luisramos0
a6ea975848
Fix editing cart when variant on_demand but on_hand is zero or negative
2019-06-24 22:07:46 +01:00
Luis Ramos
57917a498b
Merge pull request #3946 from luisramos0/missing_translatiojns
...
Fix last missing translations covered by specs
2019-06-24 20:52:59 +01:00
Luis Ramos
b30da27e92
Merge pull request #3950 from openfoodfoundation/dependabot/bundler/stripe-4.19.0
...
Bump stripe from 4.18.1 to 4.19.0
2019-06-24 20:44:57 +01:00
Maikel Linke
1e1e88fe51
Rescue checkout on shipping id conflict
...
Helps to investigate https://github.com/openfoodfoundation/openfoodnetwork/issues/3924
A better solution would be to move the update of shipments out of the
after_save callback and deal with it in controllers. Unfortunately,
that's a big and tricky task.
Since this exception is causing a lot of pain for some Australian
farmers, I introduced more logging here to understand the problem
better. The issue was observed in OFN v1 and may disappear with v2. But
we don't know that and should monitor it.
2019-06-21 16:05:54 +10:00
Maikel
e4c3c1664a
Merge pull request #3943 from jonleighton/issue-2112
...
Bring back ‘Shop for X products at:’ title
2019-06-21 15:06:21 +10:00
Maikel
5b0c8bbaef
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
...
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
Maikel
71f396a44f
Merge pull request #3896 from luisramos0/clear_unit_desc
...
Clear product.variants.unit_description if product.variant_unit is items
2019-06-21 15:00:06 +10:00
Maikel
eb162f6b29
Merge pull request #3934 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.2
...
Bump activerecord-import from 1.0.1 to 1.0.2
2019-06-21 14:59:03 +10:00
Maikel
5aea361d87
Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4
...
Start upgrade to Rails 4
2019-06-21 14:58:24 +10:00
Maikel
3721c017fa
Merge pull request #3670 from luisramos0/2-0-without-spree-fe-assets
...
[Spree Upgrade] Remove dependency to spree frontend - routes and controllers
2019-06-21 14:57:03 +10:00
Maikel
12f0ed9955
Merge pull request #3940 from luisramos0/zones
...
Remove matching of shipping method zone to user address on checkout
2019-06-21 14:43:40 +10:00
Maikel
4c4881430c
Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import
...
3877,3843 Improve handling of units and unit type in product import
2019-06-21 14:43:01 +10:00
luisramos0
bcc02f35e7
Add new preference to invoice settings: enable invoices
2019-06-19 13:29:30 +01:00
Matt-Yorkley
08b2b19d5e
Improve handling of invalid characters in uploaded CSV files
2019-06-19 09:29:59 +01:00
Maikel Linke
cccd35fdf3
Remove retries from previously flaky specs
...
It's not acceptable to have flaky specs that only pass once in three
tries. Our specs might be more stable now that we use Chrome as test
browser. Otherwise we have to find out why these specs are not stable.
It might be an important bug that happens only sometimes.
2019-06-19 16:48:04 +10:00
Maikel Linke
d8ece7cd8b
First stored credit card becomes default again
...
A user can store their credit card when checking out. Due to a bug in
https://github.com/openfoodfoundation/openfoodnetwork/pull/3840 it
didn't become the default card any more. This behaviour is now restored.
If there is not default card yet, a new card added during checkout
becomes the default card.
2019-06-19 15:43:38 +10:00
Maikel Linke
ee65d70eec
Deal with empty payments sequence
...
The task was crashing when there were no payments in the query range.
2019-06-19 09:58:47 +10:00
Matt-Yorkley
ab1ed53507
Merge pull request #3955 from openfoodfoundation/remove-travis-leftover
...
No need to keep old and used Travis config file
2019-06-18 16:48:13 +01:00
luisramos0
160b535e2f
Make weight calculator compute 0 for variants with unit different from weight
2019-06-18 15:21:13 +01:00
luisramos0
e8eeb3d5dc
Further improve weight calculator code
2019-06-18 13:28:16 +01:00
luisramos0
2b3865855d
Simplify shipping_method.include? method
2019-06-18 11:42:34 +01:00
luisramos0
1da18d3386
Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope
2019-06-18 10:52:56 +01:00
luisramos0
b025df1798
Fix a few more rubocop issues
2019-06-18 10:52:56 +01:00
luisramos0
178924af5d
Fix long lines in order_cycle model
2019-06-18 10:52:45 +01:00
luisramos0
bb1f7fde2f
Remove unused routes related to taxons
...
t/products was already an old route 4 years ago and t/*id is not currently working in master
2019-06-18 10:49:20 +01:00
luisramos0
c61e7a1672
Remove unused routes
...
This fix is in spree 2.1 here: ba420fe70e
2019-06-18 10:49:20 +01:00
luisramos0
3c964933b1
Remove stub of a deleted method #deadcode
2019-06-18 10:49:20 +01:00
luisramos0
e7b625edcf
Remove spree locale route
...
This route is not used, ofn code uses query param locale that is picked up in base controller set_locale
2019-06-18 10:49:20 +01:00
luisramos0
eab6cc563b
Fix rubocop issues
2019-06-18 10:49:20 +01:00
luisramos0
8daf9b9247
Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form
2019-06-18 10:49:20 +01:00
luisramos0
5ba0f906a1
For some reason we need the orders populate route to make product import routes work
2019-06-18 10:49:20 +01:00
luisramos0
35c8236c21
Add missing datepicker/cal.gif to ofn assets
2019-06-18 10:49:20 +01:00
luisramos0
b397a8e661
Remove spree_frontend and spree_sample from ofn's gemfile
...
spree_frontend will only be removed from gemfile.lock when spree_auth_devise is removed from OFN
2019-06-18 10:49:20 +01:00
luisramos0
61def8f2e7
Convert match routes to get routes to be compatible with rails 4
2019-06-18 10:49:20 +01:00
luisramos0
4ff0bf8162
Change gemfile to depend on the different spree gems, not spree as a whole
2019-06-18 10:49:20 +01:00
luisramos0
02b9fca620
Remove unused spree checkout and spree cart routes
2019-06-18 10:49:19 +01:00
luisramos0
40f7d07e27
Remove unnecessary method from spree storecontroller and spree orderscontroller
2019-06-18 10:47:34 +01:00
luisramos0
c56486d7ae
Remove unnecessary methods from spree checkoutcontroller
2019-06-18 10:47:34 +01:00
luisramos0
56db90f49e
Remove unused checkout controller update action and order controller populate action
...
Additionally, remove routes of these actions as well as routes already defined in routes.rb (checkout and cart)
2019-06-18 10:47:34 +01:00
luisramos0
a8b4037885
Remove dependency to coupon code logic in checkoutcontroller, ofn doesnt have that feature
2019-06-18 10:47:34 +01:00
luisramos0
fc145d472d
Add home controller to ofn codebase from spree frontend
2019-06-18 10:47:34 +01:00
luisramos0
5037cce6f5
Add all the code missing from checkout, order and store controllers to ofn controllers
2019-06-18 10:47:34 +01:00
luisramos0
c399491314
Move spree frontend routes to ofn and transform decorators with class_eval to controller classes
2019-06-18 10:47:34 +01:00
luisramos0
c15c5435ff
Fix long lines in exchange model
2019-06-18 10:45:01 +01:00
luisramos0
0cdb49818d
Remove distinct from enterprise.ready_for_checkout scope
...
Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id
2019-06-18 10:40:49 +01:00
luisramos0
9548f5c5f7
Adapt order_cycle scopes to rail 4
2019-06-18 10:40:49 +01:00
luisramos0
ba91abd20e
Adapt exchanges.with_any_variant scope to rails 4
2019-06-18 10:40:49 +01:00
luisramos0
0d07bf2a3b
Adapt enterprise.distributing_products scope to rails 4
2019-06-18 10:40:49 +01:00
luisramos0
07a6e62d09
Adapt query in product destroy process to rails 4
2019-06-18 10:40:49 +01:00
luisramos0
e9667ab289
Adapt product.managed_by scope to rails 4
2019-06-18 10:40:49 +01:00
Pau Perez
d003ba81e3
No need to keep old and used Travis config file
...
If we ever want to come back to Travis we just need to do a git revert.
Meanwhile, no need to care about it.
2019-06-18 11:12:14 +02:00
Luis Ramos
a783f4609a
Merge pull request #3942 from jonleighton/exit-if-no-nodenv
...
Exit script/setup if node is not found
2019-06-17 22:10:44 +01:00
dependabot-preview[bot]
756b3ec73b
Bump stripe from 4.18.1 to 4.19.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.18.1 to 4.19.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.18.1...v4.19.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-17 19:19:17 +00:00
Luis Ramos
d9b47ad1b3
Merge pull request #3944 from openfoodfoundation/transifex
...
Transifex
2019-06-17 16:39:25 +01:00
luisramos0
0235a04530
Add missing translation key in user sessins controller
2019-06-17 15:48:52 +01:00
luisramos0
043abdef39
Add missing translations in the account confirmation process
2019-06-17 15:48:52 +01:00
luisramos0
b372e131a1
Add missing translation key in Spree.
...
This was fixed in spree 2.1, 7de7fcd502
2019-06-17 15:48:52 +01:00
luisramos0
642d3cbfbd
Fix translation key namespace in subs order confirm email subject
2019-06-17 15:48:52 +01:00
Transifex-Openfoodnetwork
930de1b6a2
Updating translations for config/locales/en_ZA.yml
2019-06-17 20:33:27 +10:00
Pau Pérez Fabregat
e3db218e7c
Merge pull request #3941 from luisramos0/enza
...
Add en_ZA.yml copied from en_GB.yml as requested by instance manager
2019-06-17 11:54:09 +02:00
Jon Leighton
fcff302d55
Bring back ‘Shop for X products at:’ title
...
Fixes #2112
It looks like this bug was accidentally introduced during a refactor in
e5ca494db8 . The `bo-html` attribute was
replaced with `ng-html`, but it appears that it should actually have
used `ng-bind-html`
(https://docs.angularjs.org/api/ng/directive/ngBindHtml ) because the
former is not a valid AngularJS directive.
It was also necessary to bubble up the `.cta-container` class in order to
get the appropriate styling on the title.
2019-06-17 15:43:15 +10:00
Jon Leighton
150310bf67
Exit script/setup if node is not found
...
This mirrors what the script already does if ruby is not found
2019-06-17 11:26:54 +10:00
luisramos0
926fc5ee43
Add en_ZA.yml copied from en_GB.yml as requested by instance manager
2019-06-16 20:43:20 +01:00
luisramos0
ccc7a43a06
Bypass validation of shipping methods zone on checkout
2019-06-15 21:11:51 +01:00
luisramos0
e4fcaa5992
Fix typo in package.rb
2019-06-15 20:45:57 +01:00
Luis Ramos
b1d4461c77
Merge pull request #3936 from luisramos0/factories_refactor
...
Extract factories to separate files and fix rubocop issues
2019-06-14 22:28:55 +01:00
Pau Pérez Fabregat
45c77196b3
Merge pull request #3935 from mkllnk/update-rubocop-style
...
Update rubocop style
2019-06-14 19:52:22 +02:00
luisramos0
13d41dc1aa
Remove duplicate modify entry in factories
2019-06-14 13:59:24 +01:00
luisramos0
5ca382be42
Remove spec/factories.rb from rubocop exceptions, it doesnt look like a problem any longer
2019-06-14 13:55:47 +01:00
luisramos0
3259db69f0
Remove unnecessary code, this code as been accepted in spree code base and included in spree v1.2
2019-06-14 13:43:30 +01:00
luisramos0
6efb71d903
Fix more rubocop issues in spec/factories
2019-06-14 13:42:27 +01:00
Luis Ramos
91401446a5
Merge pull request #3915 from mkllnk/3844-permalink-conflicts
...
Consider deleted products when creating permalinks
2019-06-14 13:20:35 +01:00
luisramos0
59593c824a
Fix rubocop issues in different factories
2019-06-14 13:10:53 +01:00
luisramos0
79cf03b124
Fix rubocop issues in spec/factories
2019-06-14 13:01:08 +01:00
luisramos0
a6b3c26bbe
Extract users factories to separate file
2019-06-14 12:50:26 +01:00
luisramos0
8345765ada
Extract tag rules factories to separate file
2019-06-14 12:49:17 +01:00
luisramos0
03fb33ba86
Extract variant factory modify to separate file
2019-06-14 12:48:04 +01:00
luisramos0
2c8ce6e4e5
Extract products factories to separate file
2019-06-14 12:45:55 +01:00
luisramos0
3e10c703bf
Extract shipments factories to separate file
2019-06-14 12:43:07 +01:00
luisramos0
42f8b2efed
Fix static file path in order_cycle_factory
2019-06-14 12:30:36 +01:00
luisramos0
bd493c392a
Extract shipping_methods factories to separate file
2019-06-14 12:25:10 +01:00
luisramos0
dc701f55b3
Extract calculators factories to separate file
2019-06-14 12:23:32 +01:00
luisramos0
06e3328ce2
Extract orders factories to separate file
2019-06-14 12:17:24 +01:00
luisramos0
91fcb7c7c4
Extract enterprises factories to separate file
2019-06-14 12:12:45 +01:00
luisramos0
42f2e78b10
Extract subscriptions factories to separate file
2019-06-14 12:10:54 +01:00
luisramos0
0501859c23
Extract order_cycle factories to separate file
2019-06-14 12:10:27 +01:00
luisramos0
a7c970054c
Add rescue in product controller create action to avoid server error and send appropriate error message to client when product image upload fails
2019-06-14 10:20:28 +01:00
luisramos0
c97925aa4a
Improve message in private shopfront when closed or when user is not logged in
2019-06-14 10:13:33 +01:00
Maikel
5e89c54144
Merge pull request #3931 from openfoodfoundation/RachL-patch-1-3
...
Update README.md
2019-06-14 14:20:22 +10:00
Maikel
2307df980c
Merge pull request #3930 from openfoodfoundation/transifex
...
Transifex
2019-06-14 14:19:13 +10:00
Maikel Linke
b5f3f98f87
Make BlockLength style apply to all files except todo list
2019-06-14 11:49:27 +10:00
Maikel Linke
ac79e44d9a
Fix current rubocop violations
2019-06-14 11:40:09 +10:00
Maikel Linke
bf8a31abda
Add rake task to report lost payments
...
In rare cases, payment records can get lost through database rollbacks.
This new rake task tries to find log entries for lost transactions and
reports them as CSV.
2019-06-14 11:10:31 +10:00
Transifex-Openfoodnetwork
f0977f3c39
Updating translations for config/locales/nb.yml
2019-06-14 08:08:37 +10:00
dependabot-preview[bot]
16ad94f3a8
Bump activerecord-import from 1.0.1 to 1.0.2
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.1...v1.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-13 19:23:40 +00:00
luisramos0
6223a738a7
Fix rubocop issues in collapsible.css
2019-06-13 19:32:33 +01:00
luisramos0
a370216f54
Change default translation in the registration introduction so that it looks better when collapsed
2019-06-13 19:28:31 +01:00
luisramos0
473fb45132
Remove an extra break line to remove html space and make sure alignment is correct
2019-06-13 19:28:10 +01:00
luisramos0
ae0563a58f
Merge branch 'master' into 1766-registration-scroll
2019-06-13 19:10:05 +01:00
Luis Ramos
2b593a59f5
Merge pull request #3900 from luisramos0/subs_trans
...
Missing translations in Subscriptions
2019-06-13 18:51:20 +01:00
Rachel Arnould
d3cb106ae4
Update README.md
...
In order to benefit from a free unlimited account at Browser stack, they asked us to
*Give us a shoutout on your GitHub project page. Post an hyperlink and a line about how you use BrowserStack.*
2019-06-13 18:58:58 +02:00
Luis Ramos
ddfd14ebb3
Merge pull request #3905 from openfoodfoundation/dependabot/bundler/i18n-js-3.3.0
...
Bump i18n-js from 3.2.2 to 3.3.0
2019-06-13 17:33:50 +01:00
luisramos0
1db220e1e0
Remove unnecessary referer setting from products controller spec
2019-06-13 17:22:09 +01:00
Luis Ramos
29bc961e8a
Merge pull request #3890 from luisramos0/transl_prod_page
...
Add missing translation keys to the create product page
2019-06-13 17:13:40 +01:00
Transifex-Openfoodnetwork
216e181c6e
Updating translations for config/locales/en_GB.yml
2019-06-14 01:53:18 +10:00
Transifex-Openfoodnetwork
b65b94b6f9
Updating translations for config/locales/en_GB.yml
2019-06-14 01:50:11 +10:00
Luis Ramos
85ee1e7806
Merge pull request #3889 from luisramos0/tag_rules_transl
...
Fix missing translations in tag rules management page
2019-06-13 16:15:49 +01:00
Luis Ramos
7d24bcf868
Merge pull request #3798 from m-budryte/order_cycles_add_fee_remove_link
...
the translations for Remove in the exchange forms added
2019-06-13 16:15:28 +01:00
Luis Ramos
1df1ba9403
Merge pull request #3888 from luisramos0/translations
...
Add translation keys to actions in the order payments list page
2019-06-13 15:36:43 +01:00
Luis Ramos
e15ccdbd74
Merge pull request #3840 from mkllnk/3727-default-credit-cards
...
Make only reusable credit cards the default card
2019-06-13 14:13:32 +01:00
Luis Ramos
1a2703f630
Merge pull request #3886 from luisramos0/fees_translations
...
Make a few more things translatable in the Enterprise Fees management page
2019-06-13 14:12:16 +01:00
Luis Ramos
09a5426095
Merge pull request #3880 from kristinalim/fix/3792-optimize_order_cycle_variant_updates
...
3792 Optimize saving Order Cycle changes
2019-06-13 12:33:22 +01:00
Luis Ramos
bb7a2d7a5e
Merge pull request #3252 from mllocs/fix/navbar-right-items-styles
...
Top navbar redesign and cleanup
2019-06-13 12:04:20 +01:00
Pau Pérez Fabregat
080689ccfa
Merge pull request #3917 from luisramos0/subs_visible
...
Make subs radio button visible to all managers
2019-06-12 16:42:31 +02:00
Matt-Yorkley
41a36bb704
Update all locales with the latest Transifex translations
2019-06-12 13:54:41 +01:00
Luis Ramos
7cae7ca520
Merge pull request #3897 from openfoodfoundation/dependabot/bundler/fuubar-2.4.0
...
Bump fuubar from 2.3.2 to 2.4.0
2019-06-12 13:29:04 +01:00
Luis Ramos
05856c44dd
Merge pull request #3906 from openfoodfoundation/dependabot/bundler/webmock-3.6.0
...
Bump webmock from 3.5.1 to 3.6.0
2019-06-12 13:28:36 +01:00
Luis Ramos
b02bf3b83c
Merge pull request #3872 from luisramos0/rails4_where_scope
...
[Rails 4] Change all model scopes without a callable object to use a proc
2019-06-12 12:53:10 +01:00
Matt-Yorkley
48ebfbee90
Merge pull request #3902 from openfoodfoundation/transifex
...
Transifex
2019-06-12 10:02:40 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
0aa8b1a30e
Make shop hidden ams injection consistent with other uses
2019-06-12 09:47:01 +01:00
Matt-Yorkley
874fb884b8
Refactor Angular controllers further
2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b
Only query visible enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
11e83af0b6
Remove duplication of enterprise angular controllers
...
We can re-use the enterprise and producers controllers here in their respective groups tabs, no need for a third controller
2019-06-12 09:47:01 +01:00
Matt-Yorkley
9703d848ef
Improve syntax in injection_helper
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4155b17633
Remove tests that reference removed code
2019-06-12 09:47:01 +01:00
Matt-Yorkley
d5bd058754
Fix groups show page
...
It can definitely be cleaned up more in the future, but this should get us around a 90% reduction in page load times.
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4ec46c2db6
Fix groups index page
2019-06-12 09:47:01 +01:00
Matt-Yorkley
aca1f92060
Adapt specs to new loading methods
2019-06-12 09:47:01 +01:00
Matt-Yorkley
1b8dfaf049
Fix HashNavigation reload bug
2019-06-12 09:47:01 +01:00
Matt-Yorkley
ae8f1a92e8
Remove "profiles" from /shops
2019-06-12 09:47:01 +01:00
Matt-Yorkley
698d3672a6
List only current taxons for active enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
ed97400a23
Improve producers performance
2019-06-12 09:47:01 +01:00
Matt-Yorkley
45d65baf8e
Improve shops performance
2019-06-12 09:47:01 +01:00
Matt-Yorkley
e329b4bfb0
Improve queries for serializers
2019-06-12 09:47:01 +01:00
Pau Pérez Fabregat
99b82272cc
Merge pull request #3883 from Matt-Yorkley/order_cycles_performance
...
Admin order cycles performance
2019-06-12 10:38:54 +02:00
Pau Pérez Fabregat
fd95ae7e41
Merge pull request #3847 from Matt-Yorkley/api_access
...
Allow unauthenticated access to OFN API endpoints
2019-06-12 09:45:11 +02:00
Maikel Linke
76d77ceb51
Update and generalise database mirror script
...
The old script was specfic to the use in Australia and out of date. The
new version isn't perfect but works well for me.
2019-06-12 10:19:56 +10:00
luisramos0
f23094df09
Fix file name of js unit test files in admin/order_cycles/controllers
2019-06-11 21:28:55 +01:00
luisramos0
9c539da811
Fix rubocop issue in schedules_controller.collection by extracting method
2019-06-11 21:28:55 +01:00
luisramos0
6cf705ea55
In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id.
2019-06-11 21:28:52 +01:00
Maikel Linke
d1901cbea4
Allow class_eval to have more than 25 lines
2019-06-11 18:01:41 +01:00
Maikel Linke
5c72c35060
Use better credit card factory for subs specs
...
The specs for subscriptions were creating simple one-time-use credit
cards. They should not be used for subscriptions. After this was fixed
in previous commits, these integration tests failed. Now we use a new
factory that mimics stored credit cards that can be used for
subscriptions.
2019-06-11 18:01:41 +01:00
Maikel Linke
b3b8cb778f
Make only reusable credit cards the default card
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3727
When a user didn't have a default credit card and then checked out with
a credit card it became the default even when the user didn't intend to
store it. That lead to subscriptions trying to charge a one-time card
which fails.
2019-06-11 18:01:41 +01:00
luisramos0
d8a7f60f40
Make subs radio button visible to all managers
2019-06-11 17:21:13 +01:00
Maikel Linke
a10bb5acbd
Consider deleted products when creating permalinks
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3844
Spree's implementation and our implementation to create a unique
permalink failed to notice conflicts with soft-deleted products. This
patch looks at deleted products as well.
2019-06-11 18:20:41 +10:00
Kristina Lim
cf11ef8ba2
Ignore parameter list length for ProductImport::EntryValidator
...
This can be done in a separate PR. More tests might be needed when
extracting to a class.
2019-06-10 04:20:04 +08:00
Kristina Lim
8c69ee67b8
Refactor code for validating variant in reference to existing product
2019-06-10 04:20:04 +08:00
Kristina Lim
70614de955
Require product import rows to match unit of preceding rows
2019-06-10 04:20:03 +08:00
Kristina Lim
5d282f7e9f
Update code layout in ProductImporter method
2019-06-10 04:20:03 +08:00
Kristina Lim
73b388da87
Simplify product import all_entries method
2019-06-10 04:20:03 +08:00
Kristina Lim
38519b2bae
Simplify building of product import entries for range
2019-06-10 04:19:50 +08:00
Kristina Lim
37101a6b64
Extract build_entries_from_rows for product import
2019-06-09 23:38:36 +08:00
dependabot-preview[bot]
e686c61962
Bump webmock from 3.5.1 to 3.6.0
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.5.1...v3.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-06 19:21:33 +00:00
dependabot-preview[bot]
93811a6d8f
Bump i18n-js from 3.2.2 to 3.3.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.2.2 to 3.3.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-06-06 19:19:50 +00:00
Luis Ramos
568e3003ba
Merge pull request #3882 from kristinalim/feature/3408-enable_enterprise_fee_summary_for_non_superadmin
...
3408 Remove feature flag for Enterprise Fee Summary
2019-06-06 16:28:36 +01:00
Transifex-Openfoodnetwork
ec898a8127
Updating translations for config/locales/en_US.yml
2019-06-06 23:03:05 +10:00
Transifex-Openfoodnetwork
ddab3ba074
Updating translations for config/locales/en_US.yml
2019-06-06 22:59:56 +10:00
Luis Ramos
e2b506294d
Merge pull request #3870 from openfoodfoundation/dependabot/bundler/jwt-2.2.1
...
Bump jwt from 2.1.0 to 2.2.1
2019-06-05 20:48:38 +01:00
Luis Ramos
78f0164f5b
Merge pull request #3881 from openfoodfoundation/dependabot/bundler/stripe-4.18.1
...
Bump stripe from 4.11.0 to 4.18.1
2019-06-05 20:48:12 +01:00
Transifex-Openfoodnetwork
2b9ff963da
Updating translations for config/locales/en_GB.yml
2019-06-06 05:03:44 +10:00
Transifex-Openfoodnetwork
3100781f27
Updating translations for config/locales/en_GB.yml
2019-06-06 05:00:36 +10:00
Pau Pérez Fabregat
5028c9d283
Merge pull request #3899 from openfoodfoundation/transifex
...
Transifex
2019-06-05 12:28:12 +02:00
luisramos0
ff2901a9d1
Add address suburb translation key to fix edit subscription address page
...
Keeping these in the root of the translations file so that they can be used in other places later
2019-06-04 20:59:45 +01:00
luisramos0
9944f3e1e6
Make translations of tooltips in subscriptions list page work again
2019-06-04 20:59:45 +01:00
luisramos0
cfcf73b6a1
Make save and saving messages translatable in subscriptions items panel
2019-06-04 20:59:45 +01:00
luisramos0
eb42e81afc
Make some text entries translatable in create subscription pages: title in step 1 details and 4 review and date placeholders in step 1 details
2019-06-04 20:59:45 +01:00
luisramos0
64af81a4a2
Make search_by_email text translatable in subscriptions list page
2019-06-04 20:59:42 +01:00
Transifex-Openfoodnetwork
215f6e92f2
Updating translations for config/locales/fr.yml
2019-06-05 02:44:40 +10:00
Luis Ramos
fd64e53f61
Merge pull request #3841 from luisramos0/2-0-fix-ship-methods-translations
...
Move shipping methods translations to lazy lookups
2019-06-04 15:15:31 +01:00
Luis Ramos
4dcf309910
Merge pull request #3884 from luisramos0/3879_ship_cats
...
Remove matching of product shipping category with shipping method's category on checkout
2019-06-03 22:53:13 +01:00
dependabot-preview[bot]
1b92b126c8
Bump fuubar from 2.3.2 to 2.4.0
...
Bumps fuubar from 2.3.2 to 2.4.0.
2019-06-03 19:17:54 +00:00
Matt-Yorkley
98d1cbec8c
Update all locales with the latest Transifex translations
2019-06-02 18:06:51 +01:00
Kristina Lim
2c52c1a6fc
Remove unused argument from Spree::Ability method
2019-06-02 01:30:46 +08:00
luisramos0
1a4e83d633
Change products controller to clear variants unit description if variant_unit is items
2019-06-01 16:56:17 +01:00
luisramos0
4551149532
Improve code of weight calculator
2019-05-31 19:55:39 +01:00
luisramos0
82955b9fe5
Make weight calculator use line_item.final_weight_volume rather than variant.weight for cases where the final weight is set manually in the BOM
2019-05-31 19:55:17 +01:00
luisramos0
9078a1edaa
Add missing translation keys to the create product page: fields names displayed in error messages
2019-05-30 23:50:51 +01:00
luisramos0
32c107ab5a
move translation to use relative path so that the new translation key is used
2019-05-30 23:26:23 +01:00
Masha
fbf52dd1f9
removed translations that are not required, left exchange_form.remove key but reference a global remove in the table
2019-05-30 23:08:05 +01:00
Masha
436a2ba0a2
went much shorted way
2019-05-30 23:08:05 +01:00
Masha
412fffba1d
the translations for Remove in the exchange forms added
2019-05-30 23:08:05 +01:00
Pau Pérez Fabregat
ada640b159
Merge pull request #3850 from lin-d-hop/update-readme
...
Update outdated things on the README
2019-05-30 23:56:36 +02:00
luisramos0
5024da4123
Make tag rules type descriptions in the management page translatable
2019-05-30 20:39:58 +01:00
luisramos0
6620243603
Make the submit button on the add tag rule dialog translatable
2019-05-30 20:22:02 +01:00
luisramos0
48361b146c
Add translation keys to actions in the order payments list page
2019-05-30 20:13:17 +01:00
luisramos0
1d4529092f
Make fee type options in enterprise fees page translatable
2019-05-30 00:46:20 +01:00
luisramos0
6e08310744
Make the fields in the column calculator values in the enterprise fees page translatable for all fields of all current calculators
2019-05-29 21:57:03 +01:00
luisramos0
5719455731
Make enterprise fees name placeholder translatable
2019-05-29 21:33:30 +01:00
luisramos0
c5a95dee79
Remove matching of product shipping category with shipping method's category to allow users to checkout products with categories not supported by the shipping methods.
...
See issue #3884 for more details.
2019-05-29 14:43:19 +01:00
Matt-Yorkley
563f9a4f5f
Remove another N+1
2019-05-29 12:28:56 +01:00
Luis Ramos
187fbd788b
Merge pull request #3873 from Matt-Yorkley/branding
...
Use OFN logo in admin area
2019-05-29 10:12:48 +01:00
Matt-Yorkley
2dd4c1ccaf
Cut OC edit #for_order_cycle queries in half
2019-05-29 10:01:46 +01:00
Matt-Yorkley
8733036fb0
Remove 2 N+1s, reduce queries in #visible action ~90%
2019-05-29 10:01:44 +01:00
Matt-Yorkley
c0a40c616b
Use devise's check_authorization and skip_authorization_check
2019-05-28 22:02:18 +01:00
Luis Ramos
88f109da67
Merge pull request #3868 from luisramos0/delete-en-us
...
Remove unused en-US locale file
2019-05-28 20:06:07 +01:00
Kristina Lim
ecea0600b6
Remove feature flag for Enterprise Fee Summary
2019-05-29 02:50:41 +08:00
Kristina Lim
93850d4317
Merge pull request #3846 from luisramos0/transpec_features
...
Transpec spec/features
2019-05-29 01:17:30 +08:00
luisramos0
79f16e0ea3
Run transpec in spec/features/consumer/external_services_spec.rb
2019-05-28 17:04:06 +01:00
luisramos0
7397ab4fd8
Run transpec in spec/features/admin/payment_method_spec.rb
2019-05-28 17:04:06 +01:00
luisramos0
ec7e92202b
Run transpec in spec/features/admin/enterprise_user_spec.rb and spec/features/admin/overview_spec.rb
2019-05-28 17:04:06 +01:00
luisramos0
9a21ca38e1
Run transpec in a few more spec/features/admin specs
2019-05-28 17:04:06 +01:00
luisramos0
d2f62f86a9
Run transpec in a few spec/features/admin specs
2019-05-28 16:59:51 +01:00
luisramos0
80537e7e01
Run transpec in spec/features/admin/image_settings_spec.rb
2019-05-28 16:57:11 +01:00
luisramos0
7f43a66fb3
Run transpec in spec/features/admin/adjustments_spec
2019-05-28 16:57:11 +01:00
luisramos0
f2bfb9bedb
Fix rubocop issues in adjustment_decorator, line_item_decorator and product_decorator
2019-05-28 16:50:59 +01:00
luisramos0
ced6264846
Fix rubocop issues in enterprise model
2019-05-28 16:30:50 +01:00
luisramos0
f58d9ec790
Fix rubocop issues in exchange model
2019-05-28 16:10:40 +01:00
luisramos0
06c0b1375b
Fix rubocop issues in enterprise_relationship model
2019-05-28 16:07:10 +01:00
luisramos0
ffbd79d3dd
Change all model scopes without a callable object to use a proc
2019-05-28 15:55:13 +01:00
Kristina Lim
99f163d294
Make code style changes for spec file
2019-05-28 21:32:25 +08:00
Kristina Lim
75fdfb3c6a
Remove some usage of guard clauses for OC update
2019-05-28 21:32:25 +08:00
Kristina Lim
56a2347ea0
Extract removal of unauthorized OC exchange attributes to method
2019-05-28 21:29:20 +08:00
Kristina Lim
ea8d189d6c
Bulk update OC variant changes in OC form
2019-05-28 21:27:43 +08:00
Kristina Lim
bc6f14105e
Require spec_helper.rb in spec file for OC form applicator
2019-05-28 21:26:33 +08:00
Kristina Lim
9def777d02
Install activerecord-import gem
2019-05-28 21:26:32 +08:00
dependabot-preview[bot]
0b6eaa8d02
Bump jwt from 2.1.0 to 2.2.1
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.1.0...v2.2.1 )
2019-05-28 13:10:44 +00:00
dependabot-preview[bot]
df2553eac5
Bump stripe from 4.11.0 to 4.18.1
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.11.0 to 4.18.1.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.11.0...v4.18.1 )
2019-05-28 13:10:43 +00:00
Luis Ramos
6a0925539f
Merge pull request #3842 from luisramos0/rubocop-line-length
...
Fix a few rubocop warnings manually and run rubocop autocorrect
2019-05-28 14:08:16 +01:00
luisramos0
d10f9a1a43
Rebuilding rubocop_todo auto after all the fixes
2019-05-28 12:57:29 +01:00
luisramos0
07854cf372
Fix a few problems introduced by rubocop auto correct
2019-05-28 12:57:29 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
luisramos0
4a67acf954
Removing a few rubocop warnings
2019-05-28 12:55:17 +01:00
Luis Ramos
31098218d2
Merge pull request #3856 from Drumstickx/master
...
Fixed sql injection vulnerability in users_and_enterprises_report.
2019-05-28 10:32:27 +01:00
Luis Ramos
9ccf502365
Merge pull request #3797 from lin-d-hop/variant-master-price
...
Remove non-functional Price field from Edit Product screen
2019-05-28 10:30:05 +01:00
Luis Ramos
de5eeeb6f2
Merge pull request #3812 from openfoodfoundation/dependabot/bundler/unicorn-5.5.1
...
Bump unicorn from 5.5.0 to 5.5.1
2019-05-27 13:06:58 +01:00
dependabot-preview[bot]
09d4ab9f0d
Bump unicorn from 5.5.0 to 5.5.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.0 to 5.5.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-27 09:22:42 +00:00
Pau Pérez Fabregat
2d3bd7f471
Merge pull request #3828 from eelcodevlieger/webdrivers
...
Webdrivers
2019-05-27 11:20:04 +02:00
Pau Pérez Fabregat
018b019f10
Merge pull request #3865 from mkllnk/438-aus-locale
...
Add Australian English locale
2019-05-27 11:11:04 +02:00
Pau Pérez Fabregat
6aa039876d
Merge pull request #3809 from openfoodfoundation/dependabot/bundler/jquery-rails-3.0.4
...
Bump jquery-rails from 3.0.0 to 3.0.4
2019-05-27 10:40:44 +02:00
Pau Pérez Fabregat
6b08e2ab2c
Merge pull request #3864 from openfoodfoundation/disable-harmful-rake-tasks-in-production
...
Disable harmful rake tasks in production
2019-05-27 10:36:07 +02:00
Matt-Yorkley
099914be40
Use OFN logo in admin area
2019-05-27 02:20:04 +01:00
luisramos0
4143c50b1f
Move joyride translations to the correct path
2019-05-24 23:54:00 +01:00
luisramos0
dc32d282a6
Fix some rubocop issues in menu css file
2019-05-24 23:54:00 +01:00
luisramos0
2654db7c82
Add new menu style as per design
2019-05-24 23:53:56 +01:00
dependabot-preview[bot]
1a9ad4fcbc
Bump jquery-rails from 3.0.0 to 3.0.4
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 3.0.0 to 3.0.4.
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.0...v3.0.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-24 20:40:14 +00:00
Luis Ramos
655c54f367
Merge pull request #3835 from openfoodfoundation/dependabot/bundler/i18n-js-3.2.2
...
Bump i18n-js from 3.2.1 to 3.2.2
2019-05-24 21:38:16 +01:00
luisramos0
0dc0776705
Separate mobile menu cart code from large menu cart code
2019-05-24 15:17:41 +01:00
luisramos0
ec9d50c824
Add new cart icon and extract cart joyride from cart haml file
2019-05-24 15:16:36 +01:00
luisramos0
60c08347a5
Extract language selector from large menu haml file, add language name and clean up the code that generates the shopping@ label
2019-05-24 15:12:31 +01:00
Luis Ramos
b6a456cb67
Merge pull request #3863 from mkllnk/quiet-cron
...
Make inserting delayed jobs from cron quiet
2019-05-24 14:50:19 +01:00
Luis Ramos
db0c874622
Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views
...
[Spree Upgrade] Remove dependency to spree frontend - views and assets
2019-05-24 14:37:34 +01:00
luisramos0
97f09c672a
Remove unused en-US locale file
2019-05-24 10:11:44 +01:00
Pau Pérez Fabregat
1d72d461df
Merge pull request #3866 from openfoodfoundation/transifex
...
Transifex
2019-05-24 10:10:10 +02:00
luisramos0
5858a83239
Simplify spec_helper config to make file downloads work in headless chrome
2019-05-23 20:31:52 +01:00
Luis Ramos
4a321f200f
Merge pull request #3783 from kristinalim/fix/3782-missing_translation
...
3782 Fix missing translation in subscription update modal
2019-05-23 18:45:20 +01:00
Luis Ramos
ae1d260729
Merge pull request #3810 from openfoodfoundation/dependabot/bundler/deface-1.0.2
...
Bump deface from 1.0.0 to 1.0.2
2019-05-23 18:42:51 +01:00
luisramos0
15360971b0
Move signed_* files to views/shared/menu and add new logged in and profile icons
2019-05-23 15:58:02 +01:00
Luis Ramos
12282ad906
Merge pull request #3794 from m-budryte/replace_&_with_OR
...
& replaced by OR when multiple property filters are selected
2019-05-23 14:35:51 +01:00
Transifex-Openfoodnetwork
a4d59b72b0
Updating translations for config/locales/nb.yml
2019-05-23 20:35:12 +10:00
Transifex-Openfoodnetwork
6b2e10860e
Updating translations for config/locales/nb.yml
2019-05-23 20:32:02 +10:00
Maikel Linke
c93e51b73e
Update source locale description
...
The Australian instance has been using the source locale. But now we
added an Australian English locale via Transifex.
The I18n wiki page moved as well.
2019-05-23 20:14:59 +10:00
Transifex-Openfoodnetwork
3c162984f1
Updating translations for config/locales/en_AU.yml
2019-05-23 19:57:49 +10:00
Transifex-Openfoodnetwork
207fe7b64e
Updating translations for config/locales/en_AU.yml
2019-05-23 19:54:40 +10:00
Pau Pérez Fabregat
7c9299bdb5
Merge pull request #3852 from openfoodfoundation/transifex
...
Transifex
2019-05-22 16:35:27 +02:00
Pau Perez
4c19c1a0a5
Disable harmful rake tasks in production
...
No need to check whether you are running that `bundle exec rake db:reset`
command on staging or production anymore 😱 .
As described in https://github.com/adamcooke/rails-safe-tasks
> This gem provides an extra layer of safety between you and deleting all your
> production data by accident.
> It restricts the use of various rake tasks (including db:drop, db:reset etc...)
> when you are running your application in a production environment.
2019-05-22 15:30:43 +02:00
Maikel Linke
38e9976ce4
Make inserting delayed jobs from cron quiet
...
`config/schedule.rb` defines entries for cron jobs. Every five minutes
it insert several delayed jobs via `script/enqueue`. A recent upgrade of
Postgresql (a year or two ago) made that script noisy. Every time we
insert a delayed job with that script it outputs:
INSERT 0 1
Standard output like this is seen as error message by cron an forwarded
to the unix user's local mailbox in `/var/mail/openfoodnetwork`. This
file grows over time and accumulates tens of thousands of error
messages, hiding any important failures.
This patch makes inserting delayed jobs quiet. A failure is still
reported.
2019-05-22 03:36:07 +10:00
Matt-Yorkley
74d7db9fba
Allow unauthenticated access to enterprise API endpoints
2019-05-21 17:13:00 +01:00
Drumstickx
414ae58cbd
Rubocop changes.
2019-05-21 16:48:02 +02:00
Drumstickx
c162654757
Reduce code duplication.
2019-05-21 16:46:40 +02:00
Drumstickx
29f68ed5d8
Rubocop changes.
2019-05-21 14:51:52 +02:00
luisramos0
115b5dadef
Remove more dead code from usersregistration (signup calls are always ajax)
2019-05-21 12:39:29 +02:00
luisramos0
d9438cb082
Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets
2019-05-21 12:39:29 +02:00
luisramos0
ffd883e84d
Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it
2019-05-21 12:39:29 +02:00
luisramos0
25fd6f2e78
Move empty check template from spree_frontend, it is required from the checkout page
...
This makes ofn code completely independent from spree_frontend views
2019-05-21 12:39:29 +02:00
luisramos0
a0c56f31c7
Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code
2019-05-21 12:39:29 +02:00
Transifex-Openfoodnetwork
85c41c1f12
Updating translations for config/locales/pt.yml
2019-05-21 20:18:30 +10:00
Transifex-Openfoodnetwork
d252916858
Updating translations for config/locales/pt.yml
2019-05-21 20:15:53 +10:00
Transifex-Openfoodnetwork
09a9b64d28
Updating translations for config/locales/pt.yml
2019-05-21 20:15:20 +10:00
Transifex-Openfoodnetwork
31c1c82310
Updating translations for config/locales/fr.yml
2019-05-21 20:10:37 +10:00
Transifex-Openfoodnetwork
a66c2314ef
Updating translations for config/locales/fr.yml
2019-05-21 20:07:31 +10:00
Drumstickx
2f83d02168
Reduce code duplication.
2019-05-19 22:36:55 +02:00
Drumstickx
0e6a576e33
Fix user_id IS NOT NULL check.
2019-05-19 22:05:34 +02:00
Drumstickx
4204943a7c
Styling.
2019-05-19 22:04:44 +02:00
Drumstickx
1246c3b6b9
Styling.
2019-05-19 18:57:09 +02:00
Drumstickx
ec2db4dd2a
Fixed sql injection vulnerability in users_and_enterprises_report.
2019-05-19 17:58:57 +02:00
Transifex-Openfoodnetwork
ec343fda3b
Updating translations for config/locales/en_GB.yml
2019-05-15 05:58:11 +10:00
Transifex-Openfoodnetwork
ff3e8c29a7
Updating translations for config/locales/en_GB.yml
2019-05-15 05:55:01 +10:00
lin-d-hop
f19244cebd
Update outdated things on the README
2019-05-14 15:25:05 +01:00
Pau Pérez Fabregat
59d4e3d9e2
Merge pull request #3848 from luisramos0/pr_3813
...
Get PR 3813 to master (it was only on the hotfix branch 2-0-1)
2019-05-13 19:15:24 +02:00
luisramos0
189865fd80
Make stock locations backorderable_default false.
...
This is required because when the default stock location is created, the backorderable_default column doesnt exist and when this column is created, the initial default is true. This is why we need to force it to false here. This column is the default value for on_demand which must be false.
2019-05-10 22:00:24 +01:00
Pau Pérez Fabregat
7e9a149c8d
Merge pull request #3837 from luisramos0/transpec
...
transpec!!!
2019-05-10 14:59:41 +02:00
Pau Pérez Fabregat
f113ac61d7
Merge pull request #3839 from coopdevs/report-cache-diff-in-new-tab
...
Report cache diff in new tab
2019-05-10 14:38:33 +02:00
Pau Perez
9a98a7c974
Report cache diff to Bugsnag in a new tab
...
This will allow us to see the difference between the cache entry and the
actual shopfront. Otherwise, there is no way to see what wasn't
refreshed in the cache.
2019-05-10 13:13:20 +02:00
luisramos0
07e9043e34
Move shipping methods translations to lazy lookups
2019-05-10 11:44:49 +01:00
Luis Ramos
f844ff275b
Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757
...
added buttons to form and updated sanitizer to allow extra formatting
2019-05-10 10:48:55 +01:00
Maikel
50ca1f7173
Merge pull request #3824 from mkllnk/aus-content-updates
...
Aus content updates
2019-05-10 10:40:09 +10:00
luisramos0
6996353d05
Run transpec for spec/controllers
2019-05-10 01:20:40 +01:00
luisramos0
df459a21a4
Run transpec for spec/lib
2019-05-10 01:08:34 +01:00
luisramos0
e7c6892ab8
Run transpec for spec/mailers
2019-05-09 23:47:32 +01:00
luisramos0
2c6ca7e169
Run transpec for spec/helpers
2019-05-09 23:43:51 +01:00
luisramos0
0075ffbc02
Run transpec for spec/support
2019-05-09 23:39:30 +01:00
luisramos0
9cfba8ad19
Revert transpec in ability_spec.rb:461 so that spec is green again
2019-05-09 23:33:43 +01:00
luisramos0
6dcc0b1d68
Run transpec for spec/jobs
2019-05-09 23:29:11 +01:00
luisramos0
fe017713ae
Run transpec in spec/serializers
2019-05-09 22:43:07 +01:00
luisramos0
04801e5c2e
Run transpec in spec/models
2019-05-09 22:25:29 +01:00
Luis Ramos
59e7cb313d
Merge pull request #3815 from amers185/add_social_links
...
Add extra (Instagram) social media links to emails sent to customers and users [Looking for feedback/direction on completing solution]
2019-05-09 21:14:42 +01:00
dependabot[bot]
ef3ea0701e
Bump i18n-js from 3.2.1 to 3.2.2
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.2.1...v3.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-09 19:19:16 +00:00
Luis Ramos
6d62f4c4b4
Merge pull request #3817 from kristinalim/fix/1218-remove_oc_debug_information
...
1218 Remove OC "Debug Information" which appears in non-production environments
2019-05-09 16:05:18 +01:00
Luis Ramos
19881927e3
Merge pull request #3699 from HugsDaniel/3688-missing-translation-edit-sub
...
Add review & edit sub keys
2019-05-09 16:04:38 +01:00
Luis Ramos
24c96fab8b
Merge pull request #3795 from lin-d-hop/translation-oc-spinner
...
Add translation to order cycle spinner
2019-05-09 16:03:53 +01:00
Luis Ramos
b821188f5d
Merge pull request #3826 from luisramos0/knapsack
...
Add new knapsack report to get the build jobs more balanced
2019-05-09 16:00:38 +01:00
Maikel
7d163632a4
Merge pull request #3827 from openfoodfoundation/transifex
...
Transifex
2019-05-09 17:39:26 +10:00
Maikel Linke
a97792cbc3
Remove story from code comment
2019-05-09 11:57:13 +10:00
Eelco de Vlieger
d498ecf901
Issue 3450 - webdrivers update.
...
Ran `bundle install` to update Gemfile.lock (suggestion by semaphoreci check)
Moved webdrivers gem down in the list to be in better alphabetical order (suggested by codeclimate check)
2019-05-08 22:28:31 +01:00
Transifex-Openfoodnetwork
5ea9d8cf8b
Updating translations for config/locales/de_DE.yml
2019-05-09 06:29:23 +10:00
Transifex-Openfoodnetwork
9abd60ef1e
Updating translations for config/locales/de_DE.yml
2019-05-09 06:26:14 +10:00
luisramos0
ca5eddd27e
Add new knapsack report to get the build jobs more balanced
2019-05-08 19:59:17 +01:00
Eelco de Vlieger
2900dd89d8
issue 3450 - update webdrivers version - version 3.9 was released yesterday, which caused a test error, so setting version to latest 3.8.1 for now
2019-05-08 19:50:36 +01:00
Eelco de Vlieger
5667c00587
issue 3450 - add webdrivers dependency (+ spec helper setup) and remove chromedriver-helper dependency
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3450
2019-05-08 19:10:14 +01:00
eelcodevlieger
295e814988
Merge pull request #1 from openfoodfoundation/master
...
sync
2019-05-08 18:59:26 +01:00
Masha
5eacf05a45
used string interpolation for clarity
2019-05-08 15:05:15 +01:00
Masha
d5ff733f0b
spaces location swapped
2019-05-08 15:05:13 +01:00
Masha
5470f8d758
new translation key for products_or created
2019-05-08 15:03:28 +01:00
Masha
94cbac00a5
& replaced by OR when multiple property filters are selected
2019-05-08 15:00:59 +01:00
luisramos0
77178ca595
Add href and target attributes to product serializer sanitizer to allow links with target in product descriptions
2019-05-08 14:46:57 +01:00
idanceinbetween
7790401d59
added buttons to form and updated sanitizer to allow extra formatting
2019-05-08 14:45:05 +01:00
Pau Pérez Fabregat
a45782f59b
Merge pull request #3814 from coopdevs/test-bulk-update-error
...
Test empty variants_attrs in bulk_update
2019-05-08 15:43:09 +02:00
Maikel
a0f60a9bfe
Merge pull request #3806 from openfoodfoundation/transifex
...
Transifex
2019-05-08 15:50:50 +10:00
Maikel Linke
a3adbd9fc8
Replace connect-learn banner with custom content
...
The connect and learn banner is only used in Australia at the moment. We
would like to have customisable content here. Now every instance can
choose to place a custom alert banner at the top. Unfortunately, custom
banners are not translated into other languages. That's why I kept the
standard register call. For example, the register call is in use where
it is displayed in French and Italian. Completely switching to custom
content would break the translation.
Translations in custom content are an existing feature request,
"multi-lang 2.0".
2019-05-08 11:38:49 +10:00
Luis Ramos
4c767cd5b4
Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations
...
3760 Optimizations related to OCs
2019-05-07 21:12:44 +01:00
Luis Ramos
6658f85f59
Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation
...
3292 link popup text translation
2019-05-07 21:11:31 +01:00
Luis Ramos
dffa50468b
Merge pull request #3801 from Matt-Yorkley/need_for_speed
...
Fix /maps performance
2019-05-07 21:08:34 +01:00
Kristina Lim
12b28fdc32
Remove "Debug Information" in edit OC page
2019-05-08 01:33:58 +08:00
Pau Pérez Fabregat
fc38906e60
Merge pull request #3672 from Matt-Yorkley/spree2/pi_shipping_category
...
[Spree Upgrade] shipping_category now required for products
2019-05-07 16:12:05 +02:00
Matt-Yorkley
fc8b220b4c
Add specs for endpoint and serializers
2019-05-07 10:27:04 +01:00
Transifex-Openfoodnetwork
13985e28f4
Updating translations for config/locales/pt.yml
2019-05-07 19:01:37 +10:00
Transifex-Openfoodnetwork
8f62cf2bce
Updating translations for config/locales/pt.yml
2019-05-07 19:01:29 +10:00
Kristina Lim
c3d4288692
Fix translation for closed/closes in subscription update modal
2019-05-07 14:52:03 +08:00
Syed Usama Amer
f71df770d0
added social links
2019-05-06 23:28:14 -05:00
Maikel Linke
38c9ecd44f
Update pricing copy for Australian business model
2019-05-07 14:24:31 +10:00
Maikel Linke
0cf964e1bd
Update About URL
2019-05-07 11:23:48 +10:00
Matt-Yorkley
6a8a67560b
Fix API authentication
2019-05-07 00:36:08 +01:00
Matt-Yorkley
6bdc5d4438
Fix maps performance
2019-05-07 00:36:08 +01:00
Pau Perez
f940397781
Test empty variants_attrs in bulk_update
...
This covers the scenario we saw in
https://app.bugsnag.com/katuma/katuma/errors/5cd0595bece0b7001984f64c?event_id=5cd0595b0038be3b070d0000&i=sk&m=nw .
There is some other context we might be missing that makes it not
possible to reproduce.
I guess then, that this is an isolated case that does not prevent us
from deploying v2.0.0.
2019-05-06 22:23:37 +02:00
dependabot[bot]
010953cc6b
Bump deface from 1.0.0 to 1.0.2
...
Bumps [deface](https://github.com/spree/deface ) from 1.0.0 to 1.0.2.
- [Release notes](https://github.com/spree/deface/releases )
- [Changelog](https://github.com/spree/deface/blob/master/CHANGELOG.markdown )
- [Commits](https://github.com/spree/deface/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-05-06 19:16:37 +00:00
Kristina Lim
56bc497fe2
Simplify code for enterprise serializer for OCs
2019-05-06 23:49:55 +08:00
lin-d-hop
7b87e609c4
Set master variant price in products controller
...
Set master variant price in products controller
Code climate tidy up
Syntax improvement
Revert "Remove non-functional Price field from Edit Product screen"
This reverts commit 585072302c .
Syntax improvement
fixing revert
Revert "Remove non-functional Price field from Edit Product screen"
This reverts commit 585072302c .
fixing conflicts
2019-05-06 14:20:01 +01:00
Transifex-Openfoodnetwork
0e954e50d8
Updating translations for config/locales/nb.yml
2019-05-06 21:35:17 +10:00
Kristina Lim
7593168341
Update code style for Enterpise.not_ready_for_checkout
...
This was changed into multiple lines for readability.
2019-05-06 18:37:28 +08:00
Kristina Lim
c0a5bcce92
Update some comments in Enterprise and OrderCycle models
2019-05-06 18:35:01 +08:00
Kristina Lim
4430c88a95
Eager-load some data for admin order cycle pages
2019-05-06 15:41:29 +08:00
Kristina Lim
f14e7e97b1
Do not check need to warn of invalid OCs unless request is HTML
2019-05-06 15:41:29 +08:00
Kristina Lim
781afc1015
Change OC :suppliers and :distributors to associations
2019-05-06 13:43:44 +10:00
Kristina Lim
71bff0dd5b
Reduce the number of queries in Enterprise.not_ready_for_checkout
2019-05-06 13:43:44 +10:00
lin-d-hop
10fba9b39f
Add translation to order cycle spinner
...
lazy text
2019-05-05 19:12:53 +01:00
lin-d-hop
585072302c
Remove non-functional Price field from Edit Product screen
...
Update initializer to override Product Price as required field.
Revert "Update initializer to override Product Price as required field."
This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.
2019-05-05 16:41:54 +01:00
Matt-Yorkley
3323ac7650
Fix duplicate error messages
2019-05-05 13:30:38 +01:00
Pau Pérez Fabregat
b443f5ece9
Merge pull request #3789 from hughbric/remove_payment_enterprise_id_refs
...
references to payment_enterprise_id removed, new migration created
2019-05-05 12:30:19 +01:00
Matt-yorkley
bc349faf8c
Fix on_hand failure
2019-05-05 12:00:46 +01:00
Matt-Yorkley
c04c54ebf6
Refactor importer setup and fix shipping_category usage
2019-05-05 12:00:46 +01:00
Matt-Yorkley
fd31a76fba
Test shipping_category presence validation
2019-05-05 12:00:46 +01:00
Matt-Yorkley
dee9521f77
shipping_category now required for products
2019-05-05 12:00:46 +01:00
Luis Ramos
17f126d80c
Merge pull request #3788 from stveep/3249-display-name-on-edit-variant-page
...
Add display_name and display_as to admin edit variant page
2019-05-05 11:31:27 +01:00
jazzdragon
37d15a1be3
Add classes to indicate collapsible is for medium screens or smaller
2019-05-04 20:12:12 -07:00
jazzdragon
623471290e
Make sure styling doesn't get messed up if resizing down and back up
2019-05-04 19:52:08 -07:00
jazzdragon
a876f81f0a
Make collapsible always visible on large screen
2019-05-04 19:48:30 -07:00
jazzdragon
271330d2fc
Add collapsible elements and styles
2019-05-04 19:43:46 -07:00
stveep
7090281da5
Reorganise defaces so that display name fields come first
2019-05-04 21:48:32 +01:00
Pau Pérez Fabregat
958b144948
Merge pull request #3787 from eelcodevlieger/issue_3777-Make_all_map_icons_green
...
issue 3777 - Make all map icons green
2019-05-04 19:54:02 +02:00
Pau Pérez Fabregat
e3d9cab02b
Merge pull request #3785 from kkoomin/3687-missing-translation-on-demand
...
changed string into translation key & add 'infinity' key
2019-05-04 19:01:39 +02:00
stveep
a959702905
Add display_name and display_as to admin edit variant page
2019-05-04 17:20:12 +01:00
Michael Hughes
9e56198092
references to payment_enterprise_id removed, new migration created
2019-05-04 16:32:48 +01:00
Eelco de Vlieger
4b2114c1e4
issue 3777 - Make all map icons green
2019-05-04 14:44:16 +01:00
kkoomin
f65ce82778
changed string into translation key & add 'infinity' key
2019-05-04 14:40:45 +01:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Luis Ramos
4afa0cdca1
Merge pull request #3589 from kristinalim/fix/2788-ship_address_changed
...
2788 [Subscriptions] Fix address issues when syncing subscriptions and orders
2019-05-03 23:48:32 +01:00
Luis Ramos
4f0930b77c
Merge pull request #3717 from luisramos0/2-0-update-aws-sdk
...
[Spree Upgrade] Update to spree revision that depends on aws-sdk 1.11.1
2019-05-03 23:47:30 +01:00
luisramos0
53788625db
Update to spree revision that depends on aws-sdk 1.11.1 making ofn gemfile.lock compatile with ofn/spree 2-0-4 gemspec
2019-05-03 13:16:25 +01:00
Luis Ramos
22a60e4fa9
Merge pull request #3769 from amers185/fix_rebase_error
...
Closes translation bug for enterprise fee settings
2019-05-03 12:53:52 +01:00
luisramos0
d7596b4066
Merge branch 'master' into fix_rebase_error
2019-05-03 12:10:57 +01:00
Pau Pérez Fabregat
969d3e863a
Merge pull request #3768 from luisramos0/2-0-fix-on-demand
...
[Spree Upgrade] Migrate spree_variants.on_demand to spree_stock_items.backorderable
2019-05-03 10:52:16 +02:00
Luis Ramos
637e99367d
Merge pull request #3747 from luisramos0/2-0-vo-ctrl-bug
...
[Spree Upgrade] Fix bug in Variant Overrides controller
2019-05-02 17:31:13 +01:00
luisramos0
4a9570b1a1
Merge branch '2-0-stable' into fix/2788-ship_address_changed
2019-05-02 16:17:53 +01:00
Luis Ramos
3b2e614c57
Merge pull request #3734 from luisramos0/2-0-validate-distribution
...
Removing a variant from OC will prevent user with that variant in the cart from checking out
2019-05-02 16:12:41 +01:00
Pau Pérez Fabregat
046d6ebdfc
Merge pull request #3771 from luisramos0/2-0-stable-May2
...
[Spree Upgrade] LAST merge master into 2-0-stable 🎉
2019-05-02 14:26:24 +02:00
luisramos0
85cf4fa3e6
Merge branch 'master' into 2-0-stable-May2
2019-05-02 11:27:53 +01:00
Luis Ramos
edaf2479dc
Merge pull request #3741 from luisramos0/2-0-stable-Apr15
...
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
2019-05-02 11:26:54 +01:00
luisramos0
f0f08f7cd3
Update all locales with the latest Transifex translations
2019-05-02 11:22:37 +01:00
Pau Pérez Fabregat
5f47a37fac
Merge pull request #3763 from coopdevs/allow-passing-s3-region
...
Allow passing s3 region
2019-05-02 12:17:58 +02:00
luisramos0
340cbe5947
Eager load variants with variant overrides to avoid n+1 in the following line
2019-05-02 11:10:53 +01:00
luisramos0
116650595e
Move test setup code to before block
2019-05-02 11:08:31 +01:00
luisramos0
42d1d3eff6
Migrate spree_variants.on_demand to spree_stock_items.backorderable
2019-05-02 10:59:27 +01:00
Pau Pérez Fabregat
2d77605e59
Merge pull request #3764 from Matt-Yorkley/s3_backups_without_images
...
Don't use s3 for images unless images bucket has been provisioned.
2019-05-01 17:55:01 +02:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
Kristina Lim
19726061e4
Make Order#address_from_distributor public
2019-05-01 07:17:50 +08:00
Kristina Lim
92dc43d7a2
Make OrderUpdater#shipping_address_from_distributor public
2019-05-01 07:16:56 +08:00
Kristina Lim
0933d53134
Extract method OrderSyncer#update_ship_address_for
2019-05-01 07:16:56 +08:00
Kristina Lim
14d407879c
Rename method OrderSyncer#update_ship_address_for
...
This method has become only a small part of the logic for updating the
order's ship address. This no longer follows the method naming
convention within OrderSyncer where update_*_for describes almost the
complete logic for updating the association.
This is renamed in preparation for extraction of the complete update
logic for ship_address. The new method will be named
update_ship_address_for.
2019-05-01 07:16:56 +08:00
Kristina Lim
6952f4ecd1
Improve readability of conditions in OrderSyncer
2019-05-01 07:16:55 +08:00
Kristina Lim
71f379a318
Uncomment passing specs for SubscriptionPlacementJob
2019-05-01 07:16:55 +08:00
Kristina Lim
b4b24931d9
Remove ignore for OrderSyncer spec file
2019-05-01 07:16:55 +08:00
Kristina Lim
46d63f43b9
Update check for pickup address manipulation
...
The way that the bill contact details and distributor address are set
for pickup orders has changed. At this point, after before_save_hook is
called, the bill contact details have already been set as well.
2019-05-01 07:16:54 +08:00
Kristina Lim
78aa9da2cf
Uncomment and update OrderSyncer failing specs
...
This still achieves a logic issue before the Spree upgrade, where
switching from pick-up to delivery affects whether simultaneous changes
to shipping address are ignored or not.
This behaviour can be fixed in a separate PR.
2019-05-01 07:16:54 +08:00
Kristina Lim
bdf4132e01
Fix order shipment references in OrderUpdater
2019-05-01 07:16:54 +08:00
Pau Pérez Fabregat
88cbf5bd36
Merge pull request #3753 from openfoodfoundation/dependabot/bundler/whenever-0.11.0
...
Bump whenever from 0.10.0 to 0.11.0
2019-04-30 18:38:52 +02: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
Pau Perez
d5b08c602a
Allow passing a specific AWS region to S3 settings
...
This solves the error showed below when executed `bundle exec rake
db2fog:backup RAILS_ENV=staging` on Katuma staging
```
Excon::Error::BadRequest: Expected(200) <=> Actual(400 Bad Request)
excon.error.response
:body => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>AuthorizationHeaderMalformed</Code><Message>The authorization header is malformed; the region 'us-east-1' is wrong; expecting 'eu-central-1'</Message><Region>eu-central-1</Region><RequestId>3DE2763883FC601D</RequestId><HostId>1E6UapnblBqVZM0SeeLrdPNDd+VaQ0nxCWwrQ9mi8HjRo2xevAUwtSq5V3fxhsj4Cj9ynnDroco=</HostId></Error>"
```
2019-04-30 13:31:36 +02:00
Pau Perez
f36646d0a3
Store S3 keys in Config before calling db2fog
...
This ensures that Db2fog always picks up the latest value of the S3_*
env vars and not the one that was persisted last time. Now you can do
things like `S3_BUCKET=xxx bundle exec rake db2fog:backup` if you had
to.
2019-04-30 13:31:36 +02:00
Pau Pérez Fabregat
010f058618
Merge pull request #3744 from openfoodfoundation/dependabot/bundler/oj-3.7.12
...
Bump oj from 3.7.11 to 3.7.12
2019-04-30 11:53:44 +02:00
Pau Pérez Fabregat
6c9101dffa
Merge pull request #3745 from openfoodfoundation/transifex
...
Transifex
2019-04-30 11:46:17 +02:00
luisramos0
d7e706e6e7
Make text area translations run immeditaly on setup with the t function instead of sending the translation expression down to the textAngular code
2019-04-29 13:40:52 +01:00
jazzdragon
7a27973ae3
Add translation and references in taTranslations (not working in alert)
2019-04-27 19:22:15 -07:00
jazzdragon
b42426a3b8
Add test for existing input alert text
2019-04-27 18:52:23 -07:00
jazzdragon
f6c0071554
Add reference comment
2019-04-27 17:01:07 -07:00
jazzdragon
35de9077da
Add config for taTranslations (no functional change)
2019-04-27 16:57:02 -07:00
dependabot[bot]
2c536c29c5
Bump whenever from 0.10.0 to 0.11.0
...
Bumps [whenever](https://github.com/javan/whenever ) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/javan/whenever/releases )
- [Changelog](https://github.com/javan/whenever/blob/master/CHANGELOG.md )
- [Commits](https://github.com/javan/whenever/compare/v0.10.0...v0.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-23 19:18:23 +00:00
Pau Pérez Fabregat
380a9c561e
Merge pull request #3725 from coopdevs/add-specs-for-cache-variant-deletion
...
Add specs for the cache refresh on variant removal
2019-04-19 19:02:04 +02:00
Maikel
99a4878bdf
Merge pull request #3653 from mkllnk/2520-spree2-order-subscription
...
2520 Remove `process_payments!` override
2019-04-19 07:34:30 +10:00
Maikel
736ac49581
Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues
...
[Spree Upgrade] Fix two issues in admin orders edit page
2019-04-19 07:33:26 +10:00
luisramos0
a68b5eaf22
Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants
2019-04-17 15:31:19 +01:00
luisramos0
3d420d5727
Merge branch 'master' into 2-0-stable-Apr15
2019-04-16 21:14:11 +01:00
Transifex-Openfoodnetwork
225b159b9b
Updating translations for config/locales/en_BE.yml
2019-04-17 02:23:46 +10:00
Transifex-Openfoodnetwork
e07ae3d931
Updating translations for config/locales/en_BE.yml
2019-04-17 02:20:37 +10:00
Luis Ramos
6b84edb6d9
Merge pull request #3736 from kristinalim/feature/enable_newrelic_test_mode
...
Install and set up newrelic_rpm gem for development environment
2019-04-16 15:35:36 +01:00
Luis Ramos
c5720bede5
Merge pull request #3697 from coopdevs/add-delayed-job-web
...
Add delayed job web
2019-04-16 15:33:59 +01:00
Luis Ramos
eeac75ade1
Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug
...
[Spree Upgrade] Fix split button reappearing when editing line item quantity
2019-04-16 15:28:43 +01:00
Luis Ramos
67a7e26757
Merge pull request #3695 from luisramos0/2-0-emails-transl
...
[Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn
2019-04-16 13:44:24 +01:00
Luis Ramos
29000ebe0d
Merge pull request #3651 from luisramos0/2-0-enterprise-fee-report
...
[Spree Upgrade] Fix Enterprise fee report specs
2019-04-16 12:36:53 +01:00
Maikel Linke
278190a25c
Update specs for Spree v2 payment requirement
...
This pull request removed the override of `process_payments!` which was based on v1. Spree v2 has an additional check: An order in payment state requires a payment. Some specs didn't care and didn't create payments before transitioning to `complete`.
2019-04-16 10:30:14 +10:00
Maikel Linke
8b9a814131
Remove obsolete Spree 2 backport on Order
2019-04-16 10:30:14 +10:00
Maikel Linke
6f12eee8ae
Reduce the override of Order for subscriptions
...
Orders belonging to subscriptions get completed without payment. That
requires overriding Spree's functionality.
In Spree 2, an order in payment state without pending orders is invalid.
Instead we skip the payment state by not requiring a payment for
automatically generated orders until the order cycle is closed.
2019-04-16 10:30:14 +10:00
dependabot[bot]
2a025be032
Bump oj from 3.7.11 to 3.7.12
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-04-15 19:14:59 +00:00
luisramos0
a1905e43f7
Move a group of translations related to customers to the js translations namespace
2019-04-15 18:12:04 +01:00
luisramos0
9662323261
Move a group of translations related to schedules to the js translations namespace
2019-04-15 17:42:45 +01:00
Hugo Daniel
abdf3b5480
Add edit subcription translation key
2019-04-15 16:27:18 +01:00
luisramos0
e8ccb55f47
Use rspec 3 syntax in order_cycle_distributed_variants_spec and checkout_controller_spec
2019-04-15 12:39:52 +01:00
Pau Pérez Fabregat
ffbea7d3fd
Merge pull request #3712 from openfoodfoundation/transifex
...
Transifex
2019-04-15 12:58:30 +02:00
Pau Pérez Fabregat
6d0ecdc4a6
Merge pull request #3721 from Matt-Yorkley/subs_styles
...
Subs styles
2019-04-15 12:53:27 +02:00
luisramos0
8f39a18ca3
Merge branch 'master' into 2-0-stable-Apr15
2019-04-15 11:46:31 +01:00
Transifex-Openfoodnetwork
f76fada066
Updating translations for config/locales/es.yml
2019-04-15 19:15:24 +10:00
Transifex-Openfoodnetwork
1b01c44ce4
Updating translations for config/locales/es.yml
2019-04-15 19:12:19 +10:00
Transifex-Openfoodnetwork
10c917a693
Updating translations for config/locales/ca.yml
2019-04-15 17:08:06 +10:00
Transifex-Openfoodnetwork
418d80bdc0
Updating translations for config/locales/ca.yml
2019-04-15 17:05:00 +10:00
luisramos0
fce3d69345
Add flash and warning to the cart page when item becomes unavailable
2019-04-13 21:39:41 +01:00
luisramos0
d602375ac7
Redirect user to cart page if some item in the order is unavailable
2019-04-13 20:31:05 +01:00
Luis Ramos
1e85bf6a68
Merge pull request #3641 from luisramos0/2-0-update-spree-2-0-4-revision
...
[Spree Upgrade] Update spree revision to include last package_factory fix
2019-04-12 22:16:15 +01:00
Pau Pérez Fabregat
e0fd2fbaa9
Merge pull request #3726 from Matt-Yorkley/db2fog_patch
...
Db2fog patch
2019-04-12 14:26:46 +02:00
Kristina Lim
53bd421389
Add newrelic.yml to .gitignore
2019-04-12 13:57:50 +08:00
Kristina Lim
6f5a024be2
Update script/setup to create default newrelic.yml
2019-04-12 13:57:50 +08:00
Kristina Lim
d983e400cd
Add config/newrelic.yml.example for newrelic_rpm gem
2019-04-12 13:57:50 +08:00
Kristina Lim
c5e4b283f1
Install latest newrelic_rpm gem with test mode
2019-04-12 13:57:47 +08:00
Luis Ramos
0f00f48f13
Merge pull request #3634 from luisramos0/2-0-fix-sample-data
...
[Spree Upgrade] Fix new sample data in v2
2019-04-11 23:07:15 +01:00
luisramos0
59ec52babe
Refactor order_cycle_distributed_variants, better method names and simpler code
2019-04-11 22:15:24 +01:00
luisramos0
44b0592223
Move OrdercycleDistributedVariants from lib/open_food_network to app/services
2019-04-11 21:37:08 +01:00
luisramos0
96ee527f0c
Rename distribution_change_validator to order_cycle_distributed_variants
2019-04-11 21:14:01 +01:00
Transifex-Openfoodnetwork
45ca63e751
Updating translations for config/locales/fr_BE.yml
2019-04-12 01:14:59 +10:00
Transifex-Openfoodnetwork
b6989c6d6e
Updating translations for config/locales/nl_BE.yml
2019-04-12 01:05:30 +10:00
luisramos0
46278e3edd
Set distributor in order and shipping methods so that refreshing shipment rates suceeds
2019-04-10 22:16:09 +01:00
luisramos0
5791eba9bd
Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed
2019-04-10 22:16:09 +01:00
luisramos0
c852c616d5
Update spree revision to include last package_factory fix and update spree dependencies
2019-04-10 22:16:09 +01:00
Luis Ramos
ddd3443a86
Merge pull request #3659 from mkllnk/missing-translation
...
Fix "What's this?" on admin dashboard
2019-04-10 22:05:19 +01:00
Luis Ramos
4bf9320be8
Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees
...
Close adjustments so that updates are effective
2019-04-10 21:58:22 +01:00
Luis Ramos
83a4771cdd
Merge pull request #3720 from Matt-Yorkley/spree2/translations
...
Subs: missing translations
2019-04-10 21:47:47 +01:00
Luis Ramos
984155013c
Merge pull request #3648 from luisramos0/2-0-fix-ui-issue
...
[Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list
2019-04-10 21:46:40 +01:00
Luis Ramos
97c920f1b0
Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments
...
3477 Render only eligible adjustments on the order page
2019-04-10 21:44:16 +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
Matt-Yorkley
2ac981a9a3
Make db2fog tasks conditional
2019-04-10 17:17:43 +01:00
Matt-Yorkley
37cbfcb692
Use ENV var for backups bucket
2019-04-10 17:17:17 +01:00
Pau Perez
f20a15e955
Add specs for the cache refresh on variant removal
...
This is failing in `master` but thanks to the VariantDeleter it does work
in v2. This specs prove it.
2019-04-10 16:16:00 +02:00
Matt-Yorkley
14fd821283
Rename states SCSS file for clarity
2019-04-10 13:12:44 +01:00
Matt-Yorkley
e486a94fb4
Add missing translations in subscriptions
2019-04-10 12:16:31 +01:00
Matt-Yorkley
9e0f35d635
Re-adjust buttons. Much better!
2019-04-10 12:15:21 +01:00
Matt-Yorkley
e13db873b0
Fix subs panel button vertical alignment
2019-04-10 12:15:21 +01:00
Matt-Yorkley
896a45c399
Fix subs state buttons
2019-04-10 12:15:21 +01:00
Matt-Yorkley
3968cfd238
Fix chevron horizontal position
2019-04-10 12:15:21 +01:00
Matt-Yorkley
3578d82cbf
Merge pull request #3718 from luisramos0/2-0-fix-build
...
[Spree Upgrade] Add order distributor to shipping method in reports_spec
2019-04-10 12:14:00 +01:00
luisramos0
e4c54a4954
Add order distributor to shipping method in reports_spec
2019-04-09 23:26:14 +01:00
Luis Ramos
4478d51aee
Merge pull request #3668 from luisramos0/2-0-stable-Mar29
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
2019-04-09 17:46:36 +01:00
Luis Ramos
449e58723d
Merge pull request #3591 from luisramos0/2-0-fix-migrations
...
[Spree Upgrade] Fix Migrations to 2.0
2019-04-09 13:16:34 +01:00
Transifex-Openfoodnetwork
029e8eb848
Updating translations for config/locales/de_DE.yml
2019-04-09 20:50:31 +10:00
Luis Ramos
ef2e00ae31
Merge pull request #3604 from luisramos0/2-0-fix-splitters
...
[Spree Upgrade] Override default spree splitters config
2019-04-09 09:19:00 +01:00
Transifex-Openfoodnetwork
44e6adbe34
Updating translations for config/locales/en_GB.yml
2019-04-09 00:21:57 +10:00
Transifex-Openfoodnetwork
fde3d72a66
Updating translations for config/locales/en_GB.yml
2019-04-09 00:18:48 +10:00
Pau Pérez Fabregat
6e727e12e2
Merge pull request #3711 from openfoodfoundation/transifex
...
Transifex
2019-04-08 15:15:28 +02:00
Transifex-Openfoodnetwork
0261baaed3
Updating translations for config/locales/pt.yml
2019-04-08 21:06:43 +10:00
Transifex-Openfoodnetwork
4a69fdef27
Updating translations for config/locales/pt.yml
2019-04-08 21:06:39 +10:00
Transifex-Openfoodnetwork
5e672dc7d4
Updating translations for config/locales/pt.yml
2019-04-08 21:03:32 +10:00
Pau Pérez Fabregat
ffce31ca45
Merge pull request #3710 from coopdevs/pull-Transifex-translations
...
Update locales with latest Transifex translations
2019-04-08 12:56:23 +02:00
Pau Perez
860414fa31
Update locales with latest Transifex translations
2019-04-08 12:27:19 +02:00
Pau Pérez Fabregat
fa31ca5a95
Merge pull request #3686 from openfoodfoundation/transifex
...
Transifex
2019-04-08 12:23:36 +02:00
luisramos0
e9491cecab
Fix flaky spec by having only one variant with display name small bag
2019-04-06 10:14:19 +01:00
luisramos0
258a9efa0d
Adapt product_importer_spec to ofn v2 where there’s no product.count_on_hand and on_hand does not default to infinity if product.on_demand
2019-04-05 22:09:46 +01:00
luisramos0
bb4cec1186
Fix order_and_distributor_report_spec by setting ofn shipping method the ofn v2 way
2019-04-05 22:06:44 +01:00
Transifex-Openfoodnetwork
f5ab89eb03
Updating translations for config/locales/it.yml
2019-04-06 07:38:45 +11:00
luisramos0
ecc60f3b61
Merge branch 'master' into 2-0-stable-Mar29
2019-04-05 15:47:46 +01:00
Pau Pérez Fabregat
0c75a070c6
Merge pull request #3650 from kristinalim/fix/2786-address_subscription_confirm_job_failing_specs
...
3487,2786 [Spree Upgrade] Address spec failures for SubscriptionConfirmJob
2019-04-05 15:45:41 +02:00
Pau Perez
3e7e24d700
Make VariantController specs aware of destroy call
...
In v2 we no longer rely on `Variant#delete` but `Variant#destroy` so
stubbed calls needed fixing.
2019-04-05 15:38:10 +02:00
Transifex-Openfoodnetwork
80fd367da0
Updating translations for config/locales/en_US.yml
2019-04-06 00:27:12 +11:00
Transifex-Openfoodnetwork
231fa28713
Updating translations for config/locales/en_US.yml
2019-04-06 00:24:05 +11:00
Pau Pérez Fabregat
10165c4246
Merge pull request #3680 from kristinalim/fix/3285-db_migration_bang_shipping_rates
...
[Spree Upgrade] Bang version of create in DB migration for shipping rates
2019-04-05 15:11:41 +02:00
luisramos0
5989a654d1
Remove stock location from stock levels table and fix Spree.t entry bug
2019-04-05 14:01:27 +01:00
Pau Pérez Fabregat
1b55d04963
Merge pull request #3673 from Matt-Yorkley/spree2/css
...
Spree2/css
2019-04-05 14:57:57 +02:00
Pau Pérez Fabregat
67376a29a6
Merge pull request #3694 from Matt-Yorkley/db2fog
...
Fix outdated db2fog initializer
2019-04-05 12:26:07 +02:00
Transifex-Openfoodnetwork
74b7418f59
Updating translations for config/locales/fr.yml
2019-04-05 04:39:15 +11:00
Transifex-Openfoodnetwork
545f2fefa4
Updating translations for config/locales/fr.yml
2019-04-05 04:36:07 +11:00
Pau Perez
aa3f0ac577
Reuse #superadmin? in Delayed Job Web route
...
This moves #superadmin? to the user decorator so it can be reused
outside FeatureFlags.
2019-04-04 16:00:27 +02:00
Pau Perez
bf20376667
Add Delayed Job Web for superadmins only
...
This adds https://github.com/ejschmitt/delayed_job_web to enable async
job management such as retries, removal of failed jobs, etc.
Only superadmins can access this web UI though. Therefore any sysadmin
that needs to use it should have access to the appropriate instance
superadmin credentials in Bitwarden.
2019-04-04 16:00:27 +02:00
luisramos0
87327f7aa9
Fix specs testing order cancelation email. The email template now needs a order distributor for the signoff part
2019-04-04 13:41:07 +01:00
Pau Pérez Fabregat
07888b355a
Merge pull request #3679 from mkllnk/3477-missing-v2-translation
...
Add missing translation for order form in v2
2019-04-04 14:25:05 +02:00
Transifex-Openfoodnetwork
8d69180c8c
Updating translations for config/locales/es.yml
2019-04-04 23:23:06 +11:00
Transifex-Openfoodnetwork
4b60a75eae
Updating translations for config/locales/ca.yml
2019-04-04 23:22:59 +11:00
Matt-Yorkley
9b45269cbb
Fix name of Spree::Config preference
2019-04-04 13:06:05 +01:00
luisramos0
cf3b2308e1
Fix translation problem in the subject of order confirmation emails
2019-04-04 12:55:36 +01:00
luisramos0
6e49cf9f87
Bring cancel email from spree so it gets the normal ofn style
2019-04-04 12:31:12 +01:00
Matt-Yorkley
7522594b85
Fix outdated db2fog initializer
2019-04-04 12:02:57 +01:00
Maikel Linke
84501b9e41
Move feature spec to controller spec
...
It reduces the runtime (3s instead of 10s).
2019-04-04 17:01:44 +11:00
Maikel Linke
7b116c0982
Remove unnecessary condition from spec
2019-04-04 16:51:18 +11:00
Maikel Linke
72458da465
Comply to code convention using I18n.t in specs
2019-04-04 16:26:52 +11:00
Pau Pérez Fabregat
ec00544130
Merge pull request #3665 from mkllnk/stripe-version
...
Relax stripe version requirement
2019-04-03 17:02:40 +02:00
Pau Pérez Fabregat
c515a8f115
Merge pull request #3537 from Matt-Yorkley/pi/on_demand_error
...
Fix nil values in on_hand column
2019-04-03 11:56:06 +02:00
Pau Pérez Fabregat
b288cb00c1
Merge pull request #3654 from mkllnk/3237-spec-overrides-in-inventory-report
...
Test inventory report to use variant overrides
2019-04-03 11:55:33 +02:00
Maikel Linke
d31b5efac6
Simplify orders helper
2019-04-03 11:15:54 +11:00
Maikel Linke
7035d57267
Better helper naming and spec cover
2019-04-03 11:13:56 +11:00
luisramos0
ea52600fc5
Fix split button reappearing when editing line item quantity
2019-04-02 21:58:29 +01:00
Transifex-Openfoodnetwork
898966fbea
Updating translations for config/locales/pt.yml
2019-04-03 03:20:34 +11:00
Transifex-Openfoodnetwork
b8f8ea964e
Updating translations for config/locales/pt.yml
2019-04-03 03:17:29 +11:00
Transifex-Openfoodnetwork
1874f55fa4
Updating translations for config/locales/pt.yml
2019-04-03 03:14:14 +11:00
luisramos0
5e64c9f392
Fix deface override to remove configurations menu from payment methods list, this is necessary because non-admin users do get to this page through enterprises management"
2019-04-02 16:58:50 +01:00
luisramos0
5c69d6c9dc
Fix page action in the backoffice when translations are long
2019-04-02 16:58:45 +01:00
luisramos0
112a57d330
Remove association between adjustments and shipments that are going to be deleted in AddUniquenessOfOrderIdToSpreeShipments
2019-04-02 12:31:39 +01:00
luisramos0
40124b7421
Improve downloads_helper clear_downloads method
2019-04-02 11:39:52 +01:00
luisramos0
7cc5940e19
Load DownloadsHelper only for feature specs
2019-04-02 11:39:52 +01:00
luisramos0
e10264af86
Remove xfeature from enterprise fees summmary report spec
2019-04-02 11:39:52 +01:00
luisramos0
d9304916cc
Add chrome driver config to make testing csv downloads with headless chrome possible
2019-04-02 11:39:52 +01:00
luisramos0
c36f7e003b
Adapt assertions to new csv file download logic
2019-04-02 11:39:52 +01:00
luisramos0
4f803eba7e
Add around blocks to clear downloads directory before and after every test
2019-04-02 11:39:52 +01:00
luisramos0
4795832db5
Add spec DownloadsHelper to support testing csv downloads with headless chrome
2019-04-02 11:39:52 +01:00
luisramos0
c291601d9f
Fix rubocop warnings in enterprise_fee_summary report spec
2019-04-02 11:39:52 +01:00
Kristina Lim
3035d14369
Use bang version of create! in DB migration script
2019-04-02 15:21:58 +08:00
Maikel Linke
8b6561addd
Add missing translation for order form in v2
...
I saw the following error on the 2-0-stable branch:
translation missing: en.spree.line_item_adjustments
In a pending PR I change all three translations in the view file to use
lazy lookup. This commit backports the addition to the locale so that it
can be translated via Transifex before we release v2.
2019-04-02 17:52:24 +11:00
Maikel Linke
0c846758dd
Add missing translation to order form
...
I saw the following error:
translation missing: en.spree.line_item_adjustments
In this commit I change all three translations in the view file to use
lazy lookup.
2019-04-02 17:47:36 +11:00
Maikel Linke
2a6236823f
Move adjustment filtering from view to helper
2019-04-02 17:25:33 +11:00
Maikel Linke
11c12787f6
Move adjustment selection to helper
2019-04-02 17:02:05 +11:00
Maikel Linke
d78c709ad2
Remove unused variables from view
2019-04-02 16:58:08 +11:00
Maikel Linke
500cf925ad
Fix HTML validity and element finding in spec
...
The fixed partial was used twice on the same page. So the used element
id appeared twice on the page which is invalid HTML. It also confused
the spec.
Now we look at the actually displayed text to select the correct
element.
2019-04-02 16:50:44 +11:00
Luis Ramos
9c99e64f1f
Merge pull request #3316 from luisramos0/2-0-phase2-reports
...
[Spree Upgrade] Phase 2 - Reports ready - all specs running and green (except enterprise fee report)
2019-04-01 21:46:31 +01:00
Luis Ramos
d48d2a748b
Merge pull request #3662 from SDBowen/add_shipping_method
...
Add shipping method name to orders detail report
2019-04-01 15:37:57 +01:00
Matt-Yorkley
668a37f564
Fix "clear all" button spacing in inventory
2019-04-01 12:18:19 +01:00
Matt-Yorkley
4a0e5a42a3
Fix admin menu items different heights
2019-04-01 12:11:29 +01:00
Matt-Yorkley
082be15df2
Fix admin menu mixed font weights
2019-04-01 12:00:29 +01:00
Matt-Yorkley
fa91a66de6
Fix button padding after Spree 2 font changes increased the vertical height
2019-04-01 11:48:18 +01:00
Matt-Yorkley
3ad2c9f7c4
Fix 'clear all' button width on Order Cycles page
2019-04-01 11:41:46 +01:00
Kristina Lim
d866fad46e
Persist variants in customer totals specs
...
This is to properly record the on hand quantity.
2019-03-31 18:32:09 +08:00
luisramos0
bc8bca074c
Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4
...
Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.
2019-03-29 22:16:39 +00:00
luisramos0
1fc4b7fd2a
Add manual shipping adjustment
...
For some reason this adjustment is not being added to order through the callbacks as it was before. See PR #3371
2019-03-29 22:16:39 +00:00
luisramos0
d713c755e6
Uncomment report specs so we can make them work in v2
2019-03-29 22:16:38 +00:00
luisramos0
527cfc1601
Merge branch 'master' into 2-0-stable-Mar29
2019-03-29 13:48:49 +00:00
Maikel Linke
f630738b2c
Fix HTML syntax in admin view
2019-03-29 18:42:06 +11:00
Maikel Linke
5760aed6a6
Render only eligible adjustments on the order page
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3477
The admin orders edit form was displaying adjustments even if they were
"not eligible". For example, an additional fee with amount `0` is not
eligible. They were already hidden in the adjustments view and we are
hiding them in reports.
2019-03-29 18:41:38 +11:00
Maikel Linke
fabca84001
Close adjustments so that updates are effective
...
Spree 2.0 keeps shipping fee adjustments open unless they are manually
closed. But open adjustments cannot be edited.
To preserve updates, like changing the amount of the shipping fee
we close the adjustment first.
2019-03-29 17:23:15 +11:00
Maikel
7348987567
Merge pull request #3315 from luisramos0/2-0-phase2-pi
...
[Spree Upgrade] Phase 2 - Product Import ready - all specs running and green
2019-03-29 15:16:35 +11:00
Maikel
6e31f0078a
Merge pull request #3639 from coopdevs/fix-variant-cache-refreshing-on-delete
...
Fix variant cache refreshing on delete
2019-03-29 15:12:46 +11:00
Maikel Linke
29f32604f2
Relax stripe version requirement
...
We are using the latest version of the `stripe` gem. We don't depend on
any particular version. I'm proposing to drop our dependency declaration
on a particular version and just track the current used version in
Gemfile.lock. That means fewer code changes when updating, which happens
quite frequently with this gem.
2019-03-29 13:40:51 +11:00
Maikel
973ae3d43a
Merge pull request #3656 from openfoodfoundation/dependabot/bundler/stripe-4.11.0
...
Bump stripe from 4.10.0 to 4.11.0
2019-03-29 13:39:08 +11:00
sdbowen
0f7ef2671f
Add shipping method name to orders detail report
...
Added column allows users to see the shipping method of each order.
2019-03-28 16:08:10 -06:00
luisramos0
3742c70910
Add backup process to AddUniquenessOfOrderIdToSpreeShipments so that the deleted duplicated shipments can be recovered if something goes wrong
2019-03-28 18:49:38 +00:00
Maikel
fed2b60743
Merge pull request #3644 from kevinchristianson/master
...
Fixed producer profile translation bug
2019-03-28 15:51:45 +11:00
Maikel
6978e3fdb6
Merge pull request #3658 from mkllnk/3582-shipping-method-spec
...
Wait for entered tag before submitting
2019-03-28 13:46:56 +11:00
Maikel
74aea76c4c
Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit
...
[Spree Upgrade] Finish up deleting account invoices
2019-03-28 13:42:01 +11:00
Kristina Lim
f0746eb643
Use :performing_deliveries in spec
2019-03-28 02:04:13 +08:00
luisramos0
b780823970
Fix specs to adapt to the fact that for the order workflow to get to delivery, the shipping method must be linked to the order distributor otherwise it's ignored when creating the order shipment
2019-03-27 14:10:51 +00:00
Luis Ramos
4455073f6d
Merge pull request #3647 from luisramos0/fix-shipment-state-translation
...
Add missing translation key for order shipment state canceled
2019-03-27 13:02:14 +00:00
Maikel Linke
bcebb99967
Fix "What's this?" on admin dashboard
...
When a user has no enterprises, the admin dashboard displays a "What's
this?" hint in the right corner of the enterprises tab. The link text
and the tooltip were both broken (missing translation).
2019-03-27 11:04:08 +11:00
Maikel Linke
ef882b8293
Wait for entered tag before submitting
...
The changed spec was failing from time to time. This change seems to
make it stable. It may be worth moving tag entering into a helper that
verifies that the tag was entered (waits for it).
2019-03-27 10:58:00 +11:00
dependabot[bot]
6c97bb6cac
Bump stripe from 4.10.0 to 4.11.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.10.0...v4.11.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-26 19:25:43 +00:00
luisramos0
249e2bc9e1
Merge branch '2-0-stable' into 2-0-fix-sample-data
2019-03-26 15:50:16 +00:00
luisramos0
ae66e864a5
Improve models/spree/order/checkout_spec: AR is here to help you :-D
2019-03-26 15:37:36 +00:00
luisramos0
428656e92e
Add distributor to shipping method in factory completed_order_with_fees so that shipping method is not discarded during order processing in package.shipping_methods
2019-03-26 15:37:36 +00:00
luisramos0
beb19cdc8a
Override default spree splitters config (was Shipping Category and Backordered) to use only Base splitter, this splitter does not split the orders into multiple shipments
...
In OFN we cannot split the orders because one order can only have one shipment
Additionally, add spec to validate that the order workflow now works with products with different shipping categories
2019-03-26 15:37:35 +00:00
Pau Pérez Fabregat
a8f81ae7a2
Merge pull request #3652 from kristinalim/fix/3410-address_proxy_orders_controller_failing_specs
...
3410 [Spree Upgrade] Address spec failures for Admin::ProxyOrdersController
2019-03-26 15:55:13 +01:00
luisramos0
5ce762a600
Uncomment product import specs so we can make them work in v2
2019-03-26 11:34:04 +00:00
Luis Ramos
c68b0d768a
Merge pull request #3640 from luisramos0/2-0-stable-Mar22
...
[Spree Upgrade] Merging master into 2-0-stable (3rd run in Mar2019)
2019-03-26 10:42:27 +00:00
luisramos0
f35972cee9
Remove deleted menu entry product distributions
2019-03-26 09:08:52 +00:00
luisramos0
010007a2c7
Merge branch '2-0-stable' into 2-0-stable-Mar22
2019-03-26 09:07:48 +00:00
Luis Ramos
9a771ecbb8
Merge pull request #3613 from luisramos0/2-0-update-variants-stock
...
[Spree Upgrade] Add on_hand and on_demand to the variants create and edit pages
2019-03-26 08:55:34 +00:00
Maikel
d963df2c87
Merge pull request #3632 from openfoodfoundation/dependabot/bundler/oj-3.7.11
...
Bump oj from 3.7.10 to 3.7.11
2019-03-26 16:28:36 +11:00
Maikel
84246fedc9
Merge pull request #3631 from openfoodfoundation/dependabot/bundler/stripe-4.10.0
...
Bump stripe from 4.9.0 to 4.10.0
2019-03-26 16:28:08 +11:00
Maikel
6ad42fcceb
Merge pull request #3636 from openfoodfoundation/transifex
...
Transifex
2019-03-26 16:27:50 +11:00
Maikel Linke
9d4589632b
Test inventory report to use variant overrides
2019-03-26 16:13:50 +11:00
Maikel
9e3734fc3e
Merge pull request #3646 from kristinalim/fix/3528-product_sku_in_report
...
3528 Scope Customer Totals report also by variant (not just product) and use variant SKU
2019-03-26 12:05:14 +11:00
Kristina Lim
db6dab2e54
Address failing specs for ProxyOrdersController
2019-03-26 00:56:02 +08:00
Transifex-Openfoodnetwork
a2f3110b06
Updating translations for config/locales/en_CA.yml
2019-03-26 03:33:01 +11:00
Transifex-Openfoodnetwork
e504783929
Updating translations for config/locales/fr_CA.yml
2019-03-26 03:06:18 +11:00
Kristina Lim
2aad5baac5
Make code style changes for SubscriptionConfirmJob specs
2019-03-25 22:22:11 +08:00
Kristina Lim
18fe35e130
Address spec failures for SubscriptionConfirmJob
2019-03-25 21:55:38 +08:00
Transifex-Openfoodnetwork
a4bc739d48
Updating translations for config/locales/de_DE.yml
2019-03-25 16:40:06 +11:00
Kristina Lim
807cdb4746
Code style changes for Customer Totals report
2019-03-25 07:46:32 +08:00
Kristina Lim
4a95578db2
Use name helpers in Customer Totals report
2019-03-25 07:46:31 +08:00
Kristina Lim
79d0b63069
Add Spree::Address#full_name_reverse
2019-03-25 07:46:31 +08:00
Kristina Lim
7c7d61fbc5
Simplify some logic for Customer Totals report
...
Line items belong to a single order.
2019-03-25 07:46:30 +08:00
Kristina Lim
c088fb9a49
Use shorter syntax for Customer Totals report
2019-03-25 07:46:30 +08:00
Kristina Lim
46e7090d11
Group report by variant and use variant SKU
...
This groups the Customer Totals report by variant too (among others,
including by product), and then changes the report to use the variant
SKU not the product SKU.
This adds a spec for customer totals grouping and details, which
replaces the test specific to the SKU column.
2019-03-25 07:45:32 +08:00
Maikel Linke
7bc735eea3
Cover report content with specs
2019-03-25 04:47:13 +08:00
Maikel Linke
fdd8c06823
Style reports spec
2019-03-25 04:47:13 +08:00
Maikel Linke
856603cadd
Convert specs to RSpec 3.8.0 syntax with Transpec
...
This conversion is done by Transpec 3.4.0 with the following command:
transpec spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
* 8 conversions
from: == expected
to: eq(expected)
* 8 conversions
from: obj.should
to: expect(obj).to
* 1 conversion
from: obj.stub(:message)
to: allow(obj).to receive(:message)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2019-03-25 04:47:13 +08:00
Maikel Linke
0a243ac9ca
Give spec vars proper names
2019-03-25 04:47:12 +08:00
Maikel Linke
6ee27cd166
Fix spec to test the right report
...
Probably a copy&paste error. The PackingReport had exactly the same
spec.
2019-03-25 04:47:12 +08:00
Maikel Linke
dac4d4ff1a
DRY report spec
2019-03-25 04:47:07 +08:00
luisramos0
2c97eaa62e
Add missing translation key for order shipment state canceled
2019-03-24 15:33:14 +00:00
Transifex-Openfoodnetwork
b979a09478
Updating translations for config/locales/en_US.yml
2019-03-23 23:42:22 +11:00
Transifex-Openfoodnetwork
f050086d47
Updating translations for config/locales/pt.yml
2019-03-23 23:28:49 +11:00
Transifex-Openfoodnetwork
dc198b7b5d
Updating translations for config/locales/pt.yml
2019-03-23 23:28:43 +11:00
Usama
698c71f039
Fixed producer profile translation bug
2019-03-22 18:25:40 -05:00
luisramos0
a8c0eef3d3
Improve admin variants controller create action, it doesn't try to set on_hand and on_demand if there are previous errors in the variant
2019-03-22 23:23:10 +00:00
luisramos0
78ea16c684
Remove unnecessary data-hooks from stock management deface override
2019-03-22 21:30:25 +00:00
luisramos0
01f82e5214
Move OrderSyncer spec to xdescribe until it is fixed as part of spree upgrade phase 2. This is a subscriptions specific spec
2019-03-22 13:06:45 +00:00
luisramos0
287ea6038a
Remove distributors from product in completed_order_with_fees factory. This setter is no longer available after product distributions has been deleted
2019-03-22 11:50:24 +00:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
Luis Ramos
6cd07cd107
Merge pull request #3605 from kristinalim/fix/2788-improve_specs_for_order_syncer
...
[Subscriptions] (v1) Fix assertions in specs for OrderSyncer
2019-03-22 10:31:01 +00:00
Luis Ramos
8d2d5a8708
Merge pull request #3579 from luisramos0/sanitize_data
...
Add sanitize and truncate data tasks
2019-03-22 10:29:57 +00:00
Pau Pérez Fabregat
846e6fdd90
Merge pull request #3560 from kristinalim/fix/2788-shipping_method_id_in_shipments
...
2696,2788 [Spree Upgrade] Fix use of shipping method ID for subscriptions
2019-03-22 11:08:23 +01:00
Pau Pérez Fabregat
deec4f83f8
Merge pull request #3633 from mkllnk/remove-product-distribution-from-sample-data
...
Remove usage of ProductDistribution which is dead
2019-03-22 10:54:59 +01:00
Pau Pérez Fabregat
4595ea033f
Merge pull request #3624 from mkllnk/2873-spec-register-link
...
Add spec for registration link on Spree pages
2019-03-22 10:47:43 +01:00
Pau Pérez Fabregat
5b06f580e2
Merge pull request #3614 from mkllnk/3335-localized-number-for-weight-calculator
...
Support international decimals in weight calculator
2019-03-22 10:35:37 +01:00
Pau Pérez Fabregat
87f0ddabe7
Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features
...
[Spree Upgrade] Remove unused spree v2 features
2019-03-22 10:35:15 +01:00
Pau Perez
96b8c8ac2c
Refresh products cache also on Variant#delete
...
Note that, as explained in
https://apidock.com/rails/v3.2.13/ActiveRecord/Relation/delete , `delete` does
not trigger callbacks and so it skips the products cache logic.
If we still want to avoid instantiating the AR object, we need to explicitly
call that logic for the cache to be up-to-date.
2019-03-22 09:57:15 +01:00
Pau Perez
b293e00777
Test that we refresh the cache on variant destroy
...
These tests prove that
https://github.com/openfoodfoundation/openfoodnetwork/issues/3629 is
indeed is a bug because we don't refresh the cache when deleting
a variant.
2019-03-22 09:38:24 +01:00
Pau Perez
fbc3fc6a51
Test spree/admin/variants_controller #destroy
2019-03-22 09:18:31 +01:00
Transifex-Openfoodnetwork
2ba10c416a
Updating translations for config/locales/nb.yml
2019-03-22 07:41:18 +11:00
Kristina Lim
c222971e26
Clean up setup data for some OrderSyncer specs
2019-03-22 03:30:50 +08:00
Kristina Lim
0c2a75a227
Randomize bill and ship address of sample subscriptions
...
This also fixes some phone references in OrderSyncer specs.
2019-03-22 02:47:12 +08:00
Kristina Lim
7be669e1dd
Add address factory with randomized attributes
...
Randomizing all addresses generated will be explored separately.
2019-03-22 02:45:50 +08:00
Kristina Lim
d047e04e33
Customize addresses for subscriptions in specs
...
This forces us to write correct assertions when adding specs affected by
subscription addresses.
2019-03-22 01:58:27 +08:00
Transifex-Openfoodnetwork
f0d985753f
Updating translations for config/locales/fr.yml
2019-03-22 03:23:47 +11:00
Transifex-Openfoodnetwork
310b4a08b7
Updating translations for config/locales/fr.yml
2019-03-22 03:20:40 +11:00
luisramos0
e2f5515412
Fix sample data by setting on_demand in the product variant, setting product.on_demand is not possible in v2
2019-03-21 13:13:50 +00:00
luisramos0
88335c7f6c
Fix sample data in v2 by adapting to the fact that shipping methods can now have multiple zones
2019-03-21 13:12:44 +00:00
luisramos0
98a262f86e
Fix sample data in v2 by setting a Default shipping category in both products and shipping methods
2019-03-21 13:12:03 +00:00
Maikel Linke
42ee4b9f42
Remove usage of ProductDistribution which is dead
...
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
2019-03-21 13:11:05 +00:00
Kristina Lim
94606025c9
Separate call and call! for AdvanceOrderService
2019-03-21 20:34:51 +08:00
luisramos0
61433ee395
Make anonimize and truncate tasks respect rubocop rules
2019-03-21 11:16:56 +00:00
Maikel Linke
0b7192b82a
Remove usage of ProductDistribution which is dead
...
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
2019-03-21 17:37:16 +11:00
Maikel Linke
3803094409
Add more examples to LocalizedNumber spec
2019-03-21 12:49:19 +11:00
Maikel Linke
3ef6878233
Avoid global state change by using config stub
2019-03-21 12:49:19 +11:00
Maikel Linke
1ea2f37c18
Support international decimals in weight calculator
...
A previous pull request added support for flexible decimal characters
when editing money amounts.
https://github.com/openfoodfoundation/openfoodnetwork/pull/1831
This pull request applies the same principle to the weight calculator
which was missed in the previous pull request.
2019-03-21 12:49:19 +11:00
Maikel
130ba64f2f
Merge pull request #3619 from openfoodfoundation/dependabot/bundler/dalli-2.7.10
...
Bump dalli from 2.7.9 to 2.7.10
2019-03-21 12:47:29 +11:00
Maikel
f1ac33f304
Merge pull request #3590 from mkllnk/3576-bulk-order-spec
...
3576 Fix bulk order management race condition
2019-03-21 12:40:41 +11:00
Maikel Linke
d62908fd2d
Add spec for registration link on Spree pages
...
The `registration_path` helper resolves to `/signup` in Spree
controllers due to spree_auth_device > config > routes.rb.
We worked around that in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3174
Here we add a spec for this so that we can test more easily if we
remove that workaround or detect it's accidental removal.
2019-03-21 10:06:15 +11:00
dependabot[bot]
6b01eba293
Bump oj from 3.7.10 to 3.7.11
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.10 to 3.7.11.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 19:23:20 +00:00
dependabot[bot]
ee79f97aa0
Bump stripe from 4.9.0 to 4.10.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.9.0 to 4.10.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.9.0...v4.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-20 19:22:18 +00:00
Kristina Lim
d3c2d1859c
Update all locales with the latest Transifex translations
2019-03-21 01:56:45 +08:00
Kristina Lim
b942dc1074
Merge pull request #3628 from openfoodfoundation/transifex
...
Transifex
2019-03-21 01:52:58 +08:00
Transifex-Openfoodnetwork
08894c242c
Updating translations for config/locales/en_GB.yml
2019-03-21 04:04:33 +11:00
Transifex-Openfoodnetwork
eeb8f12b4e
Updating translations for config/locales/en_GB.yml
2019-03-21 04:01:27 +11:00
Transifex-Openfoodnetwork
79eb89ac0b
Updating translations for config/locales/en_GB.yml
2019-03-21 03:58:20 +11:00
Luis Ramos
61c778eeac
Merge pull request #3555 from luisramos0/2-0-fix-order-state-translations
...
[Spree Upgrade] Improve order state translations in v2
2019-03-20 12:26:35 +00:00
Luis Ramos
59af77eb0e
Merge pull request #3620 from mkllnk/3520-customers-spec
...
Fix flaky spec by waiting for modal animation
2019-03-20 12:02:11 +00:00
luisramos0
3841656979
Rename data sanitize task to data anonymize
2019-03-20 11:58:26 +00:00
luisramos0
fefced5400
Improve sanitize data: keep customers connected to users and let addresses' city and zipcode remain as they are
2019-03-20 11:49:55 +00:00
luisramos0
804375d1aa
Delete obsolete pending delayed jobs related to the deleted account invoices feature
2019-03-20 11:24:57 +00:00
luisramos0
78d7222364
Drop account invoices and billable periods tables, the feature has been deleted
2019-03-20 11:19:48 +00:00
luisramos0
c0c14b16b6
Remove dynamic monthly pricing description that would come from the deleted business model configurations
2019-03-20 11:19:04 +00:00
Maikel
0f5e6474b8
Merge pull request #3602 from luisramos0/2-0-shipments-stock-location
...
[Spree Upgrade] Add migrations necessary to successfully migrate data to v2
2019-03-20 21:36:45 +11:00
Pau Pérez Fabregat
98a2e87587
Merge pull request #3610 from luisramos0/2-0-stable-Mar16
...
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Mar2019)
2019-03-20 09:33:07 +01:00
Pau Pérez Fabregat
4f82808243
Merge pull request #3617 from luisramos0/edit-variants-specs
...
Add spec to cover editing on_hand and on_demand values in the variants edit page
2019-03-20 09:13:56 +01:00
Pau Pérez Fabregat
2a3a935c16
Merge pull request #3570 from luisramos0/byebye-prod-distributions
...
Delete dead feature product distributions
2019-03-20 09:01:23 +01:00
Maikel Linke
a66eb7fe1d
Add spec for registration link on Spree pages
...
The `registration_path` helper resolves to `/signup` in Spree
controllers due to spree_auth_device > config > routes.rb.
We worked around that in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3174
Here we add a spec for this so that we can test more easily if we can
remove that workaround or detect it's accidental removal.
2019-03-20 15:02:30 +11:00
Maikel Linke
aef5cebeed
Fix flaky spec by waiting for modal animation
...
Without waiting, `fill_in` can fail randomly:
https://github.com/teamcapybara/capybara/issues/1890
2019-03-20 12:15:01 +11:00
dependabot[bot]
b0854b6d51
Bump dalli from 2.7.9 to 2.7.10
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-18 19:21:33 +00:00
luisramos0
21a10d0206
Add on_hand and on_demand back to variants form (both variant create and edit pagei), this is where they used to be in spree v1
...
The admin variants controller create action is adapted (same as in the admin ProductsController). This is necessary because variant.on_hand and on_demand cannot be mass assigned on creation in v2, see VariantStock for more details.
For now we are hiding the new stock management page that comes in spree v2 as we don't need the complexity added by the management of stock per stock location (only one stock location in ofn v2 for now)
2019-03-18 19:02:48 +00:00
luisramos0
9194a711ea
De-deface product tabs
...
We do not include stock management from v2 because we will use the variants edit page to manage on_hand and on_demand
2019-03-18 18:47:25 +00:00
luisramos0
90a14d426b
Add spec to cover editing on_hand and on_demand values in the variants edit page
2019-03-18 17:04:59 +00:00
luisramos0
9fff795162
Fix typo in en.yml in key new_shipping_category
2019-03-18 17:04:59 +00:00
luisramos0
b148b9ae46
Remove delete addresses SQL from truncate task
2019-03-18 12:04:37 +00:00
Pau Pérez Fabregat
fb29a7c7c2
Merge pull request #3606 from openfoodfoundation/dependabot/bundler/oj-3.7.10
...
Bump oj from 3.7.9 to 3.7.10
2019-03-18 12:12:13 +01:00
luisramos0
22a051e720
Enable products cache by default only in staging and production
...
We keep tests running by default without cache, keeping it as it was before 10a79d5a65
Additionally, cached_products_renderer no longer depends on Rails.env, so here we remove that dependency from it's spec.
2019-03-17 15:03:15 +00:00
luisramos0
60ee17204b
Merge branch 'master' into 2-0-stable-Mar16
2019-03-16 16:17:38 +00:00
Kristina Lim
7505dd0410
Make order sync for shipping methods readable
2019-03-15 07:59:54 +11:00
dependabot[bot]
d7b25d63f9
Bump oj from 3.7.9 to 3.7.10
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.9 to 3.7.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.9...v3.7.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-14 19:25:55 +00:00
Kristina Lim
3ab00d862e
Create subscriptions with set up shipping methods
...
The shipping methods are updated to their target settings after the
subscription order has been created, so the order is created with the
"require_ship_address" factory default which is "true".
The shipping method setting at time of order creation has implications
on whether a shipment is set up for the order or not.
2019-03-15 03:15:55 +08:00
Kristina Lim
ba100a6522
Specify order addresses in some OrderSyncer specs
...
This is to check that we are using the correct address data in
assertions.
This also clarifies the scenario for one of the specs.
2019-03-15 03:15:55 +08:00
Kristina Lim
7200e2c2c2
Specify hub address in some OrderSyncer specs
...
This fixes some assertions from using the same subscription shipping and
billing addresses, and distributor address.
One of the specs also pass because the subscription shipping address
matches the distributor address. This commit makes that scenario
clearer.
2019-03-15 03:15:55 +08:00
Kristina Lim
ad935e8d66
Require spec_helper.rb for OrderSyncer specs
2019-03-15 03:15:54 +08:00
Pau Pérez Fabregat
75abd4586e
Merge pull request #3583 from coopdevs/handle-deleted-oc-refreshing-cache
...
Handle deleted order cycle when refreshing cache
2019-03-14 20:11:14 +01:00
Pau Pérez Fabregat
33b74bef0e
Merge pull request #3599 from coopdevs/add-nl_BE-belgium
...
Bring in latest nl_BE translations
2019-03-14 18:59:57 +01:00
Pau Pérez Fabregat
baacea9f6a
Merge pull request #3595 from coopdevs/instrument-products-cache
...
Instrument products cache
2019-03-14 18:58:43 +01:00
Pau Perez
e60437c6a2
Refactor test to execute public API instead
2019-03-14 18:53:11 +01:00
Pau Perez
b9636b975a
Refactor test to stop using .any_instance
...
Although might be useful in very particular cases its use is discourage
by RSpec itself. See https://relishapp.com/rspec/rspec-mocks/docs/working-with-legacy-code/any-instance
2019-03-14 18:53:11 +01:00
Pau Perez
bc34d04c31
Do not retry when refreshing cache on deleted OC
2019-03-14 18:53:11 +01:00
luisramos0
cb78f8f8c8
Fetch latest nl_BE translations from transifex with correct menu links
2019-03-13 23:29:40 +00:00
Pau Perez
fede58289b
Move Cache::Store config to new initializer
...
I don't know why but `Rails.logger` is still nil when evaluated from
`configure` block in `config/environments/development.rb`. The only way
I found to make ActiveSupport's cache to use the default logger is from
an initializer.
Note that `ActiveSupport::Cache::Store` uses `debug` level and so we
need to set the dev logger in that same level to see its messages. If
you want to debug in staging as well, you'll need to modify the log
level manually.
2019-03-13 19:08:46 +01:00
Pau Perez
15a95a3bf5
Use :file_store cache store in development
...
:memory_store uses the process' memory and therefore, what the
background job writes is not reachable for the rails server process when
it reads from the cache. See
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Products-cache#development .
2019-03-13 19:08:46 +01:00
Pau Perez
10a79d5a65
Decouple CachedProductsRenderer from the Rails env
...
This way we don't need to touch the class implementation to enable the
products cache in development. Just change the default value in
`app/models/spree/app_configuration_decorator.rb`.
2019-03-13 19:08:46 +01:00
Pau Pérez Fabregat
13b2115a29
Merge pull request #3581 from coopdevs/cache-stylistic-improvements
...
Cache stylistic improvements
2019-03-13 19:05:38 +01:00
luisramos0
8965dedfd7
Add sanitize and truncate tasks to support loading live data into other environments safely
2019-03-13 16:08:07 +00:00
luisramos0
0bfeabbb3e
Add migration to create default shipping category and set it in shipping methods and products that do not have a shipping category yet
...
This is a modified version of this spree migration: af16cf1d74
2019-03-13 15:36:21 +00:00
luisramos0
f914a6d869
Add migration to set default stock location on all shipments without stock location
...
This is a modified version of this spree migration: https://github.com/spree/spree/commit/219e09b
2019-03-13 14:38:56 +00:00
luisramos0
786ba15174
Remove unused translation
2019-03-13 12:24:40 +00:00
luisramos0
7a2bc384d5
Re-add spec removed in product distributions removal but now adapted to use order cycles
2019-03-13 12:24:40 +00:00
luisramos0
34d7070c6c
Delete spec used to test product distributions (removed feature)
2019-03-13 12:24:40 +00:00
luisramos0
b62e350fab
Improve reports controller decorator by removing some copy pasted code and deleting some code repeated across data_load and the main action methods
2019-03-13 12:24:40 +00:00
luisramos0
2401b947b9
Make load sample data rake task work without product distributions
2019-03-13 12:24:40 +00:00
luisramos0
05d42d475e
Make reports and subscriptions specs work without product.distributors attribute
2019-03-13 12:24:40 +00:00
luisramos0
2de6c46834
Make order.order_cycle required in cart_service. There’s no more exception for that without product_distributions.
2019-03-13 12:24:40 +00:00
luisramos0
4768ca27c7
Remove all dependencies to product distributions including the validation to avoid deleting fees with product distributions
2019-03-13 11:50:35 +00:00
luisramos0
3117dbf624
Remove product distributions from order model
2019-03-13 11:50:35 +00:00
luisramos0
a022cebfc8
Remove product distributions from enterprise model and controller
2019-03-13 11:49:13 +00:00
luisramos0
ed9321e92d
Remove product distributions from product model and controller
2019-03-13 11:47:50 +00:00
luisramos0
86f9b3d663
Delete product_distributions: drop table and remove models, controllers and BO edit page
2019-03-13 11:47:50 +00:00
Kristina Lim
8782f2087c
Use service in admin/payments#create
...
This separates logic for bang and non-bang versions of
Spree::Order#next.
The different conditions used in both methods (state == "completed" vs
order.completed?) have implications in whether a transition is attempted
or not.
2019-03-13 17:00:31 +11:00
Kristina Lim
0e691815ea
Use service in admin/orders/customer_details#update
2019-03-13 12:45:57 +08:00
Kristina Lim
abaf90fc41
Copy more actions advancing order from Spree
...
This copies the following:
* admin/orders/customer_details#update
* admin/payments#create
2019-03-13 12:45:57 +08:00
Kristina Lim
56e2ee5366
Fix specs for OrderSyncer
2019-03-13 12:45:56 +08:00
Kristina Lim
0cfee37567
Fix setup records for SubscriptionPlacementJob specs
2019-03-13 12:45:56 +08:00
Kristina Lim
7c3433425f
Fix setup records for OrderFactory specs
2019-03-13 12:45:55 +08:00
Kristina Lim
182fde58e5
Uncomment now passing tests related to subscriptions
2019-03-13 12:45:55 +08:00
Kristina Lim
a261d912ea
Simplify order sync logic for shipping methods
2019-03-13 12:45:54 +08:00
Kristina Lim
9316096d4d
Fix updating of the shipping method for an order
2019-03-13 12:45:54 +08:00
Kristina Lim
5b5d1967fd
Fix queries for pending order shipment in OrderSyncer
2019-03-13 12:45:53 +08:00
Kristina Lim
54991f8191
Retain shipping method when transitioning order
2019-03-13 12:45:53 +08:00
Kristina Lim
7a8bf76123
Move transitioning of order in admin/orders#edit to service
2019-03-13 12:45:50 +08:00
Maikel Linke
d129665d43
Wait for orders being loaded in bulk order manage
...
The bulk order management page tried to wait for orders being loaded.
But instead of receiving a request object with an a promise to wait for
the page received a simple array without promise. As a result, the page
didn't wait for orders being loaded.
When loading of orders took longer than loading of line items they or at
least not all of them were enriched with distributors and order cycles
and the line items were missing some orders. That lead to random spec
failures.
2019-03-13 10:37:24 +11:00
luisramos0
7c39c45f79
Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code
2019-03-12 19:42:08 +00:00
luisramos0
77655bfffb
Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu
...
See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)
2019-03-12 19:11:37 +00:00
luisramos0
bd9eba9ef8
Fix add_uniqueness_of_order_id_to_spree_shipments by first removing shipments from orders with more than one shipment
2019-03-12 18:00:06 +00:00
luisramos0
0c8c4be2ee
Fix migrate tax categories to line items migration
...
This is bringing 67186f8ca7 from spree v2.2
2019-03-12 17:59:55 +00:00
luisramos0
2295981375
Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features
2019-03-12 16:55:48 +00:00
Pau Pérez Fabregat
2dd55770fe
Merge pull request #3569 from luisramos0/delete-more-overrides
...
Delete some more dead overrides and more dead code
2019-03-12 17:48:12 +01:00
Pau Pérez Fabregat
01baba336d
Merge pull request #3575 from openfoodfoundation/dependabot/bundler/unicorn-5.5.0
...
Bump unicorn from 5.4.1 to 5.5.0
2019-03-12 17:30:56 +01:00
Pau Perez
c4fcc25faa
Bring in latest nl_BE translations
...
As we didn't reach 100% translation Transifex does not sync the changes
into the repo. However, the Belgian instance still needs it.
2019-03-12 15:30:52 +01:00
Kristina Lim
ce5691d080
Copy admin/orders#edit from Spree controller
...
This method needs to be updated to use custom order advance logic in
service.
2019-03-12 18:31:27 +08:00
Kristina Lim
f42eb3dab1
Create shipment when creating a order for a subscription
...
A spec has been added to check that the attributes for the order states
after "cart" ("address", "delivery", "payment") are retained if the
order is transitioned to completion, BUT currently this is passing
because it is the only shipping method available.
2019-03-12 18:31:27 +08:00
Kristina Lim
0306cc7ca7
Set shipping method when creating order for subscription
2019-03-12 18:31:26 +08:00
Kristina Lim
5f571aad2f
Set required ship address in order in spec
...
The ship address of the order is properly set in
ProxyOrder#initialise_order! through OrderFactory.
The source of these spec failures seem to be a matter of how the records
are set up for the tests.
2019-03-12 18:31:26 +08:00
Maikel Linke
7270a9e8e8
DRY date calculation in BOM js
...
This also minimises the risk of values changing in the meantime.
2019-03-12 18:59:14 +11:00
Maikel
6722f21cb0
Merge pull request #3593 from openfoodfoundation/transifex
...
Transifex
2019-03-12 16:01:28 +11:00
Maikel
b94c6c1fb6
Merge pull request #3580 from luisramos0/2-0-stable-Mar6
...
[Spree Upgrade] Merging master into 2-0-stable (1st run in Mar2019)
2019-03-12 11:44:41 +11:00
Maikel Linke
49a6b5224d
Remove duplicate expectations from spec
2019-03-12 11:35:06 +11:00
Maikel Linke
af9e80e55d
Load data after all callbacks are installed
2019-03-12 09:46:27 +11:00
Maikel Linke
0c6a5d730b
Add spaces around HAML brackets
2019-03-12 09:12:10 +11:00
Maikel Linke
6f875e83ec
Remove unconventional and unused ng:cloak selector
2019-03-12 09:10:39 +11:00
Maikel Linke
9e33ef8140
Style ng-cloak directive
2019-03-12 09:09:52 +11:00
Maikel Linke
30c1a8d924
Move ng-cloak CSS to components
2019-03-12 08:59:59 +11:00
Pau Perez
931cb89a9d
Move new class to services and rename it
2019-03-11 18:28:25 +01:00
Transifex-Openfoodnetwork
46f16c060b
Updating translations for config/locales/en_US.yml
2019-03-12 00:38:22 +11:00
Transifex-Openfoodnetwork
8afd5e7050
Updating translations for config/locales/nb.yml
2019-03-09 06:33:01 +11:00
Luis Ramos
f6ecf3de64
Merge pull request #3568 from luisramos0/2-0-improve-order-factories
...
[Spree Upgrade] Improve order factories
2019-03-08 09:43:26 +00:00
Maikel Linke
4574a770d3
Synchronise dereferencing and initilising
...
This seems to make the spec 4 times more reliable. Still failing from
time to time.
2019-03-08 17:36:25 +11:00
Maikel Linke
e00a3ee263
Use clearer and more reliable waiting in spec
2019-03-08 17:24:31 +11:00
Maikel Linke
52fd7b102e
Unify visiting bulk order management
...
DRYing the code allows for easier refactor and more consistency.
2019-03-08 14:46:58 +11:00
Maikel Linke
37d37a6057
Speed up initial spec log in
2019-03-08 14:46:39 +11:00
Maikel Linke
2d7498b77b
Hide elements before Angular is loaded
...
The "Loading orders" spinner is still visible from the beginning so that
it can be used as indicator for when the page is loaded.
Before, the "No orders found" message was visible between page load and
Angular initilisation.
2019-03-08 14:23:18 +11:00
Maikel
22bac3daaf
Merge pull request #3588 from openfoodfoundation/transifex
...
Transifex
2019-03-08 11:31:36 +11:00
Maikel
608c322770
Merge pull request #3585 from mkllnk/1829-missing-translation-product-category
...
1829 missing translation product category
2019-03-08 10:10:09 +11:00
luisramos0
61f1bf5ec8
Fix shipping_methods edit page missing translation
2019-03-07 17:15:06 +00:00
Transifex-Openfoodnetwork
2eb3b7acea
Updating translations for config/locales/fr.yml
2019-03-08 04:06:14 +11:00
Transifex-Openfoodnetwork
66d6936452
Updating translations for config/locales/en_GB.yml
2019-03-08 01:36:28 +11:00
Pau Pérez Fabregat
f125686016
Merge pull request #3511 from coopdevs/update-bugsnag-notifier-library
...
Update Bugsnag from 5.5.0 to 6.11.1
2019-03-07 11:30:04 +01:00
Maikel Linke
972ebb5fc9
Fix missing translation by using AR default
...
Using the default fixes a missing translation. The text is slightly
changed but should be okay as well:
- "^Tax Category is required"
+ "Tax category can't be blank"
2019-03-07 11:54:04 +11:00
Maikel Linke
5ed13d1539
Fix translation by using ActiveRecord's default
...
Our translations are not available when decorators are loaded. The
message for a missing product category was missing:
https://github.com/openfoodfoundation/openfoodnetwork/issues/1829
I moved the translation to ActiveRecord's default scope so that it can
be picked up automatically.
2019-03-07 11:37:54 +11:00
Matt-Yorkley
3f6a6f7f33
Merge pull request #3572 from openfoodfoundation/transifex
...
Transifex
2019-03-07 00:17:49 +00:00
Matt-Yorkley
59fd5ce478
Merge branch 'master' into transifex
2019-03-07 00:17:14 +00:00
Matt-Yorkley
4fe7d276b4
Update all locales with the latest Transifex translations
2019-03-07 00:04:09 +00:00
Maikel Linke
f033cfcc12
Remove obsolete Bugsnag option
...
It prevents the app from booting with the new Bugsnag version.
2019-03-07 10:04:20 +11:00
Pau Perez
8db6560fe7
Update Bugsnag from 5.5.0 to 6.11.1
...
This brings lots of fixes and a great dose of enhancements such as
a rewritten `Delayed::Job` integration.
2019-03-07 10:03:43 +11:00
Maikel
4780a2193f
Merge pull request #3209 from mkllnk/2072-test-data
...
2072 New sample data for testing
2019-03-07 08:49:12 +11:00
Pau Pérez Fabregat
e850182f95
Merge pull request #3563 from kristinalim/fix/3562-fix_payment_fee_for_order_based_calculator
...
3562 Fix error calculating payment fee using order-based calculator
2019-03-06 19:31:49 +01:00
Pau Pérez Fabregat
9f8d90cc0a
Merge pull request #3305 from coopdevs/improve-shops-performance-take-2
...
Improve shops performance take 2
2019-03-06 16:25:28 +01:00
Transifex-Openfoodnetwork
9922ce070e
Updating translations for config/locales/es.yml
2019-03-07 02:22:03 +11:00
Pau Perez
347aa3c4ae
Replace #valid_products_distributed_by by class
2019-03-06 15:06:00 +01:00
Pau Perez
adb40d6c73
Test just the public method
...
This one is the one calling the private method that was tested now. It
involves some refactoring of the specs as well.
2019-03-06 13:38:53 +01:00
Pau Perez
7c533c6347
Extract DistributedValidProducts from OrderCycle
2019-03-06 13:35:43 +01:00
luisramos0
2470830ec8
Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui
2019-03-06 11:28:50 +00:00
luisramos0
9644fcf67c
Improve payment method factory in sample data by removing constantize
2019-03-06 10:01:17 +00:00
Pau Perez
2b58aab197
Extract method from cache key generation
2019-03-06 10:49:56 +01:00
Pau Perez
bbfd35c861
Fix CacheSettingsController violations
2019-03-06 10:45:45 +01:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Transifex-Openfoodnetwork
0e2d303701
Updating translations for config/locales/ca.yml
2019-03-06 20:00:41 +11:00
Pau Pérez Fabregat
7e06807a11
Merge pull request #3539 from Matt-Yorkley/subs/confirmation_email
...
Don't process proxy_order if the order has been cancelled
2019-03-05 17:38:29 +01:00
Pau Pérez Fabregat
3ddee83be5
Merge pull request #3404 from luisramos0/2-0-disable-cache
...
[Spree Upgrade] Add checkbox to disable products cache
2019-03-05 14:51:11 +01:00
Pau Pérez Fabregat
30bbc5ee6f
Merge pull request #3472 from pacodelaluna/fix-datetime-picker
...
Fix datetime picker on Order Cycle form
2019-03-05 14:50:34 +01:00
Pau Pérez Fabregat
b330db3b4b
Merge pull request #2947 from Matt-Yorkley/pi/submenu_link
...
Pi/submenu link
2019-03-05 14:49:02 +01:00
Transifex-Openfoodnetwork
03aaea2a08
Updating translations for config/locales/ca.yml
2019-03-05 21:52:24 +11:00
dependabot[bot]
6ecb9cc848
Bump unicorn from 5.4.1 to 5.5.0
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.4.1 to 5.5.0.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-03-04 19:18:03 +00:00
Luis Ramos
72e9c1d002
Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices
...
[Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again
2019-03-04 15:54:09 +00:00
Pau Pérez Fabregat
2369c54f9d
Merge pull request #3552 from luisramos0/2-0-fix-stock-migration
...
[Spree Upgrade] Fix create default stock migration
2019-03-04 12:07:18 +01:00
Transifex-Openfoodnetwork
5ddb8fb1ae
Updating translations for config/locales/nb.yml
2019-03-04 21:22:36 +11:00
Pau Perez
54e120889f
Remove useless array wrapping on AR relation
2019-03-04 11:08:34 +01:00
luisramos0
5ab4ae88f5
Remove distribution change in order_spec, order distributor cannot be changed, if distributor or oc is changed, the order is emptied
2019-03-02 13:08:39 +00:00
luisramos0
7ac4a99bc7
Remove product distributions spe that needed distribution_change_validator. Product distributions will be removed soon, see https://github.com/openfoodfoundation/openfoodnetwork/issues/3525
2019-03-02 13:08:39 +00:00
luisramos0
d7bd944af3
Fix distribution_change_validator spec
2019-03-02 13:08:35 +00:00
luisramos0
351555d4e2
Remove unused methods from add_to_cart helper and distribution change validator
2019-03-02 12:55:08 +00:00
luisramos0
93e13742be
Delete some more dead overrides. We are not using spree/checkout (except for /checkout/payment) nor spree/products
2019-03-01 23:56:03 +00:00
luisramos0
d840fa7b77
Improve order factories:
...
- Make order_with_totals_and_distribution shorter by inheriting from order_with_distributor
- Make completed_order_with_fees more correct by inheriting only from order_with_distributor: this removes the line_item_with_shipment of order_with_totals_and_distribution that was causing an extra shipping adjustment to be kept in the order. This adjustment was being tested in the order controller spec (fixed the explanation comment in the spec which was wrong, there was no enterprise fee in this order)
2019-03-01 20:00:58 +00:00
Pau Pérez Fabregat
6c83f67b86
Merge pull request #3556 from Matt-Yorkley/pi/template
...
Add description to CSV template
2019-03-01 11:37:58 +01:00
Maikel
a14c785e69
Merge pull request #3435 from Matt-Yorkley/bug/tmpfile
...
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-03-01 10:20:26 +11:00
Maikel
54679f6651
Merge pull request #3535 from luisramos0/translations-for-v2
...
Move to master all en.yml entries added so far to v2 and add more missing v2 translations
2019-03-01 10:04:13 +11:00
luisramos0
e4edfe0b61
Merge branch 'master' into translations-for-v2
2019-02-28 21:32:34 +00:00
Pau Pérez Fabregat
88e6fa84a2
Merge pull request #3534 from luisramos0/registration_trans_all
...
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-28 17:15:09 +01:00
Pau Pérez Fabregat
aa635106ac
Merge pull request #3531 from mkllnk/document-stock-validation-rules
...
Document stock validation of variant overrides
2019-02-28 17:14:45 +01:00
Pau Pérez Fabregat
89708de7c1
Merge pull request #3512 from kristinalim/fix/3478-scope_enterprise_fee_summary_to_eligible
...
3466,3478 [Enterprise Fee Summary] Scope report to eligible: true and non-zero adjustments
2019-02-28 17:14:15 +01:00
Pau Pérez Fabregat
6f0479c27d
Merge pull request #3547 from openfoodfoundation/dependabot/bundler/combine_pdf-1.0.16
...
Bump combine_pdf from 1.0.15 to 1.0.16
2019-02-28 17:13:50 +01:00
Pau Pérez Fabregat
63312a6d5f
Merge pull request #3554 from coopdevs/bring-bugsnag-initializer
...
Bring in Bugsnag initializer from ofn-install
2019-02-28 16:41:59 +01:00
Kristina Lim
36e4a22b58
Use delegate for Payment#line_items
2019-02-28 09:52:56 +08:00
Kristina Lim
bd58667747
Remove stock check done for payment fees
2019-02-28 09:24:29 +08:00
Maikel Linke
958e98debd
Document stock validation of variant overrides
2019-02-28 12:21:26 +11:00
Kristina Lim
ce658e9dfa
Fix error computing payment fee when order-based
2019-02-28 12:17:45 +11:00
Kristina Lim
dfc8cc0f9e
Add failing test for calculation of payment fee
2019-02-28 12:17:44 +11:00
Maikel
4ed0831e4c
Merge pull request #3550 from openfoodfoundation/transifex
...
Transifex
2019-02-28 11:39:57 +11:00
Luis Ramos
f502ba0a1f
Merge pull request #3504 from luisramos0/2-0-scoping
...
[Spree Upgrade] Add spec to order_cycle model covering variant scoping
2019-02-28 00:09:10 +00:00
Maikel
824beba066
Merge pull request #3505 from luisramos0/vo-false
...
Adapt scope_variant_to_hub to new VO rules where on_demand=nil means use_producer_settings
2019-02-28 10:26:23 +11:00
Maikel
c472d2fbbe
Merge pull request #3498 from luisramos0/delete-dead-overrides
...
Remove dead overrides
2019-02-28 10:25:42 +11:00
luisramos0
03d242c061
Fix typo in sample_data zone creation (zonEable) and added clause to avoid re-adding the same country to the zone
2019-02-27 23:19:39 +00:00
Maikel
65ba9324de
Merge pull request #3513 from luisramos0/2-0-remove-variant-count-on-hand
...
[Spree Upgrade] Remove variant.count_on_hand (keep variant.on_hand only)
2019-02-28 09:07:41 +11:00
luisramos0
ad5c379771
Make sample data zone read from the environment variable CHECKOUT_ZONE
2019-02-27 09:46:18 +00:00
luisramos0
d418ca1b1f
Add mandatory payment method provider to sample data payment methods
2019-02-27 09:45:21 +00:00
Pau Pérez Fabregat
a04de6e3cd
Merge pull request #3499 from openfoodfoundation/dependabot/bundler/stripe-4.9.0
...
Bump stripe from 4.5.0 to 4.9.0
2019-02-27 09:56:32 +01:00
Danni M
5b880f7bfe
Update issue templates
...
Fixed headings on the story template
2019-02-27 10:41:39 +11:00
François Turbelin
82fbcd35a8
Update tests
2019-02-26 22:07:11 +01:00
Matt-Yorkley
9dd5b9dd6c
Fix import button specificity in feature spec
2019-02-26 20:06:02 +00:00
Matt-Yorkley
25e2d2adda
Update references to product_sub_menu view
2019-02-26 20:06:01 +00:00
Matt-Yorkley
777850259b
Apply and delete overrides
2019-02-26 19:42:47 +00:00
Matt-Yorkley
f1e55507c3
Recreate product_sub_menu Spree view
2019-02-26 19:42:47 +00:00
Matt-Yorkley
32470f33ec
Add description to CSV template
2019-02-26 19:36:44 +00:00
luisramos0
3f3581cdbc
Add more missing translations for v2, remove unnecessary en.order_state and remove duplicated en.spree.payment_states and en.spree.shipment_states
2019-02-26 16:54:48 +00:00
Pau Perez
4d47276810
Bring Bugsnag initializer from ofn-install
...
This copies ofn-install's `roles/app/templates/bugsnag.rb.j2` to
`config/initializers/bugsnag.rb`. All tasks and templates
regarding Bugsnag can then be 🔥 from ofn-install.
As a result, it'll fix the issue that both Katuma and OFF are facing
where the `config/initializer/bugsnag.rb` symlink to
`shared/config/bugsnag.rb` does not exist thus, nothing gets notified to
Bugsnag since December 3rd (according to customer support).
2019-02-26 17:52:49 +01:00
luisramos0
4411e1ed43
Fix create default stock migration by adding a version of the code that works with the DB at that point in time, i.e., stock_locations without active column
2019-02-26 16:05:33 +00:00
luisramos0
7b05eebc5b
Fix rubocop issue in db migration
2019-02-26 14:54:24 +00:00
luisramos0
a0594f7616
Re-add invoice settings controller removed by mistake
2019-02-26 14:14:17 +00:00
luisramos0
a36722cebf
Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand
2019-02-26 12:47:11 +00:00
luisramos0
37685c8107
Move the code that hides the split order button from js to css
2019-02-26 12:34:07 +00:00
Pau Perez
a728da4f62
Cover product and producer props. in ctrl. spec
2019-02-26 12:09:26 +01:00
Pau Perez
915b5cf09e
Inline also the active product properties query
...
This makes it easier to spot what are the differences and similarities
between active and non-active, which in turn, it'll help remove the N+1
the "active" branch causes.
Make it look `#distributed_producer_properties` with which seems to
share a lot.
2019-02-26 11:39:43 +01:00
Pau Perez
19cbda4128
Fix Rubocop violation
2019-02-26 11:39:43 +01:00
Pau Perez
24c031b3cd
Extract #distributed_product_properties method
2019-02-26 11:39:43 +01:00
Pau Perez
6e9bb640f6
Add spacing between long scopes
2019-02-26 11:36:36 +01:00
Pau Perez
7b2d4f10ee
Cover #distributed_properties \w a controller spec
...
This exercises the controller and the serializer ensuring the
integration works allowing to confidently refactor things further.
2019-02-26 11:36:36 +01:00
Pau Perez
e55fbf80fc
Check property presentation attribute only in test
...
The PropertySerializer contains :id, :name and :presentation attributes
which leads to JSON objects like `{"id": 1, "name": "foo",
"presentation": "foo"}`. Because of this, we don't care about object
identity, just about their presentation attribute.
2019-02-26 11:36:36 +01:00
Pau Perez
d4635bd7cb
Fetch Property instead of ProducerProps from query
...
By not having to treat producer properties differently we can filter and
fetch all properties from DB without having to process it with Ruby and
with a single query.
2019-02-26 11:36:36 +01:00
Pau Perez
92e2ed78d1
Test active distributor as well
2019-02-26 11:36:36 +01:00
Pau Perez
8eb35e491d
Don't fetch rows by ids of DISTINCT records
...
There's no point on fetching the same records again by the resulting ids
of the previous query (nasty way of removing duplicates), when that
query has a DISTINCT.
2019-02-26 11:36:36 +01:00
Pau Perez
328cda66f5
Stop using PropertyMerge in serializer
2019-02-26 11:36:36 +01:00
Pau Perez
47a90e937b
Have a duplicate product to test with
2019-02-26 11:36:36 +01:00
Pau Perez
8fef69387e
Simplify test setup using factory transient attrs
2019-02-26 11:36:36 +01:00
Pau Perez
0782907f4d
Setup a test order cycle with its exchanges
2019-02-26 11:36:36 +01:00
Pau Perez
64fb230297
Make it more obvious we talk about an enterprise
2019-02-26 11:36:36 +01:00
Pau Perez
a5f890cf36
Fix styling on method
2019-02-26 11:36:36 +01:00
Transifex-Openfoodnetwork
539544de28
Updating translations for config/locales/es.yml
2019-02-26 20:49:18 +11:00
Transifex-Openfoodnetwork
595fb75d82
Updating translations for config/locales/es.yml
2019-02-26 20:46:12 +11:00
luisramos0
15456577a3
Remove the button that enables user to split an order between stock locations
...
There's only one stock location in OFN so this feature is not useful at this point
2019-02-25 23:39:21 +00:00
luisramos0
ebf825e349
De-deface configuration menu
...
Remove stock locations and stock transfers from the menu
2019-02-25 23:38:50 +00:00
François Turbelin
e1953c279b
Move jquery-ui-timepicker libs to vendor dir
2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949
Tune up config and style
2019-02-25 22:22:27 +01:00
François Turbelin
68fd6de39b
Update Jquery datetimepicker lib to v1.6.3
2019-02-25 22:22:27 +01:00
dependabot[bot]
a1647053cb
Bump combine_pdf from 1.0.15 to 1.0.16
...
Bumps [combine_pdf](https://github.com/boazsegev/combine_pdf ) from 1.0.15 to 1.0.16.
- [Release notes](https://github.com/boazsegev/combine_pdf/releases )
- [Changelog](https://github.com/boazsegev/combine_pdf/blob/master/CHANGELOG.md )
- [Commits](https://github.com/boazsegev/combine_pdf/compare/v1.0.15...v1.0.16 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-25 19:26:41 +00:00
luisramos0
8a59e06d36
Remove buttons 'open/close all adjustments' from order adjustments edit page
...
We may re-add this feature in the future, we are not introducing the capacity to open/close adjustments in OFN. See https://github.com/openfoodfoundation/openfoodnetwork/issues/1830 for context
2019-02-25 16:42:22 +00:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
a870299ced
Delete preferences and adjustments related to account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
Pau Pérez Fabregat
df77f6e051
Merge pull request #3536 from Matt-Yorkley/flaky/bom_spec
...
Wait for angular to load in BOM spec
2019-02-25 13:14:57 +01:00
Pau Pérez Fabregat
6004d09698
Merge pull request #3538 from Matt-Yorkley/flaky/shipping_methods_spec
...
Adjust expectations in flaky spec
2019-02-25 12:50:48 +01:00
Pau Pérez Fabregat
8a855edbda
Merge pull request #3527 from luisramos0/2-0-fix-admin-edit-order-page
...
[Spree Upgrade] Fix edit ship method and tracking number in backoffice order page
2019-02-25 12:20:46 +01:00
Matt-Yorkley
6e77afbf35
Adjust expectations in flaky spec
2019-02-25 11:08:10 +00:00
Pau Pérez Fabregat
aed9c41b0d
Merge pull request #3394 from mkllnk/3021-update-soft-delete
...
[Spree upgrade] 3021 update soft delete
2019-02-25 11:58:41 +01:00
Pau Pérez Fabregat
4e180f9f43
Merge pull request #3517 from openfoodfoundation/dependabot/bundler/oj-3.7.9
...
Bump oj from 3.7.8 to 3.7.9
2019-02-25 11:37:43 +01:00
Pau Pérez Fabregat
59962bbfb1
Merge pull request #3540 from openfoodfoundation/transifex
...
Transifex
2019-02-25 11:36:56 +01:00
Matt-Yorkley
bbfe71fd27
Improve readability and add code comment
2019-02-25 10:27:34 +00:00
Transifex-Openfoodnetwork
021220514e
Updating translations for config/locales/ca.yml
2019-02-25 21:11:12 +11:00
luisramos0
963fddf159
Add missing translations
...
These translations are missing in v2 but some will also make v1 better
2019-02-24 22:29:44 +00:00
luisramos0
f40ff61f97
Move all en.yml entries added so far to v2 to master so that we can start the translation process now
2019-02-24 22:28:30 +00:00
Matt-Yorkley
627b101be9
Don't process proxy_order if the order has been cancelled
2019-02-24 12:06:58 +00:00
Matt-Yorkley
ea8be0ab95
Fine-tune angular helper
2019-02-23 21:45:33 +00:00
Matt-Yorkley
c4b646c583
Wait for angular to load in BOM spec
2019-02-23 16:12:37 +00:00
luisramos0
ee8fe4b6b4
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-22 14:37:45 +00:00
luisramos0
0b1ea1beda
Rename VariantOverride.use_producer_settings to VariantOverride.use_producer_stock_settings
2019-02-22 09:57:21 +00:00
Pau Pérez Fabregat
439ea618df
Merge pull request #3524 from luisramos0/2-0-stable-Feb20
...
[Spree Upgrade] Merging master into 2-0-stable (3rd run in Feb2019)
2019-02-22 09:01:40 +01:00
Pau Pérez Fabregat
632826a192
Merge pull request #3494 from luisramos0/break-oc-specs
...
Break order_cycle_spec.js in specific files and remove reference to product.count_on_hand in bulk_product_update_spec.js
2019-02-22 08:30:35 +01:00
luisramos0
45e5fed609
Improve scope_variant_to_hub code and spec by testing an invalid data state
2019-02-21 11:25:01 +00:00
Maikel
509e644cf7
Merge pull request #3526 from openfoodfoundation/transifex
...
Transifex
2019-02-21 16:05:21 +11:00
luisramos0
b73ca88811
Fix edit ship method and tracking number in backoffice order page
...
The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons
2019-02-20 23:57:57 +00:00
Transifex-Openfoodnetwork
4b21c9cb70
Updating translations for config/locales/en_CA.yml
2019-02-21 07:32:50 +11:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
Luis Ramos
34acaa4e03
Merge pull request #3425 from mkllnk/2783-product-importer-spec
...
Apply import defaults to variants of new products in Spree 2
2019-02-20 13:34:57 +00:00
Matt-Yorkley
f73221ed85
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-02-20 13:10:47 +00:00
luisramos0
ef786adcfc
Make variant_override.stock_overridden? simpler and add comment to explain relationship between count_on_hand and on_demand in a VO
2019-02-20 13:07:21 +00:00
Maikel
ec26948949
Merge pull request #3521 from openfoodfoundation/transifex
...
Transifex
2019-02-20 19:10:16 +11:00
Maikel
806226b404
Merge pull request #3496 from luisramos0/2-0-kill-allow-backorders
...
[Spree Upgrade] Remove allow_backorders from product stock verification
2019-02-20 13:09:05 +11:00
Transifex-Openfoodnetwork
aba4d742f6
Updating translations for config/locales/fr_CA.yml
2019-02-20 12:55:33 +11:00
luisramos0
5b4c986733
Add spec to cover variant scoping in order_cycle.items_bought_by_user
2019-02-20 00:05:28 +00:00
Maikel
e7e2d1d870
Merge pull request #3516 from openfoodfoundation/transifex
...
Transifex
2019-02-20 10:39:55 +11:00
Maikel Linke
8374c7dea4
Fix serializer spec for supplied products
...
In a previous commit we removed the now obsolete scope
Product.not_deleted. Calling Enterprise#supplied_products without
any scope does not issue a new SQL query but returns the products that
were present when the enterprise was loaded.
The fixed spec creates more products after loading the enterprise. So
the enterprise needs to be reloaded or the new products are not visible.
2019-02-20 08:45:58 +11:00
Transifex-Openfoodnetwork
7e59132bb2
Updating translations for config/locales/en_GB.yml
2019-02-20 06:50:52 +11:00
dependabot[bot]
47e154f2ac
Bump oj from 3.7.8 to 3.7.9
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.8 to 3.7.9.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.8...v3.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-19 19:21:37 +00:00
Transifex-Openfoodnetwork
9688fe7540
Updating translations for config/locales/fr.yml
2019-02-20 06:15:01 +11:00
luisramos0
8ee14ccb4b
Make variants_stock_levels return variants on_demand values
2019-02-19 11:56:02 +00:00
Maikel
f0a6f5ae3c
Merge pull request #3514 from openfoodfoundation/transifex
...
Transifex
2019-02-19 15:40:30 +11:00
Transifex-Openfoodnetwork
0a50a74561
Updating translations for config/locales/en_US.yml
2019-02-19 15:23:20 +11:00
Maikel Linke
99f0be2f1c
Remove unnecessary scope Variant.not_deleted
...
Spree made that scope default so that we don't need to define or call
it. There might be cases in which we were showing deleted variants and
now we are not, but I have not idea how to find them.
Related Spree commit:
- cd3add960e
2019-02-19 14:25:18 +11:00
Maikel Linke
b4d1e48693
Update soft-delete of variants
...
Spree changed their way of soft-deleting variants from calling `delete`
to calling `destroy`. We don't need our own implementation any more.
2019-02-19 14:25:18 +11:00
Maikel Linke
cdb49f88b0
Move Variant deletion into its own service
...
This keeps the override of Spree's model leaner. More importantly, it
prepares us for using `destroy` instead of `delete`.
In the past, `Product#delete` soft-deleted the product, but didn't
delete the variants. When we use `Product#destroy` to soft-delete the
product, it will also call destroy on the variants. If the model doesn't
allow the deletion of the last variant, it will fail. So when a product
is deleted we want to allow the deletion of all variants. But the user
should not be allowed to delete the last variant. That's why I'm moving
the check to the controller level.
Related commits:
- e6c7acdff3
- 2b47c9145a
- b9f19d5777 (diff-412c5af2ec1ba9f6643f6df5a673c1d4R105)
2019-02-19 14:25:18 +11:00
Maikel Linke
8f49f0006a
Update products controller decorator with Spree
...
Spree changed the controller to deal with the updated soft-delete. This
commit brings these changes to our decorator.
2019-02-19 14:25:18 +11:00
Maikel Linke
5d828bd7ae
Update soft-delete of products
...
Spree changed their way of soft-deleting products, variants and
some other models. `#destroy` is now soft-deleting and replaces
`#delete`.
This commit considers only products. Variants will follow in another
commit. The other models can be ignored, because we don't call `delete`
on them.
2019-02-19 14:25:18 +11:00
Maikel
bb4d42ef9d
Merge pull request #3464 from openfoodfoundation/transifex
...
Transifex
2019-02-19 12:41:16 +11:00
Maikel
1b45033e33
Merge pull request #3506 from Matt-Yorkley/pi/parse_bom
...
Sanitize non-parsable BOM characters inserted by Excel
2019-02-19 11:24:11 +11:00
Maikel
be59a8ce32
Merge pull request #3434 from Matt-Yorkley/pi/fix_hash_merge
...
Fix hash merge for recording already created products by name
2019-02-19 11:21:49 +11:00
Maikel
b7abb72ed5
Merge pull request #3462 from luisramos0/delete-api-order-ctrl
...
Delete empty controller class eval and spec
2019-02-19 11:14:29 +11:00
Maikel
ae4d36b3ed
Merge pull request #3451 from Matt-Yorkley/subs/currency
...
Use localized currency symbols in Subs pages
2019-02-19 09:55:36 +11:00
luisramos0
30967a5ffa
Fix bulk product edit page. on_hand and on_demand should never be mixed on the server side, the UI can make the decision to show on_demand on the on_hand column if on_demand is true
2019-02-18 22:01:48 +00:00
luisramos0
12eab1bfa9
Merge variant_stock.count_on_hand into variant_stock.on_hand
...
variant.on_hand will not return infinity any longer if variant.on_demand is true. Clients of these methods will have to handle the combinations between on_hand and on_demand values
2019-02-18 22:00:16 +00:00
luisramos0
f0842fcbe5
Convert all calls to variant.count_on_hand to variant.on_hand
2019-02-18 21:54:07 +00:00
Matt-Yorkley
9705c249ac
Sanitize no-parsable BOM characters inserted by Excel
2019-02-18 13:13:37 +00:00
luisramos0
5aee043b86
Remove allow_backorders from product stock verification because product.has_stock? already includes product.on_demand and in v2 allow_backorders becomes on_demand
2019-02-18 13:12:29 +00:00
Luis Ramos
8f192c39fb
Merge pull request #3508 from luisramos0/2-0-green
...
[Spree Upgrade] Fix bulk_order_mgmt_spec - 2-0 build GREEN !!!
2019-02-18 13:05:17 +00:00
Kristina Lim
b0a82b0e21
Exclude $0 adjustments from report
2019-02-18 16:53:19 +08:00
Kristina Lim
36fd385f7d
Add test showing $0 mandatory adjustments included
2019-02-18 16:53:19 +08:00
Kristina Lim
19f99255fa
Exclude non-eligible entries from report
2019-02-18 16:53:18 +08:00
Kristina Lim
8ce7337c9d
Add test showing $0 non-mandatory adjustments included
2019-02-18 16:53:18 +08:00
Kristina Lim
ca2c8e6ff2
Add test showing non-"eligible" entries included
2019-02-18 16:53:18 +08:00
Pau Pérez Fabregat
f5df10f5dc
Merge pull request #3507 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.141.0
...
Bump selenium-webdriver from 3.12.0 to 3.141.0
2019-02-18 09:28:01 +01:00
luisramos0
a0bd290b6a
Fix bulk_order_management spec by setting ship address on the stest order, this makes the order worflow work up to complete because the shipping methods will be validated against the address
2019-02-17 21:53:58 +00:00
Matt-Yorkley
09655b9f88
Fix nil values in on_hand column
2019-02-16 01:05:20 +00:00
dependabot[bot]
ed7015ae98
Bump selenium-webdriver from 3.12.0 to 3.141.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.12.0 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.12.0...selenium-3.141.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-15 19:20:25 +00:00
Pau Pérez Fabregat
fb412cd9cd
Merge pull request #3299 from luisramos0/2-0-admin-capture-payment
...
[Spree Upgrade] Fix order_with_totals_and_distribution factory by updating shipping fees
2019-02-15 18:37:43 +01:00
Pau Perez
4e35ea9149
Merge branch '2-0-stable' into 2-0-admin-capture-payment
...
* 2-0-stable:
Perform delivery when checking deliveries in specs
2019-02-15 17:21:09 +01:00
Pau Pérez Fabregat
e67793b204
Merge pull request #3497 from coopdevs/fix-user-confirmation-spec
...
Perform delivery when checking deliveries in specs
2019-02-15 16:52:52 +01:00
luisramos0
75a79717cf
Adapt scope_variant_to_hub to new VO rules where on_demand nil is seen as use_producer_settings
2019-02-15 14:05:24 +00:00
Transifex-Openfoodnetwork
9bf5531233
Updating translations for config/locales/nb.yml
2019-02-15 23:47:20 +11:00
Pau Pérez Fabregat
93c6271400
Merge pull request #3500 from openfoodfoundation/dependabot/bundler/bugsnag-5.5.0
...
Bump bugsnag from 4.1.0 to 5.5.0
2019-02-15 09:26:41 +01:00
Pau Pérez Fabregat
0a391783bc
Merge pull request #3470 from kristinalim/fix/3426-intermittent_spec_failures
...
3426 [Flaky Spec] Address timing issues in enterprise users feature specs
2019-02-15 08:39:39 +01:00
Maikel Linke
6790e8895d
Create sample payment methods with current environment
2019-02-15 16:44:55 +11:00
Maikel
d4589cc2f4
Merge pull request #3444 from mkllnk/3437-supplier-name-on-invoice
...
3437 supplier name on invoice
2019-02-15 16:31:29 +11:00
Matt-Yorkley
0c5cc23415
Fix hash merge for recording already created products by name
2019-02-14 21:38:18 +00:00
dependabot[bot]
7c5e58dd94
Bump bugsnag from 4.1.0 to 5.5.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 4.1.0 to 5.5.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v4.1.0...v5.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-14 19:34:17 +00:00
dependabot[bot]
a369b48bf4
Bump stripe from 4.5.0 to 4.9.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.5.0 to 4.9.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.5.0...v4.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-14 19:30:48 +00:00
Pau Pérez Fabregat
6f2b894cfe
Merge pull request #3403 from openfoodfoundation/dependabot/bundler/dalli-2.7.9
...
Bump dalli from 2.7.2 to 2.7.9
2019-02-14 20:12:06 +01:00
Pau Pérez Fabregat
43fff8f18d
Merge pull request #3460 from openfoodfoundation/dependabot/bundler/spinjs-rails-1.4
...
Bump spinjs-rails from 1.3 to 1.4
2019-02-14 19:42:33 +01:00
luisramos0
4a35b53b43
Remove dead overrides
2019-02-14 18:00:25 +00:00
Pau Pérez Fabregat
34020f7bf6
Merge pull request #3377 from openfoodfoundation/dependabot/bundler/i18n-js-3.2.1
...
Bump i18n-js from 3.1.0 to 3.2.1
2019-02-14 18:26:49 +01:00
Pau Perez
f29707fea3
Perform delivery when checking deliveries in specs
...
Otherwise checking `ActionMailer::Base.deliveries.count` won't see any.
2019-02-14 18:24:33 +01:00
Kristina Lim
af95e3871f
Move check for table presence out of helper
2019-02-15 01:15:58 +08:00
Pau Perez
e5dadd1ab1
Merge branch '2-0-stable' into 2-0-admin-capture-payment
...
* 2-0-stable: (121 commits)
Stub default value for other calls to File.exist?
Add specs for error cases in shipments_controller_spec
Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2)
Add missing translation to fix shipping methods spec
Test tagging polymorphism on a payment method
Workaround Rails inheritance bug in Spree::Gateway
Improve method names in shipments_controller_spec
Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2)
Make bulk invoices part of spree upgrade phase 2
Make Api::ShipmentsController#create re-use order.shipment if it exists Improve code and add specs to this controller
Decorate spree api shipments controller to scope variants as they are added/removed from shipments
Delete all Spree::Admin::LineItemsController customizations as they are no longer used
Update spec/controllers/spree/orders_controller_spec.rb
Fix broken spec from refactored method
Wait for button to disappear before checking flash
Use flash matcher in shipping method feature specs
Add RSpec matchers for flash messages
Do not expect modal open when checking spinner gone
Fix layout violation in Spree::Ability decorator
Fix description for feature flag example groups
...
2019-02-14 17:41:54 +01:00
Pau Perez
caf4441fa3
Do not mutate config's state in specs
2019-02-14 17:01:43 +01:00
Pau Perez
609ff737ca
Fix and simplify feature spec
2019-02-14 17:01:43 +01:00
Pau Perez
e9173f440f
Associate shipment to appropriate order in specs
2019-02-14 17:01:43 +01:00
luisramos0
bf4ce90f98
Add product.on_hand and product.on_demand positive test, these should be returned if no variants are provided in the input
...
Also, removed product.count_on_hand negative test (there's no such attriubte in v2) and added product.on_hand, this should not be returned because a variant is provided
2019-02-14 15:58:15 +00:00
luisramos0
bfa0734cc6
Break order_cycle_spec.js in specific files like create controller, edit controller and services
...
Move bulk_product_update_spec.js to its apropriate place under /admin
2019-02-14 15:57:40 +00:00
Pau Pérez Fabregat
0a885af7a6
Merge pull request #3481 from mkllnk/simplify-stripe-creation-in-specs
...
Simplify specs with stripe factory
2019-02-14 09:42:05 +01:00
Pau Pérez Fabregat
fce92090db
Merge pull request #3479 from luisramos0/2-0-stable-Feb12
...
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Feb2019)
2019-02-14 09:40:28 +01:00
Transifex-Openfoodnetwork
a71c89f70e
Updating translations for config/locales/en_GB.yml
2019-02-14 18:01:18 +11:00
Transifex-Openfoodnetwork
19568577f5
Updating translations for config/locales/es.yml
2019-02-14 18:01:18 +11:00
Transifex-Openfoodnetwork
71b24ba314
Updating translations for config/locales/ca.yml
2019-02-14 18:01:17 +11:00
Maikel
9058729a9d
Merge pull request #3459 from openfoodfoundation/dependabot/bundler/rspec-rails-3.8.2
...
Bump rspec-rails from 3.8.1 to 3.8.2
2019-02-14 17:18:07 +11:00
Maikel Linke
87abfcd704
Simplify shopping spec
2019-02-14 11:42:46 +11:00
Pau Pérez Fabregat
2d2e25b9fa
Merge pull request #3484 from coopdevs/fix-invoices-controller-spec
...
Stub default value for other calls to File.exist?
2019-02-13 20:32:13 +01:00
Luis Ramos
c6cd1b7ef2
Merge pull request #3471 from luisramos0/2-0-bulk-invoices-phase2
...
[Spree Upgrade] Make Bulk Invoices part of spree upgrade phase 2
2019-02-13 12:37:15 +00:00
Luis Ramos
576c203679
Merge pull request #3370 from mkllnk/3121-spree-gateway-inheritance
...
[Spree upgrade] Workaround Rails inheritance bug in Spree::Gateway
2019-02-13 12:27:59 +00:00
Pau Perez
59e27ffc0e
Stub default value for other calls to File.exist?
...
This fixes the following error
```
1) Spree::Admin::InvoicesController#poll when the file is available returns true
Failure/Error: spree_get :poll, invoice_id: invoice_id
#<File (class)> received :exist? with unexpected arguments
expected: ("tmp/invoices/479186263.pdf")
got: ("/home/pau/dev/openfoodnetwork/tmp/cache/paralleltests/3B7/CD1/spree%2Fapp_configuration%2Fredirect_https_to_http")
Please stub a default value first if message might be received with other args as well.
# ./spec/controllers/spree/admin/invoices_controller_spec.rb:28:in `block (4 levels) in <top (required)>'
# -e:1:in `<main>'
```
`paralleltests` also relies on `File.exist?` and so stubbing it breaks
it unless we purposefully allow other calls.
2019-02-13 13:16:28 +01:00
Pau Pérez Fabregat
1b7edab3d6
Merge pull request #3441 from luisramos0/2-0-shipments-api
...
[Spree Upgrade] Adapt api shipments controller to OFN by scoping variants before each action
2019-02-13 12:36:08 +01:00
luisramos0
5ccbf7b3ca
Add specs for error cases in shipments_controller_spec
2019-02-13 10:37:21 +00:00
luisramos0
728ed2c202
Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2)
2019-02-13 09:06:10 +00:00
luisramos0
ff2bf76e38
Add missing translation to fix shipping methods spec
2019-02-13 09:05:35 +00:00
Maikel Linke
5f5b0aaabf
Simplify specs with stripe factory
2019-02-13 18:34:22 +11:00
Maikel Linke
612ea4c781
Simplify spec of invoice creation
2019-02-13 17:55:48 +11:00
Maikel
a36dc13192
Add issue templates for tech debt
2019-02-13 17:26:56 +11:00
Maikel Linke
3b9fdfa7ac
Test tagging polymorphism on a payment method
2019-02-13 16:31:38 +11: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
Pau Pérez Fabregat
bda5eb1b1f
Merge pull request #3337 from kristinalim/feature-enterprise_fees_report-order_based_calculator_bug
...
3283 [Enterprise Fee Summary] Fix values when calculator is order-based
2019-02-12 20:07:57 +01:00
luisramos0
ba8096ff85
Improve method names in shipments_controller_spec
2019-02-12 17:31:58 +00:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
Kristina Lim
5e8a336e24
Initialize data representation classes with data
...
There is no more need to pass the summarizer.
2019-02-13 01:51:34 +11:00
Kristina Lim
ddc788ed5d
Move data representation translations to class
2019-02-13 01:51:34 +11:00
Kristina Lim
bc95560598
Add descriptions for data representation classes
2019-02-13 01:51:33 +11:00
Kristina Lim
664943a6e5
Include UsingEnterpriseFee instead of inheriting
2019-02-13 01:51:33 +11:00
Kristina Lim
b9c144bb1f
Prepare to change AssociatedEnterpriseFee to module
...
The superclasses will include this module, instead of inheriting the class.
2019-02-13 01:51:32 +11:00
Kristina Lim
373e3e1039
Simplify name of SQL data summarizer class
2019-02-13 01:51:32 +11:00
Kristina Lim
7a76355cfe
Separate summarizing of SQL data by source
2019-02-13 01:51:32 +11:00
Kristina Lim
c4801aafd4
Fix Fee Calc on Transfer Through and Tax Category
...
For exchange fees with calculator that is order-based:
* "Fee Calc on Transfer Through" should show "Entire Orders through
DISTRIBUTOR_NAME".
* For tax category:
a. If the enterprise fee itself has a tax category, this is used.
b. If the enterprise fee inherits the product's tax category, this is
"Various".
c. If the enterprise fee has no tax, this is blank.
For coordinator fees:
* "Fee Calc on Transfer Through" should be "All".
* For tax category: Same as abova.
2019-02-13 01:51:31 +11:00
Kristina Lim
8f65beeb0b
Clarify method name in report scope
2019-02-13 01:51:31 +11:00
Kristina Lim
e550be9bda
Add test for using order-based exchange fees
...
This is not filling the "Fee Calc on Transfer Through" column. This will
be addressed in another commit.
2019-02-13 01:51:31 +11:00
Kristina Lim
0212454041
Refactor SQL result summarizer for report
2019-02-13 01:51:30 +11:00
Kristina Lim
06ba5182b4
Add flat rate calculator traits to related factories
2019-02-13 01:51:30 +11:00
dependabot[bot]
0fc9ead934
Bump i18n-js from 3.1.0 to 3.2.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.1.0...v3.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-12 13:19:50 +00:00
Pau Pérez Fabregat
1f72eb9f68
Merge pull request #3378 from kevinchristianson/active-products-translation-fix
...
Add missing 'active products' translation on dashboard
2019-02-12 14:15:53 +01:00
Pau Pérez Fabregat
a0c144fd0c
Merge pull request #3415 from openfoodfoundation/feature/enterprise_fee_summary
...
[Enterprise Fee Summary] Merge "Enterprise Fee Summary" report to master
2019-02-12 13:58:47 +01:00
Pau Pérez Fabregat
b6ca0ba24f
Merge pull request #3456 from coopdevs/fix-last-orders-controller-spec
...
Fix orders controller spec
2019-02-12 12:47:15 +01:00
Pau Perez
24189ca88e
Create shipping_rate earlier for callback to work
...
If the shipping_rate is not created at the time the `#after_save`'s
`#ensure_correct_adjustment` callback is executed its call to
`shipping_method.create_adjustment` won't be executed either.
As a result, the OrderUpdater wasn't able to see any adjustments related
to the shipment causing the order total to be outdated.
2019-02-12 12:11:55 +01:00
luisramos0
935c8cb0ce
Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2)
2019-02-12 10:38:03 +00:00
luisramos0
7c0b21eb83
Make bulk invoices part of spree upgrade phase 2
2019-02-12 10:37:22 +00:00
Pau Perez
ab0b759567
Merge branch '2-0-stable' into 2-0-admin-capture-payment
...
* 2-0-stable: (208 commits)
Re implement orders ctrl update method so we can change redirection logic and add specs for it
Improve readability in admin/orders_spec
Add line items adjustments (order.price_adjustments) to the order edit page so that user is aware of adjustments included in the price like for example tax rates
Adapt variants auto complete to spree v2 code with shipments
Adapt customer search override to spree v2 and fix customer details spec in admin orders spec
Fix distributor change spec in admin orders spec
Fix admin orders spec non tax adjustments by adapting to new view
Fix failing specs due to Spree 2's new order admin page Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
Use Spree routes
Fix shop accidentally becoming order coordinator
Match date format in spec with import date filter
Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator.
Add unit test for VariantStock.can_supply?
Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError
Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock. Also, added spec to test return value of the reset method: it should return number of updated records.
Upgrade views to Spree 2 and apply overrides
Updating translations for config/locales/en_US.yml
Update name spaces for rake tasks to shorter 'ofn'.
Refactor checking no preview image in specs
Refactor checking of preview image path in specs
...
2019-02-12 11:12:40 +01:00
luisramos0
58ea28ebb4
Make Api::ShipmentsController#create re-use order.shipment if it exists
...
Improve code and add specs to this controller
2019-02-12 10:09:00 +00:00
luisramos0
77b390a836
Decorate spree api shipments controller to scope variants as they are added/removed from shipments
2019-02-12 10:09:00 +00:00
luisramos0
0f44beb477
Delete all Spree::Admin::LineItemsController customizations as they are no longer used
2019-02-12 10:09:00 +00:00
Pau Pérez Fabregat
a6c5e3423f
Merge pull request #3474 from Matt-Yorkley/pi/broken_build
...
Fix broken spec from refactored method
2019-02-12 11:03:28 +01:00
Pau Pérez Fabregat
0cc2bd052e
Merge pull request #3436 from luisramos0/2-0-orders-edit
...
[Spree Upgrade] Fix admin new order page flow (from order details to customer details)
2019-02-12 10:35:25 +01:00
Pau Pérez Fabregat
b51ad35cb1
Merge pull request #3445 from luisramos0/2-0-order-adjusts
...
[Spree Upgrade] Fix adjustments sections in admin order edit page
2019-02-12 10:16:30 +01:00
Pau Pérez Fabregat
92dca0cdfa
Merge pull request #3194 from HugsDaniel/3109-fix-orders-new
...
[Spree Upgrade] Fix admin new order page
2019-02-12 09:58:29 +01:00
Luis Ramos
edd1da7d50
Update spec/controllers/spree/orders_controller_spec.rb
...
Fix typo in doc
Co-Authored-By: sauloperez <saulopefa@gmail.com >
2019-02-12 09:12:03 +01:00
Matt-Yorkley
097ffba323
Fix broken spec from refactored method
2019-02-11 23:57:13 +00:00
Pau Pérez Fabregat
4165ba5cdb
Merge pull request #3463 from coopdevs/enable-catalan
...
Import Catalan translation from Transifex
2019-02-11 18:13:50 +01:00
Luis Ramos
dd44d6a0ca
Merge pull request #3355 from luisramos0/2-0-pord-importer-spec
...
[Spree Upgrade] Phase 2 - Fix product_importer spec
2019-02-11 15:28:47 +00:00
Pau Perez
990de63728
Merge branch 'master' into active-products-translation-fix
...
* master: (46 commits)
Wait for button to disappear before checking flash
Use flash matcher in shipping method feature specs
Add RSpec matchers for flash messages
Do not expect modal open when checking spinner gone
Update issue templates
Update all locales with the latest Transifex translations
Do not show table until first time dereferencing is done
Remove unused have_no_selector argument in feature test
Compile row ID with higher priority
Compile edit link with higher priority
Support selecting date in next months
Improve sync between keyword filter and selecting all
Wait for datepicker to associate and open before selecting date
Update cancan permissions for second iteration of bulk invoices
Fix shop accidentally becoming order coordinator
Match date format in spec with import date filter
Update name spaces for rake tasks to shorter 'ofn'.
Refactor checking no preview image in specs
Refactor checking of preview image path in specs
Fix race condition in enterprise image feature specs
...
2019-02-11 16:12:52 +01:00
Pau Pérez Fabregat
9d065c8a0b
Merge pull request #3233 from Matt-Yorkley/pi/inventories
...
Pi/inventories
2019-02-11 16:10:33 +01:00
Pau Pérez Fabregat
da09c8f86c
Merge pull request #3467 from kristinalim/fix/3455-intermittent_spec_failure
...
3455 [Flaky Spec] Do not expect modal still open when checking that the spinner is gone
2019-02-11 15:58:22 +01:00
Pau Pérez Fabregat
b508d51406
Merge pull request #3469 from kristinalim/fix/3468-intermittent_spec_failures
...
3468 [Flaky Spec] Check for presence of flash div before trying to get its text
2019-02-11 15:54:33 +01:00
luisramos0
acc99fc9bb
Improve readability of cached_product_renderer and respective spec
2019-02-11 11:46:04 +00:00
Kristina Lim
a876c2ab9f
Address timing issues in enterprise roles specs
2019-02-11 13:02:40 +08:00
luisramos0
ad0e5bb093
Re implement orders ctrl update method so we can change redirection logic and add specs for it
2019-02-10 15:31:01 +00:00
Kristina Lim
0032a237a2
Wait for button to disappear before checking flash
2019-02-10 22:08:18 +08:00
Kristina Lim
175264f41f
Use flash matcher in shipping method feature specs
2019-02-10 22:08:18 +08:00
Kristina Lim
e14c60c1c1
Add RSpec matchers for flash messages
2019-02-10 22:08:18 +08:00
Kristina Lim
f143540d0c
Do not expect modal open when checking spinner gone
...
The element referenced in the following might no longer be visible:
within "div.reveal-modal"
2019-02-09 22:40:40 +08:00
Kristina Lim
b6be8c48d1
Fix layout violation in Spree::Ability decorator
2019-02-08 21:26:39 +00:00
Kristina Lim
de30cf1198
Fix description for feature flag example groups
2019-02-08 21:26:39 +00:00
Kristina Lim
461b5725d1
Hide report link and resource from non-superadmins
2019-02-08 21:26:38 +00:00
Kristina Lim
1d3f4aa28a
Add feature flag for enterprise fee summary
2019-02-08 21:26:38 +00:00
Kristina Lim
f59834ddc8
Use receiver as "Fee Calc on Transfer Through" for outgoing exchanges
2019-02-08 21:26:38 +00:00
Kristina Lim
ddf15f1d30
Add scenario test for enterprise fee summary
...
Add test for more complex scenario where there is a coordinator and
distributor fee for an incoming exchange, and a producer and coordinator
fee for an outgoing exchange.
2019-02-08 21:26:38 +00:00
Kristina Lim
c92d202612
Rename files for factories in spec/factories/
...
Make these follow the "#{SINGULAR_OBJECT}_factory.rb" convention.
2019-02-08 21:26:38 +00:00
Kristina Lim
625069cb5a
Add :per_item factory trait to shipping and payment methods
2019-02-08 21:26:38 +00:00
Kristina Lim
d2e49b8b49
Move variant setup to new factory trait
2019-02-08 21:26:38 +00:00
Kristina Lim
f36d13a736
Rename helper for setting up incomplete order
2019-02-08 21:26:38 +00:00
Kristina Lim
ce030aeb07
Move order setup to new factory traits
2019-02-08 21:26:38 +00:00
Kristina Lim
a3aa594c42
Use enterprise fee factory trait where applicable
2019-02-08 21:26:38 +00:00
Kristina Lim
5dda3b67eb
Use factory for tax category in entperprise fee summary tests
2019-02-08 21:26:38 +00:00
Kristina Lim
61ec43f868
Add enterprise fee factory trait for per item rate
...
We should not presume what is not default for an enterprise fee object.
2019-02-08 21:26:38 +00:00
Kristina Lim
53c458f817
Clean up setup data for enterprise fee summary tests
2019-02-08 21:26:38 +00:00
Kristina Lim
4a73b1d26c
Do not include incomplete orders in report
2019-02-08 21:26:38 +00:00
Kristina Lim
eaa7800427
Do not assign I18n translation to constants
...
The preferred language could change dynamically.
2019-02-08 21:26:38 +00:00
Kristina Lim
6378afdddb
Address Rubocop violation
2019-02-08 21:26:38 +00:00
Kristina Lim
c81be75530
Move engine libraries except Engine and Version to services
2019-02-08 21:26:38 +00:00
Kristina Lim
3e499faa7c
Do not use ReportData::EnterpriseFeeTypeTotals
2019-02-08 21:26:38 +00:00
Kristina Lim
3f84d0008a
Move some in OpenFoodNetwork to engine services
...
This removes the OpenFoodNetwork namespace from these too.
2019-02-08 21:26:38 +00:00
Kristina Lim
95e3a2f45d
Move authorization to the ::Parameters class
2019-02-08 21:26:38 +00:00
Kristina Lim
c61a83faca
Move routes for enterprise fee summary to engine
2019-02-08 21:26:38 +00:00
Kristina Lim
9e035efd50
Render enterprise fee report directly in renderer
2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a
Separate enterprise fee summary action
...
Split the previous "index" action into "new" and "create" actions.
2019-02-08 21:26:38 +00:00
Kristina Lim
da914289ea
Copy spree/admin/reports#index into application
2019-02-08 21:26:38 +00:00
Kristina Lim
a17fa8013f
Clean up I18n scope in feature specs for report
2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131
Rename EnterpriseFeeSummaryReportController
...
Remove "Report" because this is redundant, and pluralize the resource
name.
2019-02-08 21:26:38 +00:00
Kristina Lim
207b6c7f30
Use shorthand for RSpec expect(subject).to
2019-02-08 21:26:38 +00:00
Kristina Lim
2063752b97
Improve specs for Enterprise Fee Summary
...
This also addresses a spec that has failed over the rebasing.
2019-02-08 21:26:38 +00:00
Kristina Lim
2bf38b3ea1
Improve code based on Rubocop recommendations
2019-02-08 21:26:38 +00:00
Kristina Lim
552bf1b9f7
Move report list to own class
2019-02-08 21:26:38 +00:00
Kristina Lim
b78e2b4720
Move lib files for enterprise fee summary to engine
2019-02-08 21:26:38 +00:00
Kristina Lim
0cdcd96bb5
Add skeleton for OrderManagement engine
2019-02-08 21:26:38 +00:00
Kristina Lim
dcb1d9fe25
Add feature tests for enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
edf0b0df76
Add navigation item for enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
d3e9a53120
Filter enterprise fee summary for user permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
8ad53055c7
Allow non-admins to see enterprise fee summary
...
Relax controller permissions for enterprise fee summary. Even non-admin
enterprise users should be able to see these reports.
Filtering of data based on permissions is handled in:
* OrderManagement::Reports::EnterpriseFeeSummary::Authorizer and
* OrderManagement::Reports::EnterpriseFeeSummary::Permissions.
2019-02-08 21:26:37 +00:00
Kristina Lim
f81f4b7e4a
Authorize filters before generating enterprise fee report
2019-02-08 21:26:37 +00:00
Kristina Lim
9ce313c7f5
Define filter authorizer for enterprise fee report
2019-02-08 21:26:37 +00:00
Kristina Lim
cd3e258b59
Rename report authorizers to reflect permissions
2019-02-08 21:26:37 +00:00
Kristina Lim
469988856d
Define permissions for enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
5fce9d0a7d
Add multi-distributor scope to shipping and payment methods
2019-02-08 21:26:37 +00:00
Kristina Lim
24ab2e7fb0
Add filtering to enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
2407531957
Make more code for report tests reusable
2019-02-08 21:26:37 +00:00
Kristina Lim
d573dc5023
Make order builder for enterprise fee summary flexible
...
This is in preparation for tests for filtering the report.
2019-02-08 21:26:37 +00:00
Kristina Lim
4a00aceba2
Include shipping fees in enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
1273cc085b
Include payment fees in enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
7d74ddc85b
Add HTML view for enterprise fee summary report
2019-02-08 21:26:37 +00:00
Kristina Lim
418050c1b8
Remove blank strings from array report parameters
...
Remove the blank strings that Rails multiple selects add by default to
make sure that blank lists are still submitted to the server as arrays
instead of nil.
https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-select
2019-02-08 21:26:37 +00:00
Kristina Lim
6e03ab03f5
Extract general behaviour for report parameters
2019-02-08 21:26:37 +00:00
Kristina Lim
34dc16f8c9
Base filter options from initial authorizer object
2019-02-08 21:26:37 +00:00
Kristina Lim
bd2b4c0134
Add enterprise fee summary form without options
...
The objects will be filled in another commit. This simply sets up the
filters UI for now.
2019-02-08 21:26:37 +00:00
Kristina Lim
ec81e4221f
Add basic action for enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
b7439d2574
Fix sort for nil cells in enterprise fee summary
2019-02-08 21:26:37 +00:00
Kristina Lim
5b6bbc3920
Add generation of CSV renderer filename
2019-02-08 21:26:37 +00:00
Kristina Lim
ed2b8e9b9f
Add CSV renderer for enterprise fee summary report
2019-02-08 21:26:37 +00:00
Kristina Lim
00e70733b0
Add test data for enterprise fee summary report
2019-02-08 21:26:37 +00:00
Kristina Lim
e7ed625d5a
Add processing of enterprise fee summary from DB
2019-02-08 21:26:37 +00:00
Kristina Lim
faf7079780
Specify sort order of enterprise fee totals data
2019-02-08 21:26:37 +00:00
Kristina Lim
3763cb98a3
Add data classes for Enterprise Fee Summary report
2019-02-08 21:26:37 +00:00
Kristina Lim
a097640464
Add basic form object for enterprise fee summary
2019-02-08 21:26:36 +00:00
Kristina Lim
519a7d2ee6
Add datetime and integer array validator matchers
2019-02-08 21:26:36 +00:00
Kristina Lim
f6e8f18d89
Add validator for integer arrays
...
Example usage:
validates :related_post_ids, integer_array: true
2019-02-08 21:26:36 +00:00
Kristina Lim
de9cff6fc2
Add validator for datetime string
...
Example usage:
validates :start_at, date_time_string: true
2019-02-08 21:26:36 +00:00
Pau Perez
f998748634
Clarify why we end up with 3 adjustments
...
And the second one is open.
2019-02-08 18:16:00 +01:00
Pau Perez
7359789903
Import Catalan translation from Transifex
...
Although we've started translating to Catalan and focused on it
recently, we never imported the file in the app thus the language menu
showed "English" for the "ca" locale and clicking on it switched to
English as well instead of Catalan.
2019-02-08 15:22:59 +01:00
luisramos0
3dc75c88d2
Delete empty controller class eval and spec. Useless left overs from 0ad2978926
2019-02-08 09:29:58 +00:00
Danni M
8ff5f9055b
Update issue templates
...
I've created 3 types of templates based on those in the wiki and the default (bug) issue template. These can be edited or additional ones added at your leisure.
I also added the OFN software instance and version to the bugs template
2019-02-08 16:58:32 +11:00
Matt-Yorkley
f9ea93933e
Use localizeCurrency filter in subscriptions
2019-02-07 22:58:49 +00:00
Matt-Yorkley
5582160e73
Add localizeCurrency filter to admin and inject currencyConfig data
2019-02-07 22:55:08 +00:00
luisramos0
1b4666fc6a
Add checkbox to cache settings to disable products cache
2019-02-07 20:06:27 +00:00
dependabot[bot]
72cd0537fb
Bump spinjs-rails from 1.3 to 1.4
...
Bumps [spinjs-rails](https://github.com/dnagir/spinjs-rails ) from 1.3 to 1.4.
- [Release notes](https://github.com/dnagir/spinjs-rails/releases )
- [Commits](https://github.com/dnagir/spinjs-rails/compare/v1.3...v1.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-07 19:39:54 +00:00
dependabot[bot]
492b1c905f
Bump rspec-rails from 3.8.1 to 3.8.2
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-07 19:39:25 +00:00
Pau Pérez Fabregat
88247064c4
Merge pull request #3397 from luisramos0/2-0-subs-allow-backorders
...
[Spree Upgrade] Remove allow backorders from subscriptions specs
2019-02-07 20:32:49 +01:00
luisramos0
93aabf6741
Update all locales with the latest Transifex translations
2019-02-07 19:26:00 +00:00
Pau Pérez Fabregat
676fa3d84d
Merge pull request #3433 from Matt-Yorkley/bi/user_permission
...
Update cancan permissions for second iteration of bulk invoices
2019-02-07 20:17:34 +01:00
Pau Perez
cde465edad
Fix orders controller spec
2019-02-07 16:05:18 +01:00
Pau Pérez Fabregat
9613aa5a4d
Merge pull request #3400 from luisramos0/2-0-ship-methods
...
[Spree Upgrade] Change app config to keep using ofn customized spree v1 shipping method calculators, not the new spree v2 ones
2019-02-07 15:41:06 +01:00
Pau Pérez Fabregat
fbde4a6c97
Merge pull request #3328 from luisramos0/2-0-pi-prod-reset
...
[Spree Upgrade] Phase 2 - Product Import - Adapt product_reset_strategy
2019-02-07 15:35:44 +01:00
Pau Pérez Fabregat
259a5b211b
Merge pull request #3429 from luisramos0/2-0-in-stock
...
[Spree Upgrade] 3428 Fix in_stock? and shopping/variant_overrides_spec
2019-02-07 15:25:43 +01:00
Pau Pérez Fabregat
56425139c0
Merge pull request #3439 from luisramos0/2-0-stable-Feb5
...
[Spree Upgrade] Merging master into 2-0-stable (1st run in Feb2019)
2019-02-07 15:09:23 +01:00
luisramos0
fe0fb22814
Improve readability in admin/orders_spec
2019-02-07 13:45:04 +00:00
Luis Ramos
8c0683938a
Merge pull request #3416 from kristinalim/fix/race_condition_in_bulk_order_management_feature_specs
...
3417,2962,3358 [Flaky Spec] Address some race conditions for bulk order management specs
2019-02-07 11:28:54 +00:00
luisramos0
3ed6aea9ab
Add line items adjustments (order.price_adjustments) to the order edit page so that user is aware of adjustments included in the price like for example tax rates
...
This change happens in spree v2.2 together with other changes (like adding the, not yet available in v2.0, shipment_adjustments this way). See commit for more details: 636d87dd77
2019-02-07 11:14:45 +00:00
Maikel Linke
5ee3dbf9f2
Re-use renderer object
2019-02-07 10:12:06 +11:00
Luis Ramos
2d0df7ffdf
Update app/controllers/spree/admin/orders_controller_decorator.rb
...
Co-Authored-By: mkllnk <maikel@email.org.au >
2019-02-07 09:19:19 +11:00
Kristina Lim
0030428647
Do not show table until first time dereferencing is done
2019-02-07 04:39:45 +08:00
Kristina Lim
428e58f8f7
Remove unused have_no_selector argument in feature test
2019-02-07 04:39:44 +08:00
Kristina Lim
35ecbe1584
Compile row ID with higher priority
2019-02-07 04:39:44 +08:00
Kristina Lim
ed5856afa4
Compile edit link with higher priority
2019-02-07 04:39:44 +08:00
Kristina Lim
fdede83086
Support selecting date in next months
...
This was causing failures when selecting tomorrow when running tests on
the last day of the month.
2019-02-07 04:39:43 +08:00
Kristina Lim
bb51f7e36b
Improve sync between keyword filter and selecting all
2019-02-07 04:36:28 +08:00
Kristina Lim
3eedee313e
Wait for datepicker to associate and open before selecting date
2019-02-07 04:36:24 +08:00
Pau Pérez Fabregat
8f63be9519
Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc
...
Reduce restrictions for adding a variant to a subscription
2019-02-06 21:24:57 +01:00
Pau Pérez Fabregat
cd1f469588
Merge pull request #3389 from openfoodfoundation/dependabot/bundler/redcarpet-3.4.0
...
Bump redcarpet from 3.2.3 to 3.4.0
2019-02-06 21:23:21 +01:00
Pau Pérez Fabregat
433d10c42f
Merge pull request #3386 from leandroalemao/fix-moment-deprecation-warning
...
[ISSUE-3348] LC: Fix moment.js deprecation warning
2019-02-06 21:22:58 +01:00
Pau Pérez Fabregat
b4ba9e65e1
Merge pull request #3367 from openfoodfoundation/dependabot/bundler/jwt-2.1.0
...
Bump jwt from 1.5.6 to 2.1.0
2019-02-06 21:22:37 +01:00
Pau Pérez Fabregat
6239397589
Merge pull request #3357 from openfoodfoundation/dependabot/bundler/stripe-4.5.0
...
Bump stripe from 3.3.2 to 4.5.0
2019-02-06 21:22:19 +01:00
Matt-Yorkley
2c3eeec2b9
Update cancan permissions for second iteration of bulk invoices
2019-02-06 18:19:53 +00:00
Luis Ramos
11304ef6fd
Merge pull request #3371 from luisramos0/2-0-xero-invoices
...
[Spree Upgrade] Fix xero invoices report specs
2019-02-06 16:48:49 +00:00
Maikel Linke
4a3e5f1d0a
Print supplier name on invoice
2019-02-06 15:07:05 +11:00
Maikel Linke
3aea16e9ba
Cover alternative invoice template with specs
2019-02-06 15:06:44 +11:00
Maikel Linke
d97fa60c31
Remove code duplication and test PDF creation
2019-02-06 14:53:05 +11:00
Maikel Linke
7c5b430a37
Test execution of BulkInvoiceService#start_pdf_job
...
The spec just tested if a job was enqueued, but not if the job can
actually be executed. Unfortunately, this test is quite slow.
2019-02-06 11:26:22 +11:00
luisramos0
1b8445eb99
Merge branch 'master' into 2-0-stable-Feb5
2019-02-05 11:16:23 +00:00
Maikel Linke
cc46bfd002
Rename namespace to ofn
2019-02-05 16:30:46 +11:00
Maikel Linke
659aa269de
Fix creation of sample payment methods on staging
...
Due to an unknown reason my chosen way of creating calculator and
assigning it to a payment method didn't work in staging environment even
though it was working in development.
Without diving deeper into the cause of this, I decided to change the
record assignments and fix the problem that way.
2019-02-05 16:24:30 +11:00
Maikel Linke
7a723d9061
Use new sample data during setup
2019-02-05 16:24:30 +11:00
Maikel Linke
c6393b6077
Warn about deprecation via ActiveSupport
2019-02-05 16:23:17 +11:00
Maikel Linke
c3029c612a
Fix sample product creation and use bang methods
...
Mistakes like the missing fee when creating product distributions were
hidden, because I didn't use the bang methods to create records.
2019-02-05 16:23:17 +11:00
Maikel Linke
1d07327325
Add descriptions to enterprises
2019-02-05 16:23:17 +11:00
Maikel Linke
4b389ba357
Move sample data factories into their own files
2019-02-05 16:23:17 +11:00
Maikel Linke
3ab02d90df
Move sample data address module to own file
2019-02-05 16:23:17 +11:00
Maikel Linke
bec9f5eb2e
Move sample data logger to own module
2019-02-05 16:23:17 +11:00
Maikel Linke
fae05ff713
Deprecate old sample data task
2019-02-05 16:23:17 +11:00
Maikel Linke
876e73a989
Rewrite task to generate sample data
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2072
We need more and better structured sample data for dev testing and to
bootstrap staging data. This new task aims to replace
openfoodnetwork:dev:sample_data.
2019-02-05 16:23:17 +11:00
Maikel
a910468fc7
Merge pull request #3418 from Jefferson-Faseler/change-rake-tasks-namespace
...
Update Rake task namespace
2019-02-05 16:21:59 +11:00
Maikel Linke
dbfcbc6db9
Apply import defaults to variants of new products
...
Spree 2 doesn't have `Product#on_hand=` any more. We actually can't save
stock levels without saving the product first which creates a stock
item.
This hacky solution overwrites the attribute in the entry so that it
gets copied to the variant later on. I think a better solution needs
some refactoring as proposed in:
https://github.com/openfoodfoundation/openfoodnetwork/issues/2783#issuecomment-459601530
2019-02-05 15:41:19 +11:00
luisramos0
d598831d67
Adapt variants auto complete to spree v2 code with shipments
2019-02-04 18:59:41 +00:00
luisramos0
698ba4618d
Adapt customer search override to spree v2 and fix customer details spec in admin orders spec
2019-02-04 18:58:02 +00:00
luisramos0
e5fdc89659
Fix distributor change spec in admin orders spec
2019-02-04 18:58:01 +00:00
luisramos0
c612df5174
Fix admin orders spec non tax adjustments by adapting to new view
2019-02-04 18:58:01 +00:00
Hugo Daniel
c823f942b4
Fix failing specs due to Spree 2's new order admin page
...
Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
2019-02-04 18:57:51 +00:00
Hugo Daniel
ae799eb2b6
Use Spree routes
2019-02-04 18:56:28 +00:00
Luis Ramos
5a4205d151
Merge pull request #3432 from kristinalim/fix/3327-intermittent_spec_failures
...
3327 [Flaky Spec] Fix shop accidentally becoming order coordinator
2019-02-03 19:32:40 +00:00
Luis Ramos
4b133bbc31
Merge pull request #3412 from kristinalim/fix/3059-race_condition_in_enterprise_image_specs
...
3059 [Flaky Spec] Fix race condition in enterprise image feature specs
2019-02-03 19:32:11 +00:00
Luis Ramos
a0b5509850
Merge pull request #3430 from kristinalim/fix/3420-intermittent_spec_failures
...
3420 [Flaky Spec] Fix date format in spec when single-digit day of month
2019-02-03 19:30:22 +00:00
Luis Ramos
8fdd1db2c3
Merge pull request #3380 from mkllnk/3379-payment-method-spec
...
Use patch to hide Paypal gateway password
2019-02-02 09:54:18 +00:00
Luis Ramos
2dce3373af
Merge pull request #3385 from luisramos0/2-0-gemfilelock-fix
...
[Spree Upgrade] Fix conflicts in gemfile lock
2019-02-02 09:48:51 +00:00
Luis Ramos
6de23fcea1
Merge pull request #3374 from luisramos0/2-0-order-cycle-mgmt-report
...
[Spree Upgrade] Fix order_cycle_management_report shipping methods filter
2019-02-02 09:47:45 +00:00
Kristina Lim
3104862739
Fix shop accidentally becoming order coordinator
...
The original setup of the order calls:
create(:simple_order_cycle)
Which picks an arbitrary distributor as coordinator:
coordinator { Enterprise.is_distributor.first || ... }
There is a chance that any of the existing distributor enterprises
becomes coordinator, causing a test to intermittently fail.
This commit makes the relationship between the reference enterprises and
the order consistent.
2019-02-01 20:28:36 +00:00
Kristina Lim
4bff256f6d
Match date format in spec with import date filter
...
This was failing if the current day of month only has one digit. The
test could not find the date in the import date filter.
Before this commit, the resulting string in the test replaced " " with
" ", so "February 2" was being changed to "February 2". The import date
filter however uses two spaces in this case, even if the browser shows
only one (HTML inline text renders two spaces as just one).
2019-02-02 01:43:52 +08:00
Pau Pérez Fabregat
e1fb005e70
Merge pull request #3387 from kristinalim/fix/3384-product_import_timeout
...
3384 [Product Import] Process only one batch of rows at a time
2019-02-01 17:29:04 +01:00
luisramos0
e584fd2155
Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator.
...
Added tests for it in scope_hub_to_variant and improved VO shopping specs
2019-02-01 16:18:09 +00:00
luisramos0
5d82efa213
Add unit test for VariantStock.can_supply?
2019-02-01 16:16:04 +00:00
Isaac Haseley
09d3cea830
Lazy-load one more translation
2019-02-01 09:22:26 -06:00
luisramos0
80af7c770b
Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError
2019-02-01 08:32:45 +00:00
luisramos0
4b9be6f1a8
Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock.
...
Also, added spec to test return value of the reset method: it should return number of updated records.
2019-02-01 08:22:50 +00:00
Pau Pérez Fabregat
faea876ff0
Merge pull request #3361 from luisramos0/2-0-report-spec
...
[Spree Upgrade] Phase 2 - Fix some specs in reports_spec and in lettuce share report
2019-02-01 08:26:55 +01:00
Isaac Haseley
73a58435a8
Adopt one/other pluralization
2019-01-31 21:45:57 -06:00
Isaac Haseley
a18c98191a
Better accomodate different sentence structures
2019-01-31 21:45:57 -06:00
Isaac Haseley
8543bb7cfb
Add missing 'active products' translation on dashboard
2019-01-31 21:45:57 -06:00
Hugo Daniel
fa1525bdd3
Upgrade views to Spree 2 and apply overrides
2019-01-31 12:59:05 +01:00
Maikel
a9bac2c1af
Merge pull request #3411 from openfoodfoundation/transifex
...
Transifex
2019-01-31 13:42:50 +11:00
Transifex-Openfoodnetwork
32c5c48709
Updating translations for config/locales/en_US.yml
2019-01-31 12:38:44 +11:00
Jefferson Faseler
d4d0489328
Update name spaces for rake tasks to shorter 'ofn'.
2019-01-30 17:14:00 -05:00
Kristina Lim
65438e2619
Refactor checking no preview image in specs
2019-01-31 05:04:18 +08:00
Kristina Lim
a3c808a172
Refactor checking of preview image path in specs
2019-01-31 05:02:57 +08:00
Kristina Lim
777712a0e9
Fix race condition in enterprise image feature specs
2019-01-31 04:52:40 +08:00
Transifex-Openfoodnetwork
24c12897de
Updating translations for config/locales/fr_CA.yml
2019-01-31 07:42:29 +11:00
Transifex-Openfoodnetwork
bd43e06605
Updating translations for config/locales/fr_CA.yml
2019-01-31 07:41:40 +11:00
luisramos0
3595abc08a
Fix seeds script for cases where default stock location already exists in the DB
2019-01-30 15:08:37 +00:00
luisramos0
f6e6f67e7d
Switch Spree::Config test setup with a mock in reports_spec to keep global test setup untouched
2019-01-30 15:03:23 +00:00
Luis Ramos
cf744bb663
Merge pull request #3407 from openfoodfoundation/transifex
...
Transifex
2019-01-30 13:58:26 +00:00
Transifex-Openfoodnetwork
2b13516d3d
Updating translations for config/locales/nb.yml
2019-01-30 19:20:56 +11:00
Transifex-Openfoodnetwork
1b50ba2729
Updating translations for config/locales/fr.yml
2019-01-30 19:16:54 +11:00
Maikel Linke
18b3363e65
Use patch to hide Paypal gateway password
2019-01-30 15:43:59 +11:00
Maikel
e8ac0e4a9f
Merge pull request #3402 from openfoodfoundation/transifex
...
Transifex
2019-01-30 14:45:39 +11:00
Maikel
155b205ac2
Merge pull request #3401 from luisramos0/2-0-stable-jan-29th
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)
2019-01-30 14:44:40 +11:00
Maikel
bef7684505
Merge pull request #3399 from kristinalim/fix/3381-address_failing_tests
...
3381 [Flaky Spec] Load enterprise users tab before inspecting table
2019-01-30 14:29:16 +11:00
luisramos0
6d2765e352
Convert if statement in case statement in product import entry validator
2019-01-29 23:53:37 +00:00
Maikel
f3ff7ca2fe
Merge pull request #3366 from coopdevs/fix-orders-controller-spec
...
Fix orders controller spec
2019-01-30 10:27:17 +11:00
dependabot[bot]
8750310648
Bump dalli from 2.7.2 to 2.7.9
...
Bumps [dalli](https://github.com/petergoldstein/dalli ) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/petergoldstein/dalli/releases )
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md )
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.2...v2.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-29 19:14:15 +00:00
Transifex-Openfoodnetwork
f7b7e98fec
Updating translations for config/locales/en_GB.yml
2019-01-30 05:12:58 +11:00
luisramos0
cc4825290b
Fix type conversion problem in product import entry validator
2019-01-29 15:45:22 +00:00
luisramos0
dce2524353
Added now mandatory shipping_category_id to CSVs in tests in admin/product_import_spec
2019-01-29 14:55:19 +00:00
luisramos0
ab2397785b
Adapted product import EntryProcessor and EntryValidator to new VariantStock logic where on_hand is set at variant level (not at product level) and only after saving the variant
2019-01-29 14:55:18 +00:00
luisramos0
2ffc5305d7
Adapted VariantStock to handle on_hand string values (product import is set on_hand with string values)
2019-01-29 14:55:18 +00:00
luisramos0
fc1004cb3a
Added now mandatory shipping_category_id to CSVs in most tests in models/product_importer_spec
2019-01-29 14:55:18 +00:00
luisramos0
c07b90ffb0
Update all locales with the latest Transifex translations
2019-01-29 12:45:28 +00:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Pau Pérez Fabregat
2b3ffd8c82
Merge pull request #2833 from kristinalim/fix-variant_override_permissions
...
Add tests for permissions for variant overrides
2019-01-29 09:51:41 +01:00
Pau Pérez Fabregat
a5ed17f0f5
Merge pull request #3390 from openfoodfoundation/dependabot/bundler/oj-3.7.8
...
Bump oj from 3.7.4 to 3.7.8
2019-01-29 09:50:25 +01:00
Pau Perez
c50fa1224b
Do not restore adjustments that got deleted
...
If something in the block deleted the adjustment update_attribute will
fail.
2019-01-29 09:40:54 +01:00
Pau Perez
59f39b14f4
Do not restore adjustments that aren't in the hash
...
This way we don't modify adjustments that get created as part of the
passed block. We don't know how this might be used in the future.
2019-01-29 09:40:54 +01:00
Pau Perez
f4b790eefa
Restore adjustments state after updating
...
We don't know exactly if all adjustments are closed in all
circumstances, so it's better to be conservative until we figure out.
Chances are that non-completed orders have them open.
2019-01-29 09:40:54 +01:00
Pau Perez
8eab3c5ec1
Extract meaningful methods from controller action
...
This sets the ground for future refactorings while providing some more
readability and context.
2019-01-29 09:40:54 +01:00
Pau Perez
c9429760cd
Trigger the appropriate callbacks from controller
2019-01-29 09:40:54 +01:00
Pau Perez
0b62b4621f
Make expectation easier to reason about
2019-01-29 09:40:54 +01:00
Pau Perez
9d1d8513e7
Make controller req. params a bit more obvious
2019-01-29 09:40:54 +01:00
Pau Perez
f589d4125d
Restore distributor in test that relies on it
2019-01-29 09:40:54 +01:00
Pau Perez
1bceb0748a
Do not modify config's state in test
2019-01-29 09:40:53 +01:00
Pau Pérez Fabregat
c9a8ec84c0
Merge pull request #3359 from kevinchristianson/ready
...
Convert sass files to scss
2019-01-28 20:02:37 +01:00
luisramos0
8a86c0473d
Change app config to keep using the same v1 shipping method calculators and not the ones spree v2 introduces, these are copy pasted versions that work with packages
...
See this commit for more details: 18e5b98f5c (diff-b0846898827183f530c113ad7b83b8ea)
Also:
- remove shipping method restriction on calculators to inherit from Spree::Shipping::ShippingCalculator so that OFN customized calculators keep working
- add shipping method serializer spec to test serialization of all shipping methods configured
2019-01-27 21:03:32 +00:00
Kristina Lim
2129ab991b
Load enterprise users tab before inspecting table
2019-01-26 12:11:41 +08:00
luisramos0
bd24d3e27a
Remove setting the now inexistent global config allow_backorders to false in subs specs because the default value for on_demand (set through stocklocation.backorderabl_default) is false in all specs
2019-01-25 22:12:13 +00:00
luisramos0
216afce6fe
Add missing translations detected in features/admin/subscriptions_spec
2019-01-25 22:11:29 +00:00
Kristina Lim
5992bba97b
Import color variables in new page SCSS partials
...
"admin/all.css" which imports these SCSS partials already imports the
color variables in "admin/variables", so actually there should be no
need to import the variables again.
However, "application.css" calls "require_tree", which means asset
precompilation through Sprockets would attempt to compile each of the
SCSS partials individually. When compiled individually, the color
variables are not available to these partials.
This is a quick solution to allow precompilation of "application.css" to
complete.
2019-01-26 03:29:19 +08:00
Kristina Lim
4a58aedf09
Use clearer translation for "No Upcoming OC"
2019-01-26 02:03:57 +08:00
Kristina Lim
c33808e8f5
Extract some actions in tests into methods
2019-01-26 02:03:56 +08:00
Kristina Lim
da4d6a092a
Add spec helper for choosing today from datepicker
2019-01-26 02:03:56 +08:00
Kristina Lim
9965e95c65
Refactor methods in SubscriptionVariantsService
2019-01-26 02:03:55 +08:00
Kristina Lim
b691d727a7
Move OFN::SubscriptionService to SubscriptionVariantsService
2019-01-26 02:03:55 +08:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08:00
Kristina Lim
929290fc77
Reduce restrictions for creating subscriptions
...
Allow the following variants:
* Variants of permitted producers
* Variants of hub
* Variants that are in outgoing exchanges where the hub is receiver
2019-01-26 02:03:54 +08:00
Kristina Lim
57f6a7a3b9
Support clicking different text for select2 helper
...
Interaction with the variant autocomplete is not precise. The specs only
search for the product name, then click the first result that matches
the product name which they see.
This could have been the case because searching using the full variant
name does not match the variant. For example, searching "Some Product -
1kg" would not have results, while searching only "Some Product" (the
product name) would list "Some Product - 1kg".
Clicking the first match does not work in all scenarios.
This allows using a separate text for searching and for clicking.
2019-01-26 02:03:54 +08:00
Kristina Lim
d3f20289f8
Move setup of feature specs for creating subscriptions
2019-01-26 02:03:53 +08:00
Kristina Lim
35c0bcb3df
Add tests for eligible variants for a subscription
2019-01-26 02:03:53 +08:00
Kristina Lim
28c70c7719
Fix nesting of specs for editing subscriptions
2019-01-26 02:03:53 +08:00
Kristina Lim
b9492d6483
Fix setup in tests for SubscriptionValidator
2019-01-26 02:03:49 +08:00
Kristina Lim
b6d8611359
Return early in JS if last batch
2019-01-25 09:06:25 +08:00
Kristina Lim
4425b0416d
Rename import_data feature test method
2019-01-25 04:42:11 +08:00
Kristina Lim
b0efc3a2fa
Add feature spec for large file import
2019-01-25 04:42:06 +08:00
dependabot[bot]
33ee46b224
Bump oj from 3.7.4 to 3.7.8
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.4 to 3.7.8.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.4...v3.7.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-24 19:16:56 +00:00
dependabot[bot]
5610f64c7a
Bump redcarpet from 3.2.3 to 3.4.0
...
Bumps [redcarpet](https://github.com/vmg/redcarpet ) from 3.2.3 to 3.4.0.
- [Release notes](https://github.com/vmg/redcarpet/releases )
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/vmg/redcarpet/compare/v3.2.3...v3.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-24 19:14:52 +00:00
Kristina Lim
b67ba89aca
Process batches of the import CSV one after another
...
Start the HTTP request for processing next batches only after the
previous batch has completed.
A con of this approach is that the user needs to keep their browser open
for later parts of the large CSV to be processed, but this is better
than a higher chance of requests timing out.
2019-01-25 00:33:13 +08:00
Kristina Lim
bf084cd8df
Move import batch size outside method
2019-01-25 00:28:56 +08:00
leandroalemao
dfa11834e3
[ISSUE-3348] LC: Fix moment.js deprecation warning
2019-01-24 11:16:31 +00:00
luisramos0
9f0958d0a4
Fix conflicts in gemfile lock
2019-01-24 09:36:57 +00:00
Maikel
4cc6a8c966
Merge pull request #3350 from openfoodfoundation/dependabot/bundler/delayed_job_active_record-4.1.3
...
Bump delayed_job_active_record from 4.1.2 to 4.1.3
2019-01-24 11:58:32 +11:00
Maikel
66cb0e6a91
Merge pull request #3352 from openfoodfoundation/dependabot/bundler/foundation-rails-5.5.2.1
...
Bump foundation-rails from 5.5.0.0 to 5.5.2.1
2019-01-24 10:29:17 +11:00
Maikel
a3cd1dc945
Merge pull request #3344 from mkllnk/3279-moment-upgrade
...
Avoid deprecation warnings of momentjs
2019-01-24 10:28:41 +11:00
Maikel
937aaf67c3
Merge pull request #3250 from coopdevs/open-adjustments-for-update
...
[Spree Upgrade] Open adjustments to enable update
2019-01-24 10:25:16 +11:00
Kristina Lim
cf7f8b887f
Add tests for permissions for variant overrides
2019-01-24 07:08:54 +11:00
luisramos0
40014b83bd
Fix order_cycle_management_report shipping methods filter
...
The original fix to adapt to v2 was wrong and still using deprecated order.shipping_method_id, this new version is now filtering the correct shipping_method_id in shipping_rates
2019-01-23 16:43:17 +00:00
Pau Pérez Fabregat
7881f96cac
Merge pull request #3341 from openfoodfoundation/dependabot/bundler/daemons-1.3.1
...
Bump daemons from 1.2.2 to 1.3.1
2019-01-23 16:09:28 +01:00
Pau Pérez Fabregat
8320dc75e8
Merge pull request #3002 from kevinchristianson/margin-fix
...
Fix bad spacing on account settings error page
2019-01-23 16:09:14 +01:00
luisramos0
908c32587b
Fix xero invoices specs in reports_spec by removing the shipping adjustment as this is put in the order by the standard order callbacks when line items are added
2019-01-23 15:07:31 +00:00
Pau Pérez Fabregat
77fd0b228e
Merge pull request #3360 from brases/wording_order_cofirmation
...
Fix wording in email template for orders confirmation
2019-01-23 13:35:00 +01:00
Maikel
2064ffe548
Merge pull request #3354 from luisramos0/knapsack
...
New Knapsack report
2019-01-22 10:58:13 +11:00
Maikel
06af79d1b0
Merge pull request #3339 from Matt-Yorkley/headless4
...
[Headless Chrome] Fix embedded_shopfront_spec unhandled alert
2019-01-22 10:46:42 +11:00
dependabot[bot]
ea7f62123b
Bump jwt from 1.5.6 to 2.1.0
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 1.5.6 to 2.1.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v1.5.6...v2.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-21 19:14:44 +00:00
Pau Pérez Fabregat
2b95b5e797
Merge pull request #3347 from luisramos0/2-0-default-on-demand
...
[Spree Upgrade] Sets StockLocation.backorderable_default to false in test factories
2019-01-21 17:34:46 +01:00
luisramos0
0f26080d79
In lettuce share report spec, call method directly instead of using send
2019-01-21 15:00:37 +00:00
Pau Pérez Fabregat
d8710d283a
Merge pull request #3320 from luisramos0/2-0-subs-mailer
...
[Spree Upgrade] Phase 2 - Subscriptions - Specify :mailer type in SubscriptionMailer spec
2019-01-21 15:09:56 +01:00
Pau Pérez Fabregat
8b1c1881f7
Merge pull request #3351 from openfoodfoundation/dependabot/bundler/diffy-3.3.0
...
Bump diffy from 3.1.0 to 3.3.0
2019-01-21 15:08:24 +01:00
Pau Pérez Fabregat
807c45a25c
Merge pull request #3349 from coopdevs/fix-shipment-without-fee
...
Fix shipment without fee
2019-01-21 14:51:10 +01:00
Pau Pérez Fabregat
659c47340e
Merge pull request #3353 from luisramos0/2-0-stable-jan-17th
...
[Spree Upgrade] Merging master into 2-0-stable (third run in Jan2019)
2019-01-21 11:06:57 +01:00
luisramos0
9b2fb56025
Fix reports_spec sales tax report test by calling count_on_hand setter, setting shipping_method in the right step in the checkout workflow and changing login method to match all other tests in this spec
2019-01-20 20:40:14 +00:00
luisramos0
4669c71b19
Fix lettuce_share_report_spec by adapting count_on_hand setter, it's not a db column anymore
2019-01-20 20:40:14 +00:00
luisramos0
5d86d3769e
Improve variable names in lettuce_share_report_spec
2019-01-20 20:40:14 +00:00
Kevin Christianson
6b7273f685
Convert sass files to scss
2019-01-19 22:40:41 -06:00
nozakis
972bfd5e62
Fixed bad margins on the account settings error page.
2019-01-19 16:23:13 -06:00
Brases
3437257515
Fix wording in order confirmation email template
...
Fixes issue #3063 "Repeated translation in Order Confirmation Screen and Email".
Now "Ready for" (collection time) is not repeated in place of "Collection
details" (collection instructions)
2019-01-19 20:37:21 +00:00
luisramos0
d155bb142c
Make proxy order spec a bit more resilient by allowing two secs diff in timestamps
2019-01-19 15:53:05 +00:00
luisramos0
6f7a351ffa
Update knapsack report to get build jobs more balanced
2019-01-18 23:46:09 +00:00
dependabot[bot]
990b90009e
Bump stripe from 3.3.2 to 4.5.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 3.3.2 to 4.5.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v3.3.2...v4.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-18 19:17:05 +00:00
Matt-Yorkley
3929689d48
Ensure login via modal is completed
2019-01-18 19:06:42 +00:00
dependabot[bot]
49e3aa5070
Bump daemons from 1.2.2 to 1.3.1
...
Bumps [daemons](https://github.com/thuehlinger/daemons ) from 1.2.2 to 1.3.1.
- [Release notes](https://github.com/thuehlinger/daemons/releases )
- [Changelog](https://github.com/thuehlinger/daemons/blob/master/Releases )
- [Commits](https://github.com/thuehlinger/daemons/compare/v1.2.2...v1.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-18 16:52:13 +00:00
dependabot[bot]
1e01cf81ec
Bump diffy from 3.1.0 to 3.3.0
...
Bumps [diffy](https://github.com/samg/diffy ) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/samg/diffy/releases )
- [Changelog](https://github.com/samg/diffy/blob/master/CHANGELOG )
- [Commits](https://github.com/samg/diffy/compare/3.1.0...3.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-18 16:51:42 +00:00
Pau Pérez Fabregat
a95dd98ed6
Merge pull request #2869 from Matt-Yorkley/bi/bulk_invoices
...
[Bulk Invoice Printing] Bulk invoices
2019-01-18 17:49:34 +01:00
Pau Pérez Fabregat
ee28cc5a29
Merge pull request #3323 from openfoodfoundation/dependabot/bundler/paper_trail-5.2.3
...
Bump paper_trail from 3.0.9 to 5.2.3
2019-01-18 17:48:56 +01:00
Pau Perez
a99a4725c9
Add #shipment to conform to OFN's decision
...
This ensures we can still use Order#shipment although Spree deprecates
it, while fixing a bug at the same time. The problem that was making the
test fail was on `Order#shipment` that Spree defines.
If the shipments association changes, `#shipment` returns stale data.
That is because the order object we might be using is still alive, and
so its @shipment ivar still holds an old shipment object (it's not nil)
and thus `@shipment ||= shipments.last` doesn't evaluate the right-hand
side of the expression.
Note that we need to `prepend` the evaluation of the concern (which it's
been rename) for our methods to take precedence over Spree ones. With
`include`, Spree's `#shipment` would still be picked up making the test
fail.
2019-01-18 16:02:51 +01:00
luisramos0
01f0671f6d
Add missing accept alert in products_spec when deleting product properties
2019-01-18 12:45:29 +00:00
luisramos0
6da94fc960
Adapt cart_controller_spec to new variant_stock where variant count_on_hand can only be set after saving the variant
2019-01-18 12:45:29 +00:00
luisramos0
eac365182f
Adapt variants_stock_levels_spec to new variant_stock where variant count_on_hand can only be set after saving the variant
2019-01-18 12:45:25 +00:00
luisramos0
13d65a4a39
Fix Gemfile.lock by running bundle install
2019-01-18 11:43:58 +00:00
luisramos0
0460e7fc6c
Merge branch 'master' into 2-0-stable-jan-17th
2019-01-17 22:51:25 +00:00
luisramos0
f896e78e6f
Set StockLocation.backorderable_default to false in DefaultStockLocation and in StockLocation factory.
...
This makes the default value of variant.on_demand false in all environments and in tests.
Additionally, adapt VariantStock.on_demand test and product factory to this change (setting on_hand value in product factory so it's not out of stock by default).
2019-01-17 20:28:05 +00:00
luisramos0
1d60732581
Improve readability of payment_method_spec
2019-01-17 20:18:43 +00:00
luisramos0
b52c99ac26
Delete on_hand test in product spec, this is already covered in product_stock_spec
2019-01-17 20:18:43 +00:00
dependabot[bot]
2e993542a7
Bump foundation-rails from 5.5.0.0 to 5.5.2.1
...
Bumps [foundation-rails](http://foundation.zurb.com ) from 5.5.0.0 to 5.5.2.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-17 19:20:09 +00:00
dependabot[bot]
560e52a0ce
Bump delayed_job_active_record from 4.1.2 to 4.1.3
...
Bumps [delayed_job_active_record](https://github.com/collectiveidea/delayed_job_active_record ) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/collectiveidea/delayed_job_active_record/releases )
- [Commits](https://github.com/collectiveidea/delayed_job_active_record/compare/v4.1.2...v4.1.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-17 19:17:20 +00:00
dependabot[bot]
adfa6b306c
Bump paper_trail from 3.0.9 to 5.2.3
...
Bumps [paper_trail](https://github.com/airblade/paper_trail ) from 3.0.9 to 5.2.3.
- [Release notes](https://github.com/airblade/paper_trail/releases )
- [Changelog](https://github.com/paper-trail-gem/paper_trail/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airblade/paper_trail/compare/v3.0.9...v5.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-17 19:08:33 +00:00
Pau Pérez Fabregat
c178478a4f
Merge pull request #3346 from luisramos0/headless-chrome
...
Merge Headless Chrome to master
2019-01-17 20:04:27 +01:00
Pau Pérez Fabregat
29990f25c1
Merge pull request #3325 from mkllnk/2469-fix-async-js-requests
...
2469 Fix async js requests
2019-01-17 20:03:54 +01:00
Pau Pérez Fabregat
e8dd6e9ce7
Merge pull request #3322 from luisramos0/delete_archive_spec
...
Delete dead code and unused folders
2019-01-17 20:01:49 +01:00
Luis Ramos
a8998fad79
Merge branch 'master' into headless-chrome
2019-01-17 18:22:25 +00:00
Pau Pérez Fabregat
fd00ad4e94
Merge pull request #3342 from openfoodfoundation/dependabot/bundler/letter_opener-1.7.0
...
Bump letter_opener from 1.6.0 to 1.7.0
2019-01-17 16:55:46 +01:00
Pau Pérez Fabregat
c51aa0f3b8
Merge pull request #3340 from openfoodfoundation/dependabot/bundler/whenever-0.10.0
...
Bump whenever from 0.9.2 to 0.10.0
2019-01-17 16:52:21 +01:00
Matt-Yorkley
e7e208061f
Assign polling numbers to variables and add comments
2019-01-17 09:37:32 +00:00
Matt-Yorkley
a3b9936f37
Improve matching inventory using 'items' unit type
2019-01-17 09:33:39 +00:00
Maikel Linke
4d3aed8467
Avoid deprecation warnings of momentjs
2019-01-17 14:49:43 +11:00
Maikel
9322c3f0c8
Merge pull request #3343 from Matt-Yorkley/headless5
...
[Headless Chrome] Fix datepicker interactions in bulk_order_management_spec
2019-01-17 14:19:00 +11:00
Maikel Linke
520ec5d047
Fix whenever upgrade by declaring dependency
...
Whenever doesn't depend on ActiveSupport any more. So we can't rely on
YAML being automatically loaded for us. We have to require it.
2019-01-17 10:41:11 +11:00
Maikel
7272ec8738
Merge pull request #3333 from Matt-Yorkley/headless3
...
[Headless Chrome] Fix shipping method tests
2019-01-17 09:18:12 +11:00
Matt-Yorkley
b3849778fa
Fix datepicker interactions in bulk_order_management_spec
2019-01-16 21:51:15 +00:00
dependabot[bot]
d884be54f9
Bump letter_opener from 1.6.0 to 1.7.0
...
Bumps [letter_opener](https://github.com/ryanb/letter_opener ) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases )
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-16 19:22:19 +00:00
dependabot[bot]
483d8893f2
Bump whenever from 0.9.2 to 0.10.0
...
Bumps [whenever](https://github.com/javan/whenever ) from 0.9.2 to 0.10.0.
- [Release notes](https://github.com/javan/whenever/releases )
- [Changelog](https://github.com/javan/whenever/blob/master/CHANGELOG.md )
- [Commits](https://github.com/javan/whenever/compare/v0.9.2...v0.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-16 19:18:32 +00:00
Matt-Yorkley
07dff0af7f
Check tag js has finished executing before submitting form
2019-01-16 17:46:56 +00:00
Matt-Yorkley
7487a6da3c
Fix shipping method tests
2019-01-16 17:17:10 +00:00
Matt-Yorkley
5caa958db0
Merge pull request #3336 from luisramos0/chrome-helper-fix
...
Fix Gemfile.lock by running bundle install. Adds missing chromedriver-helper.
2019-01-16 17:16:22 +00:00
Pau Pérez Fabregat
e557e06a7b
Merge pull request #3324 from openfoodfoundation/dependabot/bundler/spring-1.7.2
...
Bump spring from 1.1.3 to 1.7.2
2019-01-16 17:50:08 +01:00
luisramos0
41cd8c7ed3
Fix Gemfile.lock by running bundle install. Adds missing chromedriver-helper.
2019-01-16 16:29:55 +00:00
Matt-Yorkley
21bdaf9960
Fix enterprise images spec
2019-01-16 16:24:01 +00:00
Matt-Yorkley
0589516368
Add chromedriver-helper to Gemfile for test and development
2019-01-16 16:24:01 +00:00
Matt-Yorkley
40ccabc2b4
Fix broken product import spec
2019-01-16 16:24:01 +00:00
Maikel Linke
f391eab5b0
Revert "Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes"
...
This reverts commit 7dc208fb8c .
2019-01-16 16:24:01 +00:00
Maikel Linke
6a53e5fd3d
Avoid alert by waiting until shop loaded
2019-01-16 16:24:01 +00:00
Maikel Linke
dd5bd5b616
Remove js_errors = false from specs because it is not available in Selenium ChromeDriver
...
If the js errors this line was hidding become a problem we will need to address them
2019-01-16 16:24:01 +00:00
luisramos0
fce56776f6
Make embedded_shopfronts_spec work with selenium
2019-01-16 16:24:01 +00:00
luisramos0
5fb4faac91
Make features/admin/subscriptions_spec and shopworkflow work with selenium
...
Also, remove a test support method, dead code
2019-01-16 16:24:01 +00:00
Maikel Linke
e49eb42af6
Make Chrome accepting alerts
2019-01-16 16:21:30 +00:00
Maikel Linke
843ec2c08f
Wait for table rows before testing them
...
Unfortunately, the exact table row matcher doesn't wait correctly for
changes on the page. Waiting correctly would mean to assemble a very
complicated xpath similar to this gem:
https://github.com/jnicklas/capybara_table
2019-01-16 16:21:30 +00:00
Maikel Linke
1407ae7778
Make TableMatcher match exactly, not part of row
...
Reverts dbf3a7aaaf9d458f99e14983ca9db2d4cbe4b564.
The reverted commit tried to avoid a 30 second delay by using
have_selector. While that was successful in reducing test time, it made
the matcher find rows that where not exactly the wanted row, but contained
text of the wanted row. This wasn't a problem until we experimented with
Chrome as test browser returns text on select boxes.
This commit makes the matcher precise again. We still have to deal with
the 30 second delay.
2019-01-16 16:21:30 +00:00
Rob Harrington
ef68bd1b43
Replace unnecessary perform_and_ensure* type helpers with standard actions and expectations
2019-01-16 16:21:30 +00:00
Rob Harrington
98f4ae9b60
Change screen size back to large after authentication_spec
2019-01-16 16:21:30 +00:00
Rob Harrington
a988fad2db
Update orders_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
98a5b40aec
Ensure multiligual switcher specs run in large screen
2019-01-16 16:21:30 +00:00
Rob Harrington
3a781049ed
Update orders_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
3b40ede0b8
Fix table row matchers
...
The matcher was silently failing on the check step (adding ~30 seconds to out specs each time it was used!), so I changed it to fail if the basic step does not succeed
2019-01-16 16:21:30 +00:00
Rob Harrington
56c07aac5c
Don't run ticket printing spec
2019-01-16 16:21:30 +00:00
Rob Harrington
4951863e9b
Update enterprises_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
eccf874f03
Update shopping_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
2b48b4ee18
Update cart_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
bba8b2020c
Replace use of 'trigger' in ui_component helper
2019-01-16 16:21:30 +00:00
Rob Harrington
23fa57ff6d
Update multilingual_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
bbaf6359f3
Update shopping_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
1923c0dbc6
Update enterprise_fees_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
c2432fab0b
Use all_options_absent method instead of poorly written no_options_present
...
SAVES 30 SECONDS FOR EVERY SPEC THAT IS IT USED IN!
2019-01-16 16:21:30 +00:00
Rob Harrington
3e90f9aa1d
Update customers_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
189856a92a
Reimplement resize helper methods to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
1bad08c1c0
Update checkout_workflow and spec_helper to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
3ab7a3d62b
Update order_cycles_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
50a8554b55
Update enterprises_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
69e44bdeb3
Update enterprise_roles_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
5ae33747ea
Update enterprise_relationships_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
7dc792b6fe
Update enterprise_groups_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
e97f5e36a6
Update bulk_order_management_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
2ece6bfb49
Update subscriptions_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
8416af4995
Update variants_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
8413c5f60a
Update variant_overrides_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
5c268e9359
Update schedules_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
708e308b7c
Update products_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
c6a383aafd
Update bulk_product_update_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
cc55f59b00
Update tag_rules_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Rob Harrington
118d26b2ff
Add aynchronous select2 search helper
...
select2_search from spree times out after 1 second, so this new method just waits for a result to be returned before attempting to select it
2019-01-16 16:21:30 +00:00
Rob Harrington
70502a7a32
Switch to using selenium as js driver for capybara specs
...
PhantomJS is no longer being maintained
2019-01-16 16:21:30 +00:00
Rob Harrington
6608655e9a
Use headless chrome for karma specs instead of PhantomJS
...
PhantomJS is no longer being maintained
2019-01-16 16:21:30 +00:00
Pau Perez
1e03835391
Update order while adjustments are open
...
Spree supports updating line items as the model contains these two
callbacks:
f55722b38d/core/app/models/spree/line_item.rb (L27-L28)
However, as
f55722b38d/core/app/models/spree/adjustment.rb (L1-L7)
clearly states, due to Adjustment's state machine, once the order is
finalized it can't be updated. Then, if we want to have an up-to-date
adjustment_total attribute for a complete order we must update it while
the adjustments are open. Otherwise, the following `immutable?` check
does not pass.
f55722b38d/core/app/models/spree/adjustment.rb (L84-L92)
2019-01-16 15:28:54 +01:00
Pau Pérez Fabregat
b05b2c3a5a
Merge pull request #3254 from coopdevs/add-default-stock-location
...
[Spree Upgrade] Create the default StockLocation in DB
2019-01-16 12:57:45 +01:00
Pau Pérez Fabregat
d2325fc7dd
Merge pull request #3230 from luisramos0/stock_levels
...
3222 Improve stock levels calculation code on cart populate and add specs to test handling of variant overrides
2019-01-16 12:54:25 +01:00
Pau Pérez Fabregat
5bb327efbd
Merge pull request #3234 from openfoodfoundation/dependabot/bundler/oauth2-1.4.1
...
Bump oauth2 from 1.2.0 to 1.4.1
2019-01-16 12:33:39 +01:00
Pau Pérez Fabregat
d37d964ab9
Merge pull request #3311 from luisramos0/2-0-stable-jan-11th
...
[Spree Upgrade] Merging master into 2-0-stable (second run in Jan2019)
2019-01-16 12:32:52 +01:00
Matt-Yorkley
79dce01aef
Add spec for new on_demand logic
2019-01-16 01:19:01 +00:00
Matt-Yorkley
7dc7ffe1b7
Update inventory template
2019-01-16 01:18:46 +00:00
Maikel
54311c2d1b
Merge pull request #3304 from HugsDaniel/3288-3291-translation-issues
...
Add I18n keys for order state and order firstname and lastname filters
2019-01-16 09:43:28 +11:00
Maikel
2c197d40bb
Merge pull request #3326 from mkllnk/cleanup-specs
...
Cleanup specs
2019-01-16 09:23:06 +11:00
luisramos0
ea61e415e1
Add bugsnag notifications to detect potential dead code scenarios in variants_stock_levels and cart_service
2019-01-15 13:42:51 +00:00
luisramos0
d926f7c776
Reorganize and improve cart controller spec
2019-01-15 13:42:51 +00:00
luisramos0
aa603c9a84
Make rubocop happy on cart controller, cart service and stock levels service
2019-01-15 13:42:51 +00:00
luisramos0
b0449be302
Add spec to test cart controller handling of variant overrides on cart populate
2019-01-15 13:38:58 +00:00
luisramos0
c0473a4505
Extract variants_stock_levels from cart_controller and refactor some names
2019-01-15 13:38:58 +00:00
Maikel
e56915e65a
Merge pull request #3303 from openfoodfoundation/transifex
...
Transifex
2019-01-15 17:19:21 +11:00
Maikel Linke
5a5db3c458
Fix state of RequestMonitor
...
`@loading` was set to false when the request with the last id finished.
But another request started earlier (having a lower id) could take
longer. `@loading` was set to false even though these long requests were
still active.
2019-01-15 15:45:49 +11:00
Maikel Linke
ca9673f562
Fix Dereferencer service
...
It failed when `object[attr]` was `undefined` instead of `null`.
2019-01-15 15:43:00 +11:00
Maikel
8ba0e3b474
Merge pull request #3302 from mkllnk/74-bundler-version
...
Add script to install required bundler version
2019-01-15 09:36:18 +11:00
dependabot[bot]
22c225968a
Bump spring from 1.1.3 to 1.7.2
...
Bumps [spring](https://github.com/rails/spring ) from 1.1.3 to 1.7.2.
- [Release notes](https://github.com/rails/spring/releases )
- [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/spring/compare/v1.1.3...v1.7.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-14 19:18:25 +00:00
luisramos0
90240f1802
Delete unused folders under /vendor
2019-01-14 14:38:51 +00:00
luisramos0
497974db74
Delete outdated archived version of checkout spec
2019-01-14 14:32:51 +00:00
luisramos0
e2c966244a
Delete /doc.
...
The list of specs is outdated and the images were transfered to the wiki itself
The project docs should be in the wiki
2019-01-14 14:31:31 +00:00
luisramos0
0009b663e7
Specify :mailer type in specs
...
According to RSpec docs we need to specify type: :mailer for mails to
work. Check it out:
https://relishapp.com/rspec/rspec-rails/v/3-8/docs/mailer-specs .
This fixes all specs in SubscriptionMailer
2019-01-13 15:50:35 +00:00
Pau Pérez Fabregat
ccc0a2cf96
Merge pull request #3280 from openfoodfoundation/dependabot/bundler/uglifier-4.1.20
...
Bump uglifier from 4.1.19 to 4.1.20
2019-01-11 19:46:04 +01:00
Pau Perez
5b8c0dffe2
Remove test for a state that is no longer possible
2019-01-11 16:39:06 +01:00
Pau Perez
817bf4caa1
Explain why a index forbids more than a location
2019-01-11 16:39:06 +01:00
Pau Perez
10a678bdfe
Rely on Spree's default StockLocation
2019-01-11 16:39:06 +01:00
Pau Perez
730d5ff7d6
Include the default location in seed data
...
This ensures that new OFN instances will have the proper stock location
set up.
2019-01-11 15:52:25 +01:00
Pau Perez
9ebe112bcc
Abstract OFN's default stock location into a class
2019-01-11 15:52:09 +01:00
luisramos0
9ab99f13c4
Merge branch 'master' into 2-0-stable-jan-11th
2019-01-11 11:58:24 +00:00
Matt-Yorkley
3f62d82afc
Add more inventory testing for visibility in the inventory UI
2019-01-11 11:26:38 +00:00
Maikel Linke
4abacb3691
Remove unused spec helpers
...
They all seem to have been used in the past. People forgot to remove
them after removing the using spec code.
2019-01-11 18:04:24 +11:00
Maikel Linke
e89a836e72
Remove forgotten code from spec
...
Commit e4ebeb8a29 forgot to remove this
code.
2019-01-11 18:04:24 +11:00
Maikel Linke
223982f571
Prepare spec for Chrome testing
2019-01-11 18:04:24 +11:00
Maikel Linke
cbdda54989
DRY specs with new helper
2019-01-11 18:04:24 +11:00
Maikel
4920782742
Merge pull request #3072 from luisramos0/2-0-calc-line-items-for-take-2
...
Fix bug on calculator_decorator line_items_for where input is line_item with a nil order
2019-01-11 14:49:25 +11:00
dependabot[bot]
1548c7c25a
Bump oauth2 from 1.2.0 to 1.4.1
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.2.0 to 1.4.1.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.2.0...v1.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-10 23:46:45 +00:00
dependabot[bot]
7f09112d7b
Bump uglifier from 4.1.19 to 4.1.20
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.19 to 4.1.20.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.19...v4.1.20 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-01-10 23:45:22 +00:00
Maikel
ab14b73e17
Merge pull request #3211 from openfoodfoundation/dependabot/bundler/blockenspiel-0.5.0
...
Bump blockenspiel from 0.4.5 to 0.5.0
2019-01-11 10:42:40 +11:00
Maikel
fff054efc1
Merge pull request #3169 from luisramos0/hubPermissions
...
Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions
2019-01-11 10:41:57 +11:00
Maikel
6c3d769121
Merge pull request #3229 from mkllnk/3127-tax-rates-report
...
3127 More robust tax rates report
2019-01-11 10:41:12 +11:00
Maikel
935e233605
Merge pull request #3244 from luisramos0/ruby-racer
...
Revert to the ruby racer
2019-01-11 10:40:02 +11:00
Hugo Daniel
026fe55f1d
Add I18n keys for order state and order firstname and lastname filters
2019-01-10 15:32:23 +01:00
Transifex-Openfoodnetwork
e70b8c03ce
Updating translations for config/locales/nb.yml
2019-01-10 22:18:58 +11:00
Matt-Yorkley
e624faaacb
Add 'please wait' message to bulk invoice modal
2019-01-10 09:57:06 +00:00
Matt-Yorkley
0e478ff501
Increase polling to 150 seconds maximum before showing error message.
2019-01-10 09:57:06 +00:00
Matt-Yorkley
66ac61f591
Rename background processing method
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4f9f8adcd6
Add Service and remove Job
2019-01-10 09:57:06 +00:00
Matt-Yorkley
003014daf8
Extract invoice methods from ordersCtrl
2019-01-10 09:57:06 +00:00
Matt-Yorkley
bb814f91ef
Extract timeout to named function
2019-01-10 09:57:06 +00:00
Matt-Yorkley
6b6a41cfbc
Update CSS
2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada
Add polling and show action
2019-01-10 09:57:06 +00:00
Matt-Yorkley
b0f75162ac
Add delayed job for create bulk invoice
2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657
Move bulk invoice to new RESTful route
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4a88fb0626
Use simpler array for selected ids
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5279210254
Improve invoice order querying
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f3585befff
Fix customer missing from some order records - guest checkout?
2019-01-10 09:57:06 +00:00
Matt-Yorkley
24207053e4
Reset selected orders on filter change
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5cc8bad42b
Improve UI layout for select all option
2019-01-10 09:57:06 +00:00
Matt-Yorkley
42cf96e635
Disable button unless orders selected
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73
Add bulk invoices printing
2019-01-10 09:57:06 +00:00
Matt-Yorkley
96d530b473
Tidy up invoice template selection
2019-01-10 09:57:06 +00:00
Matt-Yorkley
9a71236abd
Add combine_pdf gem
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f263ef7dc0
Add selectable checkboxes
2019-01-10 09:57:06 +00:00
Maikel
4f5bb96484
Merge pull request #3300 from openfoodfoundation/transifex
...
Transifex
2019-01-10 17:52:28 +11:00
Maikel Linke
199dee3f64
Use install-bundler in setup script
2019-01-10 17:44:13 +11:00
Maikel Linke
dafa433788
Add script to install required bundler version
...
The newest version of bundler is not compatible with our current version
of Ruby. This script helps to install the bundler version defined in
Gemfile.lock.
2019-01-10 17:44:09 +11:00
luisramos0
292f22af4e
Adapt factory completed_order_with_fees to new parent order_with_totals_and_distribution by cleaning up duplicate shipping fees
2019-01-09 23:31:40 +00:00
Transifex-Openfoodnetwork
15e197b3b0
Updating translations for config/locales/en_GB.yml
2019-01-10 07:31:46 +11:00
luisramos0
e787a317dc
Adapt user_balance_calculator_spec to new order_with_totals_and_distribution with shipping fee correctly included in its total
2019-01-09 16:02:09 +00:00
luisramos0
e45f7571fb
Fix order_with_totals_and_distribution by updating shipping fees
2019-01-09 15:20:28 +00:00
Pau Pérez Fabregat
0eefd2455c
Merge pull request #3293 from luisramos0/2-0-stable-jan-8th
...
[Spree Upgrade] Merging master into 2-0-stable (first run in Jan2019)
2019-01-09 16:11:18 +01:00
Pau Pérez Fabregat
399cc5f796
Merge pull request #3224 from alvaro-chalar/footer-message
...
Add custom footer message in reports section
2019-01-09 16:01:02 +01:00
Pau Pérez Fabregat
1815a2116d
Merge pull request #3257 from coopdevs/refactor-enterprise-controller-shop-injection
...
Refactor to reveal how we load enterprises in shop
2019-01-09 13:21:56 +01:00
Maikel
abe4f78e5c
Merge pull request #2988 from Matt-Yorkley/pi/utf8
...
Pi/utf8
2019-01-09 15:39:05 +11:00
Pau Pérez Fabregat
57267ab4a4
Merge pull request #3297 from openfoodfoundation/transifex
...
Transifex
2019-01-08 22:45:55 +01:00
Transifex-Openfoodnetwork
f05f4ce0b1
Updating translations for config/locales/en_GB.yml
2019-01-09 07:06:27 +11:00
Pau Pérez Fabregat
bd10400457
Merge pull request #3295 from coopdevs/pull-translations
...
Update all locales with the latest Transifex translations
2019-01-08 17:58:51 +01:00
Pau Perez
f1f1ab9daf
Update all locales with the latest Transifex translations
2019-01-08 17:17:35 +01:00
luisramos0
2cc8a0e9e3
Fix models/variant_override_spec by setting mandatory on_demand true when count_on_hand is nil
2019-01-08 15:32:10 +00:00
luisramos0
134a51ab1d
Fix merge typo in the cancel email method of the order mailer decorator
2019-01-08 15:31:28 +00:00
luisramos0
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
Maikel
14ccb39478
Merge pull request #3287 from luisramos0/2-0-edit-variants
...
[Spree Upgrade] Fix variant edit page optiontype deface code
2019-01-08 16:37:38 +11:00
Maikel
abbbfd6191
Merge pull request #3286 from luisramos0/2-0-order-spec
...
[Spree Upgrade] Fix specs in admin orders spec
2019-01-08 16:35:59 +11:00
Maikel
a46180ef78
Merge pull request #3282 from luisramos0/2-0-credit-card
...
[Spree Upgrade] Fix credit card spec that was depending on current year
2019-01-08 16:34:03 +11:00
Maikel
68df27df02
Merge pull request #3281 from luisramos0/2-0-tab-ransl
...
[Spree Upgrade] 3119, 3112 and 3073 - fix menu translations
2019-01-08 16:31:41 +11:00
luisramos0
676f0e71b8
Fix variant edit page optiontype deface code
2019-01-07 12:16:47 +00:00
luisramos0
bdefc0ebd1
Fix admin orders spec by adapting the spec to the recently de-defaced page
2019-01-07 12:16:28 +00:00
luisramos0
42eb92c40a
Add missing translation related to capture payments in the backoffice
2019-01-07 12:16:28 +00:00
luisramos0
503d515930
Fix credit card spec that was depending on current year
...
After this commit 5d93d1dedb , this static fix was meant to fail 3f33e28839
2019-01-07 12:16:09 +00:00
luisramos0
d3325ed7bb
Add translation entries for admin menu tabs.
...
This was moved to new namespace tab in spree 2, see 4c82bfdf48
2019-01-07 12:15:36 +00:00
Luis Ramos
db6d39cedd
Merge pull request #3277 from openfoodfoundation/revert-3246-2-0-create-variants
...
Revert "[Spree Upgrade] Set on_demand default value to false in test factories"
2019-01-07 11:46:37 +00:00
luisramos0
364f9f9abd
Improve variable names in cart spec
2019-01-07 11:40:42 +00:00
Pau Pérez Fabregat
34876cc255
Merge pull request #3275 from openfoodfoundation/transifex
...
Transifex
2019-01-07 11:43:06 +01:00
Pau Pérez Fabregat
ed8f719769
Merge pull request #3245 from luisramos0/spring
...
Add spring, a rails preloader alternative to zeus, to our gemfile
2019-01-07 11:07:34 +01:00
luisramos0
2893f1c141
Add test to cover weight calculation bug #3072
2019-01-07 01:18:40 +00:00
Maikel Linke
d2ba305ce6
Fix context data for tax rate finder spec
...
The spec was accidentally finding an exact tax rate match. The new test
data provides only close matches to choose from.
The naming of variables has been simplified as well.
2019-01-04 18:31:46 +11:00
Maikel Linke
a8ccb9b818
Explain why we look for the closest tax rate of a fee
2019-01-04 17:24:45 +11:00
Luis Ramos
116b842852
Revert "[Spree Upgrade] Set on_demand default value to false in test factories"
2019-01-03 23:54:17 +00:00
Maikel
1024fc1f34
Merge pull request #3273 from coopdevs/fix-fr-BE-link
...
Fix menu_1_url translation for fr_BE
2019-01-04 09:52:44 +11:00
Transifex-Openfoodnetwork
9da7ff5698
Updating translations for config/locales/fr.yml
2019-01-04 02:15:57 +11:00
Pau Pérez Fabregat
9f0c6a6bac
Merge pull request #3251 from openfoodfoundation/dependabot/bundler/webmock-3.5.1
...
Bump webmock from 3.4.2 to 3.5.1
2019-01-03 11:18:59 +01:00
Pau Perez
edffbd72fe
Update rubocop_manual_todo
2019-01-03 11:17:10 +01:00
Pau Perez
ddf916814f
Reduce complexity of EnterprisesController#shop
...
As asked by Rubocop.
2019-01-03 11:17:10 +01:00
Pau Perez
e3edb51d3e
Update rubocop_todo
2019-01-03 11:17:10 +01:00
Pau Perez
51da607ab1
Fix too long line
2019-01-03 11:17:10 +01:00
Pau Perez
46760ce28c
Do not double-render when there is no stock
2019-01-03 11:17:10 +01:00
Pau Perez
cca15e75a6
Refactor to reveal how we load enterprises in shop
...
By sticking to Rails conventions we make it more obvious how (badly) we
are loading enterprises in EnterprisesController#shop and shed some
light on the obscure InjectionHelper.
This will also make it easier to improve its performance in the future as
it's among the top offenders. See https://www.skylight.io/app/applications/ibo3NOqCYMnq/1545851520/1d/endpoints/EnterprisesController%23shop?responseType=html
2019-01-03 11:17:10 +01:00
Maikel
ac76580932
Merge pull request #3274 from openfoodfoundation/transifex
...
Transifex
2019-01-03 11:35:47 +11:00
Transifex-Openfoodnetwork
89bf819b37
Updating translations for config/locales/en_US.yml
2019-01-03 00:33:56 +11:00
Pau Perez
112080d8c6
Fix menu_1_url translation for fr_BE
...
The first menu item in OFN BE is currently broken.
2019-01-02 13:10:33 +01:00
Maikel
832dca9742
Merge pull request #3247 from coopdevs/fix-anonymous-checkout-spec
...
[Spree Upgrade] Provide anonymous user instead of nil
2019-01-02 18:13:06 +11:00
Maikel
63ec4b59fe
Merge pull request #3246 from luisramos0/2-0-create-variants
...
[Spree Upgrade] Set on_demand default value to false in test factories
2019-01-02 18:02:34 +11:00
Maikel
f68fd6eea9
Merge pull request #3242 from luisramos0/2-0-line-item-destroy
...
[Spree Upgrade] Fix line item destroy by forcing quantity to zero and update_inventory
2019-01-02 17:44:25 +11:00
Maikel
a3b7364c75
Merge pull request #3241 from luisramos0/2-0-checkout-out-of-stock
...
[Spree Upgrade] Fix checkout_controller_spec
2019-01-02 17:37:34 +11:00
Maikel
3ec7ccb12c
Merge pull request #3240 from luisramos0/2-0-orders-ctrl-api
...
[Spree Upgrade] Fix api orders controller spec broken tests
2019-01-02 17:36:40 +11:00
Maikel
d5c48d7c41
Merge pull request #3239 from luisramos0/2-0-ship-method-restart-checkout
...
[Spree Upgrade] Fix restart checkout spec
2019-01-02 17:33:48 +11:00
dependabot[bot]
8170937708
Bump webmock from 3.4.2 to 3.5.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.4.2 to 3.5.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-27 19:16:35 +00:00
Pau Pérez Fabregat
d88be202a6
Merge pull request #3223 from kristinalim/fix-rubocop_block_length_ignore_rake_routes_dsl
...
Ignore Rake and routes DSL methods in Rubocop BlockLength
2018-12-27 17:14:57 +01:00
Pau Pérez Fabregat
755eca5abe
Merge pull request #3236 from openfoodfoundation/dependabot/bundler/guard-2.15.0
...
Bump guard from 2.14.1 to 2.15.0
2018-12-27 17:14:32 +01:00
Alvaro Chalar
6dccbeca70
Add custom footer message in reports section
2018-12-27 12:22:48 +01:00
Pau Perez
3e793652e8
Provide anonymous user instead of nil
...
As explained in
0181835fb6/app/models/spree/user.rb (L26-L32) ,
all orders have a user so checking out as a guest is just using an
automatically generated user by means of `.anonymous!`.
2018-12-27 12:18:27 +01:00
luisramos0
467623f000
Sets StockLocation.backorderable_default to false in test factories
...
This makes the default value of variant.on_demand be false
2018-12-26 22:16:05 +00:00
luisramos0
fd21914a15
Add spring, a rails preloader alternative to zeus, to our gemfile
...
Add /bin to gitignore, bin is used by spring, rails preloader
2018-12-26 13:36:48 +00:00
luisramos0
4eaaeb37c9
Reverting to therubyracer because mini racer is causing trouble to some developers using osx.
...
We will probably be able to move back to the faster mini racer when we upgrade to newer rails versions
2018-12-26 13:07:52 +00:00
luisramos0
d44c4778e1
Improve line item code by merging multiple destroy hooks into a single hook: update_inventory_on_destroy. This makes the code easier to read
2018-12-24 16:39:06 +00:00
Pau Pérez Fabregat
1ab50798fe
Merge pull request #3189 from luisramos0/3043-i18n-emails
...
Make all mailers use appropriate locale when sending emails
2018-12-24 14:59:04 +01:00
luisramos0
429e513a77
Improve line_item code by moving order.shipment reload to a line_item after_destroy hook
2018-12-23 09:15:18 +00:00
luisramos0
b83ec8d357
Add order.shipments reload to line_item.update_inventory. This is necessary when destroying line items as update_inventory may delete the shipment from the order
2018-12-23 00:23:49 +00:00
luisramos0
26b5250f2c
Fix line item destroy by forcing quantity to zero and update_inventory before_destroy so that the variant is restocked
2018-12-22 23:27:27 +00:00
luisramos0
4dd41bae9c
Change out of stock message in spec. Now the checkout controller is returning the error message, not the line items validator
2018-12-21 21:50:13 +00:00
luisramos0
c2e05e7d87
In api orders controller spec, remove inventory_units_shipment_id_null as the filter was removed in spree 2
...
Also set the distributor used in the tests on completed_order_with_fees so results for that distributor are correct
2018-12-21 16:10:31 +00:00
luisramos0
8970131685
In restart checkout spec, create failed payment before the valid payment otherwise the failed payment will invalidate the previous payment, even if it is a good one
...
In spree 2, every new payment will invalidate all previous payments in the order
See here: c9eebba4f7
2018-12-21 15:13:52 +00:00
luisramos0
7155f28acf
Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details
2018-12-21 15:13:43 +00:00
Luis Ramos
1007addddb
Merge pull request #3232 from luisramos0/2-0-out-of-stock
...
[Spree Upgrade] Scope variants in line items availability validator
2018-12-21 12:05:43 +00:00
Luis Ramos
6935bfdf8b
Merge pull request #3210 from luisramos0/2-0-bom-on-hand
...
[Spree Upgrade] Fix availability validator to include inventory_units in it's validation
2018-12-21 12:04:18 +00:00
luisramos0
6c70998b64
Move StockLocation.fill_status to VariantStock so we can easily override it
2018-12-21 11:33:07 +00:00
luisramos0
17ced61b3d
Override Spree::Variant.in_stock? in VariantStock so that we don’t depend on Spree::Stock::Quantifier
2018-12-21 11:33:07 +00:00
luisramos0
1835d97013
Adapt line_item.sufficient_stock? to spree 2
2018-12-21 11:33:07 +00:00
luisramos0
d641705053
Add variant scoping to availability_validator_decorator by using line_item.scoper and moving Spree::Stock::Quantifier.can_supply? to VariantStock so that it becomes overridable
2018-12-21 11:33:07 +00:00
luisramos0
c0a095ffaf
Improve variant_overrides_spec variable names
2018-12-21 11:33:07 +00:00
luisramos0
4f79fd5be0
Improve availability validator spec readability and remove unnecessary expect statements
2018-12-21 11:19:12 +00:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Maikel
9557457ec2
Merge pull request #3088 from kristinalim/cleanup-test_scripts
...
Run RSpec tests in custom engines (and some fixes, cleanup)
2018-12-21 14:32:56 +11:00
dependabot[bot]
e680559169
Bump guard from 2.14.1 to 2.15.0
...
Bumps [guard](https://github.com/guard/guard ) from 2.14.1 to 2.15.0.
- [Release notes](https://github.com/guard/guard/releases )
- [Changelog](https://github.com/guard/guard/blob/master/CHANGELOG.md )
- [Commits](https://github.com/guard/guard/compare/v2.14.1...v2.15.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-20 19:18:59 +00:00
Pau Pérez Fabregat
e61b7139cc
Merge pull request #3212 from openfoodfoundation/dependabot/bundler/wkhtmltopdf-binary-0.12.4
...
Bump wkhtmltopdf-binary from 0.12.3.1 to 0.12.4
2018-12-20 16:43:24 +01:00
Pau Pérez Fabregat
0876986215
Merge pull request #3227 from openfoodfoundation/dependabot/bundler/momentjs-rails-2.20.1
...
Bump momentjs-rails from 2.5.1 to 2.20.1
2018-12-20 16:36:40 +01:00
luisramos0
c1aeb2e9a3
Improve naming in availability_validator_decorator and cover it with tests
2018-12-20 14:26:34 +00:00
luisramos0
bc22b0a58e
Fix capping quantity to stock levels by always validating line items with quantity zero
...
Stock::Quantifier.can_supply? returns false for an input of zero when stock level is negative
2018-12-20 14:26:34 +00:00
luisramos0
3085e15961
Fix order factory by making line_item.skip_stock_check work in spree 2
2018-12-20 14:26:34 +00:00
luisramos0
88b1bb61d6
Fix availability validator to include inventory_units in it's validation
2018-12-20 14:26:34 +00:00
dependabot[bot]
aac8706f9a
Bump blockenspiel from 0.4.5 to 0.5.0
...
Bumps [blockenspiel](https://github.com/dazuma/blockenspiel ) from 0.4.5 to 0.5.0.
- [Release notes](https://github.com/dazuma/blockenspiel/releases )
- [Changelog](https://github.com/dazuma/blockenspiel/blob/master/History.rdoc )
- [Commits](https://github.com/dazuma/blockenspiel/commits/v0.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-20 08:35:01 +00:00
Pau Pérez Fabregat
2a759a9c0d
Merge pull request #3196 from openfoodfoundation/dependabot/bundler/angularjs-file-upload-rails-2.4.1
...
Bump angularjs-file-upload-rails from 1.1.6 to 2.4.1
2018-12-20 09:31:49 +01:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
Kristina Lim
4adae0a1e8
Disable Knapsack when running engine RSpec tests
2018-12-19 17:50:52 +08:00
Kristina Lim
a460e9d35f
Allow disabling Knapsack when running RSpec tests
2018-12-19 17:50:29 +08:00
Luis Ramos
0aaa41ced0
Merge pull request #3228 from luisramos0/2-0-stable-dec-18th
...
[Spree Upgrade] Merging master into 2-0-stable (third run in Dec2018)
2018-12-19 09:30:57 +00:00
Kristina Lim
abcb71f8b3
Document running app engine RSpec tests
2018-12-19 17:11:03 +08:00
Kristina Lim
12780b722e
Make Travis CI run RSpec tests in app engines
2018-12-19 17:08:27 +08:00
Kristina Lim
74ea1eee6b
Add description for Rake tasks
2018-12-19 17:08:24 +08:00
Kristina Lim
571ad37c3e
Add Rake task openfoodnetwork:specs:engines:rspec
2018-12-19 17:06:33 +08:00
Kristina Lim
f7e03ca60e
Add Rake tasks openfoodnetwork:specs:engines:NAME:rspec
...
The task name follows the directory name under engines/. For example,
for the Web engine in engines/web, run:
bundle exec rake openfoodnetwork:specs:engines:web:rspec
2018-12-19 17:02:19 +08:00
Maikel
4201549992
Merge pull request #3219 from luisramos0/2-0-payment-ctrl
...
[Spree Upgrade] Adapt payment controller spec to spree 2
2018-12-19 15:23:11 +11:00
Maikel Linke
a978e992bf
Remove tax_rates shortcut from adjustment
...
Becoming less dependent on Spree, using our own namespace, keeping
decorators small.
2018-12-19 14:42:38 +11:00
Maikel Linke
fc1b182275
Simplify method complexity and comply with rubocop
2018-12-19 14:31:29 +11:00
Maikel Linke
3169a384ba
Find approximate tax rate if no other is found
...
There are several cases in which a tax rate is not associated with an
adjustment. We find the closest one for reporting here. It is not a good
solution, but a workaround introduced for reporting:
https://github.com/openfoodfoundation/openfoodnetwork/pull/1496
2018-12-19 14:31:29 +11:00
Maikel Linke
a341561446
Move tax rate finding into service and spec it
...
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
2018-12-19 14:31:29 +11:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
Maikel
84f2f9af3c
Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new
...
[Defacepocalypse] De-deface payment methods new and form
2018-12-19 09:44:57 +11:00
dependabot[bot]
6de1844b7c
Bump momentjs-rails from 2.5.1 to 2.20.1
...
Bumps [momentjs-rails](https://github.com/derekprior/momentjs-rails ) from 2.5.1 to 2.20.1.
- [Release notes](https://github.com/derekprior/momentjs-rails/releases )
- [Changelog](https://github.com/derekprior/momentjs-rails/blob/master/news.md )
- [Commits](https://github.com/derekprior/momentjs-rails/compare/v2.5.1...v2.20.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-18 19:14:54 +00:00
luisramos0
5e960512ac
Set user locale on user registrations #create
...
This is done so that user.locale is used in the first confirmation email. This also stores user.locale in the DB from registration.
2018-12-18 15:30:01 +00:00
luisramos0
a9222665b8
Refactor user registrations controller, early return to reduce indentation
2018-12-18 15:26:49 +00:00
Pau Pérez Fabregat
0c8cb8abe2
Merge pull request #3218 from coopdevs/handle-soft-deleted-products-in-serializer-spec
...
Handle soft deleted products in serializer spec
2018-12-18 08:59:36 +01:00
Maikel
f36c045425
Merge pull request #3213 from kristinalim/fix-rubocop_block_length_ignore_it
...
Ignore `it` in Rubocop BlockLength
2018-12-18 11:42:14 +11:00
Matt-Yorkley
d34b8c52b8
Update all locales with the latest Transifex translations
2018-12-17 11:17:54 +00:00
Pau Pérez Fabregat
54775f6b6a
Merge pull request #3221 from zvkemp/skylight-1.7.2
...
update Skylight to 1.7.2
2018-12-17 10:44:16 +01:00
Pau Pérez Fabregat
1876ec42dc
Merge pull request #3201 from kevinchristianson/add-missing-stars
...
Add missing 'required field' stars in new product form
2018-12-17 10:36:51 +01:00
Pau Pérez Fabregat
554d650b8c
Merge pull request #3176 from kevinchristianson/button-translation-fix
...
Fix untranslated buttons at image step of registration modal
2018-12-17 10:36:07 +01:00
Pau Pérez Fabregat
2deffb9c9f
Merge pull request #3076 from Matt-Yorkley/orders_checkboxes
...
Fix checkbox values on orders page
2018-12-17 10:35:46 +01:00
Luis Ramos
dc6509aa83
use association on updates rather than #find
...
Co-Authored-By: sauloperez <saulopefa@gmail.com >
2018-12-17 10:31:52 +01:00
Kristina Lim
216c598e74
Ignore more methods in Metrics/BlockLength cop
...
Ignore these additional methods:
* collection
* member
* namespace
* resource
* resources
2018-12-17 05:21:20 +08:00
Kristina Lim
fb5a9356dc
Fix spec_helper.rb of web engine
...
This fixes the tests of the web engine when running the following from
its root: bundle exec rspec
An engine is meant to have some independence from the main application,
and its tests should be run independently.
This should be using the engine's own dummy application, actually, or
the dummy application of a dependency.
2018-12-15 16:11:15 +08:00
Kristina Lim
93940ced3a
Remove outdated comment recommending knapsack
...
We are already using this.
2018-12-15 16:11:12 +08:00
zvkemp
d3d43c8808
update Skylight to 1.7.2
2018-12-14 12:25:41 -08:00
luisramos0
a5bf7a1f35
Adapt payment controller spec to spree 2
...
In spree 2, since 5ed6015916 , to fire a payment event the order needs to be in either payment or complete state
2018-12-14 16:04:19 +00:00
Pau Pérez Fabregat
fe0c56c800
Merge pull request #3174 from kevinchristianson/footer-url-fix
...
Fix broken registration link in footer
2018-12-14 15:42:08 +01:00
dependabot[bot]
2f19b37b54
Bump angularjs-file-upload-rails from 1.1.6 to 2.4.1
...
Bumps [angularjs-file-upload-rails](https://github.com/marthyn/angularjs-file-upload-rails ) from 1.1.6 to 2.4.1.
- [Release notes](https://github.com/marthyn/angularjs-file-upload-rails/releases )
- [Commits](https://github.com/marthyn/angularjs-file-upload-rails/commits/v2.4.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-14 14:29:42 +00:00
Pau Pérez Fabregat
34a42cc592
Merge pull request #3181 from luisramos0/roadie-rails-upgrade
...
Bump roadie-rails from 1.0.3 to 1.1.1
2018-12-14 15:26:25 +01:00
Pau Perez
be6c8be07a
Handle soft deleted products when refreshing cache
...
Since cd3add960e Spree soft-deletes products and as such the models not
destroyed but updated setting a value for the `deleted_at` field.
This turns what used to be deletes into updates thus triggering AR's
update callbacks instead of the destroy ones. As a result, this bypasses
the logic to refresh the products cache on destroy and hits the
`after_save` callback.
Furthermore, since act_as_paranoid (the soft-delete gem Spree uses) uses
a default scope to avoid retrieving soft-deleted records we need to
purposefully fetch them in order to refresh the cache.
2018-12-14 15:13:06 +01:00
Pau Perez
51e277a183
Make test setup more readable
2018-12-14 15:12:41 +01:00
Kristina Lim
d0d10eba4b
Ignore it method in Rubocop BlockLength
2018-12-14 17:44:19 +08:00
Kristina Lim
77a6562762
Make DB migration generate summary by distributor
2018-12-14 13:02:43 +08:00
Kristina Lim
a6664d0ac6
Move report generated by migration to subdirectory
...
This is in preparation of an upcoming change to split the main CSV file
by distributor.
2018-12-14 13:00:42 +08:00
Kristina Lim
91e5a523f0
Add /reports/ to .gitignore but ignore README
...
Using the first slash to make sure that other reports/ directories are
not ignored.
2018-12-14 10:25:23 +08:00
Kristina Lim
d859939c79
Add README.md to reports/ directory
2018-12-14 10:24:26 +08:00
Kristina Lim
6458127892
Add undo logic for DB migration script
2018-12-14 10:09:09 +08:00
Kristina Lim
5a98acd101
Log changes from DB migration to CSV file
2018-12-14 10:09:09 +08:00
Kristina Lim
842a11b564
Refactor DB migration script
2018-12-14 10:09:08 +08:00
Maikel
24ca66bd71
Merge pull request #3207 from luisramos0/2-0-insuf-stock-transl
...
[Spree Upgrade] Add missing spree translations related to insufficient stock
2018-12-14 12:05:06 +11:00
Maikel
1ed880e353
Merge pull request #3206 from coopdevs/fix-redirection-on-admin-products-specs
...
[Spree Upgrade] Fix redirection on admin products specs
2018-12-14 11:59:21 +11:00
Maikel
f0d3992511
Merge pull request #3203 from luisramos0/2-0-fix-prod-images-delete
...
[Spree Upgrade] Fix product properties and images deletion
2018-12-14 11:54:05 +11:00
dependabot[bot]
2ecec93514
Bump wkhtmltopdf-binary from 0.12.3.1 to 0.12.4
...
Bumps [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem ) from 0.12.3.1 to 0.12.4.
- [Release notes](https://github.com/zakird/wkhtmltopdf_binary_gem/releases )
- [Changelog](https://github.com/zakird/wkhtmltopdf_binary_gem/blob/master/CHANGELOG )
- [Commits](https://github.com/zakird/wkhtmltopdf_binary_gem/compare/0.12.3.1...0.12.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-13 19:19:36 +00:00
Pau Pérez Fabregat
2eb6d0a047
Merge pull request #3185 from openfoodfoundation/dependabot/bundler/oj-3.7.4
...
Bump oj from 3.6.10 to 3.7.4
2018-12-13 18:10:55 +01:00
Kristina Lim
aa92dd8771
Declare VariantOverride in migration for safe use
2018-12-13 23:29:05 +08:00
Kristina Lim
9e3332ba2a
Rename DB migration file
2018-12-13 23:25:48 +08:00
Maikel
eb016c0471
Merge pull request #3145 from openfoodfoundation/dependabot/bundler/i18n-js-3.1.0
...
Bump i18n-js from 3.0.11 to 3.1.0
2018-12-13 10:58:22 +11:00
Maikel
eedba7a35b
Merge pull request #3197 from luisramos0/2-0-product-stock
...
[Spree Upgrade] Adapt Product level stock management to Spree 2
2018-12-13 10:53:46 +11:00
Pau Pérez Fabregat
d317603872
Merge pull request #3187 from openfoodfoundation/dependabot/bundler/rspec-rails-3.8.1
...
Bump rspec-rails from 3.7.2 to 3.8.1
2018-12-12 17:14:05 +01:00
Pau Pérez Fabregat
64e41712c6
Merge pull request #3130 from coopdevs/extract-restart-checkout
...
Extract restart checkout
2018-12-12 17:12:53 +01:00
luisramos0
5183c90c89
Add missing spree translations related to insufficient stock
2018-12-12 15:34:48 +00:00
Pau Perez
43cacfc2fc
Fix redirection on admin/products controller specs
...
In Spree v2.0 the product attributes being sent were no longer valid.
Providing a shipping category and setting a stock location on the DB so
that a stock item can be created fixes them.
Remember `Variant#create_stock_item`, which is defined as an
`after_create` callback, relies on `StockLocation` to create the item.
2018-12-12 13:10:39 +01:00
luisramos0
47be452ca0
Make ProductsController#create and #update work by not mass-assigning the provided on_hand and on_demand values and set them in product variant after the product is created
2018-12-12 12:10:29 +00:00
luisramos0
66e69edca4
Rename ProductOnDemand to ProductStock; move product.on_hand into it; add product.on_demand; and remove unnecessary on_demand=
2018-12-12 12:10:25 +00:00
Pau Perez
28cb1bf687
Clarify nasty boolean logic on method
2018-12-12 12:57:23 +01:00
luisramos0
181915c63a
Fix deletion of product properties
2018-12-11 15:53:40 +00:00
luisramos0
4b74e50353
Make ProductsController#bulk_update work by making ProductSet#create_variant not mass-assigning the provided on_hand and on_demand values and set them after each variant is created
2018-12-11 15:18:00 +00:00
luisramos0
b5379a204b
Fix deletion of product images
2018-12-11 15:10:26 +00:00
luisramos0
e274442d77
Cover i18nhelper.valid_locale and user mailer with tests related to localized emails
2018-12-11 11:16:50 +00:00
Maikel
1819fc8493
Merge pull request #3199 from luisramos0/2-0-stable-dec-10th
...
[Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)
2018-12-11 18:50:24 +11:00
Pau Pérez Fabregat
7834fa4d00
Merge pull request #3190 from luisramos0/2-0-new-product
...
[Spree Upgrade] Fix "new product" page specs and an html issue
2018-12-11 08:35:26 +01:00
haseleyi
835617159e
Add missing 'required field' stars in new product form
2018-12-10 18:02:39 -08:00
Maikel
d63ae792b3
Merge pull request #2775 from luisramos0/2-0-checkout-ship-method
...
[Spree Upgrade] Handle shipping_method_id in checkout
2018-12-11 11:59:03 +11:00
Matt-Yorkley
0c5ac99e0f
Fix multiple results with 'inventory_items_shipment_id_null' ransack query
...
The q['inventory_items_shipment_id_null'] search element was generating duplicates where there were multiple line items on an order that were ready to be shipped, with id = null
2018-12-10 20:48:53 +00:00
Matt-Yorkley
e711c5ed03
Add spec for search filters
2018-12-10 20:48:53 +00:00
Matt-Yorkley
d48774e3a2
Add comment
2018-12-10 20:48:53 +00:00
Matt-Yorkley
997169b974
Fix checkbox values on orders page
2018-12-10 20:48:53 +00:00
luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
Luis Ramos
1bc51dea40
Merge pull request #3195 from mkllnk/2938-fix-create-order
...
[Spree Upgrade] 2938 Fix Create Order in Admin - missing translation
2018-12-10 13:20:02 +00:00
Pau Pérez Fabregat
b8a61257da
Merge pull request #3188 from luisramos0/2-0-ctrl-specs
...
[Spree Upgrade] Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-10 12:31:26 +01:00
luisramos0
4f4fc00549
Improve code, specs and comments in the shipping_method selection process in the checkout controller
2018-12-09 20:05:10 +00:00
luisramos0
38ff99717a
Fix bug on calculator_decorator line_items_for where input is line_item with an nil order. Adapted line_items_for so that weight_calculator.line_items_for could be removed.
2018-12-09 19:37:11 +00:00
Kristina Lim
df51d137dc
Update some code style for product import
2018-12-10 03:30:52 +08:00
Kristina Lim
cec50e81f5
Make product import set correct VO stock settings
2018-12-10 03:30:46 +08:00
Kristina Lim
0de829017a
Refactor finding or initializing VO for product import
2018-12-10 03:30:39 +08:00
Kristina Lim
c873a7b8e3
Move stock settings override validation to concern
2018-12-09 23:29:36 +08:00
Kristina Lim
1bfdb708c1
Add app/models/concerns to autoload path
2018-12-09 23:29:36 +08:00
Kristina Lim
d67b3faf01
Address affected specs from new VO validations
2018-12-09 21:48:08 +08:00
Kristina Lim
34313c94ca
Make reset stock settings for VO force limited stock
2018-12-09 21:47:05 +08:00
Kristina Lim
ad35ea1102
Add factory stock traits for variant overrides
2018-12-09 21:47:05 +08:00
Kristina Lim
210a11783c
Test that saving invalid variant override provides error
2018-12-09 21:43:57 +08:00
luisramos0
8fb103ce8d
Fix new_product div in new product page
2018-12-08 14:53:50 +00:00
luisramos0
7ecce51b8b
Create default stock location and set required product.shipping_category in specs that create products
2018-12-08 14:52:50 +00:00
Maikel Linke
cac4fa4816
Use I18n.t instead of Spree's JS t function
2018-12-07 23:38:05 +11:00
Kristina Lim
4c0c0bbfd0
Simplify stock configuration in existing variant overrides
2018-12-07 14:40:15 +08:00
Kristina Lim
83b6973bc2
Require compatible VO on_demand and count_on_hand
2018-12-07 14:39:36 +08:00
Maikel
046ba14da4
Merge pull request #3191 from openfoodfoundation/dependabot/bundler/knapsack-1.17.1
...
Bump knapsack from 1.16.0 to 1.17.1
2018-12-07 15:18:25 +11:00
haseleyi
3f6e96dd5d
Fix comment
2018-12-06 14:07:45 -08:00
haseleyi
4a0744dd94
Add comment to explain hard-coded link
2018-12-06 11:49:39 -08:00
dependabot[bot]
6ae2df7b92
Bump knapsack from 1.16.0 to 1.17.1
...
Bumps [knapsack](https://github.com/ArturT/knapsack ) from 1.16.0 to 1.17.1.
- [Release notes](https://github.com/ArturT/knapsack/releases )
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ArturT/knapsack/compare/v1.16.0...v1.17.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 19:16:09 +00:00
luisramos0
b9b91231ae
Fix rubocop issues in mailers
2018-12-06 14:18:24 +00:00
luisramos0
0f442a911e
Improve I18nHelper.valid_locale to handle empty objects
2018-12-06 12:48:48 +00:00
luisramos0
feea499298
Make all mailers use appropriate locale when sending emails
2018-12-06 11:45:44 +00:00
Kristina Lim
71db9f5289
Import CSS variables in admin/components/input
2018-12-06 14:08:06 +08:00
Maikel
da6dc20fcf
Merge pull request #3165 from coopdevs/fix-send-confirmation-instructions-specs
...
[Spree Upgrade] Fix send confirmation instructions specs
2018-12-06 16:24:40 +11:00
Maikel
883e9bbdd8
Merge pull request #3166 from luisramos0/2-0-orders-tab-without-shipments
...
[Spree Upgrade] Remove shipments option from orders tab (gone in spree 2)
2018-12-06 15:39:14 +11:00
luisramos0
c33ca508f7
Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions
2018-12-06 15:35:44 +11:00
Maikel
1b94b10bb0
Merge pull request #3171 from luisramos0/2-0-var-over-hide
...
[Spree Upgrade] Remove hide class from the hide button in the inventory list
2018-12-06 15:21:34 +11:00
Maikel
3a3c9f3847
Merge pull request #3177 from coopdevs/dont-clean-db-twice-in-feature-specs
...
Do not clean DB twice on feature specs
2018-12-06 12:36:34 +11:00
luisramos0
7df869bd35
Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-05 22:22:15 +00:00
haseleyi
75277e92e4
Lazy-load the translations for images step of registration
2018-12-05 11:36:27 -08:00
dependabot[bot]
727cc9d578
Bump rspec-rails from 3.7.2 to 3.8.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.7.2 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-05 19:19:50 +00:00
dependabot[bot]
ebff8be996
Bump oj from 3.6.10 to 3.7.4
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.10 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.10...v3.7.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-05 19:16:55 +00:00
luisramos0
afd243c548
Replace stub with allow in checkout_controller_spec
2018-12-05 15:40:14 +00:00
luisramos0
bbc61b4eda
Bump roadie-rails to 1.1.1
2018-12-05 15:11:45 +00:00
Pau Pérez Fabregat
1052d98255
Merge pull request #3175 from haseleyi/patch-1
...
Fix link to Mac setup guide in Getting Started
2018-12-05 12:52:08 +01:00
luisramos0
460e010408
Removed shipments from orders tab. This option is removed in spree 2
2018-12-05 11:38:16 +00:00
Pau Pérez Fabregat
72a4b4f8e2
Merge pull request #3158 from luisramos0/2-0-vos-scoping
...
[Spree Upgrade] Scopes variants on order completion and on changes to completed orders
2018-12-05 12:12:49 +01:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
802e3bb447
Refactor choosing VO on_demand in feature specs
...
We are still using the Rails view I18n scope for :use_producer_settings.
Angular requires this replacement of the default blank option, which we
use for nil on_demand, to be in the template itself.
If we eventually move this template to a JS template, we can move it to
the same I18n scope as the :yes and :no options.
2018-12-05 17:40:31 +08:00
Kristina Lim
d8908bdf4b
Remove unused translation keys js.yes and js.no
2018-12-05 17:40:31 +08:00
Kristina Lim
47d51ca525
Prefer guard clause in updateCountOnHand for VOs
2018-12-05 17:40:31 +08:00
Kristina Lim
34c34b94d1
Describe method countOnHandPlaceholder for VOs
2018-12-05 17:40:30 +08:00
Kristina Lim
cff4eb0005
Improve and simplify VO count on hand suggestions
...
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
f5dc03e118
Style disabled text fields in admin pages
2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7
Make VO count on hand readonly unless limited stock
2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5
Ensure in UI compatible VO count and on demand
2018-12-05 17:40:28 +08:00
Kristina Lim
a32bb0445f
Change translation for variant override use_producer_settings
2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c
Translate variant override on_demand yes and no
2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4
Allow reset of "on demand" for variant overrides
...
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.
This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
Pau Perez
6af8544c52
Restore perform_deliveries value in tests
2018-12-05 10:20:13 +01:00
Pau Perez
25eb297215
Perform delivery when checking deliveries in specs
2018-12-05 10:05:39 +01:00
Pau Perez
064d9cf183
Do not hide flaky tests under endless retries
...
If it fails, needs fixing, not hiding the problem and making the test
suite longer.
2018-12-05 10:05:39 +01:00
Pau Perez
5845f80af0
Remove commented out code
...
Because git keeps it for you.
2018-12-05 10:05:39 +01:00
Pau Perez
6594529cda
Fix manager invitation controller spec
2018-12-05 10:05:39 +01:00
Pau Perez
25567d6bd6
Do not clean DB twice on feature specs
...
It turns out that we were executing `DatabaseCleaner.clean` on two
`after(:each)` blocks. One for all specs and another one for `js: true`
specs. As a result feature specs were hitting both which slows them down
considerably.
On my machine this changes consistently saves 2sec on
`spec/features/consumer/shops_spec.rb` but chances are it has an
accumulative effect when run on the whole test suite.
2018-12-05 09:58:14 +01:00
Pau Pérez Fabregat
3b56212290
Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1
...
Remove frontoffice enterprises n+1
2018-12-05 08:12:19 +01:00
Pau Pérez Fabregat
e5a267f4c2
Merge pull request #2735 from luisramos0/cookies_colors
...
Moved definition of colors in the cookies modal and banner colors to common darkswarm/base/colors
2018-12-05 08:06:58 +01:00
haseleyi
94d12217de
Fix untranslated buttons at image step of registration modal
2018-12-04 21:30:42 -08:00
Isaac Haseley
76e5d281bf
Fix link for Mac setup guide
2018-12-04 20:37:23 -08:00
Maikel
609a4fde4d
Merge pull request #3173 from openfoodfoundation/transifex
...
Transifex
2018-12-05 11:55:29 +11:00
Maikel
a2c8bea147
Merge pull request #3147 from luisramos0/2-0-vos
...
[Spree Upgrade] Adapt variant overrides to spree 2
2018-12-05 10:50:20 +11:00
Transifex-Openfoodnetwork
18a5f53330
Updating translations for config/locales/fr.yml
2018-12-05 09:17:00 +11:00
haseleyi
e863c3dec8
Fix broken link in register call partial
2018-12-04 10:23:46 -08:00
Pau Pérez Fabregat
24415226bf
Merge pull request #3168 from luisramos0/google-maps-comment-specs
...
Temporarily xit 2 broken specs (shops and producers search by url)
2018-12-04 19:13:40 +01:00
Transifex-Openfoodnetwork
9bedc69df8
Updating translations for config/locales/en_GB.yml
2018-12-05 04:52:44 +11:00
luisramos0
02d0b7e88c
Improve comment on VariantStock#move
2018-12-04 15:25:38 +00:00
Pau Pérez Fabregat
30e7d32cea
Merge pull request #3157 from coopdevs/fix-producer-mailer-specs
...
[Spree Upgrade] Specify :mailer type in specs
2018-12-04 15:21:17 +01:00
luisramos0
7dc208fb8c
Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes
2018-12-04 13:20:20 +00:00
luisramos0
7f7e7ea65e
Remove hide class from the hide button in the inventory list
...
The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it
2018-12-04 10:55:55 +00:00
Maikel Linke
66585e93a8
Update all locales with the latest Transifex translations
2018-12-04 14:48:03 +11:00
Maikel
60c8147391
Merge pull request #3164 from luisramos0/2-0-stable-dec-3rd
...
[Spree Upgrade] Merging master into 2-0-stable (first run in Dec2018)
2018-12-04 13:38:02 +11:00
Maikel
214235d8dd
Merge pull request #3152 from coopdevs/fix-product-spec
...
[Spree Upgrade] Fix product spec
2018-12-04 12:07:33 +11:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Pau Perez
46bf4c9eea
Specify :mailer type in specs
...
According to RSpec docs we need to specify type: :mailer for mails to
work. Check it out:
https://relishapp.com/rspec/rspec-rails/v/3-8/docs/mailer-specs .
This fixes all specs in producer_mailer_spec.rb.
2018-12-03 15:41:58 +01:00
luisramos0
258287b88d
Add tests to cover CheckoutController#update with shipping_method_id
2018-11-30 17:04:46 +00:00
luisramos0
e23c4dda68
Add order_shipping_method specs to cover select_shipping_method
2018-11-30 12:58:27 +00:00
luisramos0
7a8c65b3ea
In the checkout controller update process, grab shipping_method_id from form data and inject it in the order when the order workflow gets to delivery (which is when the order gets shipments created)
2018-11-30 10:46:31 +00:00
luisramos0
c032401eb0
Refactor checkout controller update method
2018-11-30 10:45:42 +00:00
Hugo Daniel
24dab58de7
Lazy load translations and add keys
2018-11-30 10:49:36 +01:00
Maikel
f859b7d3de
Merge pull request #3153 from coopdevs/fix-missing-translations-in-password-edit
...
[Spree Upgrade] Add missing translations causing a test failure
2018-11-30 15:48:42 +11:00
luisramos0
d962358f15
Fix rubocop and transpec models/variant_override and its spec
2018-11-30 00:43:55 +00:00
luisramos0
0577011f5b
Refactor variant override model and its spec: simplify move_stock and remove unused methods
2018-11-30 00:22:04 +00:00
luisramos0
782530d93b
Scope variants in shipment manifest as they are fetched from DB
2018-11-29 20:43:15 +00:00
luisramos0
a18d289292
Scope variants on line_item before save hook update_inventory
2018-11-29 20:43:10 +00:00
luisramos0
6156aca467
Delegate stock_location.move to variant, and override it in the variant overrides scope
2018-11-29 19:32:52 +00:00
luisramos0
1c5d94472f
Make colors.css relative reference to branding.css an absolute reference so that colors can be imported in engines
2018-11-29 18:39:58 +00:00
Pau Pérez Fabregat
08297863be
Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page
...
Expand all steps in the checkout page by default
2018-11-29 16:28:42 +01:00
Pau Pérez Fabregat
9f17acd63c
Merge pull request #3136 from kevinchristianson/dashboard-translation
...
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-29 16:27:05 +01:00
Hugo Daniel
aa948552e1
Import payment_methods edit view and apply overrides
2018-11-29 14:58:14 +01:00
Hugo Daniel
34bc79c7f6
Import payment_methods form partial and apply overrides
2018-11-29 14:58:06 +01:00
Hugo Daniel
29bc4c52a5
Import payment_methods#new view and apply overrides
2018-11-29 14:56:28 +01:00
luisramos0
93e1310deb
Fixed bug in cookies css, import colors, not branding
2018-11-29 11:47:51 +00:00
luisramos0
cdc5899791
Moved cookies policy modal and cookies banner colors to darkswarm/base/colors.scss
2018-11-29 11:47:51 +00:00
Luis Ramos
2284bfb604
Merge pull request #3150 from luisramos0/new-knapsack-report
...
[Spree Upgrade] New up to date knapsack report for 2-0-stable branch
2018-11-29 11:13:51 +00:00
Pau Pérez Fabregat
949efd88ce
Merge pull request #3154 from mkllnk/update-db-schema
...
Update schema for latest migration
2018-11-29 11:34:43 +01:00
Maikel Linke
285346fcda
Update schema for latest migration
...
I feel embarrased that this is the second follow up of my last
migration: https://github.com/openfoodfoundation/openfoodnetwork/pull/3126
The last migration didn't change any database structure, but the schema
still needs the latest migration version. Otherwise it will display
pending migrations when setting up the database.
This commit allows to run `bundle exec rake db:reset` in development
without the following message:
Run `rake db:migrate` to update your database then try again.
You have 1 pending migrations:
20181123012635 AssociateCustomersToUsers
The next pull request with a migration would have solved this problem as
well.
2018-11-29 10:29:56 +11:00
Pau Perez
957c38e4f2
Add missing translations causing a test failure
2018-11-28 18:38:09 +01:00
Pau Perez
7834b1d3f3
Fix test case for invalid product master
2018-11-28 17:39:59 +01:00
Pau Perez
ab542cfdb2
Remove commented out code
2018-11-28 17:39:51 +01:00
Pau Pérez Fabregat
3ea7fac25f
Merge pull request #3095 from luisramos0/admin-users-transl
...
In admin/users, convert Spree.t calls to t calls and use lazy lookup
2018-11-28 17:37:42 +01:00
Pau Pérez Fabregat
8df781887a
Merge pull request #3111 from kevinchristianson/pay-list-translation
...
Add translation for 'Back to Payments List' button in new payment form
2018-11-28 17:03:29 +01:00
Pau Pérez Fabregat
64c12c7a65
Merge pull request #2955 from HugsDaniel/import-spree-views-for-orders#edit
...
Import Spree views for orders#edit in our codebase
2018-11-28 17:02:40 +01:00
Pau Perez
96202ab00d
Fix Rubocop violations
2018-11-28 16:23:56 +01:00
Pau Perez
e0f43191e2
Make helper methods private
...
Otherwise next dev might think these are attributes of the resulting
JSON serialized object.
They just made the refactoring a bit easier.
2018-11-28 16:21:40 +01:00
Pau Perez
c330d931ce
Eager load product properties to avoid N+1
...
This totally removes the following N+1 query from the GET /shops request
```sql
SELECT "spree_properties".* FROM "spree_properties"
INNER JOIN "spree_product_properties"
ON "spree_product_properties"."property_id" = "spree_properties"."id"
INNER JOIN "spree_products"
ON "spree_products"."id" = "spree_product_properties"."product_id"
INNER JOIN "enterprises"
ON "enterprises"."id" = "spree_products"."supplier_id"
WHERE "spree_products"."supplier_id" = 24;
```
The product properties of the corresponding enterprises are now loaded
in a single query fired from the controller.
2018-11-28 16:21:40 +01:00
Pau Perez
4608c434b4
Eager load producer properties to avoid N+1
...
This totally removes the following N+1 query from the GET /shops request
```sql
SELECT "spree_properties".* FROM "spree_properties"
INNER JOIN "producer_properties"
ON "spree_properties"."id" = "producer_properties"."property_id"
WHERE "producer_properties"."producer_id" = 17
ORDER BY producer_properties.position;
```
The producer properties of the corresponding enterprises are now loaded
in a single query fired from the controller.
2018-11-28 16:21:40 +01:00
Pau Perez
e40c1c08ca
Refactor spec to not stub the class under test
...
This also relies on ActiveRecord which will come in handy as we move on
the refactor.
2018-11-28 16:21:40 +01:00
Pau Perez
149fc1ac6f
Inline PropertyMerge's #merge into serializer
...
Now that it has become a plain Ruby #uniq, there's no point on having
the abstraction and indirection.
2018-11-28 16:21:40 +01:00
Pau Perez
faac5f4b2d
Refactor PropertyMerge to use Ruby's #uniq instead
2018-11-28 16:21:40 +01:00
Pau Perez
1363a2a17d
Improve readability of spec
2018-11-28 16:21:40 +01:00
Pau Perez
8e1f9a1ba3
Refactor #product_properties not to fetch ids
2018-11-28 16:21:40 +01:00
Pau Perez
bc7258d43b
Test #supplied_properties helper methods
2018-11-28 16:21:40 +01:00
Pau Perez
23f629cfd6
Autofix all Rubocop violations in serializer
2018-11-28 13:54:42 +01:00
Pau Perez
c6ab5feb81
Move cached & uncached serializers to their files
2018-11-28 13:54:42 +01:00
Pau Perez
41d988176c
Pass enterprises to inject method from controller
2018-11-28 13:54:42 +01:00
Pau Perez
5a85d7a77b
RSpec3-ize controller spec
2018-11-28 13:54:42 +01:00
Pau Pérez Fabregat
b9dfaea274
Merge pull request #3143 from coopdevs/setup-rack-mini-profiler
...
Enable rack-mini-profiler in development
2018-11-28 13:54:27 +01:00
Pau Pérez Fabregat
438cff6e6d
Merge pull request #3080 from Matt-Yorkley/pi/french_issue
...
Pi/french issue
2018-11-28 13:39:04 +01:00
luisramos0
3009ab2f1a
New up to date kanpsack report for 2-0-stable branch
2018-11-28 12:36:22 +00:00
Hugo Daniel
69e186f482
Define dynamic classes in variables as a turnaround to HAML bug
2018-11-28 10:31:47 +01:00
Hugo Daniel
65dd3eb5b9
Change line items controller HTML response spec to look for form order_edit class
2018-11-28 10:31:47 +01:00
Hugo Daniel
60214b9a90
Fix failing specs
2018-11-28 10:31:47 +01:00
Hugo Daniel
422a68630f
Remove data-hook tags
2018-11-28 10:31:47 +01:00
Hugo Daniel
652191a4c5
Fixing missing variable none
2018-11-28 10:31:47 +01:00
Hugo Daniel
c233ea38cf
Import Spree views for orders#edit in our codebase and integrate deface modifications
2018-11-28 10:31:47 +01:00
dependabot[bot]
7b95e3a8d7
Bump i18n-js from 3.0.11 to 3.1.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.0.11 to 3.1.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.0.11...v3.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-27 19:17:57 +00:00
Luis Ramos
1bc06e7384
Merge pull request #3139 from luisramos0/2-0-bulk-prod-update-spec-fix
...
[Spree Upgrade] Fix tests in bulk_product_update spec
2018-11-27 18:36:36 +00:00
Pau Pérez Fabregat
c5ae9bdce2
Merge pull request #3132 from luisramos0/2-0-variant-ondemand
...
[Spree Upgrade] Add VariantStock.on_demand as attribute_accessible
2018-11-27 18:05:34 +01:00
Pau Pérez Fabregat
5c8a638320
Merge pull request #3055 from HugsDaniel/3051-products-edit-views
...
[Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides
2018-11-27 17:32:25 +01:00
Pau Pérez Fabregat
869f17256d
Merge pull request #3011 from HugsDaniel/3000-api-endpoint-enterprise-fee
...
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-27 17:28:43 +01:00
Pau Pérez Fabregat
ea6f44e78d
Merge pull request #3144 from mkllnk/2841-fix-migration-encoding
...
Encode records with special chars as well
2018-11-27 17:28:13 +01:00
Pau Pérez Fabregat
04d57f8e6e
Merge pull request #3135 from openfoodfoundation/dependabot/bundler/unicorn-rails-2.2.1
...
Bump unicorn-rails from 1.1.0 to 2.2.1
2018-11-27 17:26:12 +01:00
luisramos0
64d16258cf
Fix tests in bulk_product_update spec by:
...
- setting on_hand in the variant and not in the product directly
- setting variant on_demand to false (default from the factory is on_demand true)
- saving the variant after doing this to trigger appropriate callbacks like creating missing variant stock items
2018-11-27 16:03:52 +00:00
Pau Pérez Fabregat
d073157424
Merge pull request #3134 from coopdevs/update-skylight
...
Update Skylight from 1.6.1 to 1.7.1
2018-11-27 08:54:39 +01:00
Maikel
1b58c2519a
Merge pull request #3138 from luisramos0/2-0-stable-nov-24th
...
[Spree Upgrade] Merging master into 2-0-stable (third run in Nov2018)
2018-11-27 16:16:32 +11:00
Maikel
296029ef28
Merge pull request #3131 from coopdevs/fix-restart-checkout-spec
...
[Spree Upgrade] Fix checkout spec due to shipments
2018-11-27 15:16:01 +11:00
Maikel
2967fdccf7
Merge pull request #3142 from kristinalim/fix-rubocop_block_length_ignore_describe_context
...
Ignore `describe` and `context` in Rubocop BlockLength
2018-11-27 14:54:46 +11:00
Maikel Linke
9efa45663c
Encode records with special chars as well
...
Using Marshal.dump on the French production database raised an error:
Encoding::UndefinedConversionError: "\xC3" from ASCII-8BIT to UTF-8
Replacing Marshal with YAML solves the problem. It is also more reliable
and human readable.
This code was run against the French, Australian and UK production
data successfully.
2018-11-27 14:34:03 +11:00
Pau Perez
b365488653
Enable rack-mini-profiler in development
...
This will run it always in development mode.
2018-11-26 12:10:49 +01:00
Kristina Lim
5c6ec50dea
Ignore describe and context in Rubocop BlockLength
2018-11-26 13:55:55 +08:00
Maikel
c152da8122
Merge pull request #3126 from mkllnk/2841-convert-guest-customer
...
2841 Associate customers with their user records
2018-11-26 13:56:31 +11:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
haseleyi
691de9199f
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-23 11:23:28 -08:00
dependabot[bot]
4499c38cfe
Bump unicorn-rails from 1.1.0 to 2.2.1
...
Bumps [unicorn-rails](https://github.com/samuelkadolph/unicorn-rails ) from 1.1.0 to 2.2.1.
- [Release notes](https://github.com/samuelkadolph/unicorn-rails/releases )
- [Commits](https://github.com/samuelkadolph/unicorn-rails/compare/v1.1.0...v2.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-23 19:14:51 +00:00
Luis Ramos
94a2972d57
Merge pull request #3133 from HugsDaniel/3029-products-renderer-spec
...
[Spree Upgrade] Fix ProductsRenderer specs
2018-11-23 18:23:33 +00:00
luisramos0
73ed5eeaac
Fix product import spec related to this change, the value provided to on_hand must be an integer
2018-11-23 18:07:51 +00:00
luisramos0
f509fa6c86
Make variantStock.on_demand= save the variant so that it doesn't impact on_hand that is already saving the variant with a lock
2018-11-23 18:07:08 +00:00
luisramos0
ba8aa110c2
Fix VariantStock.overwrite_stock_levels by using stock_item.adjust_count_on_hand. This makes product_controller_decorator.bulk_update work
2018-11-23 18:06:48 +00:00
Maxim Colls
4b588cbfb0
Removed unused toggle helpers in spec/support
2018-11-23 16:47:55 +00:00
Pau Perez
2abb316bcc
Update Skylight from 1.6.1 to 1.7.1
...
This doesn't bring too many improvements but it's the latest version can
work on our Rails 3.2 version.
You can read the changelog at
https://github.com/skylightio/skylight-ruby/blob/master/CHANGELOG.md#170-april-24-2018 .
2018-11-23 17:31:53 +01:00
Hugo Daniel
f1dc52fe4e
Set variant.on_demand to false
2018-11-23 14:30:14 +01:00
luisramos0
6cdaaa9e7d
Add VariantStock.on_demand as attribute_accessible so it can be mass assigned from product_controller_decorator.bulk_update
2018-11-23 12:04:00 +00:00
Pau Pérez Fabregat
0237432ba4
Merge pull request #3125 from luisramos0/2-0-variant-stock-item
...
[Spree Upgrade] Fix Product model spec and small refactoring in VariantStock
2018-11-23 12:53:52 +01:00
Pau Perez
23421758fa
Fix checkout spec due to shipments
2018-11-23 12:28:31 +01:00
Pau Perez
453b2a99de
Rename redundant #restart_checkout to #call
2018-11-23 12:05:39 +01:00
Pau Perez
88afa70f37
Simplify and speed up service tests
2018-11-23 12:04:42 +01:00
Pau Perez
2c8a1f5e78
Check for value and not object identity in spec
2018-11-23 12:04:42 +01:00
Pau Perez
99463427ce
Refactor RestartCheckout service just extracted
2018-11-23 12:04:42 +01:00
Pau Perez
3b681a59ba
Move controller tests to service class tests
2018-11-23 12:04:42 +01:00
Pau Perez
a62a2cb52f
Extract #restart_checkout to a service
2018-11-23 12:04:42 +01:00
luisramos0
7257ab30f1
Fix typo in inventory_error_flash_for_insufficient_quantity translation
2018-11-23 08:39:46 +00:00
Maikel Linke
f4d5727fb4
Associate customers with their user records
...
When we introduced the Customer model, we didn't associate any existing
customers with users that have the same email address.
Later we decided to create that association when users sign up. But we didn't
update all the existing customers. We do that now for data consistency and to
solve several bugs.
2018-11-23 15:38:35 +11:00
luisramos0
d28f47046a
Fix product model spec by removing unnecessary on_hand setter and adding required fields for a new product
2018-11-22 20:38:58 +00:00
luisramos0
134b73d730
Improve VariantStock code by extracting stockitems.first to a separate method
2018-11-22 20:38:46 +00:00
Luis Ramos
0052d571b9
Merge pull request #3100 from HugsDaniel/2999-checkout-feature-specs
...
[Spree Upgrade] Fix checkout feature specs
2018-11-22 16:49:41 +00:00
Hugo Daniel
d7a148bb75
Fix checkout feature specs
2018-11-22 17:01:39 +01:00
Luis Ramos
d060d31051
Merge pull request #3117 from HugsDaniel/3034-api-products-controller-spec
...
Use :user factory instead of build_stubbed to create the current_api_…
2018-11-22 14:10:05 +00:00
Hugo Daniel
a08ddd8171
Use :user factory instead of build_stubbed to create the current_api_user
2018-11-22 14:29:37 +01:00
Pau Pérez Fabregat
064ec7d270
Merge pull request #3108 from luisramos0/2-0-new-order
...
[Spree Upgrade] Add missing translation to admin new order creation page
2018-11-22 10:39:06 +01:00
Maikel Linke
95dbfae757
Use expect syntax
2018-11-22 15:42:56 +11:00
Maikel
be7fea9d14
Merge pull request #3003 from kevinchristianson/getting-started-edits
...
Getting Started edits
2018-11-22 12:51:16 +11:00
haseleyi
07e246db39
Remove outdated time zone precaution from Getting Started wiki
2018-11-21 15:56:14 -08:00
haseleyi
364a00074b
Remove Resources header
2018-11-21 15:56:14 -08:00
Kevin Christianson
7dce6e1180
Remove weird red "for" text in Troubleshooting
2018-11-21 15:56:14 -08:00
Kevin Christianson
1216567be9
Add Troubleshooting section with an alternative database setup
2018-11-21 15:56:13 -08:00
Samuel Nozaki
a7032a8822
Clarify that the time zone should be Melbourne
2018-11-21 15:56:13 -08:00
nozakis
6a73ee86f8
Clarify GETTING_STARTED.md in regards to rspec test failures and time zones
2018-11-21 15:56:13 -08:00
haseleyi
d4b49a662f
Add translation for 'Back to Payments List' button in new payment form
2018-11-21 15:33:45 -08:00
luisramos0
2abf4e39cb
Add missing translation to admin new order creation page
2018-11-21 23:22:43 +00:00
Luis Ramos
391deb94b0
Merge pull request #3102 from luisramos0/2-0-fix-admin-adjusts-spec
...
[Spree Upgrade] Fix spec/features/admin/adjustments_spec
2018-11-21 22:27:28 +00:00
Matt-Yorkley
b3a9b502fa
Add missing translation key
2018-11-21 19:16:08 +00:00
Matt-Yorkley
a5407d780c
Include unexpected validation errors
2018-11-21 19:16:07 +00:00
Pau Pérez Fabregat
ac9cfaa8c3
Merge pull request #3093 from mllocs/fix/factories-ignore-warning
...
Fixed Factory warning while running tests
2018-11-21 14:44:03 +01:00
Pau Pérez Fabregat
6a1776b84a
Merge pull request #3053 from HugsDaniel/3050-products-new-views
...
[Defacepocalypse] Import products#new view into our codebase and apply overrides
2018-11-21 14:43:22 +01:00
luisramos0
24a7494103
Fix admin/adjustments spec by renaming test adjustment from Shipping to Extra Adjustment.
...
This was causing an error because the order factory now includes a Shipping adjustment
2018-11-21 13:41:16 +00:00
luisramos0
783e0eed3c
In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml
2018-11-21 11:46:14 +00:00
luisramos0
0189cefd1c
Update all locales with the latest Transifex translations
2018-11-20 22:40:11 +00:00
Maxim Colls
f179bf8c49
Fixed Factory warning while running tests
2018-11-20 18:27:43 +00:00
Pau Pérez Fabregat
398092fa50
Merge pull request #3065 from openfoodfoundation/dependabot/bundler/turbo-sprockets-rails3-0.3.14
...
Bump turbo-sprockets-rails3 from 0.3.6 to 0.3.14
2018-11-20 12:13:23 +01:00
Pau Pérez Fabregat
4c6dec6203
Merge pull request #3082 from coopdevs/remove-travis-leftovers
...
Remove all database.travis.yml
2018-11-20 09:35:12 +01:00
Maikel
733a018f37
Merge pull request #3081 from luisramos0/2-0-enterprise-groups
...
[Spree Upgrade] Fix features/admin/enterprise_groups_spec by replacing select2_search with select2_select
2018-11-20 16:41:05 +11:00
Maikel
b05bfc5cc7
Merge pull request #3075 from luisramos0/2-0-setting-transl
...
[Spree Upgrade] Fix translation issue in settings spec
2018-11-20 16:39:54 +11:00
Maikel
5e82d38bec
Merge pull request #3071 from luisramos0/2-0-xdescribe-proxy-order
...
[Spree Upgrade] Move ProxyOrder controller to xdescribe
2018-11-20 16:38:42 +11:00
Maikel
6835d24fbf
Merge pull request #3004 from luisramos0/2-0-mail-method-fix
...
[Spree Upgrade] Fix line Item specs with problems related to VariantStock.on_hand=
2018-11-20 16:37:19 +11:00
Luis Ramos
a7bd793ad2
Merge pull request #3074 from luisramos0/2-0-acct-transl
...
[Spree Upgrade] Fix missing translation in User transaction history
2018-11-20 00:43:24 +00:00
Luis Ramos
e297b19a91
Merge pull request #3069 from luisramos0/2-0-check-missing-translation
...
[Spree Upgrade] Add missing translation in the checkout confirmation page
2018-11-20 00:39:05 +00:00
Luis Ramos
d984d76e6b
Merge pull request #3070 from luisramos0/2-0-order-spec-restart
...
[Spree Upgrade] Fix order spec restart checkout test and orders controller enterprise with fees test
2018-11-20 00:38:11 +00:00
Pau Perez
9301c5e1d5
Remove all database.travis.yml
...
We no longer use this file since we started with Semaphore CI.
2018-11-19 17:16:04 +01:00
luisramos0
5f48f2b8a1
Fix enterprise groups spec by replacing select2_search with select2_select for country and state in enterprise group address
2018-11-19 12:44:25 +00:00
Pau Pérez Fabregat
27267926dc
Merge pull request #3079 from luisramos0/2-0-order-feature-spec
...
[Spree Upgrade] Fix 3 tests in shopping/orders_spec
2018-11-19 12:51:07 +01:00
luisramos0
bf32a21155
Allow adapted on_hand attr to be mass assigned in VariantStock.
...
Without specifying it in `attr_accessible`, `#assign_attributes` won't
work. See details in
https://apidock.com/rails/v3.2.13/ActiveRecord/Persistence/update_attributes
and https://apidock.com/rails/ActiveRecord/Base/assign_attributes .
2018-11-19 10:05:17 +00:00
Maikel
90e8813ff6
Merge pull request #3054 from coopdevs/fix/incorrect-order-dates
...
Fix/incorrect order dates
2018-11-19 09:17:11 +11:00
luisramos0
9deb249dec
Fix order by changing expected results: order is paid.
...
These tests use order factory order_with_credit_payment with ‘amount: order.total + 10000’ and since spree 2 when order payment state is credit_owned (customer has credit after the order), the order is considered paid 71c6c4f297
2018-11-18 20:58:55 +00:00
luisramos0
a20aba26cd
Fix order feature spec by adapting to new spree 2 order factory with 5 line_items by default. Removed currency sign to avoid having problems with it, it's not really part of the spec objective
2018-11-18 16:51:43 +00:00
luisramos0
d29778e2d1
Fix translation issue in spec by refering the correct translation namespace: spree
2018-11-18 16:36:03 +00:00
luisramos0
d282823d3a
Fix missing translation in user transaction history
2018-11-18 16:15:35 +00:00
Maxim Colls
884d4d0122
Fixed specs
2018-11-17 19:46:09 +01:00
Maxim Colls
3301b5850a
Improved UX in the accordion steps in the checkout page
2018-11-17 18:48:10 +01:00
luisramos0
d1071acfdb
Move ProxyOrder controller to xdescribe. It's part of non-core feature subscriptions and will be left for spree upgrade phase 2
2018-11-17 12:23:52 +00:00
luisramos0
b40c0e5b80
Fix order controller spec with enterprise fees by adapting to new order factory with 5 line items by default
2018-11-17 12:11:23 +00:00
luisramos0
ee8d77bc09
Fix order spec restart checkout test by adding a required line_item to the order being tested
2018-11-17 11:57:16 +00:00
luisramos0
1fc11c5658
Add missing translation in the checkout confirmation page
2018-11-16 22:56:41 +00:00
dependabot[bot]
e655e60b56
Bump turbo-sprockets-rails3 from 0.3.6 to 0.3.14
...
Bumps [turbo-sprockets-rails3](https://github.com/ndbroadbent/turbo-sprockets-rails3 ) from 0.3.6 to 0.3.14.
- [Release notes](https://github.com/ndbroadbent/turbo-sprockets-rails3/releases )
- [Commits](https://github.com/ndbroadbent/turbo-sprockets-rails3/compare/v0.3.6...v0.3.14 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-16 19:16:27 +00:00
Maikel
f593a70000
Merge pull request #2967 from openfoodfoundation/dependabot/bundler/unicorn-5.4.1
...
Bump unicorn from 4.9.0 to 5.4.1
2018-11-16 14:05:47 +11:00
dependabot[bot]
0d93705856
Bump unicorn from 4.9.0 to 5.4.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 4.9.0 to 5.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-16 02:00:48 +00:00
Maikel
5ecea06098
Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl
...
[Spree Upgrade] Fix credit card controller
2018-11-16 10:43:16 +11:00
Maikel
5d200b7753
Merge pull request #3026 from luisramos0/2-0-calculator-line-items-for
...
[Spree Upgrade] Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package
2018-11-16 10:41:29 +11:00
Luis Ramos
f985e723e8
Merge pull request #3048 from mkllnk/2882-spree2-email-config
...
[Spree Upgrade] Update test mail setup for Spree 2
2018-11-15 22:25:50 +00:00
Pau Perez
23bda74ecb
Match name of filter and db column for consistency
2018-11-15 19:09:17 +01:00
Pau Perez
a4bbe2b696
Query completed_at filtering orders by date range
2018-11-15 19:09:17 +01:00
Pau Perez
c7a1c4b253
Change order date column translation in BOM
...
This makes it consistent with the order page. In both cases we use the
`completed_at` column underneath.
2018-11-15 19:09:17 +01:00
Hugo Daniel
a50786be34
Remove old do_not_remove_referenced_fees method
2018-11-15 17:59:06 +01:00
Hugo Daniel
0868404e98
Add specs for new Api::EnterpriseFeesController
2018-11-15 17:58:56 +01:00
Hugo Daniel
1309d80f65
Import products#edit and form partial in our codebase and apply overrides
2018-11-15 17:39:36 +01:00
Pau Pérez Fabregat
ee2ace8023
Merge pull request #3022 from HugsDaniel/2756-duplicate-product-with-image
...
Add specs for cloning a product with image
2018-11-15 17:35:28 +01:00
Hugo Daniel
094d88d03a
Import products#new view into our codebase and apply overrides
2018-11-15 16:35:31 +01:00
Hugo Daniel
d060704e86
Change Spree step-6a commit reference in Gemfile
2018-11-15 15:40:44 +01:00
Pau Perez
52e58a1c31
Remove unused @show_only_completed from view
...
Now there's no difference in behavior. In both cases we sort by
completed_at in the second column of the orders page.
2018-11-15 15:40:13 +01:00
Pau Perez
b7a3255dbe
Replace completed_at in orders table w/ created_at
2018-11-15 15:40:13 +01:00
Pau Perez
b1b04b505e
Fetch orders sorted by completion date
2018-11-15 15:40:13 +01:00
Pau Perez
e69d297f86
Wrap long and unreadable lines
2018-11-15 14:26:13 +01:00
Hugo Daniel
a162a2c50b
Move product distributions check as a before_destroy in EnterpriseFee model
2018-11-15 14:05:15 +01:00
Hugo Daniel
7b33712f7a
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-15 14:05:08 +01:00
Hugo Daniel
4e29589be0
Add specs for cloning a product with image
2018-11-15 13:51:40 +01:00
Luis Ramos
1dc5cc6d42
Merge pull request #3040 from luisramos0/2-0-refactor-factories
...
[Spree Upgrade] Simplify completed_order_with_fees factory and make shipment_with an ofn factory
2018-11-15 11:24:49 +00:00
luisramos0
9ba0fc268e
Run transpec and clean up rubocop issues in credit_card_controller and spec
2018-11-15 11:07:43 +00:00
Pau Pérez Fabregat
fb56293748
Merge pull request #3046 from luisramos0/2-0-knapsack-report
...
[Spree Upgrade] New knapsack report
2018-11-15 09:32:10 +01:00
Maikel
d109f882fc
Merge pull request #3038 from luisramos0/2-0-order-factory
...
[Spree Upgrade] Remove shipping_method_id from order factory
2018-11-15 15:22:31 +11:00
Maikel
a2c9ba60d8
Merge pull request #3035 from luisramos0/2-0-order-ctrl-line-item-delete
...
[Spree Upgrade] Fix orders controller spec when removing line items from order
2018-11-15 15:20:31 +11:00
Maikel
ebbe02523e
Merge pull request #3019 from luisramos0/more-x-spec-reports
...
[Spree Upgrade] Make broken report specs xdescribe and leave them for spree upgrade pha…
2018-11-15 15:17:04 +11:00
Maikel
2d3f706c05
Merge pull request #3042 from luisramos0/2-0-stable-nov-14th
...
[Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)
2018-11-15 15:02:21 +11:00
Maikel Linke
1e312dfa41
Update test mail setup for Spree 2
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2882
The email setup differs between Spree 1 and Spree 2. We already
encapsulated that setup in a single method which now needed changing.
2018-11-15 14:30:46 +11:00
Maikel
a25cdd90de
Merge pull request #3014 from luisramos0/2-0-payments_spec
...
[Spree Upgrade] Fix admin payments spec
2018-11-15 13:02:28 +11:00
luisramos0
ece21a674a
Simplify completed_order_with_fees factory and make shipment_with factory an ofn factory to avoid creating extra dummy shipping_method in every test
2018-11-14 23:13:05 +00:00
luisramos0
688ec5fb21
Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec
2018-11-14 23:04:38 +00:00
luisramos0
7c0627a823
Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package
2018-11-14 23:04:38 +00:00
luisramos0
a5fb3e337d
New knapsack report
...
New knapsack report for 2-0-stable. Makes the 4 jobs with 20 mins each.
2018-11-14 22:58:09 +00:00
Luis Ramos
c19e954113
Merge pull request #3009 from HugsDaniel/authenticate-api-use-through-logged-in-user
...
[Spree Upgrade] Authenticate API user through logged in user
2018-11-14 14:27:30 +00:00
luisramos0
0a77eeb4b6
Merge branch 'master' into 2-0-stable-nov-14th
2018-11-14 11:35:58 +00:00
luisramos0
19321b6d4f
Fix admin payments spec. Add missing payment method to order.distributor
2018-11-14 11:26:26 +00:00
Hugo Daniel
3dd981ca05
Use logged in user (spree_current_user) for API authentication (current_api_user)
2018-11-14 11:58:28 +01:00
Pau Pérez Fabregat
a65e2487c4
Merge pull request #3013 from luisramos0/2-0-api-orders-ctrl-spec
...
[Spree Upgrade] Fix api/orders_controller_spec
2018-11-14 11:48:34 +01:00
Pau Pérez Fabregat
605f84d30a
Merge pull request #3010 from openfoodfoundation/transifex
...
Transifex
2018-11-14 11:27:01 +01:00
Pau Pérez Fabregat
8ee193dbcf
Merge pull request #2984 from Matt-Yorkley/email_https_links2
...
Specify only email link protocol setting
2018-11-14 11:26:14 +01:00
Pau Pérez Fabregat
e66f406ea6
Merge pull request #2946 from luisramos0/improve_taxons
...
Sort Product categories alphabetically by name
2018-11-14 11:23:59 +01:00
luisramos0
2947d7a98c
Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout
2018-11-13 21:25:59 +00:00
luisramos0
9b894c6a55
Fix orders controller spec when removing line items from order. Improved spec and adapted to the fact that in spree 2 the default number of line items in this factory is 5
2018-11-13 19:51:26 +00:00
luisramos0
a234308a06
Fix credit card controller by adding a rescue for wrong arguments passed in params
2018-11-13 15:28:10 +00:00
luisramos0
2037413df7
Make some report specs xdescribe and leave them for spree upgrade phase 2
2018-11-13 14:53:42 +00:00
luisramos0
ef5d679f90
Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path
2018-11-12 16:31:57 +00:00
luisramos0
bbdbfc1374
Fix opi/orders_controller_spec by providing line items with shipment and thus make the order workflow work
2018-11-12 16:29:38 +00:00
Transifex-Openfoodnetwork
f9fae06a7a
Updating translations for config/locales/en_BE.yml
2018-11-10 07:09:02 +11:00
Maikel
5c208a68c6
Merge pull request #3007 from openfoodfoundation/revert-2859-instagram_pattern
...
Revert "Instagram pattern"
2018-11-09 14:23:44 +11:00
Maikel
d8d20429aa
Revert "Instagram pattern"
2018-11-09 13:33:11 +11:00
Maikel
57efc36448
Merge pull request #2993 from Matt-Yorkley/user_class
...
Deal with failing Spree::LegacyUser test
2018-11-09 10:21:31 +11:00
Luis Ramos
0ea0016fc9
Merge pull request #2998 from coopdevs/adapt-product-on-demand
...
[Spree Upgrade] Adapt product on demand
2018-11-08 19:21:46 +00:00
Luis Ramos
ed7c12bd26
Merge pull request #2997 from luisramos0/2-0-stable-nov-8th
...
[Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)
2018-11-08 19:20:42 +00:00
Luis Ramos
4149c95c65
Merge pull request #2991 from Matt-Yorkley/missing_resource_translation
...
[Spree Upgrade] Import missing translations from Spree 2 to fix some tests
2018-11-08 12:34:53 +00:00
Luis Ramos
30bca40ed0
Merge pull request #2996 from coopdevs/update-products-new-js-template
...
[Spree Upgrade] Bring Spree changes on admin/products/new.js.erb
2018-11-08 12:13:47 +00:00
Luis Ramos
a3da941d8f
Merge pull request #2992 from Matt-Yorkley/credit-cards
...
[Spree Upgrade] Failing credit card spec
2018-11-08 12:12:34 +00:00
Pau Perez
de31823151
Add #on_demand= to make product creation page work
...
We're bringing in the setter that got removed in Spree 2.0 so that we
can still pass an on_demand value from the product creation form.
However, we won't keep the getter to keep things simple. The frontend
seems to be checking the existence of variants anyway, so then it can
also check for product.master.on_demand and we avoid some logic on the
backend.
2018-11-08 11:41:58 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Pau Perez
18c51dc596
Bring Spree changes on admin/products/new.js.erb
...
We copied it from Spree to then append a little change on it. Since the
original version changed in Spree 2.0 we need to update our copy.
2018-11-08 10:45:04 +00:00
Matt-Yorkley
8aa6b2c0ac
Stub spree_api_key on Spree::LegacyUser when signing in as regular user
2018-11-08 00:07:24 +00:00
Matt-Yorkley
edbfd64a44
Set the Spree.user_class explicitly in spree initializer
2018-11-08 00:04:04 +00:00
Matt-Yorkley
fae0617639
Merge pull request #2986 from HugsDaniel/2985-api-product-images-specs
...
[Spree Upgrade] Add an API key for admin user
2018-11-08 00:01:46 +00:00
Matt-Yorkley
3f33e28839
Fix outdated credit card spec
2018-11-07 20:48:54 +00:00
Matt-Yorkley
cfc31f1fbd
Import missing translations from Spree 2 to fix some tests
2018-11-07 19:23:28 +00:00
Pau Pérez Fabregat
51a94c8194
Merge pull request #2964 from openfoodfoundation/dependabot/bundler/awesome_print-1.8.0
...
Bump awesome_print from 1.0.2 to 1.8.0
2018-11-07 18:48:32 +00:00
Matt-Yorkley
9011f5d9a2
Rescue ArgumentError and give user feedback
2018-11-07 18:48:08 +00:00
Pau Pérez Fabregat
72a9d39ee1
Merge pull request #2932 from luisramos0/2931-weight-calculator
...
2931 Refactor and prepare weight calculator for spree 2
2018-11-07 18:40:38 +00:00
Pau Pérez Fabregat
ecc69c2c58
Merge pull request #2948 from pfac/pfac-config-time-zone
...
Fix default time zone config
2018-11-07 18:39:25 +00:00
Matt-Yorkley
b5c6ecb45a
Explicitly use UTF-8 encoding when opening spreadsheet files
2018-11-07 16:50:24 +00:00
Hugo Daniel
bc9af7c45f
Add an API key for admin user
2018-11-07 16:47:35 +01:00
Matt-Yorkley
5b16353938
Specify only link protocol setting
2018-11-07 11:22:24 +00:00
luisramos0
b7ffde795a
Add migration to update calculator class name of weight calculators
2018-11-07 09:54:53 +00:00
luisramos0
9490da329a
Move Calculator::Weight from models/open_food_network/calculator to models/calculator
2018-11-07 09:54:30 +00:00
luisramos0
bf55f50a7e
Fix rubocop warnings on weight and weight_spec
2018-11-07 09:54:30 +00:00
luisramos0
275a192270
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/models/calculator/weight_spec.rb
* 3 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should
to: expect(obj).to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-11-07 09:54:30 +00:00
luisramos0
1ef04354fd
Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package)
2018-11-07 09:54:30 +00:00
Pau Pérez Fabregat
8547d5302c
Merge pull request #2978 from Matt-Yorkley/spree-upgrade/orders#show
...
[Spree Upgrade] orders#show
2018-11-06 16:20:47 +00:00
Luis Ramos
0c02e8c15f
Merge pull request #2981 from coopdevs/remove-commented-out-code
...
Remove old commented out code
2018-11-06 16:06:59 +00:00
Luis Ramos
1ceb632b83
Merge pull request #2980 from coopdevs/fix-long-line
...
Fix long line
2018-11-06 16:05:22 +00:00
Pau Pérez Fabregat
a4139a14a8
Merge pull request #2977 from luisramos0/2-0-payment-translation
...
[Spree Upgrade] Add missing failed authorization translation
2018-11-06 16:01:00 +00:00
Luis Ramos
86721d6d42
Merge pull request #2974 from luisramos0/2-0-user-balance
...
[Spree Upgrade] Fix User Balance Calculator spec
2018-11-06 16:00:44 +00:00
Pau Perez
71702af3c3
Have a single attributes list in serializer
2018-11-06 15:52:02 +00:00
Pau Perez
51155bb368
Remove old commented out code
...
You know, git already keeps old code for us.
2018-11-06 14:23:15 +00:00
Pau Perez
26d95b7250
Fix long lines
2018-11-06 13:59:51 +00:00
Matt-Yorkley
d0b7b57017
Remove OrderSerializer#show_path and adjust to use #edit over #show
2018-11-06 11:07:14 +00:00
Matt-Yorkley
aaaec4777d
Remove admin order #show link from helper
2018-11-06 11:03:06 +00:00
luisramos0
c191a1feb8
Add missing translation related to authorization failure
2018-11-06 10:20:52 +00:00
luisramos0
79fcc7bce0
Fix user balance calculator spec by setting a target_shipment on line item of the order being tested
2018-11-05 19:23:09 +00:00
Pau Pérez Fabregat
4155f086e0
Merge pull request #2968 from openfoodfoundation/transifex
...
Transifex
2018-11-05 19:40:33 +01:00
Pau Pérez Fabregat
6bc14f4bab
Merge pull request #2970 from Matt-Yorkley/2939-edit-order-button
...
Remove workaround in failing feature spec
2018-11-05 19:25:00 +01:00
Pau Pérez Fabregat
057412111d
Merge pull request #2972 from coopdevs/mark-last-failing-enterprise-spec-pending
...
[Spree Upgrade] Mark last failing enterprises spec as pending
2018-11-05 18:59:47 +01:00
Pau Pérez Fabregat
e76bf81e2a
Merge pull request #2973 from coopdevs/deliver-email-in-spec
...
[Spree Upgrade] Perform mail delivery in spec to make it pass
2018-11-05 18:58:37 +01:00
Pau Perez
f7b6867c28
Perform mail delivery in spec to make it pass
...
We need to purposefully enable deliveries for the deliveries array to
list this email. Otherwise the delivery logic is not executed and thus
the deliveries array never filled.
2018-11-05 17:49:08 +00:00
Pau Perez
21d756a1af
Mark last failing enterprises spec as pending
...
This will get solved once we complete
https://github.com/openfoodfoundation/openfoodnetwork/issues/2971 . Until
then, let's not focus on this spec to reach our 100% green test suite.
2018-11-05 16:45:53 +00:00
Matt-Yorkley
fd47756e2f
Remove workaround in failing feature spec
...
Removed an old workaround that clicked a button multiple times.
This was no longer working and causing the spec to fail.
2018-11-05 11:19:57 +00:00
Pau Pérez Fabregat
50a06d1bd9
Merge pull request #2969 from luisramos0/2897-2-0-price-fix
...
[Spree Upgrade] Fix specs creating deleted variants
2018-11-05 11:59:06 +01:00
luisramos0
4f992a18f7
Fix specs creating deleted variants
...
Spree checks that each price belongs to a variant
Since we were creating deleted variants, the price models couldnt see those
2018-11-05 10:43:10 +00:00
Transifex-Openfoodnetwork
98d79ec939
Updating translations for config/locales/fr_BE.yml
2018-11-05 18:46:40 +11:00
Maikel
4930c9bc06
Merge pull request #2934 from mkllnk/manual-rubocop-todo-config
...
Add offending files to rubocop config
2018-11-05 10:37:03 +11:00
Maikel Linke
7ad40074a5
Make Code Climate show our real score ans split rubocop config
...
Our rubocop config hides all current violations. It allows us to have a
passing rubocop run on the current code and improve it gradually. It
detects new violations, but doesn't annoy us with all the existing ones.
Code Climate has its own way of remembering all current violations which
is more sophisticated than ours. The new config for Code Climate doesn't
hide any violations so that Code Climate can give us a realistic score
of code quality and warn us about every new violation.
Splitting the configuration into the main three parts gives a quicker
overview and makes maintaining the parts easier.
2018-11-05 10:19:30 +11:00
Maikel Linke
e798532a2f
Add offending files to rubocop config
...
The file .rubocop_todo.yml is generated automatically and contains a
configuration to make all files pass. For a lot of cops it just lists
the offending files. But for some cops it sets a different metric.
Since we don't want these lax metrics, we override them in our config
file .rubocop.yml. This leads to a lot of offences again. This patch
lists all offending files for each cop to make rubocop pass. We can
improve the code over time and remove items from the list.
2018-11-05 10:11:35 +11:00
Pau Pérez Fabregat
fe8303cb19
Merge pull request #2957 from luisramos0/2-0-paypal-spec
...
[Spree Upgrade] Fix occurrences of order.shipping_method= by replacing with order.shipments
2018-11-02 15:50:59 +01:00
Pau Pérez Fabregat
834520491c
Merge pull request #2900 from luisramos0/raise_error_if_no_stock_item_available
...
[Spree Upgrade] Avoiding variantStock raise by creating variant first and then setting `count_on_hand`
2018-11-02 15:49:21 +01:00
Pau Pérez Fabregat
e635cfc9c1
Merge pull request #2901 from luisramos0/variants_including_master
...
[Spree Upgrade] Adapt product_decorator code to spree 2 with new variants_including_master
2018-11-02 15:48:19 +01:00
Pau Pérez Fabregat
b1f3fa14e5
Merge pull request #2880 from luisramos0/backorders
...
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the cart
2018-11-02 15:47:02 +01:00
Pau Pérez Fabregat
ad743a03ac
Merge pull request #2888 from luisramos0/backorders-line-items
...
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator
2018-11-02 15:45:25 +01:00
Pau Pérez Fabregat
3b85bbe911
Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs
...
Extract email setup in specs for easy upgrade
2018-11-02 15:40:19 +01:00
Pau Pérez Fabregat
a910fc50f5
Merge pull request #2926 from luisramos0/2-0-stable-oct-25
...
[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)
2018-11-02 15:37:34 +01:00
Maikel
3259b3ecf1
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
...
Admin orders refactor
2018-11-02 16:57:28 +11:00
Maikel
cbfe1b535d
Merge pull request #2871 from openfoodfoundation/dependabot/bundler/figaro-1.1.1
...
Bump figaro from 0.7.0 to 1.1.1
2018-11-02 12:09:53 +11:00
dependabot[bot]
6416d0e1c3
Bump awesome_print from 1.0.2 to 1.8.0
...
Bumps [awesome_print](https://github.com/awesome-print/awesome_print ) from 1.0.2 to 1.8.0.
- [Release notes](https://github.com/awesome-print/awesome_print/releases )
- [Changelog](https://github.com/awesome-print/awesome_print/blob/master/CHANGELOG.md )
- [Commits](https://github.com/awesome-print/awesome_print/compare/v1.0.2...v1.8.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-01 19:15:40 +00:00
Maikel
931c1207da
Merge pull request #2813 from openfoodfoundation/dependabot/bundler/haml-4.0.7
...
Bump haml from 4.0.4 to 4.0.7
2018-11-01 16:52:07 +11:00
Maikel
7c4370be69
Merge pull request #2963 from luisramos0/2960_migration
...
Fix variant_overrides permissions for overrides that belong to the supplier herself
2018-11-01 11:41:51 +11:00
luisramos0
079d4e0bf5
Fix variant_overrides permissions for overrides that belong to the supplier herself
2018-10-31 11:26:15 +00:00
Pau Pérez Fabregat
1fbeb43c3a
Merge pull request #2958 from coopdevs/pull-translations
...
Update all locales with the latest Transifex translations
2018-10-31 10:52:02 +01:00
Pau Pérez Fabregat
fc6a2d4a53
Merge pull request #2959 from coopdevs/fix-name-error-on-migrate
...
Move default_url_options set up to an initializer
2018-10-31 10:51:06 +01:00
Pau Perez
f16897a0b8
Fix DE translations manually
...
We don't want 🇩🇪 to have a broken menu.
2018-10-31 08:39:25 +01:00
Pedro Costa
1ddbc24a8b
Fix default time zone config
...
Why:
* Starting the environment, even with just `bundle exec rake`, results
in the following error:
```sh
Value assigned to config.time_zone not recognized.Run "rake -D time"
for a list of tasks for finding appropriate time zone names.
```
This change addresses the issue by:
* Adding the time zone setting to environment specific configurations,
defaulting to UTC in development, and using Melbourne in tests.
2018-10-30 23:50:23 +00:00
Pau Perez
2e2c7c56cb
Move default_url_options set up to an initializer
...
For some reason running `bundle exec rake db:migrate RAILS_ENV=staging`
fails with:
```
rake aborted!
NameError: uninitialized constant Spree::Config
```
Running `bundle exec rails server` for instance, does not. There must be
a difference on the way a rake task and the rails commands load the app.
Moving this configuration to an initializer, at the end of the
initialization process, fixes it. The constant `Spree::Config` is
already loaded.
**This is preventing the release v1.22.0 from being staged and tested**
2018-10-30 19:45:04 +01:00
luisramos0
3d106d749b
Fix rubocop warnings on load_sample_data task
2018-10-30 18:00:52 +00:00
luisramos0
82befd945b
Sort Product categories alphabetically by name and fixsample data by fixing taxons taxonomy id
2018-10-30 18:00:48 +00:00
Pau Pérez Fabregat
e4b988c9a2
Merge pull request #2924 from kristinalim/fix-disable_hiding_of_offcanvas_upon_resize
...
Disable hiding of hamburger menu upon resize <= 1024px width
2018-10-30 19:00:14 +01:00
Pau Pérez Fabregat
b35b24d4ae
Merge pull request #2914 from luisramos0/checkout-language-bug
...
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-30 17:46:37 +01:00
Pau Pérez Fabregat
7ffa3a2ca1
Merge pull request #2913 from HugsDaniel/2905_password_reset_missing_translations
...
Add password confirmation, token and expired keys
2018-10-30 17:34:01 +01:00
Pau Pérez Fabregat
3d88199257
Merge pull request #2896 from Matt-Yorkley/email_https_links
...
Use https on all links in emails in production
2018-10-30 17:33:32 +01:00
Pau Pérez Fabregat
8e602d453b
Merge pull request #2876 from luisramos0/subs-states-fix
...
Fix bug in subscriptions address controller where country states were not correctly returned
2018-10-30 17:32:34 +01:00
Pau Perez
7f177598f2
Update all locales with the latest Transifex translations
2018-10-30 15:13:57 +01:00
luisramos0
8a034a1538
Fix occurrences of order.shipping_method= by replacing with order.shipments=
2018-10-30 13:37:45 +00:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
Maikel
7609496df3
Merge pull request #2859 from albarnaz/instagram_pattern
...
Instagram pattern
2018-10-30 15:10:27 +11:00
Maikel
ee042f51a4
Merge pull request #2949 from pfac/pfac-fix-new-preferences-migration
...
Fix new preferences migration
2018-10-30 15:09:35 +11:00
Luis Ramos
4422cdc691
Merge pull request #2936 from luisramos0/2933-2-0-orders-admin
...
[Spree Upgrade] Fix some tests in orders admin spec
2018-10-29 23:17:48 +00:00
Pau Pérez Fabregat
5fade045f8
Merge pull request #2928 from luisramos0/line_items_controller_spec
...
Reorganize LineItemsController's destroy line item specs
2018-10-29 16:09:20 +01:00
Pedro Costa
91e4f99c19
Fix new preferences migration
...
Why:
* In a clean environment, running the new preferences migration fails,
due to a missing file from Spree core being manually required. This
file has now been missing since ab707cf .
This change addresses the issue by:
* Copying the missing file from Spree Core 1.3.6.beta into the migration.
This fixes the issue for now, but also means that a migration merge
and/or rewrite might be in order for the future.
2018-10-29 14:53:01 +00:00
Matt-Yorkley
443515dae4
Improve comment in index action
2018-10-29 10:34:05 +00:00
luisramos0
b16ed86b2d
Fix shipping_method basic test. Adapt to spree 2 that needs shipping_categories to be set and sets them on the base factory in a after_create block, the build command was not picking it up
2018-10-27 20:34:25 +01:00
Matt-Yorkley
f3124e5472
Explicitly add :host to actionmailer config
2018-10-26 22:42:47 +01:00
Matt-Yorkley
b826beb0d7
Inline hashes in tests
2018-10-26 21:38:57 +01:00
Matt-Yorkley
29492d61f9
Use #allow syntax
2018-10-26 21:38:57 +01:00
Matt-Yorkley
8c19d1afec
Move tests from spree/admin/orders_controller_spec to api/orders_controller_spec and tidy up
2018-10-26 21:38:57 +01:00
Matt-Yorkley
033ae4f570
Add basic SearchOrders service spec
2018-10-26 21:38:57 +01:00
Matt-Yorkley
1f8f7b0495
Add new Api::OrdersController spec
2018-10-26 21:38:57 +01:00
Matt-Yorkley
46b1317159
Update orders resource js spec
2018-10-26 21:38:57 +01:00
Matt-Yorkley
334eebeab1
Move json to API and strip index action
2018-10-26 21:38:57 +01:00
Matt-Yorkley
0bd67bd06a
Remove unnecessary Spree::Config fallback value
2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee
Refactor Spree::Admin::OrdersController
2018-10-26 21:38:57 +01:00
luisramos0
4450380cb0
Add missing translation to filter on orders admin page
2018-10-26 21:32:16 +01:00
luisramos0
a5d4c50dea
Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test.
2018-10-26 21:32:16 +01:00
luisramos0
09f8df6340
Reorganize LineItemsController's destroy line item specs to separate contexts with different test orders (completed_with_total and completed_with_fees)
2018-10-25 18:06:48 +01:00
Pau Pérez Fabregat
8a3f621b42
Merge pull request #2893 from luisramos0/deleted_products_break_inventory
...
Fix bug in inventory management page
2018-10-25 18:20:42 +02:00
Pau Pérez Fabregat
7cac4637fe
Merge pull request #2916 from luisramos0/date-transl-fix
...
Add Portuguese and German to list of momentJS locales
2018-10-25 18:18:53 +02:00
luisramos0
90d7b7f4a0
Merge branch 'master' into 2-0-stable-oct-25
2018-10-25 14:28:58 +01:00
Kristina Lim
2cc594dc98
Proceed to hide off-canvas when resized to >1024px
2018-10-25 20:36:27 +08:00
Kristina Lim
14eaa49204
Disable hiding the off-canvas upon window resize.
...
In some browsers for mobile devices, the address bar is automatically
hidden when scrolling down the page. This is not workable if the height
of the contents of the off-canvas exceeds the height of the screen,
because the latter portion of the contents stays hidden to the user.
https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js
2018-10-25 19:29:19 +08:00
Maikel
acb8ec772e
Merge pull request #2922 from mkllnk/update-rubocop-todo
...
Update rubocop todo list
2018-10-25 14:48:51 +11:00
Maikel
3cab3d1798
Merge pull request #2921 from openfoodfoundation/transifex
...
Transifex
2018-10-25 14:22:10 +11:00
Maikel Linke
cd5c23993a
Update rubocop todo list
...
Since we activated more cops in 0ac16ce096
we had a lot of files missing in the todo list. They are likely from
other pull requests that have been open at the same time. This is a
quick update so that rubocop gives us some useful feedback again.
2018-10-25 14:08:04 +11:00
Maikel Linke
e6adb8a3b9
Extract email setup in specs for easy upgrade
...
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
2018-10-25 13:53:22 +11:00
Maikel
51a1787881
Merge pull request #2908 from Matt-Yorkley/bulk_orders_bug
...
Fix pagination conflict with LineItemsCtrl requests
2018-10-25 13:18:11 +11:00
Maikel Linke
dc5302ca08
Speed up database queries and make them scale
...
This commit makes use of three ActiveRecord features:
1. Using `select` instead of `all.map` enables ActiveRecord to nest one
select into the other, resulting in one more efficient query instead of
two.
2. Using `find_each` saves memory by loading records in batches.
https://api.rubyonrails.org/classes/ActiveRecord/Batches.html#method-i-find_each
3. Using `pluck` creates only an array, avoiding loading all the other
columns of the records into objects.
Running this on the current Canadian database, fixes the following
variant overrides:
```
[]
[]
[]
[]
[]
[]
[925, 924, 966, 965]
[]
[]
[]
[]
[462,
863,
464,
822,
949,
947,
944,
939,
942,
946,
945,
943,
438,
937,
938,
941,
940,
467,
952,
875,
453,
953,
454,
951,
487,
460,
457,
528,
527,
486,
459,
458,
461,
529,
530,
950,
642,
384,
380,
643,
385,
381,
644,
386,
382,
960,
959,
379,
640,
377,
375,
532,
639,
376,
374,
646,
390,
389,
637,
406,
408,
647,
391,
393,
633,
396,
400,
398,
645,
388,
387,
648,
394,
392,
536,
632,
399,
397,
395,
634,
403,
401,
635,
404,
402,
636,
407,
405,
535,
534,
638,
410,
409,
948,
533,
537,
531,
877,
880,
894,
893,
672,
671,
673,
674,
703,
714,
715,
716,
717,
862,
864,
879,
876,
865,
881,
878,
463,
954,
866,
823,
957,
958,
955,
956,
899,
897]
[]
[969]
```
2018-10-25 11:33:14 +11:00
Transifex-Openfoodnetwork
c17939631f
Updating translations for config/locales/en_US.yml
2018-10-25 09:31:36 +11:00
Pau Pérez Fabregat
ce93c52dfe
Merge pull request #2850 from Matt-Yorkley/password_change_logout
...
Password change logout
2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat
9ef4852bd4
Merge pull request #2818 from nikobozi/refactor-variant-overrides-query
...
Move query from variant_overrides_controller to its model scope
2018-10-24 11:42:22 +02:00
Pau Pérez Fabregat
7651ee0909
Merge pull request #2798 from as1729/as1729-update-docs-Stripe-publishable_key-for-pr
...
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
2018-10-24 11:23:21 +02:00
Pau Pérez Fabregat
f32e4dddb1
Merge pull request #2902 from luisramos0/more-pending-tests
...
[Spree Upgrade] Mark specs from secondary features as xfeature
2018-10-23 19:00:49 +02:00
Pau Pérez Fabregat
9a06c1ef98
Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin
...
[Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2
2018-10-23 18:59:01 +02:00
Pau Pérez Fabregat
235d42024a
Merge pull request #2903 from luisramos0/2884-2-0-order-ships-path
...
[Spree Upgrade] In order list page, the shipment state is now a label, not a link. The shipments page is gone in spree 2.
2018-10-23 18:57:05 +02:00
luisramos0
c9784a5eda
Add Portuguese and German to list of moment locales. The main usage is in the order cycle closure time in the shopfront
2018-10-23 17:53:08 +01:00
luisramos0
034d9ef72a
Refactor multilingual spec: extract method with repeated assertion
2018-10-23 14:10:52 +01:00
luisramos0
9d9f5d38d7
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-23 14:10:48 +01:00
Hugo Daniel
c5f6af95c7
Add password confirmation, token and expired keys
2018-10-23 10:40:20 +02:00
Maikel
6f5289c730
Merge pull request #2894 from openfoodfoundation/transifex
...
Transifex
2018-10-23 16:21:20 +11:00
Luis Ramos
a9b390d0aa
Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs
...
[Spree Upgrade] Fix feature specs for shipping_methods
2018-10-22 23:12:20 +01:00
Matt-Yorkley
42c1584e6f
Fix pagination conflict with LineItemsCtrl requests
2018-10-22 18:13:56 +01:00
Pau Pérez Fabregat
a1bbf5328e
Merge pull request #2872 from mkllnk/2765-fix-geocoding
...
2765 Fix geocoding to display enterprises on map
2018-10-22 16:44:30 +02:00
luisramos0
d0d9038308
Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2
2018-10-22 11:24:01 +01:00
luisramos0
34d1e6ffdb
Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794
2018-10-21 22:13:15 +01:00
luisramos0
7ae5a615b2
Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending
2018-10-21 22:09:21 +01:00
luisramos0
6f78f3c595
Move all specs in proxy_order_spec temporarily to pending
2018-10-21 22:08:10 +01:00
luisramos0
b0ffb0f91a
Move all specs in subscription_confirm_job_spec temporarily to pending
2018-10-21 22:07:23 +01:00
luisramos0
2e64226d29
Move all specs in spec/features/admin/subscriptions_spec temporarily to pending
2018-10-21 22:06:31 +01:00
luisramos0
ca786249a6
Move all specs in subscription_form_spec temporarily to pending
2018-10-21 22:05:45 +01:00
luisramos0
3afc59c864
Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending
2018-10-21 22:04:16 +01:00
luisramos0
5b6b0f408f
Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing
2018-10-21 22:02:34 +01:00
luisramos0
5d36450de2
Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing
2018-10-21 21:56:55 +01:00
luisramos0
92c7db2249
Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem
2018-10-20 23:43:33 +01:00
luisramos0
f3ef3d0c3e
Avoiding variantStock raise by creating variant first and then setting count_on_hand
2018-10-20 23:28:22 +01:00
luisramos0
653c67971f
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
2018-10-20 15:11:47 +01:00
luisramos0
d375bb8c55
Migration: Revoke variant overrides without permissions
2018-10-20 12:32:55 +01:00
luisramos0
9079437284
Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted
2018-10-20 12:32:51 +01:00
luisramos0
5ae0ad87a7
Refactor EnterpriseRelationship before save hook: some renames and extract methods
2018-10-20 11:52:11 +01:00
Matt-Yorkley
c3cef699ca
Use https on all links in emails in production
2018-10-19 17:03:51 +01:00
Transifex-Openfoodnetwork
c911462737
Updating translations for config/locales/en_GB.yml
2018-10-20 02:04:33 +11:00
luisramos0
c373d5ab33
Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method
2018-10-18 19:44:38 +01:00
luisramos0
df36e0b344
In cart population, replace usage of global allow_backorders with variant.on_demand adapter
2018-10-18 18:37:09 +01:00
Pau Pérez Fabregat
32632addfb
Merge pull request #2823 from luisramos0/2-0-order-spec-fees
...
[Spree Upgrade] Fix fees tests in models/spree/order_spec
2018-10-18 13:30:15 +02:00
luisramos0
a92e8c9923
Improve readability of shipment decorator
2018-10-18 10:54:21 +01:00
luisramos0
a83af367b4
Fix order_spec related to retrieving previously ordered items
...
In spree 2, each completed_order_with_totals comes with 5 line items (see order_factory in spree), so instead of 1+1+1=3 the calculation becomes 5+5+1=11
2018-10-18 10:54:21 +01:00
luisramos0
74eff8730b
Fix tests of fees in a completed order in models/spree/order_spec by:
...
- set distributor with taxes on the order
- simplify the factory completed_order_with_fees by replacing shipment with shipping_method and ship_address and letting the order workflow handle shipments and inventory units
2018-10-18 10:54:21 +01:00
luisramos0
91f52d80c8
Fix problem in order and adjustment model specs by fixing the order.adjustment association
...
This fix was taken from spree 2.1 here 3fa44165c7
2018-10-18 10:53:00 +01:00
luisramos0
2ccbb87adc
Fix payment decorator bug
...
Payment line items must come from the order, payment does not have inventory_units
2018-10-18 10:53:00 +01:00
Maikel
3a2e52cc98
Merge pull request #2780 from luisramos0/2-0-stripe-factory
...
[Spree Upgrade] Fix Stripe connect factory
2018-10-18 14:54:28 +11:00
Maikel
01c21c302c
Merge pull request #2811 from luisramos0/2-0-adjust-basic-spec-fix
...
[Spree Upgrade] Fixes shipping tests in adjustment spec
2018-10-18 14:49:28 +11:00
Maikel Linke
9698fd3c5a
Style spec
2018-10-18 11:07:16 +11:00
Maikel Linke
d197c8587f
Test address deletion
2018-10-18 11:06:32 +11:00
Maikel Linke
e96cab957a
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/models/spree/addresses_spec.rb
* 13 conversions
from: obj.should
to: expect(obj).to
* 2 conversions
from: it { should ... }
to: it { is_expected.to ... }
* 1 conversion
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-10-18 10:52:46 +11:00
luisramos0
fe9f4a1c95
Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead
2018-10-17 12:16:33 +01:00
luisramos0
c281927372
Fix subscription address form. It now clears the state selection when a different country is selected
2018-10-16 23:02:26 +01:00
luisramos0
1804bf5a2b
Extract countryStates logic from customer_address modal and re-use new CountryStates service
2018-10-16 22:45:38 +01:00
luisramos0
5c5a2194d6
Extract country states logic out of subscriptions address controller into new service CountryStates
2018-10-16 21:58:27 +01:00
luisramos0
feaf16d878
Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases
2018-10-16 20:59:34 +01:00
luisramos0
98161daa90
Refactor duplicated distributors association in payment_method and gateway to a concern
2018-10-16 20:27:22 +01:00
fabricio.albarnaz
419493f153
Move instagram regex to an method to fix codeclimate
2018-10-16 16:09:15 -03:00
fabricio.albarnaz
8e4adbd23a
Add more test cases
2018-10-16 15:34:46 -03:00
fabricio.albarnaz
93a051bf5a
Regex ajust
2018-10-16 15:33:10 -03:00
Pau Pérez Fabregat
601e0b927a
Merge pull request #2816 from luisramos0/2-0-adjust-enterprise-fees-spec-fix-aplicator
...
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - enterprise_fee_aplicator
2018-10-16 19:47:10 +02:00
Pau Pérez Fabregat
54f0ccab93
Merge pull request #2861 from luisramos0/2-0-stable-spree-revision
...
[Spree Upgrade] Update spree 2-0-4-stable revision used to pick up latest commits
2018-10-16 19:41:08 +02:00
Luis Ramos
3e4f92fe92
Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix
2018-10-16 17:33:33 +01:00
Pau Pérez Fabregat
c99fec44da
Merge pull request #2824 from luisramos0/2-0-order-spec
...
[Spree Upgrade] Fix taxes tests in models/spree/order_spec
2018-10-16 18:09:33 +02:00
Pau Pérez Fabregat
f2fe3c8cff
Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix
...
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - tax_rate
2018-10-16 18:02:21 +02:00
luisramos0
b3c56e6823
Duplicated payment method distributors association to gateway. This fixes the inheritance problem found in stripe gateway
...
See PR 2780 for more details
2018-10-16 16:55:18 +01:00
Pau Pérez Fabregat
db9669b4ce
Merge pull request #2817 from coopdevs/remove-reference-to-on-demand
...
[Spree Upgrade] Remove on_demand from Product serializers
2018-10-16 17:52:42 +02:00
Luis Ramos
faf8322c59
Merge pull request #2785 from luisramos0/2-0-order-updater-fix
...
[Spree Upgrade] Fix order_updater_spec by using create (instead of build) in shipment
2018-10-16 16:43:42 +01:00
luisramos0
570016463b
Fix order_updater_spec by using create (instead of build) in shipment. Also simplified spec by using prebuild shipment_with and shipping_method factories
2018-10-16 16:37:36 +01:00
Pau Pérez Fabregat
afe1d7caef
Merge pull request #2863 from luisramos0/2-0-stable-oct
...
[Spree Upgrade] Merging master into 2-0-stable (one month of commits in master)
2018-10-16 17:09:56 +02:00
Pau Pérez Fabregat
590091c42a
Merge pull request #2842 from Matt-Yorkley/pi/missing_variable
...
Fix missing local variable in EntryProcessor
2018-10-16 13:19:23 +02:00
Maikel Linke
8fb81bb6a7
Configure Geocoder with API key as required by Google
2018-10-16 16:49:52 +11:00
Maikel Linke
61797fff56
Restrict deletion of address explicitely
...
Enterprises have an `address_id` which must point to a valid
`Spree::Address`. As Rubocop suggested, I restricted the deletion of
addresses when they are still associated to an enterprise.
Without declaring `dependent: :restrict`, trying to delete the address
would raise `ActiveRecord::InvalidForeignKey`. Now it is more specific
and raises `ActiveRecord::DeleteRestrictionError`.
I didn't find code rescuing the InvalidForeignKey when deleting addresses. I
actually think that we never delete addresses. So this change should not
have any impact on the execution.
2018-10-16 15:18:44 +11:00
Maikel Linke
a8705ca179
Simplify address methods
2018-10-16 14:49:36 +11:00
Maikel Linke
5021ed9c69
Simplify by using Rails tools
2018-10-16 14:49:35 +11:00
Maikel Linke
34849c441a
Reduce complexity and duplication
2018-10-16 14:48:12 +11:00
Maikel Linke
c4437a6437
Style address decorator
2018-10-16 14:48:12 +11:00
Maikel Linke
b109f6d78c
Remove temporary reporting code
2018-10-16 14:48:12 +11:00
fabricio.albarnaz
02bc134c59
Change befor save check to format validation
2018-10-15 17:51:33 -03:00
dependabot[bot]
dc6c8ec455
Bump figaro from 0.7.0 to 1.1.1
...
Bumps [figaro](https://github.com/laserlemon/figaro ) from 0.7.0 to 1.1.1.
- [Release notes](https://github.com/laserlemon/figaro/releases )
- [Changelog](https://github.com/laserlemon/figaro/blob/master/CHANGELOG.md )
- [Commits](https://github.com/laserlemon/figaro/compare/v0.7.0...v1.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-15 19:14:26 +00:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Pau Pérez Fabregat
f8bccda6ab
Merge pull request #2847 from Matt-Yorkley/emails/validation
...
Emails/validation
2018-10-15 15:54:41 +02:00
Pau Perez
a5a2cb8ea7
Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up"
...
This reverts commit fa689b6607 , reversing
changes made to 2aeed9763c .
2018-10-15 15:48:48 +02:00
Pau Pérez Fabregat
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
0e4a3dbc26
Merge pull request #2845 from coopdevs/fix-invalid-variant-creation
...
Fix invalid variant creation
2018-10-15 12:16:39 +02:00
Pau Pérez Fabregat
fa689b6607
Merge pull request #2856 from luisramos0/2-0-adjust-clean-up
...
[Spree Upgrade] Running Transpec and Rubocop in "new" models/spree/adjustment_spec
2018-10-15 11:13:46 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
luisramos0
f133524a9c
Remove useless comment from spec factories
2018-10-12 23:09:36 +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
luisramos0
a5522b90f6
Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created
2018-10-12 23:09:35 +01:00
luisramos0
bd31348b94
Improve docs and readability on tax_rate_decorator
2018-10-12 23:09:35 +01:00
luisramos0
5693f44f5e
Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment
2018-10-12 23:09:35 +01:00
Matt-Yorkley
fcff835922
Update results on dropdown select
2018-10-12 17:06:42 +01:00
Matt-Yorkley
a2828ea305
Use :for_hubs scope
2018-10-12 17:00:19 +01:00
Matt-Yorkley
123d1963ad
Remove duplicate method
2018-10-12 17:00:19 +01:00
Matt-Yorkley
3cb43121d5
Refactor long lines for new character limit
2018-10-12 17:00:18 +01:00
Matt-Yorkley
8fcaa54de7
Update CSV templates
2018-10-12 16:57:13 +01:00
Matt-Yorkley
bd4f0507ce
Adjustments for new Settings and ResetAbsent classes
2018-10-12 16:57:13 +01:00
Matt-Yorkley
1c85de6f58
Use producer and distributor for field names
2018-10-12 16:57:13 +01:00
Matt-Yorkley
2c9dc8899a
Update fields in specs
2018-10-12 16:57:13 +01:00
Matt-Yorkley
5c2b5377bc
Assign supplier_id when saving new product to products list
2018-10-12 16:57:13 +01:00
Matt-Yorkley
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +01:00
Matt-Yorkley
8a0a33deec
Merge pull request #2858 from Matt-Yorkley/rubocop_line_limit
...
Increase rubocop line limit to 100
2018-10-12 16:52:37 +01:00
luisramos0
1b6f7485b8
Update spree 2-0-4-stable revision used to pick up latest commits
2018-10-12 12:05:18 +01:00
luisramos0
3b6d29968d
Fix spree/models/adjustment_spec rubocop issues
2018-10-11 23:02:17 +01:00
luisramos0
6aa8978fe9
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/models/spree/adjustment_spec.rb
* 30 conversions
from: obj.should
to: expect(obj).to
* 25 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-10-11 23:02:17 +01:00
luisramos0
23ed4f705c
Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item
2018-10-11 23:02:17 +01:00
luisramos0
b7416e42f4
Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8)
2018-10-11 23:02:17 +01:00
luisramos0
8b0726b815
Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items
2018-10-11 23:02:17 +01:00
luisramos0
8aee0f9438
Reorganize code in EnterpriseFeeApplicator
2018-10-11 23:02:17 +01:00
fabricio.albarnaz
6ad32fb66d
Add check for instagram.com
2018-10-11 18:05:18 -03:00
fabricio.albarnaz
e46b3566c3
Remove the check for www.instagram.com
2018-10-11 16:51:43 -03:00
fabricio.albarnaz
48720c835c
Add spec to instagram pattern
2018-10-11 16:30:17 -03:00
fabricio.albarnaz
e87075aed7
Add before save to check the instagram link pattern
2018-10-11 15:27:46 -03:00
luisramos0
ed429dd20d
Fix models/spree/order_spec tests related to tax on shipments:
...
- make Spree::Config be picked up correctly by reordering test object creation
- make sure line item is loaded in the order when the order is created
2018-10-11 18:06:33 +01:00
luisramos0
56ff4fe90d
Remove useless comment from spec factories
2018-10-11 17:16:58 +01:00
luisramos0
dcf0eefe04
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-11 17:16:58 +01:00
Matt-Yorkley
57c6530e46
DRY code and use more flexible I18n
2018-10-11 16:38:14 +01:00
Matt-Yorkley
ebb03906cf
Increase rubocop line limit to 100
2018-10-11 15:37:38 +01:00
Pau Perez
60d05a941c
Fix variants with 'weight' and missing unit_value
...
This adds a data migration to fix those cases. It defaults to showing
1 unit of the specified weight. That is, if the user chose Kg, it'll
display 1 as unit.
Note that migration logs the process in a log/migrate.log file separate
from the regular Rails log/production.log file.
When you run the migration you'll see something like:
Fixing variants missing unit_value...
Processing variant 12...
Succesfully fixed variant 12
Done!
This helps auditing the changes applied and debug any possible failure
scenarios. You can delete it once all is ok.
2018-10-11 15:52:40 +02:00
Pau Perez
5bd375d422
Favor early return over dumb else branch
2018-10-11 15:52:40 +02:00
Pau Perez
c8c16f0e8a
Use Rails 3.2 validates syntax
2018-10-11 15:52:40 +02:00
Pau Perez
cbac916e66
Validate unit value when updating variant_unit
...
Variants whose product's variant_unit is weight or volume require
a unit_value.
2018-10-11 15:52:40 +02:00
Pau Perez
a2228d4131
Make ProductSet parseable by humans
...
Now it's imposible to understand what is really going on. Feels more
like assembler than Ruby.
2018-10-11 15:52:40 +02:00
Pau Perez
575d76e23e
Cover variant creation and update with basic tests
2018-10-11 15:52:40 +02:00
Pau Perez
d43726504b
Make #update_attributes parseable by humans
...
As it is this is impossible to follow.
2018-10-11 15:52:40 +02:00
Pau Perez
f54c69cbba
Add first test case for ProductSet
...
This covers creation and update of a product.
2018-10-11 15:52:40 +02:00
Pau Perez
2d60b3180e
Wrap and improve comment block readability
2018-10-11 15:52:40 +02:00
Matt-Yorkley
4760ebb80c
Use global config
2018-10-11 09:04:37 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
1bafa0cb7d
Merge pull request #2853 from mkllnk/remove-parallel-tests
...
Remove parallel tests
2018-10-10 16:01:44 +02:00
luisramos0
39d232daaf
Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item
2018-10-09 19:50:35 +01:00
Pau Pérez Fabregat
227dd3e399
Merge pull request #2831 from kristinalim/fix-product_import_date_error
...
Fix product import date error when some but not all variants have import date
2018-10-09 16:37:25 +02:00
Pau Pérez Fabregat
85962158b8
Merge pull request #2821 from nikobozi/oc-clear-filter
...
Make 'Clear All' button work on order cycle page
2018-10-09 16:35:57 +02:00
Matt-Yorkley
900c65e0fc
Merge pull request #2855 from openfoodfoundation/transifex
...
Transifex
2018-10-09 14:21:14 +01:00
Matt-Yorkley
edca209f67
Merge pull request #2844 from Matt-Yorkley/bi/angular_orders_changing_page
...
Fix bindings on angular orders data
2018-10-09 14:15:38 +01:00
Transifex-Openfoodnetwork
c2c492cd6b
Updating translations for config/locales/es.yml
2018-10-09 21:57:06 +11:00
Matt-Yorkley
55411af3fa
Improve user account spec
2018-10-09 10:07:41 +01:00
Maikel Linke
245d900b58
Remove unused CI scripts
...
We used to have our own CI server, but now we are using Travis and
Semaphore. We don't need these scripts any more. And since
parallel_tests was removed in the previous commit, they are broken
anyway.
2018-10-09 17:06:59 +11:00
Maikel Linke
4cbc449a51
Remove unused parallel_tests gem
...
Reverts db47c01784
2018-10-09 16:54:08 +11:00
Pau Pérez Fabregat
5606550cd2
Merge pull request #2815 from openfoodfoundation/dependabot/bundler/rspec-retry-0.6.1
...
Bump rspec-retry from 0.5.6 to 0.6.1
2018-10-09 07:30:25 +02:00
Maikel
68c58dcb68
Merge pull request #2770 from openfoodfoundation/transifex
...
Transifex
2018-10-09 15:18:17 +11:00
Matt-Yorkley
3e39f3e749
Disable logout on password change
2018-10-08 23:06:54 +01:00
Matt-Yorkley
8f5fd41c8b
Update email confirmation address
2018-10-08 21:38:47 +01:00
Matt-Yorkley
3ec8c12899
Update account setting spec for updating email address
2018-10-08 20:41:59 +01:00
Pau Pérez Fabregat
2aeed9763c
Merge pull request #2789 from luisramos0/pending_order_syncer
...
[Spree Upgrade] Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788
2018-10-08 17:51:36 +02:00
Pau Pérez Fabregat
c30458b90a
Merge pull request #2787 from luisramos0/pending_subs_mailer
...
[Spree Upgrade] Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786
2018-10-08 17:51:24 +02:00
Pau Pérez Fabregat
875f0c01bc
Merge pull request #2794 from luisramos0/pending_bulk_prod_update
...
[Spree Upgrade] Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in #2790
2018-10-08 17:51:08 +02:00
Pau Pérez Fabregat
d2720652bb
Merge pull request #2795 from luisramos0/pending_subs_pacement_job
...
[Spree Upgrade] Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793
2018-10-08 17:50:58 +02:00
Pau Pérez Fabregat
b51bd4aa4b
Merge pull request #2796 from luisramos0/pending_prod_import
...
[Spree Upgrade] Making product import and product importer specs pending, 17 tests to be fixed in #2791
2018-10-08 17:50:48 +02:00
Pau Pérez Fabregat
86d9f4d56a
Merge pull request #2797 from luisramos0/pending_reports
...
[Spree Upgrade] Making reports and reports_controller specs pending, 18 tests to be fixed in #2792
2018-10-08 17:50:25 +02:00
Pau Pérez Fabregat
ea6e522775
Merge pull request #2826 from 73VW/master
...
[README] Updated build status badge
2018-10-08 17:47:52 +02:00
Pau Pérez Fabregat
f5573f419b
Merge pull request #2778 from coopdevs/refactor-entry-processor
...
Refactor entry processor
2018-10-08 17:11:23 +02:00
Matt-Yorkley
37a7cceead
Fix bindings on angular orders data
2018-10-08 15:42:46 +01:00
Matt-Yorkley
b78716c283
Fix missing local variable
2018-10-08 14:49:29 +01:00
Maikel
d15f524cb1
Merge pull request #2779 from luisramos0/2-0-shipment-specs
...
[Spree Upgrade] Fixed several specs by defining line_items.target_shipmnt
2018-10-08 17:43:54 +11:00
Transifex-Openfoodnetwork
8b59943256
Updating translations for config/locales/de_DE.yml
2018-10-08 16:58:01 +11:00
luisramos0
574f031020
Fix typo in matomo optout iframe url in cookies_policy_helper
2018-10-05 21:36:03 +01:00
Kristina Lim
da904c908d
Fix product import date when not all variants have it
2018-10-06 03:03:22 +08:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
73VW
7a1cffb4b5
Updated build status badge
2018-10-04 18:43:30 +02:00
Pau Pérez Fabregat
b139f3839a
Merge pull request #2806 from luisramos0/rep
...
Delete representative_view dependency, not used
2018-10-04 13:02:35 +02:00
niko
f99ed81863
Make 'Clear All' button work on order cycle page
2018-10-04 11:46:38 +02:00
niko
f65d3c2815
fix rubocop issue
2018-10-04 03:30:32 +02:00
niko
3ae38178a3
Move query from variant_overrides_controller to its model scope
2018-10-04 02:43:02 +02:00
Pau Perez
f8ec198f9f
Remove on_demand from Api::CachedProductSerializer
...
This fixes lots of specs like the whole
spec/controllers/shop_controller_spec.rb, almost all specs of
spec/lib/open_food_network/products_renderer_spec.rb and most of
spec/features/consumer/shopping/shopping_spec.rb.
2018-10-03 14:27:59 +02:00
Pau Perez
75ad4254a6
Remove on_demand from Api::Admin::ProductSerializer
...
This change also moves the spec file to its appropriate place for the
sake of consistency and RSpec3-izes the test example.
2018-10-03 13:06:13 +02:00
luisramos0
8a22567291
Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items
2018-10-02 23:44:38 +01:00
luisramos0
1ce431b671
Reorganize code in EnterpriseFeeApplicator
2018-10-02 23:39:31 +01:00
luisramos0
3fbb98519d
Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8)
2018-10-02 23:28:47 +01:00
dependabot[bot]
8a6da745a3
Bump rspec-retry from 0.5.6 to 0.6.1
...
Bumps [rspec-retry](https://github.com/noredink/rspec-retry ) from 0.5.6 to 0.6.1.
- [Release notes](https://github.com/noredink/rspec-retry/releases )
- [Changelog](https://github.com/NoRedInk/rspec-retry/blob/master/changelog.md )
- [Commits](https://github.com/noredink/rspec-retry/compare/v0.5.6...v0.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-02 19:15:12 +00:00
dependabot[bot]
4e1521fd6a
Bump haml from 4.0.4 to 4.0.7
...
Bumps [haml](https://github.com/haml/haml ) from 4.0.4 to 4.0.7.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/4.0.4...4.0.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-02 19:13:34 +00:00
luisramos0
c559cf0394
Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created
2018-10-02 16:17:26 +01:00
luisramos0
bed4ec4102
Improve docs and readability on tax_rate_decorator
2018-10-02 16:15:10 +01:00
luisramos0
795441484d
Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment
2018-10-02 16:15:00 +01:00
luisramos0
daafe73d81
Delete representative_view dependency, not used
2018-10-02 15:11:13 +01:00
Pau Pérez Fabregat
aa78b9e54c
Merge pull request #2777 from coopdevs/setup-simplecov
...
Setup simplecov
2018-10-02 14:39:43 +02:00
Pau Pérez Fabregat
6ddcb01b7c
Merge pull request #2736 from openfoodfoundation/dependabot/bundler/oj-3.6.10
...
Bump oj from 2.1.2 to 3.6.10
2018-10-02 14:38:26 +02:00
Matt-Yorkley
55d7d5d1e4
Rename #capture_path to #payment_capture_path
2018-10-02 11:10:51 +01:00
Matt-Yorkley
017e3d14df
Use variable colour assignment
2018-10-02 11:10:21 +01:00
Pau Perez
6a7359a3c5
Pass supplier_ids in strategy #reset instead
...
This removes the need to expose supplier_ids through #<< and makes both
ResetAbsent and its strategies simpler.
This could be made even simpler if the strategies just implemented
`#relation` as public method and ResetAbsent called `#update_all` on
them. The data to be fetched is the only thing that changes but the
update is the same.
2018-10-01 17:37:49 +02:00
Pau Perez
82654cd1ee
Turn delegation to a reader to make it simpler
...
This makes the solution less smart and as a result ResetAbsent improves
it's consistency and returns always an integer.
2018-10-01 16:40:34 +02:00
Pau Perez
148321f7b7
Make strategies class names more explicit
2018-10-01 16:40:34 +02:00
Pau Perez
af93af1a64
Replace strategy with a more explicit name
2018-10-01 16:40:34 +02:00
Pau Perez
8715fce295
Remove @import_settings in favor of Settings
2018-10-01 13:12:06 +02:00
Pau Perez
fd69c7672d
Add specs for ResetAbsent strategies
...
This also fixes the case where there are no overrides to exclude.
2018-10-01 13:12:06 +02:00
Pau Perez
d527f6265a
Remove pointless sum
2018-10-01 13:12:06 +02:00
Pau Perez
5eb10edbfd
Inject #updated_ids to strategy
...
Their values are known beforehand.
2018-10-01 13:12:06 +02:00
Pau Perez
186801a1e2
Remove unused supplier_ids argument
2018-10-01 13:12:06 +02:00
Pau Perez
718f529ede
Use nested module in test to improve readability
2018-10-01 13:12:06 +02:00
Pau Perez
f04fa4ed63
Do not treat ResetAbsent as a decorator anymore
...
This fully encapsulates it's logic and reduces its tight coupling with
EntryProcessor.
2018-10-01 13:12:06 +02:00
Pau Perez
95ae18a1ba
Remove method delegation
2018-10-01 13:12:06 +02:00
Pau Perez
54d6bc5443
Don't use importing_into_inventory? in ResetAbsent
...
This completely decouples ResetAbsent from the particular strategy used.
2018-10-01 13:12:06 +02:00
Pau Perez
a10e58e20a
Inject strategy_factory into ResetAbsent
2018-10-01 13:12:06 +02:00
Pau Perez
a9444b8909
Extract InventoryReset and Products strategies
...
Extract this strategy classes from ResetAbsent and move #reset there.
2018-10-01 13:12:06 +02:00
Pau Perez
8d7a11b0ac
Make all steps of the algorithm have 2 branches
2018-10-01 13:12:06 +02:00
Pau Perez
23471346b6
Do not call ResetAbsent when preconditions not met
2018-10-01 13:12:06 +02:00
Pau Perez
a409353d37
Move import_settings query methods to Settings
2018-10-01 13:12:06 +02:00
Pau Perez
fd84bea463
Test that variants or overrides are actually reset
2018-10-01 13:12:06 +02:00
Pau Perez
b940f06238
Return early if reset_all_absent is not set
...
No need to go through half of the algorithm if the setting is not
enabled. It does not change per enterprise.
This also assumes "Previously we were updating both (products and inventory)
at the same time during one import, but now it's one or the other" in
Matt's words.
2018-10-01 13:12:06 +02:00
Pau Perez
c955e151b7
Pass enterprise ids as strs as current code does
2018-10-01 13:12:06 +02:00
Pau Perez
e04162415a
Move code comment to be the method's doc
2018-10-01 13:12:06 +02:00
Pau Perez
5ac3598550
Inject Settings object in ResetAbsent
2018-10-01 13:12:06 +02:00
Pau Perez
b5766a2dd9
Extract common conditional clauses
...
This also turns local vars into ivars so that the behaviour can be
thoroughly tested. These ivars are meant to be removed once this class
is refactored further. Now there's no other way to ensure its state.
2018-10-01 13:12:06 +02:00
Pau Perez
ed073e9750
Rely on Settings and don't access internal struct.
2018-10-01 13:12:06 +02:00
luisramos0
d2fe203c89
Fixes error undefined 'stock_location' by adding shipment to line_items in the following specs: features/admin/reports_spec, lib/open_food_network/bulk_coop_report_spec, lib/open_food_network/customers_report_spec, lib/open_food_network/order_cycle_management_report_spec, lib/open_food_network/orders_and_fulfillments_report_spec and lib/open_food_network/packing_report_spec
2018-10-01 11:57:36 +01:00
Aditya Sridhar
372ae8e4aa
updated the spacing to be consistent.
2018-09-30 16:10:57 -04:00
Aditya Sridhar
06b28c1ab4
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
2018-09-30 15:50:33 -04:00
luisramos0
1ff1e32398
Making reports and reports_controller specs pending, 18 tests to be fixed in issue #2792
2018-09-30 00:30:49 +01:00
luisramos0
7dfce6c368
Making product import and product importer specs pending, 17 tests to be fixed in issue #2791
2018-09-30 00:21:43 +01:00
luisramos0
1d49edb194
Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793
2018-09-30 00:10:31 +01:00
luisramos0
50ac519dd5
Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in issue #2790
2018-09-30 00:04:33 +01:00
luisramos0
e79d184db0
Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788
2018-09-29 23:42:35 +01:00
luisramos0
801c4d1cab
Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786
2018-09-29 23:31:11 +01:00
Pau Perez
663db47433
Move products_reset_count to ResetAbsent
2018-09-29 10:57:23 +02:00
Pau Perez
3150741849
Extract ResetAbsent class from EntryProcessor
2018-09-29 10:57:18 +02:00
luisramos0
6c05be9772
Fixed 22 out of 30 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.
2018-09-27 21:13:11 +01:00
luisramos0
3cf10020bf
Fix bug on slow page loads where banner and policy modal were both loaded
...
This solution makes the banner aware of the policy modal: the banner doesnt open if the policy modal is enabled
2018-09-27 17:47:36 +01:00
Pau Perez
16badcd1b5
Setup Simplecov to have code coverage analysis
...
This enables code coverage analysis when running specs in your dev
environment. Simply run them as usual and you'll see a line like the
following at the end of the output:
Coverage report generated for RSpec to /home/pau/dev/openfoodnetwork/coverage
Simply browse to coverage/index.html and the results in a web UI.
This is a useful tool that helps you decide if the tests you added are
enough or not.
2018-09-27 15:57:02 +02:00
Luis Ramos
f0183cd17e
Merge pull request #2762 from luisramos0/2-0-order-model-spec
...
[Spree Upgrade] Fixed updates of order.shipping_method_id and improved order, stock_location and shipment factories
2018-09-27 13:43:58 +01:00
Pau Pérez Fabregat
060b3c55f1
Merge pull request #2751 from luisramos0/2-0-order-details
...
[Spree Upgrade] Refactored spree/order_details, extracted delivery and pickup details into separate partials
2018-09-27 14:30:42 +02:00
Matt-Yorkley
54b17ac701
Use Spree::Order.pending_payments and remove service
2018-09-27 13:04:56 +01:00
Maikel
d488ae3f44
Merge pull request #2725 from mkllnk/2699-email-confirm-jobs
...
2699 email confirm jobs
2018-09-27 14:27:43 +10:00
Maikel Linke
f0021be53c
Style I18n call
2018-09-27 13:33:09 +10:00
Maikel Linke
af1ac333df
Create MailMethod before User when seeding
2018-09-27 13:33:09 +10:00
Maikel Linke
9dcc683dc0
Notify Bugsnag on sign-up errors
...
This may lead to more error reports than we want to see. A not existing
email address may cause Bugsnag to be notified. If this happens, we can
rescue form these specific errors and only report the rest.
2018-09-27 13:33:09 +10:00
Maikel Linke
17d951f99d
Rescue from any sign-up errors
...
The most common failure would happen when sending the confirmation email
triggered by `user.save`. We rescue any errors here and give feedback to
the user.
This allows for immediate feedback when the user types an email address
that is not accepted by our mail server or the email setup is not
configured properly.
2018-09-27 13:33:08 +10:00
Maikel Linke
3ae073dce5
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/controllers/user_registrations_controller_spec.rb
* 10 conversions
from: obj.should
to: expect(obj).to
* 7 conversions
from: == expected
to: eq(expected)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-09-27 13:33:08 +10:00
Maikel Linke
600c8fcd4c
Send confirmation emails immediately
...
Using deferred methods on the user model breaks delayed jobs when the
user is deleted while the job still exists. We could create a proper job
referencing a user id for sending these emails instead. But since the
user has to wait for the confirmation email anyway, we can send it
within the current request. This should be revised if performance
becomes an issue.
Sending the email directly also has the advantage that we can tell the
user if emailing failed. See the following commits.
This change impacts a bunch of specs as we now need a working email
setup to create unconfirmed users. This commit introduces a custom
matcher to unify testing for confirmation emails.
2018-09-27 13:33:08 +10:00
luisramos0
921105301c
Move angular-templates route and controller into Web engine
...
The route and controller were in the main app and the views in the engine, with this commit they stay all inside the engine
This is done to keep it simple and remove the unnecessary dependency between main app and engine
If we use this mechanism in the future for other things in the main app or other engines, we can find a way to extract/abstract this
2018-09-26 12:39:51 +01:00
luisramos0
b1c7e6c091
Fix assets precompilation by including web/all.js and web/all.css in the assets precompilation list in application.rb
2018-09-26 12:30:45 +01:00
luisramos0
a23b1b980d
Make Web engine an isolated namespace engine mounted on / (without /web prefix)
...
This approach is better to separate concerns, see “Isolated Engine” here: https://api.rubyonrails.org/v3.2/classes/Rails/Engine.html
2018-09-26 12:30:06 +01:00
Pau Pérez Fabregat
037432d1a7
Merge pull request #2767 from luisramos0/order_empty
...
[Spree Upgrade] Destroy all shipments when clearing order
2018-09-26 08:54:11 +02:00
Matt-Yorkley
2dcc8ea4bb
Add spec for pending payments service
2018-09-25 10:05:32 +01:00
Matt-Yorkley
e93d46e75a
Use .find instead of .select().first
2018-09-25 09:35:05 +01:00
Maikel
267edbdb45
Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
...
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-25 11:37:46 +10:00
Maikel
5ede6a40e7
Merge pull request #2766 from HugsDaniel/2744_add_require_ship_address_to_shipping_methods_form
...
[Spree Upgrade] Add require_shipping_address to shipping_methods_form
2018-09-25 11:37:15 +10:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
Maikel
bf1f2b93c6
Merge pull request #2768 from coopdevs/fire-unused-users-task
...
Remove no longer used rake task
2018-09-25 11:30:04 +10:00
luisramos0
4f32a8efc2
Fixed shipment factory by making shipments unique per order and stock_location factory by making stock_location unique
2018-09-25 00:49:03 +01:00
Transifex-Openfoodnetwork
97775c0bc1
Updating translations for config/locales/fr_CA.yml
2018-09-25 06:12:48 +10:00
Matt-Yorkley
1d9243af19
DRY and clarify serializer and service
2018-09-24 16:58:43 +01:00
Pau Perez
4a7ee9b91e
Remove no longer used rake task
2018-09-24 17:17:10 +02:00
Matt-Yorkley
6f2760cf92
Move translations into their namespace and use '.key' format
2018-09-24 15:54:05 +01:00
Pau Perez
eb64569c9a
Destroy all shipments when clearing order
...
Now we only clear the order's shipping_method, and in Spree 2.0 it can
have many shipments.
2018-09-24 15:25:33 +01:00
luisramos0
89114655fd
Fixed shipping_method update in features/consumer/shopping/orders_spec, order.shipment is now updated instead of order.shipping_method_id
2018-09-24 15:13:36 +01:00
luisramos0
4476b88044
Fixed shipping_method update in models/spree/order_spec, order.shipment is now updated instead of order.shipping_method_id
2018-09-24 15:13:36 +01:00
luisramos0
99fff3d279
Fixed factory completed_order_with_fees by skipping a failing and unnecessary part of the checkout workflow
...
Fixed factory's shipment_with shipping_fees trait by ensuring only one shipping_rate in the shipment
2018-09-24 15:13:35 +01:00
Luis Ramos
08104c62be
Merge pull request #2667 from luisramos0/2-0-ship-method-last-used-address
...
[Spree Upgrade] Adapt Address_Finder.last_used_ship_address to spree 2
2018-09-24 15:07:27 +01:00
Luis Ramos
0eb2854f8a
Merge pull request #2680 from luisramos0/2-0-stable-x
...
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
2018-09-24 15:07:04 +01:00
Pau Perez
f743b5f02f
Extract Settings from Product Import processor
...
This encapsulates the data structure used by the entry processor to
check various settings. It still requires a lot of work to move more
logic to this new class.
2018-09-24 13:55:33 +02:00
Hugo Daniel
0dd1b1a976
Fix feature specs for shipping_methods
2018-09-24 12:40:59 +02:00
Hugo Daniel
06ee75981a
Add require_shipping_address to shipping_methods_form
2018-09-24 12:35:40 +02:00
Pau Pérez Fabregat
b8417058b4
Merge pull request #2741 from coopdevs/refactor-checkout-process-bits
...
Refactor checkout process bits
2018-09-24 12:08:19 +02:00
Pau Pérez Fabregat
128ec1623a
Merge pull request #2760 from luisramos0/2-0-admin-enterprise-spec
...
[Spree Upgrade] In admin enterprises spec, replacing select2_search with select2_select
2018-09-24 11:15:18 +02:00
Pau Pérez Fabregat
52a412a218
Merge pull request #2638 from coopdevs/unit-test-variant-stock
...
Unit test variant stock
2018-09-24 11:14:03 +02:00
Maikel
9d48ea7b62
Merge pull request #2759 from luisramos0/del_old_spec_helper
...
Removed deprecated spec helper have_select2_option and fixed its last usage
2018-09-24 11:25:51 +10:00
Maikel
26eb79f5f2
Merge pull request #2729 from luisramos0/2-0-ship-method-curr-order-ser
...
[Spree Upgrade] Replace order.shipping_method_id in current_order_serializer
2018-09-24 08:56:21 +10:00
Maikel
9b10fbde2d
Merge pull request #2728 from luisramos0/2-0-ship-method-ctrl
...
[Spree Upgrade] Remove use of Order#shipping_method_id from ShippingMethodsControllerDecorator
2018-09-24 08:54:03 +10:00
Matt-Yorkley
9f57b43a13
Move sortble header elements to a partial
2018-09-23 22:14:12 +01:00
Maikel
f0bb927020
Merge pull request #2734 from coopdevs/make-rubocop-useful
...
Get useful feedback from Rubocop Metrics cops
2018-09-23 19:48:05 +10:00
Maikel
89be54f79e
Merge pull request #2750 from openfoodfoundation/transifex
...
Transifex
2018-09-22 16:05:04 +10:00
Transifex-Openfoodnetwork
7175434910
Updating translations for config/locales/en_US.yml
2018-09-22 01:25:48 +10:00
Pau Pérez Fabregat
3c4ec62352
Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit
...
[Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-21 16:16:25 +02:00
Pau Pérez Fabregat
33fa687c28
Merge pull request #2755 from HugsDaniel/apply_overrides_to_shipping_methods_form
...
[Spree Upgrade] Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-21 15:35:41 +02:00
Pau Pérez Fabregat
36bdde6cc4
Merge pull request #2754 from HugsDaniel/apply_overrides_to_shipping_methods_index
...
[Spree Upgrade] Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-21 15:28:44 +02:00
Maikel
e2fd5a36d8
Merge pull request #2757 from luisramos0/delete_dead_specs
...
Deleted sample specs and one pending spec
2018-09-21 15:41:49 +10:00
luisramos0
a04e90d188
In admin enterprises spec, replacing select2_search with select2_select makes all tests pass. Also made screen size longer to avoid errors with overlaying components
2018-09-20 23:58:14 +01:00
luisramos0
33d2b65d65
Removed deprecated spec helper have_select2_option and fixed its last usage
2018-09-20 23:01:23 +01:00
luisramos0
2a68184c01
Deleted unused test helper for rabl views
2018-09-20 20:09:14 +01:00
Hugo Daniel
f9c5e732d8
Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-20 19:21:02 +02:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Hugo Daniel
0d7e24e554
Change to new ruby hash syntax
2018-09-20 14:34:10 +02:00
Hugo Daniel
b0fa76f519
Change to new ruby hash syntax
2018-09-20 14:32:27 +02:00
Hugo Daniel
07cbb08b42
Change to new ruby hash syntax
2018-09-20 14:28:20 +02:00
Pau Pérez Fabregat
3dd1fcbc72
Merge pull request #2749 from luisramos0/delete-li-ship-method-name
...
Drop unused db column line_items.shipping_method_name
2018-09-20 13:26:26 +02:00
Hugo Daniel
56c1b073ee
Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-20 12:37:26 +02:00
Hugo Daniel
493da83378
Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-20 12:35:49 +02:00
Hugo Daniel
a14337df5c
Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-20 12:34:16 +02:00
Matt-Yorkley
897e43fe0b
Remove Spree's Deface data-hooks from new view
2018-09-20 11:33:22 +01:00
Maikel Linke
5763bf0518
Update all translations
2018-09-20 10:33:02 +10:00
luisramos0
0e6b0aa248
Deleted sample specs and one pending spec
2018-09-19 23:45:00 +01:00
Matt-Yorkley
fc68e28e4d
Add :description to non-updatable attributes list
2018-09-19 22:30:10 +01:00
Matt-Yorkley
ebb18e9394
Remove unneccesary method
2018-09-19 21:12:30 +01:00
Matt-Yorkley
cc98cc832c
Prefer #public_send over #send
2018-09-19 21:12:30 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Pau Perez
0ac16ce096
Get useful feedback from Rubocop Metrics cops
...
One of the biggest pros of linters like Rubocop is to get valuable feedback to
help write better code. The way we have Rubocop configured now we don't prevent
new code from adhere improved code quality and this is specially important when
touching code that already suffers from complexity.
Without all Rubocop's Metrics cops enabled there's no way to get this insights
and write better code. This enables them while regenerating the
`.rubocop_todo.yml` to hide the current violations.
So, next time we touch existing code that we think could be simpler, we should
go to `.rubocop_todo.yml` and remove any occurrences of the file in question.
This way we could Rubocop's feedback right in the editor. This is tremendously
helpful when refactoring. It shows you where to start.
2018-09-19 19:27:40 +02:00
Pau Pérez Fabregat
62bebdb15e
Merge pull request #2698 from openfoodfoundation/dependabot/bundler/uglifier-4.1.19
...
[Security] Bump uglifier from 2.7.1 to 4.1.19
2018-09-19 18:02:06 +02:00
luisramos0
57bb1fec9a
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
2018-09-19 16:21:12 +01:00
Pau Perez
a2b3d8372e
Reduce complexity of OrderUpdater decorator
2018-09-19 16:03:33 +02:00
Pau Pérez Fabregat
99ba9d7d1b
Merge branch '2-0-stable' into unit-test-variant-stock
2018-09-19 15:41:21 +02:00
Pau Perez
b77dd41eb0
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
...
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Pau Perez
0491a96d44
Ask to use backorderable? instead of on_demand
2018-09-19 15:12:38 +02:00
Transifex-Openfoodnetwork
454cd8bfbf
Updating translations for config/locales/nb.yml
2018-09-19 22:30:06 +10:00
HugsDaniel
c4d4b52668
Merge pull request #2742 from openfoodfoundation/transifex
...
Transifex
2018-09-19 14:18:03 +02:00
Matt-Yorkley
3cbb576b4f
Move payment object logic out of order serializer and delete code
2018-09-19 13:00:30 +01:00
Matt-Yorkley
ba254802f8
Move angular_pagination to /views/admin/shared/
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9ce32e3c14
Add new ordersCtrl spec
2018-09-19 13:00:30 +01:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
luisramos0
524f9af148
Drop unused db column line_items.shipping_method_name
2018-09-19 11:38:19 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Transifex-Openfoodnetwork
f0d015be0d
Updating translations for config/locales/de_DE.yml
2018-09-19 08:34:42 +10:00
Transifex-Openfoodnetwork
258347bc63
Updating translations for config/locales/fr.yml
2018-09-19 01:45:12 +10:00
luisramos0
edcdf59621
In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec.
2018-09-18 16:11:01 +01:00
Pau Perez
314ad5400f
Move variant_stock.rb to concerns/
2018-09-18 12:18:50 +02:00
Pau Pérez Fabregat
9f7d24934d
Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters
...
Translate "Any Enterprise" and "Any Schedule" in OC filters
2018-09-18 11:42:19 +02:00
Pau Perez
2a0e0eed73
Move state_machine's additions inside class_eval
...
And also cover them with tests.
2018-09-18 11:20:32 +02:00
Pau Perez
1fdc578901
Increase readability (a bit) of OrderUpdater
2018-09-18 11:20:32 +02:00
Pau Perez
99cdeca0b1
Remove useless RSpec context block
2018-09-18 11:20:32 +02:00
Pau Perez
13f73b4512
Test :restart_checkout state machine event
2018-09-18 11:20:32 +02:00
Pau Pérez Fabregat
e79f7c13f1
Merge pull request #2727 from luisramos0/2-0-shipment-adjustment
...
[Spree Upgrade] Adapt order_decorator.shipments.adjustments to spree 2
2018-09-18 09:37:10 +02:00
Maikel
1130bb341d
Merge pull request #2677 from luisramos0/2-0-sample-data
...
[Spree Upgrade] Fixed db:load_sample_data
2018-09-18 16:37:22 +10:00
Maikel
19df4ff640
Merge pull request #2701 from mkllnk/2700-improve-product-refresh-scheduling
...
2700 improve product refresh scheduling
2018-09-18 12:09:24 +10:00
dependabot[bot]
ccf7d91487
Bump oj from 2.1.2 to 3.6.10
...
Bumps [oj](https://github.com/ohler55/oj ) from 2.1.2 to 3.6.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/commits/v3.6.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-17 19:16:27 +00:00
luisramos0
c22ac0086b
Moved cookies_policy_helper to Web engine and respective spec
2018-09-17 16:05:38 +01:00
luisramos0
95f2f92cf3
Extracted cookies footer links from view to footer links helper
2018-09-17 16:05:38 +01:00
luisramos0
bded530137
Moved web api endpoint from /api to /web/api
2018-09-17 16:05:38 +01:00
luisramos0
dc5eb6448e
Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css
2018-09-17 16:05:38 +01:00
luisramos0
d170a4d489
New domain Web (rails engine) with the following features extracted from the main app:
...
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
2018-09-17 16:05:32 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Pau Pérez Fabregat
0f627cdf39
Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle
...
Translate "COPY OF" when cloning an OC
2018-09-17 12:38:29 +02:00
Pau Pérez Fabregat
0520f2187c
Merge pull request #2540 from luisramos0/delete_dead_store
...
removed assets related to spree store: dead code
2018-09-17 11:33:56 +02:00
Kristina Lim
798a6ed391
Translate more text in OC filters
2018-09-17 10:09:17 +10:00
luisramos0
843cd44b23
In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments
2018-09-17 00:51:01 +01:00
luisramos0
c66b611b99
Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec
2018-09-17 00:51:01 +01:00
luisramos0
75656668cd
Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments
2018-09-17 00:51:01 +01:00
luisramos0
38c2f52278
In features/admin/reports_spec, fixed setting shipping_method in order, this is now done through order shipments
2018-09-17 00:51:01 +01:00
luisramos0
fbd2d96b05
Moved shipment and shipping_method factories with flat rate and shipping fees to traits
2018-09-17 00:51:01 +01:00
luisramos0
7b6e4825e7
Fixed controllers/spree/admin/orders/customer_details_controller_spec:
...
- fixed order creation to use order.shipments instead of order.shipping_method
- adapted test to new spree 2 controller logic (shipments page is gone since 67f568914988bcc0a1fc520d15ed6444a6d12824 and redirect logic changed on e9cde1b4d570dd4f7f979ac71a58d6f3f342ebb4)
2018-09-17 00:44:14 +01:00
luisramos0
93ac99b5cc
Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec
2018-09-17 00:44:14 +01:00
Maikel Linke
ac85b90315
Clarify private class method declaration
2018-09-15 10:18:54 +10:00
luisramos0
8e5f43ed25
Fixed current order serializer spec name
2018-09-14 23:12:00 +01:00
luisramos0
238d2f4feb
Removed unnecessary code copied and replaced with call to identical super class
2018-09-14 22:20:21 +01:00
luisramos0
5b3a529487
Adapted address_finder_spec to spree 2 shipments
2018-09-14 18:41:59 +01:00
luisramos0
d685b706ad
In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists
2018-09-14 17:13:20 +01:00
luisramos0
2da7cc00f8
Fixed Address Finder last_used_ship_address. It now uses order.shipments.shipping_methods instead of order.shipping_method
2018-09-14 16:43:20 +01:00
luisramos0
6b3fd22db8
Adapted order_decorator to spree 2 by fixing adjustment.update! call on update_adjustment
2018-09-14 16:40:59 +01:00
Maikel
ce7be68fac
Merge pull request #2660 from kristinalim/translations-failed_oc_creation
...
Translate and fix fallback errors when creating or updating OC
2018-09-14 16:58:39 +10:00
dependabot[bot]
05225aaba7
[Security] Bump uglifier from 2.7.1 to 4.1.19
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 2.7.1 to 4.1.19. **This update includes security fixes.**
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v2.7.1...v4.1.19 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-14 06:29:22 +00:00
Maikel
c3f461ad6e
Merge pull request #2622 from openfoodfoundation/dependabot/bundler/db2fog-0.9.0
...
Bump db2fog from 0.8.0 to 0.9.0
2018-09-14 16:26:54 +10:00
Maikel
e836ac0234
Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link
...
Enable setting a customized user guide link in general settings
2018-09-14 15:46:05 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Maikel
eabb9f4574
Merge pull request #2659 from kristinalim/translations-admin_area_fixes
...
Simple translation fixes for admin area and profile page
2018-09-14 14:38:25 +10:00
Maikel
da2f278060
Merge pull request #2649 from kristinalim/translations-fix_store_link_in_admin_header
...
Fix i18n translation for Store link in admin header for `fr`
2018-09-14 14:24:29 +10:00
Maikel
43a3ecff06
Merge pull request #2612 from openfoodfoundation/dependabot/bundler/jwt-1.5.6
...
Bump jwt from 1.5.4 to 1.5.6
2018-09-14 14:13:02 +10:00
Maikel
514f64c8d0
Merge pull request #2650 from kristinalim/translations-more_admin_header
...
Add "more" translation key
2018-09-14 13:31:13 +10:00
Maikel
6b56def649
Merge pull request #2697 from mkllnk/2655-fix-admin-payments
...
2655 fix admin payments
2018-09-14 11:26:20 +10:00
Maikel
1000bd4d24
Merge pull request #2658 from kristinalim/translations-order_and_shipment_emails
...
Allow fixing and customizing translations for order cancellation and shipment emails
2018-09-14 10:11:56 +10:00
Hugo Daniel
8dd0e01b8e
Use explicit syntax for section objects in preference_sections definition
2018-09-13 12:34:06 +02:00
Pau Pérez Fabregat
692101db36
Merge pull request #2691 from coopdevs/fix-variant-override-spec
...
Fix failing spec due to wrong attribute
2018-09-13 12:21:35 +02:00
Maikel Linke
ec953e1db0
Style cache refreshment class
2018-09-13 17:22:01 +10:00
Maikel Linke
2e635f94f6
Make job queuing more robust and efficient
2018-09-13 17:20:11 +10:00
dependabot[bot]
b676bfdcc8
Bump jwt from 1.5.4 to 1.5.6
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 1.5.4 to 1.5.6.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v1.5.4...v1.5.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-13 02:34:11 +00:00
Maikel
065df96872
Merge pull request #2675 from Matt-Yorkley/bi/remake_views
...
Remake orders index view
2018-09-13 12:29:54 +10:00
Maikel
5e722bf57d
Merge pull request #2634 from luisramos0/cookies_matomo_optout
...
[Cookies] Adds matomo optout iframe to cookies policy page
2018-09-13 12:29:09 +10:00
Maikel
f46c1e8414
Merge pull request #2424 from frank-west-iii/issue-2100-mini-racer
...
Replace therubyracer with mini_racer
2018-09-13 12:28:03 +10:00
Maikel Linke
81f60aab46
Make PaymentMethod serialisable with fees
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2655
2018-09-13 12:01:17 +10:00
Maikel Linke
d7b19750e5
Add spec for GH issue #2655
2018-09-13 12:01:16 +10:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
luisramos0
478dd68072
In cookies policy helper, added string interpolation to variable to avoid variable (Spree::Config entry) to break the concatenation. Added unit test to validate the error case
2018-09-12 18:30:24 +01:00
luisramos0
409f084bd4
Added matomo opt out iframe to cookies policy page
2018-09-12 18:30:24 +01:00
Pau Perez
ce148e0197
Fix failing spec due to wrong attribute
2018-09-12 18:19:08 +02:00
Pau Pérez Fabregat
3f5c799166
Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page
...
Fix ask anonymous users to login for order page
2018-09-12 16:17:34 +02:00
Hugo Daniel
cc43d789e2
Refacto edit method for content controller and enable custom user guide link
2018-09-12 14:51:53 +02:00
dependabot[bot]
91c0de3f2a
Bump db2fog from 0.8.0 to 0.9.0
...
Bumps [db2fog](https://github.com/itbeaver/db2fog ) from 0.8.0 to 0.9.0.
- [Release notes](https://github.com/itbeaver/db2fog/releases )
- [Changelog](https://github.com/itbeaver/db2fog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/itbeaver/db2fog/commits/v0.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-12 11:09:57 +00:00
Pau Pérez Fabregat
e474271698
Merge pull request #2637 from Vadlusk/remove_css_splitter
...
Remove duplicate css_splitter references, delete split css file.
2018-09-12 13:07:15 +02:00
Pau Pérez Fabregat
64e71a1ee7
Merge pull request #2544 from kristinalim/fix-scrolling_in_modals
...
Fix top position, height, and scrolling with modals
2018-09-12 13:05:20 +02:00
luisramos0
145b4385a4
Fixed db:load_sample_data shipping_method build
2018-09-11 22:21:43 +01:00
Matt-Yorkley
4d9ebf0550
Apply submenu override
2018-09-11 12:17:28 +01:00
Matt-Yorkley
f08d6389d8
Apply capture order override
2018-09-11 12:06:58 +01:00
Matt-Yorkley
507f4d0878
OCD tidy up of visually misaligned filter
2018-09-11 11:53:37 +01:00
Matt-Yorkley
afedaea2b5
Apply special instructions override
2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308
Apply ship shortcut override
2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e
Apply distributor td override
2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca
Apply distributor th override
2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932
Apply distributor filter inputs override
2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed
Apply colgroup override
2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47
Apply ng-app override
2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f
Convert Spree view to HAML
2018-09-11 11:22:54 +01:00
Pau Pérez Fabregat
e58f7269c3
Merge pull request #2652 from luisramos0/2-0-within-zone
...
[Spree 2 Upgrade] Removed unused shipping_method.within_zone, customization not needed
2018-09-11 08:43:06 +02:00
Pau Pérez Fabregat
288f685fd4
Merge pull request #2654 from luisramos0/2-0-ship-method
...
[Spree 2 Upgrade] - Added adapted order.shipping_method
2018-09-11 08:27:36 +02:00
luisramos0
c00e6a5dc7
Added DB uniqueness constraint on order_id to shipments
...
By forbidding more than a row per order in the spree_shipments table we ensure all orders have no more than one shipment associated
2018-09-11 00:24:50 +01:00
luisramos0
3577f3790d
Moved order.shipping_method to the OrderShippingMethod concern
2018-09-11 00:24:35 +01:00
luisramos0
62951f7d48
Removing duplicated factories inserted by previous PRs: 2668 and 2670
2018-09-10 16:51:20 +01:00
luisramos0
f24b20d28c
Added adapted implementation of order.shipping_method to order_decorator
2018-09-10 14:32:50 +01:00
Pau Perez
8d8670bdf4
Fix typos in comments
2018-09-10 14:26:19 +02:00
Pau Pérez Fabregat
cde2f98514
Merge pull request #2590 from luisramos0/spree2_mail_method_create
...
Spree 2 - MailMethod - CreateMailMethod is now MailConfiguration
2018-09-10 12:08:23 +02:00
Pau Pérez Fabregat
a906ad15bd
Merge pull request #2670 from luisramos0/2-0-ship-method-adjustment-spec
...
[Spree 2 Upgrade] Fix issues related to shipments in adjustment_spec
2018-09-10 11:32:54 +02:00
luisramos0
44d81622ac
CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly
2018-09-10 10:21:23 +01:00
Pau Pérez Fabregat
5a11af9118
Merge pull request #2668 from luisramos0/2-0-ship-method-order-spec
...
[Spree 2 Upgrade] Fixed models/order_spec issues related to order.shipping_method
2018-09-10 11:18:10 +02:00
Maikel
bce2c1cfd5
Merge pull request #2588 from luisramos0/spree2_mail_method_specs
...
Spree 2 Upgrade - MailMethod - Fix "undefined mail method" error in specs
2018-09-10 11:28:34 +10:00
luisramos0
2f1616a286
Changed reference from order.shipping_method to order.shipments in adjustment_spec
2018-09-09 23:32:59 +01:00
luisramos0
5bcc49a61c
Removed calls to the now inexistent order.create_shipment! from specs
2018-09-09 23:16:19 +01:00
luisramos0
73512d3591
Replaced order.shipping_method with order.shipments in models.order_spec.
...
Fixed factory completed_order_with_fees used in order_spec and also in line_items_controller_spec and orders_controller_spec.
2018-09-09 23:13:32 +01:00
luisramos0
afedbe45ab
Fixed scenario "guest order with registered email" in order_spec
...
Spree order factory requires user (we are setting it to nil below so, no impact on the test)
Defining shipping method is not necessary for this test
2018-09-09 23:13:32 +01:00
luisramos0
d6cff9bc68
Removed calls to the now inexistent order.create_shipment! from specs
2018-09-09 23:13:27 +01:00
Kristina Lim
02a909c1b1
Do not use image_tag for enterprise image previews
...
If Rails config.assets.compile is false and config.assets.digest is
true, which is the case for staging and production, image_tag fails when
the image file is not found.
We do not need sprockets to ensure presence of the image file for these
tags, because the correct SRC values are assigned through the JS.
Inserting HTML should be sufficient.
2018-09-08 23:23:49 +08:00
Maikel
5e0997d03e
Merge pull request #2635 from apoc64/timezone_comments
...
Adds comments for setting up timezone in application.yml
2018-09-08 15:55:16 +10:00
Maikel
ce7c7b3867
Merge pull request #2640 from luisramos0/2-0-stable-spree-revision
...
Updated spree 2-0-4 revision used
2018-09-08 15:00:50 +10:00
Kristina Lim
003e65fbed
Translate error when failing to create order cycle
2018-09-08 02:15:52 +08:00
Kristina Lim
2c2dd62f6a
Translate "COPY OF" when cloning an OC
2018-09-08 02:06:52 +08:00
Kristina Lim
9dcdb67352
Translate inherits_properties label in product form
2018-09-08 01:37:57 +08:00
Kristina Lim
fc79aae17c
Translate authorized shops headers in account page
2018-09-08 00:34:47 +08:00
Kristina Lim
c64acf47ab
Fix translation key for "involving" in OC filters
2018-09-07 21:38:44 +08:00
Kristina Lim
86f4a118dd
Translate placeholder for order cycle name filter
2018-09-07 17:58:34 +08:00
Kristina Lim
40443b19f1
Add translations for headers in enterprise index
...
This is for the view when logged in as enterprise manager.
The translations added are:
* Producer?
* Package
* Status
2018-09-07 17:51:08 +08:00
Kristina Lim
2cf608ffdf
Add translations for shipment emails
2018-09-07 17:08:12 +08:00
Kristina Lim
f1d5088aaa
Add translations for order cancellation emails
2018-09-07 17:01:43 +08:00
Maikel
62f5228f1f
Merge pull request #2643 from luisramos0/transifex_manual
...
Fetched latest translations from transifex with tx pull --force
2018-09-07 16:46:24 +10:00
Maikel
3e0c74494d
Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug
...
Pi/updating variants bug
2018-09-07 15:10:18 +10:00
Maikel Linke
d6c2a36451
Blacklist libv8 version that breaks mini_racer
2018-09-07 14:11:33 +10:00
Frank West
b9fe1ced16
Replace therubyracer with mini_racer
...
This is being replaced to increase the reliability and speed of asset
compilation.
2018-09-07 14:11:30 +10:00
Maikel
937da277f7
Merge pull request #2628 from openfoodfoundation/dependabot/bundler/rubyzip-1.2.2
...
[Security] Bump rubyzip from 1.2.1 to 1.2.2
2018-09-07 10:51:41 +10:00
luisramos0
d2f4f8ccb2
Removed unused shipping_method.within_zone, customization not needed
2018-09-06 20:29:04 +01:00
Kristina Lim
d06bccb832
Change i18n key for Store link in admin header
...
spree_i18n translates the "store" key in different ways, sometimes like
"shop" and sometimes like "save". This could be because of a clash in
usage between Spree add-ons.
To be more specific, the "Store" link in the admin section now uses the
"admin.header.store" translation key.
2018-09-06 22:03:39 +08:00
Pau Perez
cd53ec1a4f
Replace exception with DB uniqueness constraint
...
By forbidding more than a row per variant in the spree_stock_items we
can ensure all variants have a single stock_item associated.
2018-09-06 13:21:22 +02:00
Pau Perez
8848af15ee
Raise when a variant has more than a stock item
...
This means we violated the business rules of having a single stock
location for the OFN instance and hence a single stock item per variant.
Although it is too late to preserve the data integrity we can know data
needs to be cleaned up.
2018-09-06 13:20:52 +02:00
Pau Perez
59883f9509
Add deprecation warnings for VariantStock methods
...
This will prevent other devs from relying on this methods and will tell
us the exact lines that call this methods, which will come in handy when
removing this module.
2018-09-06 13:20:52 +02:00
Pau Perez
fc5882686a
Add unit tests to VariantStock
...
This also replaces the after_save callback to after_update.
We enforce a stock_item exists when modifying the variant and the
stock_item gets created on variant's after_create. This means it's not
possible to use any of the VariantStock's setters before the variant is
persisted so executing the callback on creation is pointless.
2018-09-06 13:20:52 +02:00
Kristina Lim
6d5f8553ef
Add "more" translation key
...
This is used in places such as the adaptive menu in the admin section.
This is actually included in spree_i18n but not correctly translated for
fr.
2018-09-06 18:10:27 +08:00
Kristina Lim
f9533f8fb8
Refactor redirecting back after requiring login
2018-09-06 19:46:17 +10:00
Kristina Lim
cd41498da9
Ask to login when not authenticated for order page
...
Redirect the user to the login page, instead of responding with HTTP
401.
2018-09-06 16:26:48 +08:00
Kristina Lim
3bf9e95511
Add specs for existing behaviour in order page
2018-09-06 16:26:45 +08:00
Kristina Lim
28d2bb3d47
Wrap controller specs for viewing cart
2018-09-06 15:04:11 +08:00
Maikel
417c33a870
Merge pull request #2639 from luisramos0/2-0-stable-sept
...
Merging master into 2-0-stable (one month of commits in master)
2018-09-06 08:50:47 +10:00
Kristina Lim
339ea6fa91
Clean up SCSS as suggested by scss-lint
2018-09-06 04:21:35 +10:00
Kristina Lim
9258e8c464
Remove height limit for modals in small screens
2018-09-05 23:58:26 +08:00
Kristina Lim
169aa752d8
Enlarge potential size of modals for large screens
...
Change modals for large screens from 10% position from top and 80% max
height, to 5% position from top and 90% max height.
This is to accommodate the taller cookies policy modal.
It seems that it is not easy to apply a custom position and height to a
specific modal only. This doesn't seem to be supported by the modal
library currently being used.
Before the recent changes, most modals were rendering at 10px top
position (not the originally planned 10%), so changing this to 5%
doesn't seem to be much of a compromise.
2018-09-05 23:58:26 +08:00
Kristina Lim
f4725198e8
Move some CSS to pages/ subdirectory.
2018-09-05 23:58:26 +08:00
Kristina Lim
f03eb02269
Keep height of modal, dialog within screen height
2018-09-05 23:58:25 +08:00
Kristina Lim
a37e9f1b87
Use v0.9.0-20180826174721 in kristinalim fork of angular-foundation
...
There is a bug in the handling of % values for the "top" CSS property of
the modals. See details here:
https://github.com/kristinalim/angular-foundation/pull/1
A PR to the original repository has also been submitted, but the project
doesn't seem to be active anymore:
https://github.com/yalabot/angular-foundation/pull/319
And to another fork of the repository:
https://github.com/cwadrupldijjit/angular-foundation/pull/1
The bug was causing the 10% "top" CSS property for the modal to be
treated as 10px.
2018-09-05 23:58:25 +08:00
Kristina Lim
34adf7cf6c
Lower the start point for sliding of modals
...
Occasionally, the page scrolls up while the modal is being opened. This
was causing the final position of the modal to be at the wrong location
relative to the viewport.
This was happening because of a race condition between the animation
that slides the modal from above the viewport to the middle, and focus()
which the modal does:
https://github.com/yalabot/angular-foundation/blob/0.8.0/src/modal/modal.js#L109
The final vertical position of the modal is at 10%, so the animation
which translates the modal -25% vertically was starting -15% above the
viewport. The focus() was then causing vertical scroll.
This lowers the starting point of the animation, so there will no longer
be scrolling.
Additionally, the animation would only happen on large screens. The CSS
property "top" is 0 for smaller screens.
2018-09-05 23:58:25 +08:00
Kristina Lim
6e55e5b1c7
Use maximum of 80% for modals in large screens
...
When there is enough content in the modal, the height of the modal plus
its top margin could exceed the height of the viewport.
Considering a top position of 10%, a max height of 80% renders a tall
modal vertically centered, with 10% remaining space at the bottom.
2018-09-05 23:58:22 +08:00
luisramos0
138fa41b8d
Fetched latest translations from transifex with tx pull --force
2018-09-05 14:02:51 +01:00
Pau Pérez Fabregat
0a05e6944e
Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise
...
Rename "entreprise" in i18n keys to "enterprise"
2018-09-05 13:23:02 +02:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
luisramos0
89d51d75ae
Merge branch 'master' into 2-0-stable-sept
2018-09-04 17:43:20 +01:00
Maikel
0d2fa3dc40
Merge pull request #2611 from luisramos0/cookies_banner_font_size
...
[Cookies] Increased cookies banner font size for med/large screens to improve readability
2018-09-04 11:35:32 +10:00
Maikel
1b6bb72966
Merge pull request #2587 from luisramos0/spree2_order_mailer_decorator_bug
...
Spree 2 Upgrade - MailMethod - Fixed bug on order_mailer_decorator (only visible in spree 2)
2018-09-04 11:29:51 +10:00
luisramos0
d29a1ebf9a
Updated spree 2-0-4 revision used
2018-09-04 00:41:29 +01:00
Kristina Lim
ce0758d420
Add confirm dialog for enterprise image removal
2018-09-04 02:08:26 +08:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Kristina Lim
c9370672c6
Add JS support for removal of enterprise images
2018-09-04 02:08:12 +08:00
Kristina Lim
9c3bb863da
Add endpoints for removing enterprise images
2018-09-04 01:32:39 +08:00
Kristina Lim
01d4b8fb10
Allow custom resource permission for admin controllers
2018-09-04 01:18:48 +08:00
Kristina Lim
f30032eee7
Include image URLs in serialized enterprise for admin
2018-09-04 01:18:45 +08:00
VadLusk
8efbe0e6d2
Delete _split2.css from application.rb assets precompile array.
2018-09-03 11:08:38 -06:00
Pau Pérez Fabregat
7dbbc3e9d8
Merge pull request #2610 from luisramos0/cookies_banner_bug
...
[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
2018-09-03 17:23:17 +02:00
apoc64
fbce828305
Breaks comment into multiple lines
2018-09-03 08:56:42 -06:00
Pau Pérez Fabregat
903d70090e
Merge pull request #2636 from luisramos0/heroku_dead_code
...
Removed old files that were used with, now unsupported, heroku
2018-09-03 12:49:19 +02:00
Pau Pérez Fabregat
0f118baa4e
Merge pull request #2615 from mkllnk/2575-variant-on-hand-api
...
2575 variant on hand api
2018-09-03 11:16:02 +02:00
luisramos0
8004abbb9f
Improved Order mailer and Subscriptions mailer specs by removing dependency to old mail method
2018-09-03 10:03:06 +01:00
luisramos0
921c8dfdf4
Removed unnecessary cancel_email from order_email_decorator (spree one is equivalent after ofn PR#2589). Also refactored remaining order_mailer_decorator methods by extracting duplicated code.
2018-09-03 10:03:02 +01:00
luisramos0
14d526efc2
removed assets related to spree store: dead code
2018-09-03 09:50:42 +01:00
Maikel
129e2c915e
Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0
...
Bump angular-rails-templates from 0.2.0 to 0.3.0
2018-09-03 14:39:21 +10:00
Maikel
1b264403e0
Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user
...
Subscription emails for customer should not link to order page if customer has no user account
2018-09-03 14:38:56 +10:00
Maikel
3fadd06dc7
Merge pull request #2613 from luisramos0/cookies_better_policy_page
...
[Cookies] Updated cookies policy page text
2018-09-03 11:49:14 +10:00
Maikel
42afd426d5
Merge pull request #2620 from openfoodfoundation/dependabot/bundler/foreigner-1.7.4
...
Bump foreigner from 1.6.1 to 1.7.4
2018-09-03 11:48:48 +10:00
Maikel
11ab875b9a
Merge pull request #2623 from openfoodfoundation/dependabot/bundler/eventmachine-1.2.7
...
Bump eventmachine from 1.2.3 to 1.2.7
2018-09-03 11:48:34 +10:00
Maikel
c510bbd8d0
Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update
...
Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address
2018-09-03 11:05:48 +10:00
VadLusk
f74a6e47d5
Remove css_splitter references, delete all_split2.css. #1361 #2633
2018-09-03 09:20:26 +10:00
luisramos0
512577768c
Removed old files that were used with, now unsuported, heroku
2018-09-02 22:13:42 +01:00
apoc64
e62a755ddb
Adds comments for setting up timezone in application.yml
2018-09-02 11:08:27 -06:00
luisramos0
59f8dd4458
Improved cookies spec by keeping global config values as they were before the test
2018-09-01 20:35:07 +01:00
Kristina Lim
f844236b9c
Remove order link in non-user order cancellation email
2018-09-01 23:46:12 +08:00
Kristina Lim
5f2c3a1955
Remove order link in non-user failed payment email
2018-09-01 23:46:12 +08:00
Kristina Lim
f8244a400a
Custom subscription placement email if non-user
...
The order link should not be provided if the order does not have an
associated user account.
2018-09-01 23:46:11 +08:00
Kristina Lim
ad8b120e48
Extract format for order cycle closing in emails
...
Using a helper for this, but this can be changed to look up a
translation key.
2018-09-01 23:46:08 +08:00
Matt-Yorkley
9d05e5c97a
Remove duplicate line in spec
2018-09-01 14:09:07 +01:00
Kristina Lim
dc4037474d
Test order links in subscription placement emails
2018-09-01 15:40:36 +08:00
Matt-Yorkley
d8bbcdc54b
Decrease batch size to reduce chance of timeouts
2018-08-31 22:52:44 +01:00
Matt-Yorkley
4dfbbd60d4
Fix occasional StaleObjectError on variant updates
2018-08-31 19:47:08 +01:00
dependabot[bot]
4557bfbc17
[Security] Bump rubyzip from 1.2.1 to 1.2.2
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases )
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md )
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-31 17:49:12 +00:00
Matt-Yorkley
75a9ea5bfa
Prefer .flat_map(&foo) over .map(&foo).flatten
2018-08-31 15:38:38 +01:00
Matt-Yorkley
04d50d4555
Fix filter results bug in validation section
2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6
Rename "entreprise" in i18n keys to "enterprise"
2018-08-31 15:26:30 +08:00
Maikel
a9c8c033c7
Merge pull request #2566 from openfoodfoundation/dependabot/bundler/daemons-1.2.6
...
Bump daemons from 1.2.2 to 1.2.6
2018-08-31 14:54:53 +10:00
Maikel
c30e29051a
Merge pull request #2594 from openfoodfoundation/dependabot/bundler/compass-rails-3.1.0
...
Bump compass-rails from 2.0.4 to 3.1.0
2018-08-31 13:47:22 +10:00
Maikel
42936be40a
Merge pull request #2578 from luisramos0/spree2_fix_test_line_items
...
Spree2 fix test line items
2018-08-31 13:26:25 +10:00
Maikel Linke
13b9ecab21
Fix font issue in mobile menu
2018-08-31 11:23:11 +10:00
luisramos0
1b4e0cd73a
Made the menu config default values more user friendly
2018-08-31 11:23:11 +10:00
luisramos0
e573a3fc2b
The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.
2018-08-31 11:23:11 +10:00
dependabot[bot]
508643b64e
Bump eventmachine from 1.2.3 to 1.2.7
...
Bumps [eventmachine](https://github.com/eventmachine/eventmachine ) from 1.2.3 to 1.2.7.
- [Release notes](https://github.com/eventmachine/eventmachine/releases )
- [Changelog](https://github.com/eventmachine/eventmachine/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eventmachine/eventmachine/compare/v1.2.3...v1.2.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-30 19:19:08 +00:00
dependabot[bot]
287b21b0cf
Bump foreigner from 1.6.1 to 1.7.4
...
Bumps [foreigner](https://github.com/matthuhiggins/foreigner ) from 1.6.1 to 1.7.4.
- [Release notes](https://github.com/matthuhiggins/foreigner/releases )
- [Changelog](https://github.com/matthuhiggins/foreigner/blob/master/CHANGELOG.md )
- [Commits](https://github.com/matthuhiggins/foreigner/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-30 19:16:41 +00:00
Pau Perez
1de13a5049
Favor #public_send over #send using Rubocop's cop
...
Devs keep using `#send` although that method does not preserve
private/protected visibility. Watching after this turned out to be quite
time-consuming while doing code review.
Currently, the Style/Send cop doesn't enforce `#public_send` however
(that's what we want). It simply discourages the use of #send. See
https://github.com/rubocop-hq/rubocop/pull/2081#issuecomment-292251650
for details. So a new entry on the Code Conventions doc has been added
to overcome this limitation:
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Code-Conventions#prefer-public_send-over-send
2018-08-30 18:48:45 +02:00
Pau Pérez Fabregat
b4bfa3ff2d
Merge pull request #2591 from mkllnk/remove-rack-livereload
...
Remove gem rack-livereload
2018-08-30 13:50:57 +02:00
Maikel
1b88edea1f
Merge pull request #2420 from stveep/stripe-admin-2
...
Stripe admin 2
2018-08-30 15:48:49 +10:00
Maikel Linke
d1f7828432
Fix pending spec
...
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
2018-08-30 14:50:41 +10:00
Maikel Linke
429bf132da
Test creating a fee, not updating
...
The spec for creating an enterprise fee didn't actually create a new
fee. Because all enterprise fees are displayed, it changed an existing
fee.
2018-08-30 14:50:41 +10:00
Maikel Linke
297ea830dc
Further style spec
2018-08-30 14:50:41 +10:00
Maikel Linke
bc1e8bfde6
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/features/admin/enterprise_fees_spec.rb
* 27 conversions
from: obj.should
to: expect(obj).to
* 8 conversions
from: == expected
to: eq(expected)
* 4 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-08-30 14:50:41 +10:00
Maikel Linke
a789aeb30a
Speed up enterprise fee spec
2018-08-30 14:50:41 +10:00
Maikel Linke
0174b84254
Remove old deactivated code
2018-08-30 14:50:41 +10:00
Maikel Linke
cebcdea40c
Replace obsolete count_on_hand call for variant
...
The variant factory supports only `on_hand` now.
2018-08-30 13:55:12 +10:00
Maikel Linke
e9c1868759
Update factory to fix tests
...
In Spree 2, products don't have `on_hand` or `on_demand` any more. But
we always create a standard variant in an after-save hook which accepts
these values due to our backwards compatibility patch.
2018-08-30 13:55:12 +10:00
Maikel Linke
c7648d67bd
Add Variant stock API of Spree 1
2018-08-30 13:55:12 +10:00
Maikel
174bc15ac9
Merge pull request #2607 from openfoodfoundation/dependabot/bundler/pg-0.21.0
...
Bump pg from 0.13.2 to 0.21.0
2018-08-30 13:37:25 +10:00
dependabot[bot]
664db1b0c2
Bump pg from 0.13.2 to 0.21.0
...
Bumps [pg](https://bitbucket.org/ged/ruby-pg ) from 0.13.2 to 0.21.0.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc )
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v0.21.0..v0.13.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-30 03:19:13 +00:00
Maikel
8a97088bb6
Merge pull request #2606 from openfoodfoundation/dependabot/bundler/poltergeist-1.18.1
...
Bump poltergeist from 1.16.0 to 1.18.1
2018-08-30 13:16:47 +10:00
Maikel
1c61539119
Merge pull request #2585 from greysteil/bump-ams
...
Bump active_model_serializer to 0.8.4, and pin it
2018-08-30 10:00:22 +10:00
Maikel
fac29ebb96
Merge pull request #2595 from openfoodfoundation/dependabot/bundler/immigrant-0.3.6
...
Bump immigrant from 0.1.6 to 0.3.6
2018-08-30 09:56:37 +10:00
luisramos0
efcf680094
Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment
...
Fixed 5 out of 7 tests in orders_and_fulfillments_report_spec by providing target_shipment in test line_items
Fixed 12 out of 44 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.” “The remaining 32 failing tests are now failing with the very common: undefined method on_hand= on Spree::Variant
Improved 1 test in reports_spec.rb by providing target_shipment in test line_items. Test now fails with undefined method Spree::Order.shipping_method
Fixed 9 tests in orders_controller_spec by providing target_shipment in test line_items
Fixed 4 tests in packing_report_spec.rb by providing target_shipment in test line_items. Failing tests are now failing with undefined product.on_hand? method
Fixed 8 tests in line_items_controller_spec by providing target_shipment in test line_items
Fixed 1 test in update_billable_periods_spec by providing target_shipment in test line_items
Fixed 4 tests in bulk_coop_report_spec by providing target_shipment in test line_items. The 2 failing tests are now failing with undefined product.on_hand? method
Improved 1 test in line_items_controller_spec by providing target_shipment in test line_items. Test is still failing with an unexpected method call
Fixed 1 test in order_and_distributor_report_spec by providing target_shipment in test line_items
2018-08-30 00:33:15 +01:00
luisramos0
02b968b312
Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view
2018-08-30 00:27:35 +01:00
luisramos0
53e7fcb019
Imcreased cookies banner font size for med/large screens to improve readability
2018-08-30 00:21:00 +01:00
luisramos0
8dc10ffc6e
Added new test to cookies spec to cover bug on cookies banner and fixed it. See issue #2599 .
...
Also, improved readability on cookies spec with some extracted methods.
2018-08-28 23:48:22 +01:00
dependabot[bot]
3d8c4c69a7
Bump poltergeist from 1.16.0 to 1.18.1
...
Bumps [poltergeist](https://github.com/teampoltergeist/poltergeist ) from 1.16.0 to 1.18.1.
- [Release notes](https://github.com/teampoltergeist/poltergeist/releases )
- [Changelog](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md )
- [Commits](https://github.com/teampoltergeist/poltergeist/compare/v1.16.0...v1.18.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-28 19:15:06 +00:00
Matt-Yorkley
8de0355dc7
Add spec for multiple stages during import
2018-08-28 14:05:57 +01:00
Matt-Yorkley
f905284f7a
Add spec for edge case
2018-08-28 12:45:04 +01:00
Maikel
189bd0911b
Merge pull request #2574 from luisramos0/bulk_line_items_controller_spec_fix
...
Spree2 - Bulk line items controller spec fix
2018-08-28 16:47:04 +10:00
Maikel
79f50e0b7b
Merge pull request #2353 from luisramos0/customers_admin_country_state
...
fixed UX problem in the state selector in customers admin
2018-08-28 16:46:00 +10:00
Maikel
b4bea59bb0
Merge pull request #2567 from greysteil/better-feater-matchers
...
Switch feature matcher style from `to_not have` to `to have_no`
2018-08-28 16:44:57 +10:00
Matt-Yorkley
6b9b8d8b73
Match multiple product names
2018-08-28 03:26:17 +01:00
Grey Baker
562a7936d9
Bump active_model_serializer to 0.8.4
2018-08-28 01:00:06 +01:00
Maikel
c39ac26f57
Merge pull request #2580 from openfoodfoundation/dependabot/bundler/stripe-3.3.2
...
Bump stripe from 3.3.1 to 3.3.2
2018-08-28 09:42:38 +10:00
Matt-Yorkley
8c2a49a57c
Update PI model spec
2018-08-27 23:08:19 +01:00
Matt-Yorkley
1df1ddcf66
Add spec for saving product and variant simultaneously
2018-08-27 23:06:54 +01:00
luisramos0
082f9e404b
Fixed test on order_cycle_spec by replacing eq with match_array
2018-08-27 21:04:18 +01:00
luisramos0
b5038fa5dc
Changed calls to MailMethod in specs to calls to Spree::Config[:mails_from]
2018-08-27 21:02:54 +01:00
dependabot[bot]
61097c3bf9
Bump immigrant from 0.1.6 to 0.3.6
...
Bumps [immigrant](https://github.com/jenseng/immigrant ) from 0.1.6 to 0.3.6.
- [Release notes](https://github.com/jenseng/immigrant/releases )
- [Changelog](https://github.com/jenseng/immigrant/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jenseng/immigrant/compare/v0.1.6...v0.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-27 19:18:13 +00:00
dependabot[bot]
67802cd4ee
Bump compass-rails from 2.0.4 to 3.1.0
...
Bumps [compass-rails](https://github.com/Compass/compass-rails ) from 2.0.4 to 3.1.0.
- [Release notes](https://github.com/Compass/compass-rails/releases )
- [Changelog](https://github.com/Compass/compass-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Compass/compass-rails/compare/2.0.4...3.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-27 19:17:55 +00:00
Maikel Linke
58cbe492d4
Remove gem rack-livereload
...
I don't think that anybody is using it. I asked on Slack and people
didn't know what it was. I kept guard-livereload which is probably
offering the same, maybe even better.
2018-08-27 16:34:50 +10:00
Maikel
44faa116db
Merge pull request #2583 from mkllnk/seed-mail-connection-type
...
Configure mail TLS or SSL connection when seeding
2018-08-27 09:52:56 +10:00
Kristina Lim
28792fc895
Add tests for adding/updating enterprise images
2018-08-26 03:58:19 +08:00
luisramos0
0de691b821
Delete outdated base_mailer_decorator.from_address (it used old MailMethod). This way we rely on the correct spree base_mailer.from_address (that gets it from Spree::Config
2018-08-25 13:47:05 +01:00
luisramos0
27f5e6db8a
Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: 32d2adc8a2 (diff-aa82d768109073ea8ad7858146630be4R9). Spree change introduced here: 8d90ae15f8 (diff-1e2ba31309f1f1abd2a4b626036d316fR94)
2018-08-25 12:50:36 +01:00
Maikel
8eee8f96ed
Merge pull request #2557 from Matt-Yorkley/pi/class_descriptions
...
Class descriptions for Product Import
2018-08-24 18:14:12 +10:00
Matt-Yorkley
717f626dfe
Refactor enterprise validation
2018-08-24 15:51:37 +10:00
Matt-Yorkley
2b057a26d5
Add primary_producer to index to reduce queries
2018-08-24 15:51:37 +10:00
Matt-Yorkley
666fbf53bf
Validate enterprise.is_primary_producer?
2018-08-24 15:51:37 +10:00
Maikel
616b42a14d
Merge pull request #2555 from luisramos0/cookie_http_only
...
Added httponly to cookieConsent cookie, this makes this cookie secure…
2018-08-24 15:50:13 +10:00
Maikel
a37931afda
Merge pull request #2542 from luisramos0/add_to_cart
...
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
2018-08-24 14:43:33 +10:00
Maikel
bf55190136
Merge pull request #2546 from Matt-Yorkley/pi/sku_validation
...
Remove empty SKU values if empty
2018-08-24 14:32:00 +10:00
Maikel Linke
b158c92998
Configure mail TLS or SSL connection when seeding
...
This allows to seed the secure connection type of the default mail
method.
2018-08-24 14:03:21 +10:00
Maikel
871e423e12
Merge pull request #2548 from kristinalim/feature-bulk_update_of_order_cycle_name
...
Make OC name editable from the OC index
2018-08-24 11:38:31 +10:00
Maikel
c4c4547338
Merge pull request #2572 from greysteil/bump-webmock
...
Bump webmock
2018-08-24 08:49:11 +10:00
dependabot[bot]
358bb3030a
Bump stripe from 3.3.1 to 3.3.2
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v3.3.1...v3.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-23 19:16:15 +00:00
dependabot[bot]
2e4a8d6318
Bump angular-rails-templates from 0.2.0 to 0.3.0
...
Bumps [angular-rails-templates](https://github.com/pitr/angular-rails-templates ) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/pitr/angular-rails-templates/releases )
- [Changelog](https://github.com/pitr/angular-rails-templates/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pitr/angular-rails-templates/compare/v0.2.0...v0.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-23 19:15:48 +00:00
luisramos0
910297572e
Removed unnecessary currency from CartService constructor, using order.currency instead
2018-08-23 12:40:18 +01:00
luisramos0
ec069b1e3e
Converted specs to latest rspec syntax
2018-08-23 12:39:58 +01:00
luisramos0
c7b202f932
Fixed CodeClimate warnings on services/cart_services.rb
2018-08-23 12:39:58 +01:00
luisramos0
05bfc098ff
/controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator.
2018-08-23 12:39:55 +01:00
luisramos0
6caa361354
Moved Spree::OrderController.populate to new CartController.
...
This was done to make order populate independent of Spree::OrdersController
2018-08-23 12:37:52 +01:00
Maikel
0312bf93dd
Merge pull request #2556 from luisramos0/cookies_failing_tests
...
Make cookies tests more stable
2018-08-23 13:29:02 +10:00
Maikel Linke
00b8b0a36c
Sleep to avoid race conditions in cookie spec
...
We tried a lot to avoid these sleep commands, but nothing worked. So
it's better to have reliable specs than fast specs.
2018-08-23 13:13:05 +10:00
Maikel
0c35d1bade
Merge pull request #2570 from openfoodfoundation/dependabot/bundler/atomic-1.1.101
...
Bump atomic from 1.1.99 to 1.1.101
2018-08-23 11:05:46 +10:00
Maikel
5dd0aed1c0
Merge pull request #2569 from openfoodfoundation/dependabot/bundler/rack-livereload-0.3.17
...
Bump rack-livereload from 0.3.16 to 0.3.17
2018-08-23 10:56:00 +10:00
Maikel
bc192dabbc
Merge pull request #2564 from openfoodfoundation/dependabot/bundler/fuubar-2.3.2
...
Bump fuubar from 2.2.0 to 2.3.2
2018-08-23 10:10:07 +10:00
Maikel
7d40e960f4
Merge pull request #2563 from openfoodfoundation/transifex
...
Transifex
2018-08-23 10:06:16 +10:00
Maikel
92e9392bc5
Merge pull request #2561 from mkllnk/2233-enable-embedded-shopping-spec
...
Enable embedded shopping spec
2018-08-23 09:23:12 +10:00
luisramos0
a97138dd58
Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment
2018-08-22 23:20:30 +01:00
Grey Baker
468c29b8c1
Use new basic auth stub style
2018-08-22 21:35:56 +01:00
dependabot[bot]
b459ed7122
Bump webmock from 1.8.11 to 3.4.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 1.8.11 to 3.4.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v1.8.11...v3.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 21:26:05 +01:00
dependabot[bot]
f35e24d5ce
Bump atomic from 1.1.99 to 1.1.101
...
Bumps [atomic](https://github.com/ruby-concurrency/atomic ) from 1.1.99 to 1.1.101.
- [Release notes](https://github.com/ruby-concurrency/atomic/releases )
- [Commits](https://github.com/ruby-concurrency/atomic/compare/1.1.99...1.1.101 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 19:18:33 +00:00
dependabot[bot]
c5b426fded
Bump rack-livereload from 0.3.16 to 0.3.17
...
Bumps [rack-livereload](https://github.com/onesupercoder/rack-livereload ) from 0.3.16 to 0.3.17.
- [Release notes](https://github.com/onesupercoder/rack-livereload/releases )
- [Commits](https://github.com/onesupercoder/rack-livereload/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 19:17:49 +00:00
Grey Baker
a747561e77
Switch feature matcher style from to_not have to to have_no
2018-08-22 09:29:48 +01:00
dependabot[bot]
8fb5625f1d
Bump daemons from 1.2.2 to 1.2.6
...
Bumps [daemons](https://github.com/thuehlinger/daemons ) from 1.2.2 to 1.2.6.
- [Release notes](https://github.com/thuehlinger/daemons/releases )
- [Changelog](https://github.com/thuehlinger/daemons/blob/master/Releases )
- [Commits](https://github.com/thuehlinger/daemons/compare/v1.2.2...v1.2.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 07:48:28 +00:00
dependabot[bot]
ade005bb2c
Bump fuubar from 2.2.0 to 2.3.2
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.2.0 to 2.3.2.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.2.0...releases/v2.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 07:47:04 +00:00
Maikel
4417a8f156
Merge pull request #2539 from luisramos0/delete_dead_cart
...
removed Cart route, controller, model and specs: dead code
2018-08-22 17:35:58 +10:00
Transifex-Openfoodnetwork
1bbc615496
Updating translations for config/locales/fr_CA.yml
2018-08-22 08:37:41 +10:00
Transifex-Openfoodnetwork
39b3a964dd
Updating translations for config/locales/fr.yml
2018-08-22 04:25:59 +10:00
luisramos0
653804d14c
Make cookies test more stable
2018-08-20 21:08:09 +01:00
luisramos0
61f69905f8
fixed UX problem in the state selector in customers admin
2018-08-20 20:51:22 +01:00
luisramos0
898e41acfb
Removed monkeypatchs to scope variants on inventory_unit and line_item decorators. We need to make the scoping somewhere else in spree2, see #2559
2018-08-19 20:23:31 +01:00
stveep
17f2ba47ca
Add label for card field
2018-08-19 12:00:31 +01:00
stveep
8c6b8d5e84
Move injectors outside Stripe partial to satisfy dependencies
2018-08-19 11:50:34 +01:00
stveep
286101c934
PR changes: switch syntax for mapCC, remove ng-init
2018-08-19 10:43:53 +01:00
stveep
c0f41b6833
PR changes - erb to haml, don't update en_GB translations
2018-08-19 10:43:53 +01:00
stveep
b3da7049c6
Should not hide post code on admin side as no billing address otherwise
2018-08-19 10:43:53 +01:00
stveep
ff7dc811e9
Add translations for messages and remove old placeholder translation
2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff
add to manifest, tidy up requirements, hide postcode similar to frontend
2018-08-19 10:43:53 +01:00
stveep
a848b9172e
Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages
2018-08-19 10:43:53 +01:00
stveep
8272aebe29
Add Stripe form and duplicate Stripe Elements in backend Angular app
2018-08-19 10:43:53 +01:00
Matt-Yorkley
fbbbc93aba
Class descriptions for Product Import
2018-08-18 11:42:02 +01:00
luisramos0
56879377d5
Added httponly to cookieConsent cookie, this makes this cookie secure, cannot be altered by javascript
2018-08-17 22:57:57 +01:00
Maikel
e0d13010bb
Merge pull request #2543 from openfoodfoundation/transifex
...
Transifex
2018-08-17 17:36:22 +10:00
Maikel Linke
7dccbb5213
Enable embedded shopping spec
...
It was disabled in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2232 , because
it was very unreliable. But it seems stable again since
https://github.com/openfoodfoundation/openfoodnetwork/pull/2468 .
2018-08-17 17:00:15 +10:00
Matt-Yorkley
28b1fc076a
Remove empty SKU values if empty
2018-08-16 14:29:50 +01:00
Kristina Lim
c14e7ea8d5
Allow bulk update of order cycle name
2018-08-16 21:18:24 +08:00
luisramos0
91e57cb893
Removed Cart table, its dependency on spree orders table and removed some more dead code related to this
2018-08-15 23:29:28 +01:00
Transifex-Openfoodnetwork
d76112e072
Updating translations for config/locales/de_DE.yml
2018-08-14 17:18:51 +10:00
Maikel Linke
c9862535f8
Import required colour definitions in SCSS
...
This avoids asset compile errors like this one:
Sass::SyntaxError: Undefined variable: "$disabled-light".
2018-08-14 10:01:48 +10:00
luisramos0
8681618490
Fixed CodeClimate scss feedback on cookies banner and policy page css
2018-08-14 10:01:48 +10:00
luisramos0
ccd5147b11
Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration
2018-08-14 10:01:48 +10:00
luisramos0
1c20967ca4
Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile
2018-08-14 10:01:48 +10:00
luisramos0
bff5581a42
Added functional tests for cookies related features: cookies policy page, cookies banner and privacy policy link
2018-08-14 10:01:48 +10:00
luisramos0
4b64369ddb
Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)
2018-08-14 10:01:48 +10:00
luisramos0
ca35c59e52
Moved the footer TOS URL from the content settings to the new section legal settings in the global settings
2018-08-14 10:01:48 +10:00
luisramos0
d920c32376
Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO
2018-08-14 10:01:48 +10:00
luisramos0
92f9cbd00a
Added new cookies banner (with link to cookie policy page and the accept cookies button)
2018-08-14 10:01:48 +10:00
luisramos0
08c5d8f3ab
Added new cookies policy page and added a link to it in the footer (cookies policy link)
2018-08-14 10:01:48 +10:00
luisramos0
362ed8ed08
Changed modals max height from 120% to 100% so that the content in the modal is never outside the viewport
2018-08-14 10:01:48 +10:00
Transifex-Openfoodnetwork
4f751eb3e3
Updating translations for config/locales/nb.yml
2018-08-13 17:08:33 +10:00
Maikel
910c1d437d
Merge pull request #2536 from openfoodfoundation/transifex
...
Transifex
2018-08-13 15:48:11 +10:00
luisramos0
0b9061df28
removed Cart route, controller, model and specs: dead code
2018-08-11 22:17:12 +01:00
Transifex-Openfoodnetwork
6c306aa1dd
Updating translations for config/locales/fr.yml
2018-08-10 21:09:21 +10:00
luisramos0
3b1bd53d3a
Added basic integration with Matomo
...
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
2018-08-10 16:12:58 +10:00
Kristina Lim
6251c72921
Add divider between admin enterprise index actions
2018-08-10 12:17:31 +10:00
Kristina Lim
17978f58c7
Rename edit link in admin enterprise index
...
Change "Edit Profile" link to "Settings".
2018-08-10 12:17:31 +10:00
Kristina Lim
295604b689
Change heading for edit enterprise page
...
Change the start of the heading from "Editing:" to "Settings:".
2018-08-10 12:17:31 +10:00
Kristina Lim
0b4fcf8a14
Change enterprise "Manage" button to "Settings"
2018-08-10 12:17:30 +10:00
Kristina Lim
b91019ad64
Split translation key for enterprise manage button
...
The ".manage" key is still used by the column header for the "Manage"
buttons.
2018-08-10 12:12:26 +10:00
Maikel Linke
9dcbd9076e
Override in_stock? to prepare for Spree 2.0
2018-08-09 14:22:43 +10:00
Maikel Linke
b84e524f2d
Prepare inventory report for Spree upgrade
...
This change could impact the performance of the report. But therefore it
takes VariantOverrides into consideration. The old code ignored the
distributor for this filter. It also ignored the `on_demand` flag.
2018-08-09 14:22:43 +10:00
Maikel Linke
289d0b937f
Style ScopeVariantToHub
2018-08-09 14:22:43 +10:00
Maikel Linke
27ddb712c1
Remove unused scope Spree::Variant.in_stock
...
Our added scope is not used anywhere and conflicts with the Spree
upgrade.
https://github.com/openfoodfoundation/openfoodnetwork/issues/2014
2018-08-09 14:22:43 +10:00
Maikel
33f6dc21e7
Merge pull request #2516 from kristinalim/cleanup-move_admin_and_spree_from_routes
...
Separate admin and Spree routes from main file
2018-08-09 10:10:49 +10:00
Maikel
f93ed0de85
Merge pull request #2519 from mkllnk/more-efficient-login-in-specs
...
More efficient login in specs
2018-08-09 10:05:54 +10:00
Maikel
03468efa7e
Merge pull request #2346 from oeoeaio/subs-totals
...
Subs: totals in backend are consistent and include fee breakdown
2018-08-07 18:17:13 +10:00
Maikel Linke
9aff9fbce2
Remove empty spec
2018-08-07 16:01:38 +10:00
Maikel Linke
b628ead525
Speed up shipping methods spec
2018-08-07 16:01:38 +10:00
Maikel Linke
54552f2be7
Speed up admin schedules spec
2018-08-07 16:01:37 +10:00
Maikel Linke
819a173167
Speed up reports spec
2018-08-07 16:01:37 +10:00
Maikel Linke
aa677a117b
Speed up admin products spec
2018-08-07 16:01:37 +10:00
Maikel Linke
eb550505ae
Speed up admin payment method spec
2018-08-07 16:01:37 +10:00
Maikel Linke
9023b16395
Speed up admin orders spec
...
From 80s to 74s.
2018-08-07 16:01:37 +10:00
Maikel Linke
71a381e48e
Speed up order cycles spec
...
From 68 to 63 seconds.
2018-08-07 16:01:37 +10:00
Maikel Linke
f4cd5a7e4b
Speed up admin enterprise spec
...
From 40s to 36s.
2018-08-07 16:01:37 +10:00
Maikel Linke
121bc51feb
Speed up admin enterprises spec
...
From 6.5s to 5.3s.
2018-08-07 16:01:37 +10:00
Maikel Linke
f0da823445
Speed up enterprise user spec
...
From 1.9s to 1.7s.
2018-08-07 12:41:07 +10:00
Maikel Linke
e4ebeb8a29
Remove dead spec code
...
The code has been inactive since 2015 and was probably obsolete anyway.
2018-08-07 12:37:49 +10:00
Maikel Linke
0b39054954
Speed up relationships spec
...
From 18s to 12s: 33% speed up
2018-08-07 12:33:26 +10:00
Maikel Linke
126f312c6b
Make spec more robust not relying on order
...
Enterprises can be in different order. Using `with_options` doesn't
care about the order.
2018-08-07 12:30:59 +10:00
Maikel Linke
edb32218b0
Use quick login to speed up product edit spec
...
From 48s to 44s: 8% speed up
2018-08-07 12:11:15 +10:00
Maikel Linke
0edf393c12
Use quick login to speed up spec
...
We don't need to visit the admin dashboard before each spec.
On my machine:
54 seconds before
47 seconds after
speed up by 13%
2018-08-07 10:56:42 +10:00
Maikel Linke
30fad228c5
Remove code duplication in spec helper
2018-08-07 09:24:31 +10:00
Maikel
32846af230
Merge pull request #2517 from kristinalim/cleanup-disable_rubocop_cop_rails_activerecordaliases
...
Disable rubocop cop "Rails/ActiveRecordAliases"
2018-08-07 09:11:00 +10:00
Kristina Lim
d77a94335b
Update .rubocop_todo.yml
2018-08-06 18:45:52 +08:00
Kristina Lim
a494fb274e
Disable rubocop cop Rails/ActiveRecordAliases
...
The methods :update! and :update (to replace :update_attributes! and
:update_attributes) were not added until Rails 4.
See this for more information:
https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Rails/ActiveRecordAliases
2018-08-06 18:12:43 +08:00
Kristina Lim
b67c8cc9f1
Improve requiring of additional routes
...
This is more appropriate, and allows changes the separate route files to
be loaded automatically in the development environment.
2018-08-06 17:04:03 +08:00
Kristina Lim
4d34693c05
Move Spree route customizations from main file
2018-08-06 09:57:29 +08:00
Kristina Lim
72036a4993
Move admin routes from main file
2018-08-06 09:57:24 +08:00
Maikel Linke
f0be8ff290
Style proxy order serializer
2018-08-03 15:07:22 +10:00
Maikel Linke
b736560d63
Inform about inaccurate subscription totals
...
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Maikel Linke
d5fdda1c46
Fix typo translating Enterprises
2018-08-03 12:15:50 +10:00
Maikel Linke
c48889f368
Remove duplicate translation key
2018-08-03 12:15:50 +10:00
Rob Harrington
cead905d05
Use estimated subscription total for proxy orders if order has not been initialized
2018-08-03 12:14:25 +10:00
Rob Harrington
fb93351386
Show fee breakdown in line items panel if present
2018-08-03 12:14:25 +10:00
Maikel
d726b0a851
Merge pull request #2509 from coopdevs/update-spree-fork-version
...
Update Spree's fork revision in Gemfile
2018-07-31 09:26:00 +10:00
Maikel
f04903bca0
Merge pull request #2493 from HugsDaniel/2433-change-from-simple-product-to-base-product
...
Reimplement Spree's simple_product in OFN factory
2018-07-31 07:40:42 +10:00
Hugo Daniel
ce46f3de39
Removed empty line
2018-07-30 12:11:02 +02:00
Pau Perez
c4b23b62d0
Update Spree's fork revision in Gemfile
2018-07-30 18:11:02 +10:00
Maikel
915531acc4
Add section about documentation updates
...
This should prevent issues like https://github.com/openfoodfoundation/openfoodnetwork/issues/2427 .
Also converted comments into HTML syntax so that you don't have to delete them when creating a PR.
2018-07-30 14:44:07 +10:00
Maikel
8ecc786b99
Include bug severity in issue template
...
And formatted for easier reading and writing.
2018-07-30 14:28:01 +10:00
Pau Perez
43bf7293bf
Merge branch 'master' into 2-0-stable
...
* master: (125 commits)
Fix syntax error in GETTING_STARTED.md
Fix syntax error in README.md
Fix link syntax errors in REAME.md and GETTING_STARTED.md
Style recently merged code
Update gem i18n-js to pick up locale changes
Fix embedded shopfront menu responsiveness
Add communications links to README
Fix script/setup by making it less clever
Change import and reset logic to work with first page
Move options to first page
Fix wrong sort predicates in customer index
Reset reverse when clicking another column to sort
Move logic for toggling by column into SortOptions
Generalize sorting through SortOptions service
Remove unused sorting preferences in ColumnsCtrl
Fix frontend sorting in "Bulk Order Management"
Fix frontend sorting in "Customers" index
Change sorting to be done in ascending order first
Wrap rows in customer index with TBODY tag
Update .rubocop_todo.yml
...
2018-07-27 10:21:47 +02:00
Pau Pérez Fabregat
67bac8aae4
Merge pull request #2503 from coopdevs/upgrade-spree-2-0-4-version
...
[Spree upgrade] Update Gemfile.lock to fetch the latest revision
2018-07-27 08:51:06 +02:00
Maikel
238a07dbd6
Merge pull request #2488 from HugsDaniel/2434-remove-dash-dependency
...
[Spree Upgrade] Remove dependency to Dash and Jirafe
2018-07-27 13:00:15 +10:00
Rob H
7f26b1494b
Fix syntax error in GETTING_STARTED.md
2018-07-27 12:49:18 +10:00
Rob H
eb89b74022
Fix syntax error in README.md
2018-07-27 12:48:37 +10:00
Pau Perez
6fb95d30c3
Update Gemfile.lock to fetch the latest revision
...
Since https://github.com/openfoodfoundation/spree/pull/6 got merged, we
need the app to use the latest Spree fork revision to pick up those
changes.
2018-07-26 18:06:57 +02:00
Pau Pérez Fabregat
5a4bc0c584
Merge pull request #2366 from coopdevs/refactor-ship-address-from-distributor
...
Refactor ship address from distributor
2018-07-26 12:04:02 +02:00
Maikel
933ff63de2
Merge pull request #2389 from luisramos0/bulk_prod_edit_fix
...
admin page fetcher is now synchronously fetching all pages before reso…
2018-07-26 14:09:21 +10:00
Maikel
3f91850301
Merge pull request #2499 from mkllnk/update-com-links-in-readme
...
Add communications links to README
2018-07-26 11:39:29 +10:00
Rob Harrington
a16058f52a
Fix link syntax errors in REAME.md and GETTING_STARTED.md
2018-07-26 11:38:39 +10:00
Maikel
02331221ef
Merge pull request #2471 from Matt-Yorkley/pi/post_save
...
PI: post-save UI changes
2018-07-26 11:26:51 +10:00
Maikel Linke
2ceb969925
Style recently merged code
...
We enabled more Rubocop checks and code that was merged around the same
time, didn't comply with the new checks.
2018-07-26 10:52:56 +10:00
Maikel Linke
f0f9662957
Update gem i18n-js to pick up locale changes
...
We had some problems recently with changes in en.yml not being picked up
by i18n-js to be included in all.js. There have been some patches for
the current version that have an impact on that:
578555f57e
db3cdf82aa
a88b206644
Trying it out locally, the updated i18n-js gem works while the old
version doesn't update the Javascript translations when new keys are
added. To reproduce the issue, you can add a new key in `en.yml` and
reference it from an Angular template in `app/assets/javascripts/`. The
old version complained about a missing translation until you ran:
```
bundle exec rake tmp:cache:clear
```
We don't need to do that any more.
2018-07-26 10:45:35 +10:00
Pau Pérez Fabregat
97e61dc6f9
Merge pull request #2498 from Matt-Yorkley/embedded_mobile
...
Fix embedded shopfront menu responsiveness
2018-07-25 15:10:46 +02:00
Pau Perez
eaf108718c
Add doc to method
2018-07-25 13:52:05 +02:00
Pau Perez
a0d2ec5666
Enable OFN's custom OrderUpdater
2018-07-25 13:51:01 +02:00
Pau Perez
d1e65691cf
Copy distributor addr. when using a pick up method
...
This copies the distributor's address when at least one of the order shipments
uses a shipping method that requires shipping address.
2018-07-25 11:07:16 +02:00
Pau Perez
f1896313b3
Move shipping_address_from_distributor to OrderUpdater
...
This is still Spree-1.3 compatible not considering multiple shipments
and shipping methods.
2018-07-25 11:07:16 +02:00
Pau Perez
21d905a092
Refactor OrderUpdater to decorate Spree's one
...
This replaces the nasty class eval and provides some encapsulation
2018-07-25 11:07:16 +02:00
Pau Perez
72f02ee1ee
RSpec3-ize OrderUpdater spec
2018-07-25 11:07:16 +02:00
Matt-Yorkley
ae5fd864d1
Fix embedded shopfront menu responsiveness
2018-07-25 17:41:26 +10:00
Pau Pérez Fabregat
a3cace46e0
Merge pull request #2431 from mkllnk/2007-no-shipment-for-payment
...
2007 Skip shipment creation for payment step
2018-07-25 08:46:47 +02:00
Hugo Daniel
eab04e0d86
Reimplement Spree<2.0 :simple_product factory in OFN
2018-07-24 16:27:30 +02:00
Hugo Daniel
ec751c0a78
Remove admin analytics ability
2018-07-24 15:27:22 +02:00
Maikel Linke
5db5bc65c0
Add communications links to README
...
This was originally proposed by Kirsten in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/2478
2018-07-24 11:18:54 +10:00
Maikel
ffd3d28889
Merge pull request #2474 from Matt-Yorkley/pi/import_options
...
PI: import options UI
2018-07-24 10:34:14 +10:00
Maikel
30be40ebd9
Merge pull request #2441 from kristinalim/fix-scoping_issue_in_sorting_of_tables
...
Fix front-end sorting in "Customers" index and "Bulk Order Management" page
2018-07-24 10:31:13 +10:00
Pau Pérez Fabregat
26d6ca4a54
Merge pull request #2487 from coopdevs/stricter-code-climate
...
Make CodeClimate config more strict
2018-07-23 12:42:06 +02:00
Pau Pérez Fabregat
687d7c5f38
Merge pull request #2483 from coopdevs/fix-setup-script
...
Fix script/setup by making it less clever
2018-07-23 12:31:50 +02:00
Pau Pérez Fabregat
b60bada542
Merge pull request #2495 from mkllnk/remove-newrelic
...
Remove unused gem newrelic-rpm
2018-07-23 11:19:27 +02:00
Pau Perez
14480b920e
Fix script/setup by making it less clever
...
Now we ask the dev to create the "ofn" user as precondition. This is
way easier than developing a script that fits all possible setups.
It also stops requiring a particlar Postgres version. Although in
production we use 9.5 it is very unlikely we will use any
version-specific feature in the near future. This should make it a bit
easier for new devs to set up their environment.
2018-07-23 10:59:32 +02:00
Matt-Yorkley
67767f86eb
Change import and reset logic to work with first page
2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b
Move options to first page
2018-07-23 01:46:32 +01:00
Kristina Lim
89ac558f37
Fix wrong sort predicates in customer index
2018-07-23 10:33:40 +10:00
Kristina Lim
47608525c6
Reset reverse when clicking another column to sort
2018-07-23 10:33:40 +10:00
Kristina Lim
5179f7fd63
Move logic for toggling by column into SortOptions
2018-07-23 10:33:40 +10:00
Kristina Lim
55d0b1dfc5
Generalize sorting through SortOptions service
2018-07-23 10:33:40 +10:00
Kristina Lim
8b6b694244
Remove unused sorting preferences in ColumnsCtrl
2018-07-23 10:33:40 +10:00
Kristina Lim
2bba72c5a9
Fix frontend sorting in "Bulk Order Management"
2018-07-23 10:33:40 +10:00
Kristina Lim
822b2c929a
Fix frontend sorting in "Customers" index
...
The scope for customersCtrl did not have access to the sorting
preferences stored in the nested ColumnsCtrl scope. To address this,
the page has been changed to use a new set of sorting preferences
declared in the customersCtrl scope itself.
Also, these sorting preferences are now stored in an object. This
enables the parent scope to see changes to the sorting preferences which
are done via the nested ColumnsCtrl scope,
The "Bulk Order Management" page is also affected by the same scoping
issue. Once this page is fixed, we can remove remnants of the sorting
preferences initialized in ColumnsCtrl.
2018-07-23 10:33:39 +10:00
Kristina Lim
9f09861d8b
Change sorting to be done in ascending order first
...
Currently, we always toggle "reverse" when triggering a sort.
If "reverse" is initially set to false, triggering a sort for the first
time then toggles this to true. The effect is that, the first time that
sorting is done, the rows are sorted in reverse order.
This is not intuitive - they should be sorted in ascending order first.
2018-07-23 10:33:39 +10:00
Kristina Lim
745390dcd5
Wrap rows in customer index with TBODY tag
2018-07-23 10:33:39 +10:00
Maikel
12838ba61e
Merge pull request #2468 from mkllnk/improve-testing-embedded-pages
...
Improve testing embedded pages
2018-07-23 08:59:11 +10:00
Maikel
add250b30f
Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid
...
PI: Don't allow save if invalid entries are present
2018-07-23 08:54:01 +10:00
Maikel
df29d4d611
Merge pull request #2472 from lilwillifo/logo-sizing-to-css
...
Logo sizing to css
2018-07-23 08:47:45 +10:00
Pau Perez
7d790a7d59
Update .rubocop_todo.yml
2018-07-20 18:58:37 +02:00
Hugo Daniel
514fc0a781
Remove dependency to Dash and Jirafe
2018-07-20 13:04:58 +02:00
Pau Perez
44fe3de732
Make CodeClimate config more strict
...
There's no point of using Code Climate if most of its checks are
disabled. Now it scores our codebase with an A and reports just 2 code
smells, 64 duplications and 14 other issues. That couldn't farther from
reality. If we care about the architecture and maintainability of our
app, this is a must.
To transition towards enabling all default checks, I started with
scss-lint, duplication and method-complexity. This doesn't mean will
have to fix them all straight away as we'll add the current violations
to the `.rubocop_todo.yml` but it'll point us the parts where we should
focus our efforts.
2018-07-20 09:08:03 +02:00
Maikel Linke
5f4115fbd9
Remove unused gem newrelic-rpm
2018-07-20 16:56:12 +10:00
Margaret Williford
512e974672
move width setting for tagline logo image from HTML to CSS
2018-07-20 14:00:06 +10:00
Margaret Williford
d952276e2a
move footer logo sizing from html to css
2018-07-20 14:00:06 +10:00
Maikel
23964b2542
Merge pull request #2422 from luisramos0/1667_email_validation_fix
...
1667 manage validations emails
2018-07-20 12:19:23 +10:00
Maikel
1b571e9835
Merge pull request #2379 from Matt-Yorkley/uk/guest_label
...
Add guest label to admin customers index
2018-07-20 08:53:26 +10:00
Maikel Linke
962c54b606
Remove unnecessary expectation
...
The `iframe` is rendered in pure HTML and should always be there.
2018-07-19 10:45:33 +10:00
Maikel Linke
8a3a617870
DRY specs with new EmbeddedPagesHelper
2018-07-19 10:44:43 +10:00
luisramos0
8246893652
Added notice for unexpected mail in confirmation instructions mail (HugsDaniel)
2018-07-19 09:26:29 +10:00
Maikel
1dbd265b30
Merge pull request #2384 from luisramos0/open_new_tab
...
added directive to make links open in new tab by default in textangul…
2018-07-19 09:17:09 +10:00
Matt-Yorkley
e3162b0a14
Change import method to fix missing variable error on asset precompilation
2018-07-18 23:00:50 +01:00
Matt-Yorkley
456e05d5d2
Include subfolders in scss import
2018-07-18 22:56:10 +01:00
Matt-Yorkley
24ff5555be
Create admin SCSS colour palette
2018-07-18 22:56:10 +01:00
Matt-Yorkley
75e52a7a91
CSS tweaks fo guest flag
2018-07-18 22:56:10 +01:00
Matt-Yorkley
583f16b38d
Add guest label to admin customers index
2018-07-18 22:56:10 +01:00
Pau Pérez Fabregat
4fe1e1fc9f
Merge pull request #2482 from Matt-Yorkley/uk/mail_config
...
Allow preferred_mails_from and preferred_mail_bcc to be set from configs
2018-07-18 19:20:55 +02:00
Pau Pérez Fabregat
4f215da735
Merge pull request #2467 from mkllnk/ci-output-test
...
Use progress formatter on Travis to avoid timeout
2018-07-18 19:19:40 +02:00
Pau Pérez Fabregat
37e2d76a39
Merge pull request #2477 from mkllnk/2465-use-right-subscriptions-translation
...
Reference existing translation: closed order cycle
2018-07-18 16:47:35 +02:00
Pau Pérez Fabregat
fac8e26d8b
Merge pull request #2475 from Matt-Yorkley/pi/landing_page
...
PI: landing page
2018-07-18 16:47:17 +02:00
Matt-Yorkley
23cbcda0c3
Allow preferred_mails_from and preferred_mail_bcc to be set from configs
2018-07-18 15:43:02 +01:00
Matt-Yorkley
5e142205bd
Use relative translation keys
2018-07-18 13:35:23 +01:00
Matt-Yorkley
5737c9803d
Add unit_type field to inventory template
2018-07-18 12:59:52 +01:00
Matt-Yorkley
c7deae4253
Remove category field from inventory specs
2018-07-18 12:59:19 +01:00
Matt-Yorkley
b37bea35fa
Use relative translation keys
2018-07-18 11:43:31 +01:00
Matt-Yorkley
18206c9369
Remove old view file
2018-07-18 11:42:07 +01:00
Pau Pérez Fabregat
8ae5d5f52e
Merge pull request #2415 from oeoeaio/update-readme
...
Update README.md and add GETTING_STARTED.md
2018-07-18 11:19:33 +02:00
Pau Pérez Fabregat
d56698e4a6
Merge branch 'master' into update-readme
2018-07-18 10:59:20 +02:00
Pau Pérez Fabregat
7bf27ec6b3
Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors
...
2013 Remove dead code for Spree upgrade
2018-07-18 10:38:19 +02:00
Pau Pérez Fabregat
bd05af5a29
Merge pull request #2442 from kristinalim/translations-enterprise_relationships_to_enterprise_permissions
...
Change "Enterprise Relationships" to "Enterprise Permissions"
2018-07-17 14:48:08 +02:00
Kristina Lim
c16f4203f9
Rename enterprise "Relationships" to "Permissions"
...
This only updates en* translations, and does not affect URLs and other
back-end references.
2018-07-17 16:03:48 +10:00
Pau Pérez Fabregat
0fd57ee7bd
Merge pull request #2390 from luisramos0/buk_prod_edit_rounding_issue
...
fixed number rounding issue in product bulk edit
2018-07-16 16:44:59 +02:00
luisramos0
4a44454210
fixed number rounding issue in product bulk edit
2018-07-16 13:13:58 +10:00
Maikel Linke
4d68723fe3
Reference existing translation: closed order cycle
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2465
Viewing a customers subscription could display a translation missing
error.
2018-07-16 09:24:32 +10:00
Matt-Yorkley
c4af50e95c
Add sidebar to Import index page
2018-07-15 23:12:26 +01:00
Matt-Yorkley
632b991952
Add downloadable templates
2018-07-15 21:25:42 +01:00
Matt-Yorkley
f344b7893d
Remove Product Import guide page
2018-07-15 20:49:55 +01:00
Matt-Yorkley
8aed78b0e6
Don't allow save if invalid entries are present
2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab
PI post-save UI changes
2018-07-15 00:27:21 +01:00
Pau Pérez Fabregat
da344adbcd
Merge pull request #2466 from kristinalim/doc-notes_about_i18n_in_contributing
...
Add section about internationalisation to CONTRIBUTING.md
2018-07-13 19:43:52 +02:00
Pau Pérez Fabregat
c2d9b094d3
Merge pull request #2419 from frank-west-iii/issue-2412-duplicate-menu
...
Remove spree product navigation override
2018-07-13 19:43:07 +02:00
Maikel Linke
622517501c
Make spec robust on slow computers
...
This spec just failed in an unrelated pull request.
https://travis-ci.org/openfoodfoundation/openfoodnetwork/jobs/403435522
This change should fix it even on very slow computers.
2018-07-13 19:10:06 +10:00
Frank West
e3b7e050a0
Remove spree product navigation override
...
This was here to override the original spree products navigation link,
but since moving back to the index action this had the side effect of
adding an additional navigation item instead. We can simply remove this
override to get rid of the additional menu item.
2018-07-13 16:58:57 +10:00
Maikel Linke
8e90488117
Use progress formatter on Travis to avoid timeout
...
We had a few Travis builds lately that timed out, because no output was
received. Even though our standard formatter Fuubar should detect Travis
and print the right output, nothing was visible in our builds.
https://github.com/travis-ci/travis-ci/issues/1337
In this patch, I tell Travis to use Rspec's default formatter to print
dots for every passed test.
2018-07-13 16:51:56 +10:00
Maikel Linke
599f1a966b
Use embedded shops example for tests
2018-07-13 16:36:19 +10:00
Kristina Lim
4ebcf4e3c3
Add internationalisation info to CONTRIBUTING.md
2018-07-13 14:26:27 +08:00
Maikel Linke
66980b247a
Fix test of opening shops in new windows
...
The test case had some hard-coded enterprise name that didn't match
anything. It then confirmed that all found links (none) would open a new
window. So it wasn't confirming anything.
2018-07-13 15:37:19 +10:00
Maikel Linke
6f737d8d1e
Unclutter spec setup
2018-07-13 15:37:19 +10:00
Maikel Linke
ed747ec612
Use embedded groups example for tests
2018-07-13 15:37:19 +10:00
Maikel Linke
185cf9a312
Remove code duplication
2018-07-13 15:37:18 +10:00
luisramos0
dfb510debe
admin page fetcher is now receiving a onLastPageComplete function that is used to show "no results" messages only after the last page is fetched
2018-07-13 15:01:43 +10:00
Maikel Linke
d5d1eae715
Improve spec description
2018-07-13 09:04:42 +10:00
Maikel Linke
43883d1ab4
Simplify email confirmation directive
...
Making better use of Angular features.
Adding a spec for this functionality.
2018-07-13 09:04:42 +10:00
Maikel Linke
fbe2f7ab4c
Remove unused variable from mailer
...
The second variable passed by Devise is actually a hash, not a token.
2018-07-13 09:04:41 +10:00
Maikel Linke
a531135804
Remove unused data-hooks
2018-07-13 09:04:41 +10:00
Maikel Linke
e37213f6a5
Remove redundant edit action
2018-07-13 09:04:41 +10:00
Maikel Linke
28c2ad7160
Move override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
a347837044
Move override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
ab9975cb6c
Move override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
339b04a044
Convert spree admin user list to haml
2018-07-13 09:04:41 +10:00
Maikel Linke
9020e7ddd9
Import admin user list from Spree
2018-07-13 09:04:41 +10:00
Maikel Linke
60b66540df
Add resend email button to admin user form
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
2018-07-13 09:04:41 +10:00
Maikel Linke
6a58deb436
Add message about unconfirmed email to user form
2018-07-13 09:04:41 +10:00
Maikel Linke
8157897f76
Remove unused data hooks
2018-07-13 09:04:41 +10:00
Maikel Linke
9050a52cc2
Move admin user form override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
2032ed6328
Convert admin user edit form to haml
2018-07-13 09:04:41 +10:00
Maikel Linke
cb1dc6e657
Import admin user edit form from spree_auth_devise
2018-07-13 09:04:41 +10:00
Maikel Linke
23dd09a8fa
Convert Spree view from erb to haml
2018-07-13 09:04:41 +10:00
Maikel Linke
652cc6e677
Import admin user edit view from spree_auth_devise
...
We would like to do some customisations and importing the whole file is
simpler and less error prone than using Spree's overrides.
2018-07-13 09:04:40 +10:00
Maikel Linke
97d1b5d7fe
Add spec for creating users
2018-07-13 09:04:40 +10:00
Maikel
b65578fdc5
Merge pull request #2408 from mkllnk/cleanup-route
...
Remove impossible route
2018-07-13 09:01:33 +10:00
Maikel
0bd40f498a
Merge pull request #2447 from mkllnk/update-translation-documentation
...
Move i18n locale doc to wiki and reference that
2018-07-12 10:07:39 +10:00
Maikel Linke
86f2d7a344
Remove impossible route
...
Hash fragments are not part of the http request and not sent to the
server. So the routes will never see a hash fragment which means that
this route is never used.
2018-07-12 10:05:08 +10:00
luisramos0
b302a1d03d
added Enterprise registration exit message and moved step TYPE translations to a new structure on en.yml (test if transifex picks up the existing translations)
2018-07-12 08:53:06 +10:00
Pau Pérez Fabregat
8cec9d5723
Merge pull request #2451 from Matt-Yorkley/pr_categories
...
Add changelog category to PR template
2018-07-11 22:40:52 +02:00
Matt-Yorkley
056df62359
Add changelog category to PR template
2018-07-11 18:03:45 +01:00
Pau Pérez Fabregat
79b86a4885
Merge pull request #2448 from kristinalim/fix-broken_great_pr_link_in_contributing
...
Fix broken "making a great pull request" link in CONTRIBUTING.md
2018-07-11 13:19:17 +02:00
Kristina Lim
5508c6741f
Fix broken "great-pr" link in CONTRIBUTING.md
2018-07-11 14:10:20 +08:00
Maikel Linke
24f77184cf
Move i18n locale doc to wiki and reference that
2018-07-11 11:31:27 +10:00
Maikel Linke
2334f0854c
Less invasive modifying the checkout state machine
2018-07-11 10:55:12 +10:00
Pau Pérez Fabregat
deb04c3075
Merge pull request #2444 from openfoodfoundation/transifex
...
Transifex
2018-07-10 12:12:05 +02:00
Maikel Linke
459057a7db
Revert accidental copy and paste
2018-07-10 10:31:51 +10:00
Maikel
26c23887e2
Merge pull request #2276 from oeoeaio/subs-use-default-card
...
Subs: Use Default Card for Subscriptions
2018-07-10 10:22:58 +10:00
Maikel Linke
f9a3338755
Simplify serialiser with delegate
2018-07-10 10:01:18 +10:00
Maikel Linke
b478ef9fd0
Make admin serialiser specs runnable on their own
2018-07-10 09:59:00 +10:00
Transifex-Openfoodnetwork
15db5e1d50
Updating translations for config/locales/en_GB.yml
2018-07-09 20:23:01 +10:00
Rob Harrington
3dacd06b6b
Reload order before sending emails to ensure state is up to date
2018-07-05 19:26:12 +10:00
Rob Harrington
0afa9fae8e
Check authorisation before attempting to charge credit cards on order cycle close
2018-07-05 19:26:12 +10:00
Rob Harrington
4fd333bbaf
Remove obsolete reference to credit_card from subscription serializer
2018-07-05 19:26:12 +10:00
Rob Harrington
a902af42a3
Update attribute that errors are added to from credit_card to payment_method
2018-07-05 19:26:12 +10:00
Rob Harrington
edde929ced
Replace uses of #stub with #allow in Admin::CustomersController
2018-07-05 19:26:12 +10:00
Rob Harrington
4863f2b5b4
Remove unrequired credit_card_id field from subscriptions table
2018-07-05 19:26:12 +10:00
Rob Harrington
21c3f7d21c
Remove unrequired #cards and #addresses actions from Admin::CustomerController
2018-07-05 19:26:12 +10:00
Rob Harrington
e0d46aa105
Add new serializer to allow search for customer addresses
2018-07-05 19:26:12 +10:00
Rob Harrington
c71a5ec0df
Update subscription form to use new card validations for Stripe payment method
2018-07-05 19:26:11 +10:00
Rob Harrington
a03dd1e10c
Serialize default card auth and presence for Customers
2018-07-05 19:26:11 +10:00
Rob Harrington
21c24eb69b
Validate presence and auth of default card for customer
2018-07-05 19:26:11 +10:00
Rob Harrington
cf8ca1f8c1
Add show action to Admin::CustomersController
2018-07-05 19:26:11 +10:00
Rob Harrington
45895e9924
Use the user's default card to pay for subcriptions
2018-07-05 19:26:11 +10:00
Rob Harrington
fc2844a3d5
Add default_card method to user model
2018-07-05 19:26:11 +10:00
Maikel Linke
c7f7e420ea
Skip shipment creation for payment step
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2007
Spree 2.0.4 creates in-memory shipments for the payment step. That means
we don't need to create a shipment in that transition. This change
copies the checkout_flow from the Spree code, but leaves one last
customisation: removal of the confirm step.
75ec77dc31
2018-07-05 16:34:11 +10:00
Frank West
09534b41e9
Remove taxon when primary taxon is changed
...
We are adding taxons to the product as you change the primary taxon.
However we never remove the previous primary taxon so it forces the user
to update the taxons manually. This can be a big problem if you are bulk
updating products.
We now remove the taxon that matches the previously set primary taxon.
2018-07-04 09:16:50 +10:00
Rob Harrington
82e3016a26
Add comment to StripeGateway wrapper methods indicating that they are named by Spree
2018-07-03 14:21:58 +10:00
Rob Harrington
2da6234362
Add spec for StripeGateway#refund
2018-07-03 14:21:58 +10:00
Rob Harrington
c496d0f14d
Allow credit owed on payments made via stripe to be refunded via the admin section
2018-07-03 14:21:58 +10:00
Rob Harrington
108c4a7abb
Add GETTING_STARTED.md and update README.md
2018-06-28 22:11:33 +10:00
Maikel
687612dba8
Merge pull request #2403 from luisramos0/hide-stripe-postcode
...
Hide postcode - not necessary as passed from billing address and wrec…
2018-06-28 08:55:42 +10:00
Maikel Linke
b7de80dd7f
Remove unused count_on_hand setting from spec
...
This spec doesn't need to set the product's `count_on_hand`. The product
comes with a count of 3, but what matters is the count of variants.
2018-06-27 11:41:55 +10:00
Maikel Linke
306bfa1944
Remove unused method enterprise method
...
`Enterprise.has_supplied_products_on_hand?` is not used anywhere.
2018-06-27 11:25:44 +10:00
Maikel Linke
792701297b
Remove unused scope Enterprise.active_distributors
...
Working on the Spree upgrade, we found that this scope is using the soon
obsolete column `spree_products.count_on_hand`. Trying to measure the
impact of changing this scope, I couldn't find any use of it.
There is a variable called `active_distributors` used when serialising
enterprises, but that variable is initialised with
`Enterprise.distributors_with_active_order_cycles.ready_for_checkout`,
not using the `active_distributors` scope.
See also:
https://github.com/openfoodfoundation/openfoodnetwork/issues/2013
2018-06-27 11:12:54 +10:00
Maikel
eb9064f5be
Merge pull request #2383 from frank-west-iii/issue-2271-prepend-load
...
Fix NoMethodError in order cycles index
2018-06-27 09:12:18 +10:00
Maikel
f5346289c7
Merge pull request #2388 from Matt-Yorkley/uk/pi_available_on
...
Add available_on notes to PI guide
2018-06-26 17:58:39 +10:00
Maikel
3f334855d1
Merge pull request #2360 from oeoeaio/faster-stats
...
Rewrite user stat query for improved performance of homepage
2018-06-26 17:58:23 +10:00
Maikel
e9fad741e6
Merge pull request #2387 from Matt-Yorkley/embedded_referrers
...
Embedded response headers
2018-06-26 17:57:48 +10:00
Rob Harrington
ddb9ae1140
Load all shops that a user is associated with as a customer
...
Regardless of the presence of an order
2018-06-24 16:28:47 +10:00
Pau Perez
7707df354b
Merge branch 'master' into 2-0-stable
...
* master: (206 commits)
embedded groups layout changes
embedded groups initial test
Allow html requests for OrderCycleController#update
Move applicator calls to OrderCycleForm
Refactor OrderCycleForm to make logic clearer
Extract schedule syncing logic into OrderCycleForm
Add basic specs for OrderCyclesController#create
Add basic OrderCycleForm to handle create/update logic
Remove unnecessary respond_to blocks from OrderCyclesController
Include admin users as managers on new enterprises
Remove obsolete goWithoutHashFragments
Simplify Navigation.go, not preserving hash fragments
Only show change warning for open order cycles
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
Preload subscription counts for serialization in order cycle collection actions
Request the subscription count for change warning each time, don't cache
Ask user to confirm oc date change for open order cycles with subsciptions
Fix ordering of Gemfile.lock
Add rack-rewrite to handle redirects
Renames product bulk edit action to index
...
2018-06-22 13:23:18 +02:00
luisramos0
0d9b03b066
Hide postcode - not necessary as passed from billing address and wrecks mobile UX
2018-06-22 11:42:50 +01:00
Rob Harrington
5e6291bce3
Don't request customers if list is already populated
2018-06-22 15:39:47 +10:00
Rob Harrington
d1d9c5a092
Add help button to saved cards list on account page
...
Describes the purpose of the default card
2018-06-22 15:39:47 +10:00
Rob Harrington
7db7084008
Use help-modal to display help text for authorised shops
...
Also updated the text slightly to make it more clear when the purpose of authorised shops are
2018-06-22 15:39:47 +10:00
Rob Harrington
32622c77bc
Add basic help modal directive
...
Useful for showing help text that is too long for a tool tip
2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde
Add basic view allowing customers to authorise shop use of their credit cards
2018-06-22 15:39:47 +10:00
Rob Harrington
ffa8a8c7d6
Create Api::BaseController to allow use of ActiveModelSerializers
...
Also add index action to Api::CustomersController
2018-06-22 15:39:47 +10:00
Rob Harrington
29922d4be9
Add allow_charges field to Customer model
2018-06-22 15:39:46 +10:00
Rob Harrington
6e76fd8164
Add Api::CustomersController with update action
2018-06-22 15:39:46 +10:00
Rob Harrington
e25574790b
Split out float: right css from .help-btn.tiny selector
2018-06-22 15:39:46 +10:00
Keir Osborn
bd7e072938
embedded groups layout changes
2018-06-22 14:03:00 +10:00
Keir Osborn
f626a21c5e
embedded groups initial test
2018-06-22 14:03:00 +10:00
Buildkite
964059f25b
Merge remote-tracking branch 'origin/master' into HEAD
2018-06-22 02:41:15 +00:00
Buildkite
57dbf2e770
Merge remote-tracking branch 'origin/master' into HEAD
2018-06-22 00:59:28 +00:00
Rob Harrington
cf9f8edcce
Allow html requests for OrderCycleController#update
...
This is still used from the Advanced Settings page, to update the order_cycle
2018-06-22 09:46:08 +10:00
Rob Harrington
25525ae30b
Move applicator calls to OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
f88f4a5791
Refactor OrderCycleForm to make logic clearer
2018-06-22 09:46:08 +10:00
Rob Harrington
d9830749f1
Extract schedule syncing logic into OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
21bd9d2e10
Add basic specs for OrderCyclesController#create
2018-06-22 09:46:08 +10:00
Rob Harrington
ab9c06837b
Add basic OrderCycleForm to handle create/update logic
2018-06-22 09:46:08 +10:00
Rob Harrington
3f5b6be5b6
Remove unnecessary respond_to blocks from OrderCyclesController
2018-06-22 09:46:08 +10:00
Matt-Yorkley
172fa168ea
Change layout attribute to method with question mark
2018-06-21 15:19:40 +01:00
Matt-Yorkley
aaba6da162
Add available_on notes to PI guide
2018-06-21 14:20:59 +10:00
Matt-Yorkley
d9623176fb
Include admin users as managers on new enterprises
2018-06-21 13:21:08 +10:00
Maikel Linke
d510df5236
Remove obsolete goWithoutHashFragments
...
It was introduced, because `Navigation.go` perserved hash fragments. We
actually don't need that behaviour and it has been corrected.
`goWithoutHashFragments` also didn't deal with absolute URLs. And it used
`location.origin` which is not supported by Internet Explorer. That is
fixed by our use of Modernizr though.
2018-06-21 10:29:32 +10:00
Maikel Linke
fb02bdd25a
Simplify Navigation.go, not preserving hash fragments
...
I looked through the history and it looks like this function was a bit
flawed (preserving hash fragments) from the beginning. It has been
patched a few times without addressing the underlying issue that we want
more than just replacing the pathname. We want to go somewhere else.
2018-06-21 10:29:32 +10:00
Pau Pérez Fabregat
6cf09c936b
Merge pull request #2345 from luisramos0/do-not-upcase-state
...
removed uppercase from state on shops and producers lists in the frontoffice
2018-06-20 21:30:10 +02:00
Matt-Yorkley
6e81871459
Specs for new EmbeddedPageService
2018-06-20 15:14:56 +01:00
Maikel
3399eba428
Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel
...
Move product bulk edit to product index route
2018-06-20 17:53:57 +10:00
Rob Harrington
a29a1bd047
Only show change warning for open order cycles
2018-06-20 16:28:36 +10:00
Rob Harrington
7af11da901
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
2018-06-20 13:06:06 +10:00
Rob Harrington
d5b1041481
Preload subscription counts for serialization in order cycle collection actions
2018-06-20 13:06:06 +10:00
Rob Harrington
8770122eae
Request the subscription count for change warning each time, don't cache
2018-06-20 13:06:05 +10:00
Rob Harrington
86d7453d26
Ask user to confirm oc date change for open order cycles with subsciptions
2018-06-20 13:06:05 +10:00
Maikel Linke
bbe21b7804
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel
2018-06-20 10:31:17 +10:00
Matt-Yorkley
ff0e0d9f3d
Move logic from ApplicationController to service and improve clarity
2018-06-20 01:28:35 +01:00
Matt-Yorkley
e73b378201
Adjust embedded response headers
2018-06-20 01:28:35 +01:00
luisramos0
b8f1571282
added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages
2018-06-19 16:53:21 +01:00
Pau Pérez Fabregat
8da8a5a086
Merge pull request #2392 from openfoodfoundation/transifex
...
Transifex
2018-06-19 13:37:38 +02:00
Pau Pérez Fabregat
20c25cd030
Merge pull request #2368 from Matt-Yorkley/uk/admin_orders
...
Uk/admin orders
2018-06-19 11:00:35 +02:00
Frank West
3821b9e0da
Fix ordering of Gemfile.lock
...
When we run bundle the gems are being reordered to be alphabetical.
Seems to have been committed on 26/05/2018 here:
7a64ad1cc1
2018-06-19 17:51:24 +10:00
Frank West
f7848b025f
Add rack-rewrite to handle redirects
...
We are moving bulk edit to a different route and we want to be able to
handle redirects on this route. Handling this at the rack level before
the rails stack is the most performant way outside of rewrites on the
web server itself.
2018-06-19 17:51:23 +10:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
3484996dbd
Merge pull request #2335 from luisramos0/issue2334
...
Fixed missing translations on shops filter - delivery option
2018-06-19 09:34:13 +02:00
Pau Pérez Fabregat
236920d28f
Merge pull request #2357 from luisramos0/enterprises_country_state
...
changed the country and state selectors to angular on enterprises admin
2018-06-19 09:30:24 +02:00
Pau Pérez Fabregat
b1bccb07f2
Merge pull request #2369 from coopdevs/product-import-for-superadmins-only
...
Show product import's UI only to superadmins
2018-06-19 09:23:58 +02:00
Transifex-Openfoodnetwork
55e619af8d
Updating translations for config/locales/de_DE.yml
2018-06-19 10:59:37 +10:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e
changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed
2018-06-19 10:34:02 +10:00
Maikel
2bfb635bcc
Merge pull request #2341 from luisramos0/checkout_country_state
...
fixed country_state selectors on checkout
2018-06-19 09:34:21 +10:00
Transifex-Openfoodnetwork
fe39d96e7f
Updating translations for config/locales/fr_CA.yml
2018-06-19 05:48:59 +10:00
Frank West
f2e1caabff
Fix NoMethodError in order cycles index
...
When a user's session has timed out and they try to load new data on the
order cycles page by changing filters, the application throws a
`NoMethodError` because we are prepending the load data method before
checking the user's session.
We can fix this by removing the prepend on this action.
2018-06-18 06:36:55 -07:00
Maikel
f272a7b604
Merge pull request #2361 from mkllnk/2356-report-search-hint
...
2356 report search hint
2018-06-18 14:51:48 +10:00
luisramos0
ea9ea83fee
improved checkout country and state selectors code
2018-06-18 14:50:03 +10:00
luisramos0
3cb0b76d21
fixed checkout tests by replacing state abbr with name in address selector boxes
2018-06-18 14:50:03 +10:00
luisramos0
836a5836d9
fixed country_state selectors on checkout
2018-06-18 14:50:03 +10:00
Maikel Linke
b7770510a7
Use CSS for layout
2018-06-18 11:08:58 +10:00
Maikel Linke
67c2574b0b
Show report search instructions
...
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
2018-06-18 11:08:58 +10:00
Maikel Linke
7a2218fe26
Style the reports controller
2018-06-18 11:08:58 +10:00
Maikel Linke
6243640bca
Unify sales tax report rendering with others
2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6
Unify report table rendering
...
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
2018-06-18 11:08:58 +10:00
Maikel
86ff24b43c
Merge pull request #2386 from frank-west-iii/fix-ssl-errors-specs
...
Set the SSL protocol for secure connections
2018-06-18 08:45:31 +10:00
Frank West
0d7352813c
Set the SSL protocol for secure connections
...
There are ssl errors when using stripe through phantom js. This allows
other SSL protocols now.
2018-06-15 11:43:26 -07:00
Rob H
61f303ced2
Merge pull request #2373 from oeoeaio/fix-import-date-filter
...
Reimplement import date filter as an actual Filter
2018-06-15 16:53:22 +10:00
Rob Harrington
d0f8e9fba6
Reimplement import date filter as an actual Filter
2018-06-15 11:31:47 +10:00
Maikel
46f5f5061a
Merge pull request #2377 from mkllnk/2376-fix-paypal-redirects
...
Pass on redirect path instead of URL
2018-06-15 10:16:31 +10:00
Maikel Linke
561a73e911
Pass on redirect path instead of URL
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2376
The checkout doesn't deal with absolute URLs since
fc2cc09ea5 .
2018-06-14 16:49:52 +10:00
Pau Pérez Fabregat
24c6b940f6
Merge pull request #2370 from openfoodfoundation/transifex
...
Transifex
2018-06-13 12:03:34 +02:00
Pau Pérez Fabregat
d5310eed6c
Merge pull request #2371 from HugsDaniel/2359_js_libs_not_found_or_not_defined
...
Changed require syntax to fit jquery-ui-rails v<5.0
2018-06-13 09:12:57 +02:00
Rob Harrington
c72a2fda91
Use placed_at state to determine whether to remove orphaned proxy orders
2018-06-13 13:46:11 +10:00
Rob Harrington
d9ddad554e
Prevent proxy_orders for active or complete order cycles from being removed automatically by ProxyOrderSyncer
2018-06-13 13:46:11 +10:00
Rob Harrington
ac309ffaf5
Rename obsolete_proxy_orders to orphaned_proxy_orders
2018-06-13 13:46:11 +10:00
Maikel
51bbf64b10
Merge pull request #2363 from oeoeaio/update-contributors
...
Update contributors list in the README
2018-06-13 11:11:29 +10:00
Hugo Daniel
6e2966d7e8
Changed require syntax to fit jquery < 5.0
2018-06-12 15:59:41 +02:00
Matt-Yorkley
ea0d24a5bf
Re-word test names for clarity
2018-06-12 13:20:00 +01:00
Transifex-Openfoodnetwork
644c2e8788
Updating translations for config/locales/nb.yml
2018-06-12 20:33:43 +10:00
Transifex-Openfoodnetwork
03fb5e7ccf
Updating translations for config/locales/fr.yml
2018-06-12 20:03:03 +10:00
Transifex-Openfoodnetwork
6908635822
Updating translations for config/locales/pt.yml
2018-06-12 19:36:28 +10:00
Pau Perez
78e59d059a
Show product import's UI only to superadmins
...
We still need to iterate on its implementation and it's too early to
make it publicly available.
2018-06-11 19:50:53 +02:00
Rob Harrington
56040685a0
Add Matt, Pau and Enrico to the contributors list on the README
2018-06-10 18:26:50 +10:00
Matt-Yorkley
c7f7541e2d
Admin order customer details spec
2018-06-10 02:32:59 +01:00
Matt-Yorkley
d90e362e6f
Remove guest checkout radio buttons from admin order view
2018-06-09 02:43:42 +01:00
Matt-Yorkley
7bef474efd
Admin Order guest checkout status
2018-06-09 02:43:42 +01:00
Pau Pérez Fabregat
4c9dd4e8a1
Merge pull request #2349 from robotscissors/issue-2278-add-missing-image
...
Add image back into server for background
2018-06-08 19:12:01 +02:00
luisramos0
9e0732ceae
removed uppercase from state on shops and producers lists in the frontoffice
2018-06-08 14:11:53 +01:00
Pau Pérez Fabregat
bb3ae976c6
Merge pull request #2364 from coopdevs/update-template
...
Ask devs to tell whether we should test on mobile
2018-06-08 14:37:16 +02:00
Pau Perez
fed60cf961
Ask devs to tell whether we should test on mobile
2018-06-08 10:01:04 +02:00
Pau Pérez Fabregat
b77091f87d
Merge pull request #1969 from coopdevs/feature/do-not-upcase-state-abbr
...
Do not upcase State abbreviation
2018-06-08 08:36:55 +02:00
Rob Harrington
5cbc4cbf30
Use scoped keys for table headers in saved card partial
2018-06-08 15:30:08 +10:00
Rob Harrington
18c211e97c
Ensure that savedCreditCards always exists
2018-06-08 15:30:08 +10:00
Rob Harrington
6a202d9446
Use more descriptive name for after_save callback method: :ensure_single_default_card
2018-06-08 15:30:08 +10:00
Rob Harrington
5dbf98f39b
Use exists? method to avoid unnecesary loading of credit card array
2018-06-08 15:30:07 +10:00
Rob Harrington
05e4d9007e
Update card spec to make the initial roles of cards clearer
2018-06-08 15:30:07 +10:00
Rob Harrington
254f0db97c
Automatically select the customer's default card in the checkout
2018-06-08 15:30:07 +10:00
Rob Harrington
e88e963b4c
Alter cards interface to allow updating of default card
2018-06-08 15:30:07 +10:00
Rob Harrington
1327b9dc2c
Add update method to CreditCardsController
2018-06-08 15:30:07 +10:00
Rob Harrington
d146d3714f
Add callbacks to ensure a user always has a default credit card
...
(if any exist)
2018-06-08 15:30:01 +10:00
robotscissors
5c25e85d92
Create dark background on load
2018-06-07 21:53:17 -07:00
Rob Harrington
3619ec0dc8
Add is_default attribute to Spree::CreditCard model
2018-06-08 12:01:10 +10:00
Maikel
0befc714ce
Merge pull request #2358 from coopdevs/revert-current-order-argument
...
Spree 2.0: Fix GET "/"
2018-06-07 10:45:06 +10:00
Pau Pérez Fabregat
d4e0d14fe1
Merge pull request #2342 from openfoodfoundation/transifex
...
Transifex
2018-06-06 09:05:29 +02:00
Rob Harrington
4fa09639cb
Rewrite user stat query for improved performance of homepage
2018-06-06 16:27:23 +10:00
Pau Pérez Fabregat
7ff7fe4891
Merge pull request #2122 from oeoeaio/subs-unplaced-fees
...
Subs: prevent fees from displaying in email when subscription order cannot be fulfilled
2018-06-06 07:57:18 +02:00
Maikel
9d2c1976e0
Merge pull request #2343 from mkllnk/2212-remove-report-default-filters
...
2212 remove report default filters
2018-06-06 12:19:47 +10:00
Pau Perez
daf12d1300
Revert "Refactor Order#current_order argument"
...
This reverts commit ae935202be .
2018-06-05 18:42:41 +02:00
Pau Perez
89c2733f50
Revert "Removing redundant curly braces"
...
This reverts commit 03173d4f7b .
2018-06-05 18:42:31 +02:00
Pau Perez
32069cffe1
Revert "Removing useless spaces"
...
This reverts commit d81b6be259 .
2018-06-05 18:42:19 +02:00
Maikel
494aeb9a14
Merge pull request #2348 from oeoeaio/fix-tabs
...
Provide specific tab widths for shop tabs when screen width > medium
2018-06-05 15:27:40 +10:00
Pau Pérez Fabregat
3283c5158b
Merge pull request #1492 from Matt-Yorkley/uk/import2
...
Uk/import2
2018-06-04 09:56:36 +02:00
Pau Pérez Fabregat
cf77bb439a
Merge pull request #2337 from Matt-Yorkley/uk/modal_fix
...
Fix guest checkout login modal
2018-06-04 09:56:00 +02:00
Pau Pérez Fabregat
ed116867d4
Merge pull request #2322 from luisramos0/issue1913
...
Fixed issue #1913 with expand/collapse of list of producers of a shop
2018-06-04 09:55:40 +02:00
Rob Harrington
fed0a81159
Add an optional link to Skylight dashboard to footer
2018-06-02 11:55:28 +10:00
Rob Harrington
e3ea60fda5
Process proxy orders even if underlying subscription has been paused or cancelled
2018-06-01 16:57:56 +10:00
robotscissors
65e13c2a2d
add image back into server for background
2018-05-30 20:42:31 -07:00
Rob Harrington
8201da9fab
Prodide specific tab widths for shop tabs when screen width > medium
2018-05-30 17:05:31 +10:00
Rob Harrington
184bf9ce36
Allow super admin users to enable subscriptions for enterprises
2018-05-30 09:42:03 +10:00
Rob Harrington
16211da5f6
Reimplement tabs on shopfront using our custom tab directive
2018-05-30 08:35:21 +10:00
Maikel
cb19643b3a
Merge pull request #2332 from oeoeaio/1938-oc-switch
...
Correct 'Next Order Closing' text in shopfront when switching OCs
2018-05-30 08:28:23 +10:00
Maikel
cee2f76406
Merge pull request #2299 from frank-west-iii/issue-1832-phone-shopfront
...
Add phone number to shopfront contact info
2018-05-30 08:27:07 +10:00
Maikel
32ef507221
Merge pull request #2318 from luisramos0/issue2307
...
Fixed broken translation keys in "new order cycle" screen
2018-05-29 17:38:04 +10:00
Maikel
603c88a93c
Merge pull request #2317 from luisramos0/issue2308
...
Added missing translation key for no results in admin orders page
2018-05-29 17:37:26 +10:00
Maikel
307132d1f7
Merge pull request #2298 from frank-west-iii/issue-953-ent-description-formatting
...
Fix enterprise description display formatting
2018-05-29 17:36:47 +10:00
Maikel Linke
e6ef43c91d
Give a spec some style
2018-05-29 16:55:30 +10:00
Maikel Linke
54bdcf7679
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/lib/open_food_network/xero_invoices_report_spec.rb
* 15 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 10 conversions
from: obj.should
to: expect(obj).to
* 4 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-29 16:53:18 +10:00
Maikel Linke
72ae6f2af6
Add spec helper to make spec run on its own
2018-05-29 16:49:00 +10:00
Maikel Linke
02c4795640
Remove default dates from reports
...
Closes https://github.com/openfoodfoundation/openfoodnetwork/issues/2212
2018-05-29 16:47:23 +10:00
Transifex-Openfoodnetwork
6d450aeae2
Updating translations for config/locales/pt.yml
2018-05-29 14:53:01 +10:00
Transifex-Openfoodnetwork
d1e9d52acd
Updating translations for config/locales/fr.yml
2018-05-29 14:51:07 +10:00
Matt-Yorkley
b440d05205
Tidy up unnecessary PI code
2018-05-26 19:34:20 +01:00
Matt-Yorkley
a4a2bc438a
Import settings spec
2018-05-26 19:34:20 +01:00
Matt-Yorkley
a503b5e2d0
Add not_master scope to Spree::Variant
2018-05-26 19:34:20 +01:00
Matt-Yorkley
91521dc2b0
Improve import_date queries
2018-05-26 19:34:20 +01:00
Matt-Yorkley
6f6db9384f
Tidy up SCSS and coffeescript
2018-05-26 19:34:20 +01:00
Matt-Yorkley
d9c720e89a
Tidy up import_date
2018-05-26 19:34:20 +01:00
Matt-Yorkley
73f7bc3db0
Remove use of before_filter
2018-05-26 19:34:20 +01:00
Matt-Yorkley
e65bdf35fa
Change wording on default import settings text
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c5b7cec19f
Change checkbox confirmation behaviour
2018-05-26 19:34:20 +01:00
Matt-Yorkley
58e9f0266a
User guide check
2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9
Product Import Guide WIP
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2
Create separate angular module
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a
Product Import refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
11908f125e
Fix flaky spec
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e
Refactor PI
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ff39b8df5
Fix altered translation key
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7a64ad1cc1
Fix roo-xls version in Gemfile
2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a6f316ede
Codeclimate refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7c283d90db
Spec adjustments
2018-05-26 19:34:19 +01:00
Matt-Yorkley
1c34ce6162
PI exception handling
2018-05-26 19:34:19 +01:00
Matt-Yorkley
b26bec45d6
Expanding PI specs
...
squash
2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400
PI inventories UX
...
Minor tweaks
2018-05-26 19:34:19 +01:00
Matt-Yorkley
678a2a365d
Fix spec date to string issue
2018-05-26 19:34:19 +01:00
Matt-Yorkley
2ef63efe28
Tax and Shipping adjustments
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3
PI human-readable unit fields
...
Enhanced unit specs
2018-05-26 19:34:19 +01:00
Matt-Yorkley
02661d5c23
PI unit_value typecasting
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e848957712
Clean up PI controller
...
Remove assignment
Tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4
Product Import v3 with asynchronous processing
...
Fixed spec
Quick spec tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
3a650dd8b3
Add roo-xls gem for Excel support
2018-05-26 19:34:19 +01:00
Matt-Yorkley
684b493fb3
PI translations
2018-05-26 19:34:19 +01:00
Matt-Yorkley
6e2de0d6ac
PI refactoring
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e76a818fde
Update PI spec
2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480
PI inventories additions
2018-05-26 19:34:19 +01:00
Matt-Yorkley
4e97445655
PI inventories timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900
PI inventories and overhaul
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fc2cc09ea5
checkout redirect excludes angular path variables
2018-05-26 18:13:35 +01:00
luisramos0
533ae77234
Fixed missing translations on shops filter - delivery option
2018-05-25 23:46:44 +01:00
Pau Pérez Fabregat
e04141d797
Merge pull request #2291 from coopdevs/remove-producers-tab-from-dashboard
...
Remove producers tab from dashboard
2018-05-25 19:24:29 +02:00
Rob Harrington
17259b3269
Overwrite cached value for current_order_cycle when updating it
...
This ensures that the correct order cycle is rendered in the json response
2018-05-25 17:28:54 +10:00
Pau Pérez Fabregat
9d57beb33f
Merge pull request #2305 from Matt-Yorkley/uk/domain_headers
...
Ensure domain in SSL header matches request with or without www prefix
2018-05-23 20:08:56 +02:00
luisramos0
d821664ee3
Fixed issue #1913 with expand/collapse of list of producers of a shop
2018-05-23 17:32:38 +01:00
luisramos0
a59d9cb670
Fixed broken translation keys in new order cycle screen
2018-05-23 13:12:56 +01:00
Luis Ramos
12232f552c
Added missing translation key for no results in admin orders page
2018-05-22 21:00:03 +01:00
Pau Perez
2a3772dba0
Do not show icons for producer-enterprises
...
Payment and shipping methods don't apply to them.
2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd
Ensure non-distributors are listed in dashboard
...
We want to show all enterprises in a single list regardless of their
type.
2018-05-22 10:21:35 +02:00
Pau Perez
bd34f27ace
Inline partials into enterprises view
...
Now there are no tabs in the dashboard so is pointless to refer to them
and to split in multiple partials.
2018-05-22 10:21:35 +02:00
Pau Perez
889199a525
Refactor Overview Controller to make it more clear
...
Assigns meaningful names to the boolean conditions to make it easier
to understand, breaks down the big and nested if/else and converts the
specs to RSpec 3.
Note the check `!spree_current_user.admin?` has been removed because
in admin/base_controller_decorator.rb `#authorize_admin` is already
called.
2018-05-22 10:21:35 +02:00
Pau Perez
51f3542a92
Remove no longer used Angular controller
...
There are no tabs to keep track of now.
2018-05-22 10:21:35 +02:00
Pau Perez
5a182e8e88
Remove enterprises producers tab from dashboard
2018-05-22 10:21:35 +02:00
Matt-Yorkley
c2934d3570
Ensure domain in SSL header matches request with or without www prefix
2018-05-21 17:50:34 +01:00
Frank West
f995a04ebf
Add phone number to shopfront contact info
2018-05-18 14:05:28 -07:00
Frank West
b05b9747b8
Fix enterprise description display formatting
...
Removes `text-small` class from container and change container to `div`
instead of `p` for semantic differentiation.
2018-05-18 07:20:56 -07:00
Maikel Linke
d218a51d96
Test public instead of private method
...
Refactoring and styling the whole thing, possibly causing conflicts with
other pull requests.
2018-05-18 11:27:48 +10:00
Maikel Linke
57dd984512
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/lib/open_food_network/order_and_distributor_report_spec.rb
* 2 conversions
from: == expected
to: eq(expected)
* 2 conversions
from: obj.should
to: expect(obj).to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:48 +10:00
Maikel Linke
7f8f935017
Shorten module referencing
2018-05-18 11:27:48 +10:00
Maikel Linke
0fa9ca653e
Move duplicate code into its own module
2018-05-18 11:27:48 +10:00
Maikel Linke
40b0a0bd5a
Determine searching state by params, not request
...
We may want to use GET for searching or POST to display a certain report
type.
2018-05-18 11:27:48 +10:00
Maikel Linke
8a1a540f3d
Clarify creating objects for test context
2018-05-18 11:27:48 +10:00
Maikel Linke
acee5da31b
Remove unnecessary whitespace
2018-05-18 11:27:48 +10:00
Maikel Linke
8a4457e8e4
Give better names
2018-05-18 11:27:48 +10:00
Maikel Linke
63799b2cb1
Remove outdated comment
2018-05-18 11:27:48 +10:00
Maikel Linke
8e2aee71da
Compile Order Cycle Management only on search
2018-05-18 11:27:48 +10:00
Maikel Linke
7a546087b2
Compile Packing report data only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
1e80487afc
Compile Order And Distributors only on search
...
And move most logic into the report class like the others.
2018-05-18 11:27:47 +10:00
Maikel Linke
53436024e2
Compile Orders & Fulfillment report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
feb33c3ca5
Compile Payments report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
bf74282e5f
Compile Bulk Co-Op report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
5f9d239f19
Compile Products & Inventory report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
d464216027
Don't compile Sales Tax report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
983e128d90
Half test run time by loading less data
...
On my computer it took 3 seconds to load all four orders with all the
attached order cycles and enterprises.
Runtime before: 56.38 seconds
Runtime after: 25.14 seconds
This really speeds up developing reports.
2018-05-18 11:27:47 +10:00
Maikel Linke
b8ca37e9d2
Don't compile xero report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
14e7cdd138
Don't compile customers report data before search
...
Distributors, suppliers and order cycles are still loaded for the search
form.
2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0
Don't compile user-enterprises report before search
2018-05-18 11:27:47 +10:00
Maikel Linke
fcd41c67fa
Add logic for showing empty reports initially
2018-05-18 11:27:47 +10:00
Maikel Linke
031c4d417e
Simplify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
41bb5e4e96
Unify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
28d66ad3e0
Activate dormant specs
...
It looks like a typo prevented a bunch of specs from being run.
2018-05-18 11:27:47 +10:00
Maikel Linke
5aef7031d2
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/features/admin/reports_spec.rb
* 40 conversions
from: obj.should
to: expect(obj).to
* 10 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +10:00
Maikel Linke
682b92e617
Avoid deprication warning for using stub
2018-05-18 11:27:46 +10:00
Maikel Linke
99a6afd9cd
Convert specs to RSpec 3.7.0 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/controllers/spree/admin/reports_controller_spec.rb
* 20 conversions
from: obj.should
to: expect(obj).to
* 14 conversions
from: obj.should_not
to: expect(obj).not_to
* 5 conversions
from: == expected
to: eq(expected)
* 4 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 2 conversions
from: obj.should_receive(:message)
to: expect(obj).to receive(:message)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +10:00
Maikel Linke
f3d542a3ec
Fix style and spelling
2018-05-18 11:27:46 +10:00
Maikel Linke
36b5f0eea7
Render only displayed report options
2018-05-18 11:27:46 +10:00
Maikel Linke
742e9d2a5f
Remove more code duplication
2018-05-18 11:27:46 +10:00
Maikel Linke
6a52ca8113
Remove code duplication
2018-05-18 11:27:46 +10:00
Maikel
4df9a0afa2
Merge pull request #2272 from rtrunkhill/620-error-message-tweak
...
changed error message in en.yml line 2207
2018-05-18 11:19:45 +10:00
Maikel
48b9536621
Merge pull request #2268 from stveep/1213-back-empties-cart
...
Set response headers to disable cache - to avoid back button emptying…
2018-05-18 10:54:05 +10:00
stveep
6efc0ab802
Set response headers to disable cache - to avoid back button emptying cart ( #1213 )
2018-05-18 09:57:32 +10:00
Maikel
b15f4de921
Merge pull request #2270 from mkllnk/2265-update-active-merchant
...
Update activemerchant to v1.78 with new root cert
2018-05-18 09:54:15 +10:00
Rory Trunkhill
5706cecf26
modify enterprise eror name message #620
2018-05-17 18:10:35 +00:00
Pau Pérez Fabregat
e356d712c4
Merge pull request #2288 from frank-west-iii/issue-2182-confirm-first-user
...
Confirm first user when seeding database
2018-05-16 08:51:12 +02:00
Pau Pérez Fabregat
5b89f6a159
Merge pull request #2285 from coopdevs/get-last-spree-fork-changes
...
Upgrade spree to point to 1c3dfc7fb
2018-05-16 08:42:41 +02:00
Maikel Linke
585bba0e23
Update activemerchant to v1.78 with new root cert
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2265 .
Most changes are in gateways we don't use, I believe. There has been a
change in Stripe, but we use another implementation, I guess.
2018-05-15 16:48:03 +10:00
Pau Pérez Fabregat
a28fa441c5
Merge pull request #2282 from openfoodfoundation/transifex
...
Transifex
2018-05-15 08:24:39 +02:00
Maikel
1b371e6388
Merge pull request #2249 from mkllnk/upgrade-rubocop-config
...
Upgrade Rubocop config to be compatible with 0.55
2018-05-15 16:19:38 +10:00
Maikel Linke
7c68ac9d0c
Wait for dialog to appear before using it
...
Travis was failing a few times. This should make the spec more robust.
2018-05-15 15:00:18 +10:00
Frank West
91351c3f78
Confirm first user when seeding database
...
Currently the first user is not confirmed until running the task
`openfoodnetwork:dev:load_sample_data`. This task does not need to be
run on a minimum implementation of a new server or development setup.
We now confirm the first user during seeding. This could be the default
email address or the user entered email address entered during seeding.
2018-05-14 15:30:04 -07:00
Pau Pérez Fabregat
6033981ad5
Merge pull request #2283 from coopdevs/remove-outdated-specs
...
Remove no longer valid tests
2018-05-14 13:22:00 +02:00
Pau Perez
6f8317b007
Upgrade spree to point to 1c3dfc7fb
...
This will fetch latest changes applied in the fork. It also changes the
Github organization we fetch it from. From now on we'll work there and
not in Coopdevs org.
2018-05-14 13:05:51 +02:00
Pau Perez
5c260dae51
Remove no longer valid tests
...
`#available_to_order?` is gone in Spree 2.0 and our customization on top
of it went away with #2256 .
2018-05-14 12:30:11 +02:00
Pau Pérez Fabregat
1991a7f34d
Merge pull request #2256 from coopdevs/add-custom-package
...
Add custom package
2018-05-14 10:44:05 +02:00
Buildkite
f2e07419a8
Merge remote-tracking branch 'origin/master' into HEAD
2018-05-11 03:37:13 +00:00
Matt-Yorkley
495f932069
Authentication service class description
2018-05-11 12:05:27 +10:00
Matt-Yorkley
74689afb8a
Unregistered user checkout issue
2018-05-11 12:05:27 +10:00
Matt-Yorkley
d3344973b7
checkout_controller clarity
2018-05-11 12:05:27 +10:00
Matt-Yorkley
9841f27f92
Add missing key for devise message
2018-05-11 12:05:27 +10:00
Matt-Yorkley
0741b5fa58
Ensure checkout modal opens at correct height
2018-05-11 12:05:27 +10:00
Maikel Linke
45fc42723c
Simplify query for existing email
...
It should be easier to read and more efficient now.
2018-05-11 12:05:27 +10:00
Maikel Linke
fe979b801f
Improve readability by grouping depending logic
2018-05-11 12:05:27 +10:00
Matt-Yorkley
358edb4727
Disable guest checkout in model
2018-05-11 12:05:27 +10:00
Matt-Yorkley
6b2c4de20f
Tidy up checkout spec
2018-05-11 12:05:27 +10:00
Matt-Yorkley
94b90b4a73
Registered user controller method spec
2018-05-11 12:05:27 +10:00
Matt-Yorkley
598677be3f
Disable guest checkout for registered users
2018-05-11 12:05:26 +10:00
Daniel Dominguez
4551fa60c5
Lowercase tag when adding a tag to the array, as they are lowercased after at the database level,
...
there is no point to display them with uppercase letters on the view.
2018-05-11 11:16:58 +10:00
Maikel Linke
7caf166768
Updates pulled from Transifex
2018-05-10 09:42:34 +10:00
Transifex-Openfoodnetwork
48217a54b9
Updating translations for config/locales/es.yml
2018-05-09 22:58:59 +10:00
Maikel Linke
8a3244513f
Run Codeclimate with new rubocop
2018-05-08 15:29:04 +10:00
Maikel Linke
fcb9d1411f
Exclude file that rubocop fails to parse
2018-05-08 15:19:44 +10:00
Maikel Linke
21b96c63af
Update cop naming
2018-05-08 14:52:13 +10:00
Maikel Linke
10d3abeaac
Upgrade Rubocop to the latest version
2018-05-08 14:46:57 +10:00
Steven Lawson
fd3e0d885b
Closes issue 1926, Changed package screen text from choose your starting point to choose your package
2018-05-07 17:15:55 -06:00
Pau Pérez Fabregat
98985d7211
Merge pull request #2266 from dan1d/upgrade-to-factory-bot
...
Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.
2018-05-07 15:22:12 +02:00
Daniel Dominguez
9d9a974295
Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.
...
- Change FactoryGirl to FactoryBot everywhere on code.
2018-05-04 11:52:08 -03:00
Pau Pérez Fabregat
501ad8107d
Merge pull request #2264 from coopdevs/exclude-js-libs-from-codeclimate
...
Exclude shared JS libs from CodeClimate
2018-05-03 16:53:45 +02:00
Pau Pérez Fabregat
8713bacfab
Merge pull request #2260 from coopdevs/improve-report
...
Improve order_and_distributor report's readability
2018-05-03 16:52:16 +02:00
Pau Perez
dd14915209
Exclude shared JS libs from CodeClimate
...
CodeClimate is raising issues from code that we don't own and won't
touch thus, causing false negatives.
2018-05-03 13:56:19 +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
Pau Perez
5da9b55cdd
Improve order_and_distributor report's readability
2018-05-02 12:26:42 +02:00
Pau Pérez Fabregat
21ebb5849c
Merge pull request #2258 from mkllnk/2254-invite-manager-flow
...
Fix initial password setting
2018-05-02 08:48:36 +02:00
Pau Pérez Fabregat
b2301190af
Merge pull request #2259 from mkllnk/remove-heroku
...
Remove Heroku references since nobody is using it
2018-05-02 08:43:51 +02:00
Maikel Linke
c597b3c377
Speed-up spec
2018-05-01 14:40:05 +10:00
Maikel Linke
7b06abd4c2
Fix initial password setting
2018-05-01 14:18:56 +10:00
Maikel Linke
de5124f90c
Remove Heroku references since nobody is using it
2018-05-01 10:20:21 +10:00
Pau Perez
6784621c1b
Remove invalid spree config
...
According to
5ef8dc67df
"Backorders can be configured now as per stock location or stock item".
2018-04-30 13:53:23 +02:00
Pau Perez
c3132e87d6
Rename and fix simple_product to base_product
...
This factory has been merged into the base_product factory. Besides,
products no longer have on_hand attribute.
2018-04-30 13:49:52 +02:00
Pau Pérez Fabregat
e7b1d933f4
Merge pull request #2253 from coopdevs/apply-spree-2.0-migrations
...
Apply spree 2.0 migrations
2018-04-30 12:51:29 +02:00
Pau Perez
19870eccdc
Install and run Spree v2.0.4 migrations
2018-04-27 17:02:28 +02:00
Pau Pérez Fabregat
9840f3bb6b
Merge pull request #2252 from coopdevs/use-patched-spree-2.0.4
...
Use OFN's Spree fork of 2.0.4 to get fixes
2018-04-27 16:58:33 +02:00
Pau Pérez Fabregat
d238aedb21
Merge pull request #2224 from coopdevs/minor-upgrade-rails
...
Upgrade Rails to 3.2.22.5 to get security fixes
2018-04-27 12:46:26 +02:00
Matt-Yorkley
a08b095547
Extract json render from :user_confirmed? method
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1c57f0f241
Update :return_url value when re-sending email confirmations
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1f23402912
Disable password reset for unconfirmed users
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1782a8c700
manager invite permissions spec
2018-04-27 10:13:54 +10:00
Matt-Yorkley
b431a7417a
Add cancan permissions for Admin::ManagerInvitationsController
2018-04-27 10:13:54 +10:00
Pau Perez
97e8adf7a7
Use OFN's Spree fork of 2.0.4 to get fixes
...
We encountered the bug that
3fd1535e75
fixes, which is needed to boot the app using Spree 2.0.4.
This stems from
https://github.com/openfoodfoundation/openfoodnetwork/issues/2236#issuecomment-384633612
2018-04-26 16:35:28 +02:00
Enrico Stano
6ae1780180
Merge pull request #2248 from coopdevs/upgrade-rubyzip
...
Update rubyzip to fix security issue
2018-04-26 14:50:10 +02:00
Pau Pérez Fabregat
1abf56efd5
Merge pull request #2246 from coopdevs/autofix-comment-indentation
...
Autofix comment indentation
2018-04-25 15:39:34 +02:00
Pau Perez
c12ac91371
Update rubyzip to fix security issue
...
Github reported us about CVE-2017-5946 which is a high severity issue.
This gem is used by Roo which already supports the Rubyzip version that
contains the fix (version 1.2.1). Check
872bb3a0b6
for further details.
Rubyzip's changelog for the version 1.2.1 can be found in
https://github.com/rubyzip/rubyzip/blob/master/Changelog.md#121 .
2018-04-24 16:08:34 +02:00
Pau Perez
25ad9b22aa
Update .rubocop_todo.yml
2018-04-23 13:03:05 +02:00
Pau Perez
11081ab1d6
Autocorrect Rubocop's Layout/CommentIndentation cop
2018-04-23 12:51:09 +02:00
Pau Pérez Fabregat
a1645477e0
Merge pull request #2235 from coopdevs/upgrade-to-spree-2.0.4
...
Upgrade Spree to 2.0.4 instead of 2.0.13
2018-04-23 12:14:49 +02:00
Maikel Linke
3fc49d5935
Simplify code
2018-04-23 12:55:49 +10:00
Matt-Yorkley
cd4268d219
Add manager dropdown UX
2018-04-23 12:55:49 +10:00
Rob Harrington
c77a01815c
Copy datepicker directive to utils module
...
Ensures that datepicker is available for subscriptions
2018-04-23 11:05:22 +10:00
Pau Pérez Fabregat
386716088a
Merge pull request #2190 from Matt-Yorkley/uk/bep_images_modal
...
Use angular translation filter on image upload modal
2018-04-20 16:22:53 +02:00
Pau Pérez Fabregat
9a75728b6e
Merge pull request #2231 from coopdevs/add-image-for-wiki
...
Add image to be used in Spree upgrade wiki page
2018-04-20 09:26:17 +02:00
Pau Perez
58f3b5a97e
Upgrade Spree to 2.0.4 instead of 2.0.13
...
Although we don't know how big the fixes introduced between 2.0.4 and
2.0.13 are, jumping from roughly 1.3.99 to 2.0.13 seems too big of
a change to do in one go.
Unless more issues like this one come up that force us to upgrade to
a newer version I believe it's best to be conservative. You'll find an
in-depth explanation in
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade#getting-to-version-204-
A previous effort was done to upgrade to v2.0.13 in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2209
2018-04-18 08:56:03 +02:00
Pau Perez
ef3ef2d4f3
Upgrade Rails to 3.2.22.5 to get security fixes
...
This will fix reported vulnerabilities CVE-2015-7576, CVE-2016-2098
(reported as high severity), CVE-2016-0751 and CVE-2015-7577.
2018-04-17 20:56:51 +02:00
Pau Perez
cd9d13cb2a
Add images to be used in Spree upgrade wiki page
2018-04-17 20:55:42 +02:00
Pau Pérez Fabregat
89bc9380eb
Merge pull request #2232 from coopdevs/skip-feature-spec-until-fixed
...
Disable totally unreliable feature test
2018-04-17 20:54:20 +02:00
Pau Perez
9f06d1f809
Disable totally unreliable feature
...
We need to investigate why it fails so many times fix it and then enable it
back. As it is, it brings cons than pros preventing even PRs that don't
touch code from being merged.
2018-04-17 19:22:03 +02:00
Pau Pérez Fabregat
ac37b0fc7e
Merge pull request #2221 from Matt-Yorkley/uk/bep_images_ux
...
Close modal when image updated successfully
2018-04-17 18:05:20 +02:00
Pau Perez
06ef2a4c63
Remove commented out gem from Gemfile
2018-04-17 16:10:41 +02:00
Hugo Daniel
595a622d5b
Removing useless spaces
2018-04-17 16:10:41 +02:00
Hugo Daniel
d9f451b6fe
Removing redundant curly braces
2018-04-17 16:10:41 +02:00
Hugo Daniel
abe5d3596c
Refactor Order#current_order argument
2018-04-17 16:10:41 +02:00
Hugo Daniel
e6b58c6db4
Remove ssl deprecated configuration
2018-04-17 16:10:40 +02:00
Hugo Daniel
6f3663f1b9
update gemfile to spree 2.0.13
2018-04-17 16:10:40 +02:00
Pau Pérez Fabregat
1abfe2ab8c
Merge pull request #2199 from coopdevs/auto-correct-cops
...
Auto correct cops
2018-04-16 14:58:28 +02:00
Pau Pérez Fabregat
b1fc15f242
Merge pull request #2223 from openfoodfoundation/transifex
...
Transifex
2018-04-16 13:43:40 +02:00
Pau Pérez Fabregat
fc7dd5d081
Merge pull request #2222 from coopdevs/upgrade-skylight
...
Upgrade to latest Skylight from 1.6.0 to 1.6.1
2018-04-16 11:38:23 +02:00
Pau Perez
2aea612f10
Upgrade to latest Skylight from 1.6.0 to 1.6.1
2018-04-16 10:52:15 +02:00
Pau Perez
147a74f005
Fix Rubocop violations reported by Code Climate
2018-04-16 10:27:44 +02:00
Rob Harrington
6a71aafce1
Update totals for empty order before sending email
2018-04-16 17:07:07 +10:00
Rob Harrington
f5e77cdcec
Ensure order total for uplaced subscription orders is zero
2018-04-16 17:07:07 +10:00
Rob Harrington
50ffd7ca01
Clear adjustments on subs orders when no items are able to be fulfilled
...
This prevents shipping and payment fees from being displayed in the notification email
2018-04-16 17:07:07 +10:00
Matt-Yorkley
37ba1e6c83
Close modal when image updated successfully
2018-04-15 20:52:25 +01:00
Matt-Yorkley
5777d04821
Use angular translation filter on image upload modal
2018-04-15 17:08:16 +01:00
Pau Pérez Fabregat
514ad5d898
Merge pull request #2208 from coopdevs/performance-monitoring-badge
...
Add Skylight's performance monitoring badge
2018-04-13 08:45:30 +02:00
Pau Perez
5822e60a66
Add Skylight's performance monitoring badge
...
Adding the badge, which points now to Katuma's performance monitoring
information, is required for Skylight to showcase OFN on their website.
2018-04-12 09:29:40 +02:00
Transifex-Openfoodnetwork
ce2a7a510f
Updating translations for config/locales/en_US.yml
2018-04-11 00:06:55 +10:00
Pau Perez
394fb91dd5
Auto correct Rubocop's Layout/MultilineArrayBraceLayout cop
2018-04-09 18:47:18 +02:00
Pau Perez
1640d5ad0b
Auto correct Rubocop's Layout/IndentHeredoc cop
2018-04-09 18:47:18 +02:00
Pau Perez
76fe1c7ee9
Auto correct Rubocop's Layout/IndentAssignment cop
2018-04-09 18:47:18 +02:00
Pau Perez
33ea2c0b07
Auto correct Rubocop's Layout/FirstParameterIndentation cop
2018-04-09 18:47:18 +02:00
Pau Perez
f5a5d735fd
Auto correct Rubocop's Layout/EmptyLinesAroundModuleBody cop
2018-04-09 18:47:18 +02:00
Pau Perez
6593dea4f6
Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop
2018-04-09 18:47:17 +02:00
Pau Perez
3161fa3801
Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop
2018-04-09 18:47:17 +02:00
Pau Perez
746fcd5802
Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop
2018-04-09 18:47:17 +02:00
Pau Perez
9da33b4e82
Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop
...
This also `script/rubocop_autocorrect` to automate the process of fixing
a cop and comitting the changes.
2018-04-09 18:46:11 +02:00
Pau Perez
e876ef7df1
Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop
2018-04-09 17:22:52 +02:00
Pau Perez
e4c86df7b2
Auto correct Rubocop's Layout/CaseIndentation cop
2018-04-09 17:19:47 +02:00
Transifex-Openfoodnetwork
15945fa1e0
Updating translations for config/locales/fr.yml
2018-04-05 04:48:54 +10:00
Transifex-Openfoodnetwork
ad898848f8
Updating translations for config/locales/pt.yml
2018-04-05 04:29:49 +10:00
Rob Harrington
236ba9328d
Order cycles in specs comply with new date validations
2018-04-04 17:18:33 +10:00
Rob Harrington
ce56e667a4
Use union operator instead of concatenate to load order cycle collection
2018-04-04 17:18:33 +10:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956
Return an error if no order_cycle_set params are submitted to #bulk_update action
2018-04-04 17:17:36 +10:00
Rob Harrington
18f7ec992d
Refactor loading of OrderCycleSet in OrderCyclesController
...
This should result in a significant speed bump in saving order cycles in bulk, because only referenced OCs are loaded into the set, rather than OrderCycle.all
2018-04-04 17:17:36 +10:00
stveep
46d2d6cb8a
Include option text in dropdown cart even if the variant and product have the same name
2018-04-04 16:40:18 +10:00
Maikel Linke
a2e4c33922
Remove old and useless sentence from welcome email
...
The sentence made assumptions of the availability of FAQs and support
forums without linking to them. So it didn't really help. It also
promised that someone would monitor the support page in the forum which
nobody seems to do.
2018-04-04 16:21:39 +10:00
Matt-Yorkley
101269a487
Adjust wording on manager invite email
2018-04-04 15:49:04 +10:00
Maikel
61fbdfcefc
Merge pull request #2178 from HugsDaniel/2172_flexi_rate_miscalculated
...
Fixing flexible rate miscalculation
2018-04-04 15:47:33 +10:00
Hugo Daniel
2a942da160
Use rspec context
2018-04-04 14:58:48 +10:00
Hugo Daniel
bd97d08653
Remove stub after test and create two distinct calculators
2018-04-04 14:58:47 +10:00
Hugo Daniel
68ca352510
Use rspec expect syntax
2018-04-04 14:58:47 +10:00
Hugo Daniel
a71b650f89
Added tests
2018-04-04 14:58:47 +10:00
Hugo Daniel
f40bd9cfcb
Fixing wrong incrementation
2018-04-04 14:58:47 +10:00
Hugo Daniel
843bca9ea3
Updated calculation for flexible rate
2018-04-04 14:58:46 +10:00
Maikel Linke
80da0d5330
Set enterprise form dirty on any change
...
Commit 4953c69123 introduced a bug that
the save button is not activated when changing enterprise fields.
https://github.com/openfoodfoundation/openfoodnetwork/issues/2195
This is reverting the change and fixes #2195 .
Sadly, it re-opens
https://github.com/openfoodfoundation/openfoodnetwork/issues/1216 .
But that one is not as severe as the current bug.
2018-04-04 13:36:03 +10:00
Hugo Daniel
5ec89dde42
Update test sentences to fit new PriceSack behavior
2018-04-04 11:25:26 +10:00
Hugo Daniel
213456f4d9
Moved PriceSack tests from per item list to per order
2018-04-04 11:25:26 +10:00
Hugo Daniel
14ea591c7d
Removed redundant self
2018-04-04 11:25:25 +10:00
Hugo Daniel
28009afbea
Calculate price sack fees and tests
2018-04-04 11:25:25 +10:00
Matt-Yorkley
357ff5fb7d
Improve associating customer specs
2018-04-04 10:14:55 +10:00
Matt-Yorkley
5f2e72e3d4
Private shop spec
2018-04-04 10:14:55 +10:00
Em-AK
3b5c3f41a2
Ensure created users are associated with customers
...
When a user is created with the same email as existing customers
Then the user is associated with these customers
So that the user can access the private shops where he has been invited
to before signup
2018-04-04 10:14:55 +10:00
Rob Harrington
a83bdf16c9
Add error message for case when schedule cannot be deleted
2018-04-04 09:21:52 +10:00
Maikel
f9dbf61afc
Merge pull request #2176 from HugsDaniel/2002_calculator_options_not_translated
...
Overwrites spree_i18n translations for calculator's options
2018-04-04 08:17:18 +10:00
Pau Pérez Fabregat
15bd0de971
Merge pull request #2194 from wrycoder/spec-deprecation-fix
...
Replacing deprecated #ignore with #transient
2018-04-03 18:53:04 +02:00
Pau Pérez Fabregat
87329ad729
Merge pull request #2092 from ltrls/fix-tax-admin-order-show
...
Fix incorrect tax on Admin Order Show
2018-04-03 08:36:10 +02:00
Hugo Daniel
6731dd0b64
Overwrites spree_i18n translations for entreprise fees calculator's options
2018-04-03 08:38:00 +10:00
Michael Toulouse
0519269a53
Replacing deprecated #ignore with #transient
2018-04-02 06:40:12 -04:00
Pau Pérez Fabregat
1357c7c3b5
Merge pull request #2185 from coopdevs/remove-in-stock-dead-scope
...
Remove in_stock dead scope
2018-03-28 13:16:02 +02:00
Pau Perez
0cbd967007
Remove in_stock dead scope
...
This makes the upgrade to Spree 2.0 a bit easier.
`spree_variants.count_on_hand` is removed in that version and this
column was used in the `in_stock` scope that we no longer use.
2018-03-28 12:13:34 +02:00
Pau Pérez Fabregat
7fbaff71c7
Merge pull request #2179 from coopdevs/ignore-vendor-bundle
...
Ignore Bundler's vendor/bundle
2018-03-28 11:29:56 +02:00
Pau Perez
e8d8d5b0e6
Ignore Bundler's vendor/bundle
2018-03-27 16:56:58 +02:00
Pierre de Lacroix
28bb15f4a9
Fix old rspec syntax
2018-03-20 12:21:27 +01:00
Pierre de Lacroix
e0b12b1332
Remove dependency on model method in feature test
2018-03-20 12:18:54 +01:00
Pierre de Lacroix
2ceecc3d6e
Test Order#tax_adjustment_totals with taxed adjustment on order
2018-03-20 12:18:51 +01:00
Pierre de Lacroix
03de6c690c
Fix incorrect tax amount on Admin Order #show
...
by calling Order#tax_adjustment_totals from
Order#price_adjustment_totals
2018-03-20 12:18:09 +01:00
Maxim Colls
5db1559f28
Fixed spec to use unuppercased states
2018-02-07 13:35:50 +11:00
Maxim Colls
09f98307f4
Do not upcase State abbreviation
2018-02-07 13:35:50 +11:00