Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01: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
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
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
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
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
2ae34d8df3
Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page
...
change shop name to be link to shop on transactions page
2020-05-21 10:56:19 +01:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Luis Ramos
cf0ad179a1
Move hubs_sidebar to the last 4 columns at the top of the page
2020-05-21 10:45:58 +01:00
Maikel
da55956a6e
Merge pull request #5392 from luisramos0/ship_method_bo
...
Make "backoffice only" ship methods work and remove option "frontoffice only"
2020-05-21 10:16:15 +10:00
Matt-Yorkley
3df2d4721b
Fix search bar in /shops and /groups
2020-05-19 14:00:20 +02:00
Matt-Yorkley
fe27c8466e
Add feature specs for full cart page stock correction process
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
Robin Klaus
438c0ecde9
delete extra lines
2020-05-16 20:12:54 +10:00
Robin Klaus
ba8ecf19ac
Added input code to two additional pages to cover shop tab search boxes
2020-05-16 12:56:06 +10:00
Matt-Yorkley
c2efa901c2
Don't highlight update button when form is invalid
2020-05-15 13:38:17 +02: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
73b533690e
Refactor cart update button syntax
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
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Matt-Yorkley
70e3f0f1f1
Fix closed shop message not displaying full-width
2020-05-12 18:29:48 +02:00
Matt-Yorkley
265a8ed573
Move messages and products form outside of row and columns to enable full-width
2020-05-12 18:24:10 +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
dee793a392
Change join word between the two filter sets to be "and", to match the actual logic
2020-05-10 09:44:12 +02:00
Matt-Yorkley
b78976fcd7
Ensure consistent styling in both "no results" and "searching for" text
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a75d3276a4
Include applied filters list in "no results" feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a1435e78c9
Extract applied filters feedback to partial
2020-05-10 09:44:12 +02:00
Matt-Yorkley
483a654d31
Add join word "or" when both categories and properties are present
...
Previously for example with "Organic" property and "Fruit" and "Nuts" categories it rendered as: "Fruit or Nuts Organic" instead of: "Fruit or Nuts or Organic"
2020-05-10 09:44:12 +02:00
Matt-Yorkley
07ac7dd9c7
Add explicit 'search' input type to search field.
...
In theory this should improve some of the custom-keyboard functionality added by mobiles, but the implementations will be vary...
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
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
14d928c39d
Fix feature specs where UI has changed
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
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
ebe00bdc31
Update filters clear button functionality
2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0
Add missing translation key
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f337fd49e1
Extract search feedback bar into partial and move into main column
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff07b97033
Add sidebar footer and buttons
...
Also includes a minor refactor to resolve an issue with animation timings. Angular was not adding the "shown" class to the different elements at the same time in the digest cycle, and it looked a bit shaky.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
7c00d41fc4
Add some animation effects
2020-05-10 09:44:11 +02:00
Matt-Yorkley
8e9833fd06
Implement overlaid sidebar on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f43bf3880c
Add filters button on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
142cef3f3a
Add filters count
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f46ca0c595
Move search to new searchbar
...
This required a lot of refactoring, as the search needed to be inside both the form element and the Angular ProductsCtrl element, but to get a full-width row for the searchbar it needed to be outside of the 12 column layout of the other shop page elements...
2020-05-10 09:44:11 +02:00
Matt-Yorkley
532e27b7e1
Move filters into new column on desktop
2020-05-10 09:37:56 +02:00
