Maikel
065df96872
Merge pull request #2675 from Matt-Yorkley/bi/remake_views
...
Remake orders index view
2018-09-13 12:29:54 +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
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
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
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
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
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
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
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
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
VadLusk
f74a6e47d5
Remove css_splitter references, delete all_split2.css. #1361 #2633
2018-09-03 09:20:26 +10: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
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
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 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
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
0174b84254
Remove old deactivated code
2018-08-30 14:50:41 +10: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
