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 |
|
Pau Pérez Fabregat
|
3f593d6246
|
Merge pull request #5440 from luisramos0/grumpy_cat
Fix Grumpy Cat on shop page (cart with items from a closed OC)
|
2020-05-22 18:38:41 +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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Luis Ramos
|
37350fcbb0
|
Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query
|
2020-05-18 10:55:03 +01: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 |
|
Luis Ramos
|
1c749a8029
|
Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles
|
2020-05-15 19:36:59 +01:00 |
|
Luis Ramos
|
a438317d69
|
Extract order_cart_reset service from enterprises_controller
|
2020-05-15 19:30:00 +01:00 |
|
Luis Ramos
|
35824c7aa1
|
Rename restartCheckout to order_checkout_restart to make it follow service naming convention
|
2020-05-15 19:29:37 +01:00 |
|
Luis Ramos
|
ba585064e1
|
Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders
|
2020-05-15 19:29:37 +01:00 |
|
Luis Ramos
|
21d1a7bc04
|
Remove dead code
|
2020-05-15 19:29:37 +01:00 |
|
Luis Ramos
|
6827ce5c7f
|
Refactor order.set_order_cycle, return early and remove indentation
|
2020-05-15 19:29:37 +01:00 |
|
Luis Ramos
|
94bb95861b
|
If selected OC is not in the available OCs, empty the order
|
2020-05-15 19:29:35 +01:00 |
|
Luis Ramos
|
52e7ca2417
|
Select first default OC only if no OC is already selected
|
2020-05-15 14:26:56 +01:00 |
|
Luis Ramos
|
c3f0c0ed7f
|
Extract method to prepare work ahead
|
2020-05-15 14:25:20 +01: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 |
|
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 |
|
Luis Ramos
|
ef2d7f9485
|
Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
[mobile ux] Merge search and filter epic to master
|
2020-05-13 08:59:32 +01:00 |
|
Matt-Yorkley
|
598071fa78
|
Remove conflicting "clear search" buttons added by Chrome
|
2020-05-12 18:59:15 +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 |
|
Luis Ramos
|
41645e8351
|
Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file
Output logs in Delayed Job's log file
|
2020-05-12 10:05:26 +01: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
|
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
|
82b11d6947
|
Ensure join words are not bold
|
2020-05-10 09:44:12 +02:00 |
|