1043 Commits

Author	SHA1	Message	Date
Matt-Yorkley	0af20e48b0	Add missing translation key for enterprise taxon ordering	2020-10-31 19:17:19 +00:00
Luis Ramos	3b682bc47f	Add warning when uploading a file	2020-10-30 15:09:13 +00:00
Luis Ramos	be35f97622	Add tooltip icon to terms and conditions	2020-10-30 15:09:13 +00:00
Luis Ramos	ca79270ba3	Show T&Cs warning when uploading a new file	2020-10-30 15:09:13 +00:00
Luis Ramos	2cf7b1b36c	Make label translatable	2020-10-30 15:09:13 +00:00
Luis Ramos	f7c07f492c	Make TCs file input onoy accept pdf files	2020-10-30 15:09:13 +00:00
Luis Ramos	9f17e4fd8f	Add upload timestamp to TCs upload form in enterprise business details	2020-10-30 15:09:13 +00:00
Luis Ramos	c980d22826	Make TCs link open in a new tab in the backoffice	2020-10-30 15:09:13 +00:00
Luis Ramos	e860e2ca57	Add label to customer balance so it's clear to the manager what's the balance status: credit owed or balance due	2020-10-29 13:38:36 +00:00
Luis Ramos	e4f3aae7c0	Add customer balance to customer list	2020-10-29 13:38:36 +00:00
Maikel	8c65498661	Merge pull request #5998 from andrewpbrett/shipping-per-pound ... Per-pound shipping calculator	2020-10-16 15:27:57 +11:00
Luis Ramos	6c95444339	Merge pull request #6020 from andresgutgon/fix/admin-menu-in-multiple-lines ... Fixed admin header buttons dropping multiple lines.	2020-10-07 21:24:48 +01:00
Andy Brett	9ef706a201	update styles on enterprise fee UI	2020-09-21 15:21:18 -07:00
andresgutgon	ef85ac3e27	Fixed admin header buttons dropping multiple lines.	2020-09-19 11:37:09 +02:00
Andy Brett	96fb65600e	refactor views to oneliners without single letter variable names	2020-09-17 16:45:55 -07:00
Andy Brett	988abf7a8c	update preference field interface to be more clear	2020-09-17 08:27:45 -07:00
Andy Brett	d32ed6b48f	improve styling on calculators UI	2020-09-12 10:43:14 -07:00
Luis Ramos	a3e9226878	Add option to remove existing terms and conditions file	2020-08-31 17:40:34 +01:00
Luis Ramos	0974c4b2ac	Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations	2020-08-31 17:40:34 +01:00
Luis Ramos	aedc12e0e3	Add top padding to terms file upload input in enterprises form	2020-08-31 17:40:34 +01:00
Luis Ramos	1a734aacf8	Allow user to upload terms and conditions PDF file to an enterprise	2020-08-31 17:40:34 +01:00
Pau Pérez Fabregat	2fa8cd54fd	Merge pull request #5769 from Matt-Yorkley/customer-names ... Customer names in reports	2020-08-27 15:39:47 +02:00
Matt-Yorkley	23bb72faa6	Add Enterprise shop preference to allow customer names in reports	2020-08-14 20:48:32 +01:00
Luis Ramos	85e9819c3b	Make more translation keys use lazy look ups	2020-07-31 09:00:48 +01:00
Luis Ramos	2d4326ded3	Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil ... Present is not blank, so unless blank? becomes if present?	2020-07-01 14:08:07 +01:00
Matt-Yorkley	add38bf550	Use #image_path helper correctly ... Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`	2020-06-16 18:25:13 +02:00
Luis Ramos	983bed3c4e	Merge branch 'master' into 3-0-stable-jun-2	2020-06-11 19:50:56 +01:00
Steve Roberts	f8673fb575	Moved tag manager instructions to be directly below the field	2020-06-10 15:06:53 +10:00
Steve Roberts	5fcc0dcd14	Add configuration to enable matomo tag manager ... - Update embed codes and allow both scripts concurrently - Add lines around blocks - Update MTM copy based on PR feedback - checked cookies unchanged	2020-06-09 10:21:11 +10:00
Luis Ramos	f34f693620	Merge branch 'master' into 3-0-stable-may-22	2020-05-22 22:54: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	839b373b5c	Merge branch 'master' into 3-0-stable-Apr28	2020-04-28 13:40:19 +01:00
chrishil1	a9829ba5d9	Update _enterprise_relationship.html.haml	2020-04-15 17:01:22 -05:00
jeffrey s hill md	5e1dea61a8	added missing translations to enterprise_relationship page	2020-04-14 11:20:56 -05:00
Luis Ramos	1c628fac58	Merge branch 'master' into 3-0-stable-mar20	2020-03-20 11:28:06 +00:00
Maikel	b63c47cca2	Merge pull request #4816 from mkllnk/1860-copy-paste ... 1860 Remove style from pasted text for shopfront messages	2020-03-18 16:23:50 +11:00
Luis Ramos	32a4355f09	Merge branch 'master' into 3-0-stable-mar6	2020-03-12 16:54:09 +00:00
Pau Pérez Fabregat	5811f3ead1	Merge pull request #4905 from luisramos0/untouch ... Remove some live but elderly debug code	2020-03-10 09:17:13 +01:00
Luis Ramos	8c367a2ed2	Merge branch 'master' into 3-0-stable-mar6	2020-03-09 13:20:19 +00:00
Luis Ramos	af8369ae1b	Remove 5 years old debug code ... This reverts ab9bc7b1dc, it can be added if the issue happens again	2020-03-03 10:56:57 +00:00
Eduardo	64d83bfc4d	fix ampersand problem using ng-bind-html	2020-03-01 17:54:36 -03:00
Maikel Linke	325c427219	Remove style from pasted HTML in editor	2020-02-24 11:22:47 +11:00
Matt-Yorkley	fd11d4fa5b	Fix broken html encoding of injected json in admin views	2020-02-22 11:06:51 +00:00
Luis Ramos	18c165e893	Merge pull request #4784 from CSCI-462-01-2020/Issue4731 ... Add Order Cycle Button Tooltips	2020-02-17 19:32:39 +00:00
blainebillings	fec653186a	Add Order Cycle Button Tooltips	2020-02-11 10:10:39 -05:00
Matt-Yorkley	140e0b9cb1	Refactor #exchangeLoadedVariants	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
Luis Ramos	ea75714561	Merge pull request #4635 from luisramos0/main_app_routes ... Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url	2020-02-04 16:02:48 +00:00
Matt-Yorkley	91d959b7d6	Remove "previous" button from order cycle savebar	2020-01-03 16:25:26 +01:00
luisramos0	55bb328d48	Prefix all calls to root_url with main_app	2019-12-28 18:46:50 +00:00