Matt-Yorkley
0ba670b180
Ensure order is cleanly reset to cart state when redirecting to cart
2020-11-27 11:42:46 +00:00
Matt-Yorkley
c4cfc1dc05
Improve order test in paypal controller spec
2020-11-27 11:42:06 +00:00
Matt-Yorkley
2fa2a30c67
Add spec coverage, refactor, avoid double-render errors
...
👍
2020-11-22 18:37:31 +00:00
Matt-Yorkley
cabec7e73f
Fix Rubocop warnings and tidy up
2020-11-22 18:02:54 +00:00
Matt-Yorkley
87df44764f
Extract stock-check logic to controller concern and inject prior to final Paypal payment confirmation.
2020-11-22 18:02:52 +00:00
Matt-Yorkley
242c1a2715
Add new Paypal feature spec
2020-11-19 01:44:53 +00:00
Matt-Yorkley
21d67a0723
Extract some more paypal-specific test code to new helper
2020-11-19 01:44:38 +00:00
Matt-Yorkley
41a5787830
Extract paypal response stubbing to helper
2020-11-18 15:39:01 +00:00
Matt-Yorkley
010c1c799d
Add some notes on paypal checkout flow
2020-11-18 14:55:29 +00:00
Matt-Yorkley
2faea65f82
Bring in Spree::PaypalController#confirm method
...
Original method from the gem. This handles the post-payment response from paypal.
2020-11-18 14:51:23 +00:00
Matt-Yorkley
dd8f139c1b
Memoize Spree::PaypalController#payment_method
...
This gets called 4 or 5 times in a single request just to read basic attributes from the object. The query doesn't need to be repeated each time
2020-11-18 13:45:14 +00:00
Matt-Yorkley
6d0d4b5096
Bring in Spree::PaypalController#payment_method
...
Original method from the gem. Modified in preceding commit.
2020-11-18 13:45:13 +00:00
Maikel Linke
315a5f0fd9
Update translations
2020-11-17 10:17:08 +11:00
Matt-Yorkley
c080c1f1d6
Merge pull request #6382 from Matt-Yorkley/menu-fix
...
Fix the user menu
2020-11-16 22:20:12 +01:00
Matt-Yorkley
3b92df42c3
Fix the menu!
...
🙈
2020-11-16 19:05:08 +00:00
Matt-Yorkley
e2dbb150e5
Update all locales with the latest Transifex translations
2020-11-16 16:02:40 +00:00
Luis Ramos
ca29604ff8
Merge pull request #6377 from luisramos0/repeat_calculator_migrations
...
Repeat calculator migrations to clean up existing data
2020-11-16 10:46:42 +00:00
Luis Ramos
e5b7c036d5
Repeat calculator migrations to clean up existing data
2020-11-13 16:35:22 +00:00
Pau Pérez Fabregat
6f1d8664ac
Merge pull request #6355 from coopdevs/install-gems-on-docker-boot
...
Install any missing gems when booting docker
2020-11-13 13:32:27 +01:00
Pau Pérez Fabregat
8d5e90e40f
Merge pull request #6365 from Matt-Yorkley/mail-settings
...
Allow mail_auth_type to be set
2020-11-13 13:30:17 +01:00
Pau Pérez Fabregat
6db80e837b
Merge pull request #6361 from andrewpbrett/fix-gateway-error-error
...
move gateway_error require to lib/spree/core.rb
2020-11-13 13:15:13 +01:00
Matt-Yorkley
cec295a113
Merge pull request #6373 from andrewpbrett/fix-admin-users
...
specify Spree routes for pagination, fix 500 on admin/users
2020-11-13 11:30:16 +01:00
Maikel Linke
a553547403
Update translations
2020-11-13 14:15:45 +11:00
Maikel
1e4edc671a
Merge pull request #6364 from openfoodfoundation/transifex
...
Transifex
2020-11-13 14:05:12 +11:00
Maikel
b2113c96a2
Merge pull request #6317 from openfoodfoundation/dependabot/bundler/kaminari-0.17.0
...
Bump kaminari from 0.14.1 to 0.17.0
2020-11-13 13:58:25 +11:00
Maikel
408103516e
Merge pull request #6321 from openfoodfoundation/dependabot/bundler/awesome_nested_set-3.2.1
...
Bump awesome_nested_set from 3.0.3 to 3.2.1
2020-11-13 13:30:18 +11:00
Maikel
d96216b8d7
Merge pull request #6268 from yihyang/master-yy-added-product-sorting
...
Sort products alphabetically in OC edit/create page
2020-11-13 13:29:54 +11:00
Maikel
d4ff9055c0
Merge pull request #6351 from efgalvao/issue#6249
...
Fixes Issue#6249
2020-11-13 13:28:55 +11:00
Maikel
591ba34eb6
Merge pull request #6335 from cillian/reset-on-demand-on-inventory-import
...
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
2020-11-13 13:28:17 +11:00
Andy Brett
8dfd3f624d
paginate zones using spree routes as well
2020-11-12 14:24:04 -08:00
Andy Brett
9cf30b431a
specify Spree routes for pagination
2020-11-12 14:09:59 -08:00
Pau Pérez Fabregat
777cedd90d
Merge pull request #6305 from efgalvao/issue#6292
...
Fixed issue #6292 .
2020-11-12 17:42:42 +01:00
Transifex-Openfoodnetwork
b80d15b672
Updating translations for config/locales/pt_BR.yml
2020-11-13 02:43:56 +11:00
Transifex-Openfoodnetwork
228c7cc13a
Updating translations for config/locales/pt_BR.yml
2020-11-13 02:40:55 +11:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Pau Pérez Fabregat
692adb0113
Merge pull request #6336 from coopdevs/fix-shop-layout
...
Fix .top-bar-section not to wrap the icons-menu
2020-11-11 17:29:53 +01:00
Matt-Yorkley
58e34b5ad6
Allow mail_auth_type to be set
2020-11-11 15:51:08 +00:00
Transifex-Openfoodnetwork
694bc6a598
Updating translations for config/locales/ar.yml
2020-11-12 02:18:05 +11:00
Transifex-Openfoodnetwork
e06b82f335
Updating translations for config/locales/ar.yml
2020-11-12 02:14:55 +11:00
Andy Brett
17202ff39c
move gateway_error require to lib/spree/core.rb
2020-11-10 14:55:56 -08:00
Andy Brett
d5037abbe7
add specs for new/edit product pages
2020-11-10 10:49:14 -08:00
Pau Perez
5ddfc54b2b
Install any missing gems when booting docker
...
This runs `bundle install` if there are any missing gems when booting
the containers. `bundle check` ensures we don't unnecessarily run
`bundle install`, which is rather slow.
This avoids having to build the entire image (painfully slow) or having
to bring up a container just to install the gems. I used to do this
with `docker-compose run --rm web bundle install`.
2020-11-10 18:08:34 +01:00
Pau Pérez Fabregat
bea8982085
Merge pull request #6329 from openfoodfoundation/transifex
...
Transifex
2020-11-10 17:37:00 +01:00
Pau Pérez Fabregat
fc06cc242b
Merge pull request #6210 from ipalo/feature/update-docker-image-to-ubuntu-20-04
...
Update the base Ubuntu Docker image from 18.04 to 20.04
2020-11-10 17:30:03 +01:00
Pau Pérez Fabregat
b70c349b05
Merge pull request #6352 from openfoodfoundation/dependabot/bundler/webmock-3.9.5
...
Bump webmock from 3.9.4 to 3.9.5
2020-11-10 16:47:44 +01:00
Pau Perez
634ab5ca6a
Don't scale logo image
...
The trick using `width: 100%` and a set `max-width` doesn't work if we
can't know the image width as it can be uploaded by superadmins. There's
no need though because the media query breakpoint triggers just before that.
2020-11-10 09:51:41 +01:00
Luis Ramos
c7c5a95407
Merge pull request #6345 from Matt-Yorkley/flaky-oc-spec
...
Improve flaky order cycle spec
2020-11-09 21:59:41 +00:00
dependabot-preview[bot]
1825c90a5f
Bump webmock from 3.9.4 to 3.9.5
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.9.4 to 3.9.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.9.4...v3.9.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-11-09 19:14:30 +00:00
efgalvao
307b1ca9f9
Fixes Issue#6249
2020-11-09 14:06:37 -03:00
Pau Perez
17abb3e345
Fix feature specs
...
The underlying markup and CSS changed but the tests did not.
2020-11-09 15:43:54 +01:00
