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 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
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
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
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
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
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
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
