raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 19 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

17514 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Maikel Linke
c7648d67bd Add Variant stock API of Spree 1 2018-08-30 13:55:12 +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
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
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
Matt-Yorkley
6b9b8d8b73 Match multiple product names 2018-08-28 03:26:17 +01:00