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
