2471 Commits

Author	SHA1	Message	Date
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	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	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	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	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
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
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	82b11d6947	Ensure join words are not bold	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	026b98022c	Add clear search button in shop searchbar	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	e25e4e7482	Fix issue with button submitting form instead of opening popup	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	142cef3f3a	Add filters count	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
Luis Ramos	424932d61b	Merge pull request #5262 from luisramos0/closed_shop_msg ... [Mobile] Improve the design of shop page messages (closed shop, private shop and select OC)	2020-05-08 07:52:58 +01:00
Luis Ramos	52b39d04a4	Merge pull request #5359 from mbudm/issue/5108 ... Add NavigationCheck to order cycles edit form	2020-05-07 14:37:32 +01:00
Manvil George	63a1a6fefa	More optimsations: removing unwanted code	2020-05-07 22:58:09 +10:00
Luis Ramos	3c7970f72f	Add select oc message when there are multiple OCs	2020-05-07 12:18:40 +01:00
Luis Ramos	d4980893a1	Refactor darker-background directive, extract method	2020-05-07 12:17:43 +01:00
Luis Ramos	77d7d2b804	Make the background darker only in specific cases	2020-05-07 12:17:43 +01:00
Manvil George	a629e1ecb7	Remove incorrect commenting	2020-05-07 11:46:49 +10:00
Manvil George	585a754b18	Missed out on inverting the boolean expression	2020-05-07 11:31:27 +10:00
Manvil George	7847c4ed9e	Removing unwanted blank lines	2020-05-07 09:37:35 +10:00
Manvil George	5b009f606a	More optimizations around coding standards	2020-05-07 09:07:32 +10:00
Manvil George	bf3bb4fb63	Review Comments incorporation	2020-05-07 00:54:01 +10:00
Pau Pérez Fabregat	dadc17398f	Merge pull request #5371 from Matt-Yorkley/cart-add-error ... Cart add error handling	2020-05-06 15:22:06 +02:00
Manvil George	f802775ad6	Fixing up old Enterprise Modal references	2020-05-06 15:37:28 +10:00
Manvil George	19b5f6a562	Handling multiple enterprises at the same location ... Changes: * Introduced a cluster marker to denote multiple points of interest at the same location * Seperated out a plain enterprise modal into 2 parts * A modal called EnterpriseModal for showing a list of enterprises at the same location * A box called EnterpriseBox(which by the way is also a technically a modal) that shows the details of that particular enterprise selected * If at a location there exists only a single enterprise then only the box is shown	2020-05-06 12:54:42 +10:00
Robin Klaus	f43380fce5	Added inputmode attribute to show appropriate mobile keyboard for selected field	2020-05-06 12:52:53 +10:00
Robin Klaus	7dce53a77b	Added inputmode attribute to show appropriate mobile keyboard for selected field	2020-05-06 12:46:37 +10:00
Steve Roberts	4573127c59	Add NavigationCheck to order cycles edit form ... - Simplify if statements with safe navigation operator - Simplify order cycle nav check spec - Rename nav check callback so a comment is not needed and remove unnecessary assignation to $scope	2020-05-06 10:43:21 +10:00
Matt-Yorkley	13e4411b89	Add error message on cart populate failure and don't keep re-sending the data to the server. ... This was triggering many requests to be continuously re-sent in a very problematic way (server-melting), and with no user feedback.	2020-05-05 17:22:10 +02:00
Matt-Yorkley	9a7807b134	Don't continuously re-post data on cart error	2020-05-05 16:04:05 +02:00
Matt-Yorkley	068c8feea7	Merge pull request #5289 from Matt-Yorkley/cart-populate ... Cart populate	2020-05-05 13:56:17 +02:00
Pau Pérez Fabregat	e7df9bb58d	Merge pull request #5178 from coopdevs/dont-populate-empty-cart ... Dont populate empty cart	2020-04-29 13:08:26 +02:00
Matt-Yorkley	3ce7e96777	Add some debounce and an onwheel hack to product add to basket field ... Debounce ensures we don't get a million requests if the up/down buttons are clicked rapidly. The onwheel hack adds some protection against scrolling triggering the quantity up/down. See: https://stackoverflow.com/a/51076231	2020-04-27 19:27:07 +02:00
Luis Ramos	b3eda9fecb	Merge pull request #5256 from dacook/5190-fix-order-sorting ... Fix sorting of orders list	2020-04-26 14:24:00 +01:00
Pau Perez	c224df9b6a	Do not trigger an orderChanged with null quantity ... When loading the page $watchGroup calls the listener function for every listed line item but with a set variant and null quantity and max_quantity. There's no point on computing an order change when there was none. This saves an empty request on the second most used endpoint of the app, specially busy when users are placing orders.	2020-04-24 15:54:46 +02:00
Luis Ramos	aa52cf8bf0	Merge pull request #5254 from chrishil1/missing_translation_save_as_default ... Added missing translation to column dropdown	2020-04-23 11:08:33 +01:00
Luis Ramos	23f4faf192	Merge pull request #4841 from luisramos0/kill_rabl ... Hide broken product taxons field, remove last rabl template and rabl itself	2020-04-21 18:49:12 +01:00