Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
Luis Ramos
6f0106251e
Move product-img css class to parent div so we can center align it and keep existing img styling
2020-05-27 19:16:31 +01:00
Luis Ramos
513ee6393a
Make product modal display image on the right for medium screens like it was doing for large screens
2020-05-25 19:31:02 +01:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Pau Pérez Fabregat
16dfb3c7e9
Merge pull request #5408 from luisramos0/columns_params
...
[Spree 2.1] Add missing permitted param to Column Preferences controller
2020-05-21 14:41:30 +02:00
Luis Ramos
4292636e70
Remove close button in product modal
2020-05-15 12:16:19 +01:00
Luis Ramos
30fe457cb5
Make product modal show close button only if there is a scroll bar
2020-05-15 12:12:07 +01:00
Luis Ramos
cbfaaabb72
Adjust different paddings and margins to make mobile product modal contents similar to required design
2020-05-15 12:12:07 +01:00
Luis Ramos
0a378a897b
Add close button to mobile product modal, this can be reused in other modals later
2020-05-15 12:12:07 +01:00
Luis Ramos
59a13adff0
Remove product category from product modal
2020-05-15 12:11:32 +01:00
Luis Ramos
9a115afd4f
Remove bars around product description and border around product image
2020-05-15 12:11:32 +01: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
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
7804c740a6
Add name to permitted params and fix some rubocop issues
2020-05-12 15:35:47 +01:00
Matt-Yorkley
e25e4e7482
Fix issue with button submitting form instead of opening popup
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
Manvil George
bf3bb4fb63
Review Comments incorporation
2020-05-07 00:54:01 +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
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01: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
jeffrey s hill md
70005a99a3
Added missing translations
2020-04-17 17:02:37 -05:00
Luis Ramos
5ce4fec68b
Add html to show the errors reported by devise 3 about password and password confirmation mismatch on user.errors[:password_confirmation] (instead of user.errors[:password])
2020-03-09 15:48:45 +00:00
Matt-Yorkley
140e0b9cb1
Refactor #exchangeLoadedVariants
2020-02-05 15:11:34 +01:00
Matt-Yorkley
b3f05d1a98
Use "Variants" instead of "Products" in order cycle exchanges UI
2020-02-05 15:11:34 +01:00
Matt-Yorkley
6f644936b0
Show counts including all variants in order cycle exchanges
2020-02-05 15:10:26 +01:00
Matt-Yorkley
4c9cc7460a
Increase space for buttons in savebar layout
2019-12-27 17:08:37 +01:00
Luis Ramos
db7146014c
Rename exchange products file names to increase clarity
2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae
Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form
2019-12-13 12:24:16 +00:00
luisramos0
7ad8951375
DRY exchange products templates by extracting header and footer content to partial templates
2019-12-12 18:49:11 +00:00
luisramos0
99e59595b4
Add spinner when loading all products in an exchange
2019-12-12 18:48:36 +00:00
luisramos0
a9598c5d97
Only show load more and load all if not all products are loaded already
2019-12-12 18:48:36 +00:00
luisramos0
3e5b7ebbf1
Show exchange products list only after first page of products is loaded
2019-12-12 18:48:36 +00:00
luisramos0
1a9c3007b0
Make select all work again in incoming exchanges by loading alll products before triggering the select all process
2019-12-12 18:48:35 +00:00
luisramos0
2f7fd1482a
Add link to load all products at the top of the list of products and include summary of number of products loaded already
2019-12-12 18:48:35 +00:00
luisramos0
0416521772
Add load all prouducts button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
cfe3f72d0e
Add load more button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
9451f1b66d
Remove funky panel open listener code and initialize the panel data with a ng-init in the panel template
2019-12-12 18:44:45 +00:00
luisramos0
24d7672abb
Use new exchange products endpoint for outgoing exchanges and make the exchange products panel work for outgoing exchanges
2019-12-12 18:44:44 +00:00
luisramos0
15bcde36cb
Remove order by filter on outgoing exchanges list of products
...
The products are now coming from the server already sorted
2019-11-26 17:59:30 +00:00
luisramos0
75dfde2552
In the Edit OC page, the list of supplied products should only include checkboxes for normal variants: removed html to display product checkbox and also master variants
...
Two rules we can use to make this more simple: all products have variants (at least what is called the standard variant) and master variants cannot be added to OCs
2019-11-01 17:18:48 +00:00
Matt-Yorkley
c6ce516129
Fix prices not updating with new exchange fees when changing OC
2019-10-18 21:15:13 +01:00
Jon Leighton
fcff302d55
Bring back ‘Shop for X products at:’ title
...
Fixes #2112
It looks like this bug was accidentally introduced during a refactor in
e5ca494db8https://docs.angularjs.org/api/ng/directive/ngBindHtml ) because the
former is not a valid AngularJS directive.
It was also necessary to bubble up the `.cta-container` class in order to
get the appropriate styling on the title.
2019-06-17 15:43:15 +10:00
Luis Ramos
2b593a59f5
Merge pull request #3900 from luisramos0/subs_trans
...
Missing translations in Subscriptions
2019-06-13 18:51:20 +01:00
luisramos0
9944f3e1e6
Make translations of tooltips in subscriptions list page work again
2019-06-04 20:59:45 +01:00
luisramos0
6620243603
Make the submit button on the add tag rule dialog translatable
2019-05-30 20:22:02 +01:00
luisramos0
a1905e43f7
Move a group of translations related to customers to the js translations namespace
2019-04-15 18:12:04 +01:00
