Luis Ramos
6e842212ea
Always throw back error even if there is an error loading the flash for example translating the error message
2020-05-29 14:45:22 +01:00
Luis Ramos
83edfbd1dd
Merge pull request #5266 from luchiago/improve-order-cancellation-email
...
Improve order cancellation email
2020-05-28 19:48:26 +01: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
Luis Ramos
9a71ffc093
Merge pull request #5438 from Matt-Yorkley/cart-stock-ux
...
Cart stock UX
2020-05-22 14:21:16 +01:00
Luis Ramos
76b721b663
Merge pull request #5457 from Matt-Yorkley/cart-fix
...
Fix cart fields sharing same scope
2020-05-19 19:31:49 +01:00
Matt-Yorkley
3df2d4721b
Fix search bar in /shops and /groups
2020-05-19 14:00:20 +02:00
Matt-Yorkley
4a837e8c07
Fix display issue on order cycle form
...
Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.
2020-05-19 11:56:41 +02:00
Matt-Yorkley
05e6f5792d
Fix cart fields sharing same scope
...
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
2020-05-19 10:23:12 +02:00
Lucas Hiago
ba30f55e70
Add fullwidth for table selector
2020-05-18 22:53:46 -03:00
Matt-Yorkley
e3c337ef7e
Fix mixed error display issue
2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc
Use fresh scope for each quantity field
2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082
Move reused available stock logic to service
2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799
Update invalid input feedback
2020-05-18 16:14:14 +02:00
Matt-Yorkley
f7b4717f29
Improve validation code
2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4
Update cart page links to be disabled when changes are required and form is unsaved
...
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432
Fix tab-buttons element overlapping order cycle selector
2020-05-18 14:27:05 +02:00
Luis Ramos
ea8157a5c6
Merge pull request #5304 from dacook/5299-orders-filter-several-tags
...
5299 Impossible to filter orders with several tags
2020-05-18 11:25:54 +01:00
Matt-Yorkley
3ba1182661
Dynamically mark quantity field as invalid when stock is incorrect
2020-05-15 12:59:29 +02:00
Matt-Yorkley
42195b76d3
Highlight update button when cart page form is "dirty"
2020-05-15 12:59:29 +02:00
Matt-Yorkley
78f736db45
Add red border on quantity field when it must be updated
2020-05-15 12:59:28 +02:00
Luis Ramos
4fe1135a33
Merge pull request #5376 from rmklaus12/5104-mobile-keyboard-inputs
...
Added inputmode attribute to show appropriate mobile keyboard for sel…
2020-05-15 08:49:42 +01:00
David Cook
f5629d59b0
5299: Add trailing square brackets for array parameters (distributor and order_cycle)
2020-05-15 15:04:01 +10:00
David Cook
8a2c65b6bb
Remove duplicate line
2020-05-15 15:04:01 +10:00
Luis Ramos
5f7c1474a2
Merge pull request #5377 from manvil/1782_enterprise_at_same_address
...
Handling multiple enterprises at the same location
2020-05-13 19:31:14 +01:00
Matt-Yorkley
598071fa78
Remove conflicting "clear search" buttons added by Chrome
2020-05-12 18:59:15 +02:00
Matt-Yorkley
0cd4ad0a1a
Ensure large amount of search text doesn't break layout with clear all button
2020-05-10 09:44:12 +02:00
Matt-Yorkley
9f882a8674
Ensure search results feedback wraps nicely onto next line
2020-05-10 09:44:12 +02:00
Matt-Yorkley
cb9c56d8aa
Ensure correct left-alignment on text in search results feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
82b11d6947
Ensure join words are not bold
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7be85d1dab
Use bold font with teal colour for both applied taxons and applied properties
2020-05-10 09:44:12 +02:00
Matt-Yorkley
f6b910b38a
Fix clear search (x) button position on some layouts
...
Hopefully this will work on iPhones as well...?
2020-05-10 09:44:12 +02:00
Matt-Yorkley
ea06ec7ede
Remove smaller (less than 1em) scaling in search bar on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
71fb3b1845
Focus search field after it's cleared, ready for immediate typing of new search term on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
e0cb514cad
Add hover state to filters button with darker background
2020-05-10 09:44:12 +02:00
Matt-Yorkley
5ceaff24e9
Darken overlay background colour to reduce distraction
2020-05-10 09:44:11 +02:00
Matt-Yorkley
a7771a20c4
Adjust border-radius on filters button
2020-05-10 09:44:11 +02:00
Matt-Yorkley
03afae01b3
Decrease sidebar width on mobile for more tapping space
2020-05-10 09:44:11 +02:00
Matt-Yorkley
96c6da304a
Increase margin between filter selectors
2020-05-10 09:44:11 +02:00
Matt-Yorkley
2964ec138d
Update display of join words in filters list and rearrange code a bit for clarity
...
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.
$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
6b66787004
Update "no results" layout on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4
Update "no results" styling
2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465
Update styling on search feedback bar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
026b98022c
Add clear search button in shop searchbar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff69389bb0
Make search bar "sticky" for tablets and mobile
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f24969edb1
Remove gutter padding on shop content to gain a bit more horizontal real-estate
2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbb67e15ed
Extract button styles
2020-05-10 09:44:11 +02:00
Matt-Yorkley
865dcf79cb
Extract some properties to variables
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ebe00bdc31
Update filters clear button functionality
2020-05-10 09:44:11 +02:00