5698 Commits

Author	SHA1	Message	Date
Matt-Yorkley	429ef4e2ba	Altered product property headings for issue #522	2017-03-29 14:44:30 +11:00
Lynne Davis	e8999d23e1	Updated translations	2017-03-29 13:12:29 +11:00
Keir Osborn	209c9242d9	remove word-wrap class from enterprise.email_address and enterprise.website in javascripts/templates/partials/contact.html.haml	2017-03-24 12:55:30 +11:00
Matt-Yorkley	c62a044598	PI highlight invalid fields in feedback tables	2017-03-17 16:11:52 +11:00
Matt-Yorkley	f73fbe7f23	SpreadsheetEntry Class and PI refactor	2017-03-17 16:11:52 +11:00
Matt-Yorkley	5e1e4c1d19	Product Import UX review updates ... Minor tweaks Minor fix	2017-03-17 16:11:52 +11:00
Matt-Yorkley	cc5a335fb7	Refactor and additional permissions checks ... Don't include non-permitted enterprises in existin product count Tweaked feedback	2017-03-17 16:11:52 +11:00
Matt-Yorkley	91fc3f33a0	PI reset and save step improvements	2017-03-17 16:11:52 +11:00
Matt-Yorkley	648753b412	Improved save step UI	2017-03-17 16:11:52 +11:00
Matt-Yorkley	24fcc3dd34	PI reset absent products	2017-03-17 16:11:52 +11:00
Matt-Yorkley	14fb40a996	Product Import options and defaults ... Added available_on test Obscure case fix and extra spec	2017-03-17 16:11:52 +11:00
Matt-Yorkley	f4511fc74d	PI permission test	2017-03-17 16:11:52 +11:00
Matt-Yorkley	3d0f192490	Product Import update	2017-03-17 16:11:52 +11:00
Matt-Yorkley	6b7cdf3a37	Product Import Refactoring	2017-03-17 16:11:52 +11:00
Matt-Yorkley	6e5c878491	Product Import cancan permissions and ui tab	2017-03-17 16:11:52 +11:00
Matt-Yorkley	c0c6cd1a60	Product Import feature	2017-03-17 16:11:52 +11:00
Rohan Mitchell	2cb3da56ab	Fix regression: Transaction fee double-charged	2017-03-17 12:02:13 +11:00
Rohan Mitchell	170101cbfe	Avoid reloading order during checkout request, which clears credit card number	2017-03-17 12:02:13 +11:00
Rob Harrington	7ef0964af2	Adding shortcuts for both sales tax reports to the reports index	2017-03-15 23:57:13 +11:00
Rob Harrington	18472ea8c3	Making 'tax types' report the default sales tax report	2017-03-15 23:56:44 +11:00
Rob Harrington	36e0f45a89	Show the shops invoice text on old invoice template	2017-03-15 17:39:21 +11:00
Rob Harrington	bea0b2b1e5	Adding feature toggle for receipt printing using qz	2017-03-15 16:39:04 +11:00
Rob Harrington	e19bab1aa2	Fixing translations for invoice settings edit template	2017-03-15 15:06:28 +11:00
Pierre de Lacroix	70707969f3	Add Qz integration	2017-03-15 15:06:28 +11:00
Pierre de Lacroix	2fe25c6219	Allow both invoice layouts to coexist ... Add a new "Invoice" page in the admin backend with a checkbox to toggle between layouts	2017-03-15 15:06:28 +11:00
Pierre de Lacroix	cc1ef5b28b	fixes on invoice and tax report	2017-03-15 15:04:57 +11:00
Pierre de Lacroix	3fc2070b2c	fix aggregation of taxes for taxes on adjustments	2017-03-15 15:03:46 +11:00
Pierre de Lacroix	d22f5678be	small fixes for sales tax report	2017-03-15 15:03:46 +11:00
Rob Harrington	0429906eed	Slight adjustments to invoice layout ... 1. Hide tax column when no tax included in the order 2. Save a little bit of space in the header by sharing rows	2017-03-15 15:03:46 +11:00
Pierre de Lacroix	88a09da325	fix for pull request #1374	2017-03-15 15:03:18 +11:00
Pierre de Lacroix	8570471c00	add tax rates report	2017-03-15 15:03:18 +11:00
Pierre de Lacroix	7925af30d6	add enterprise logo and custom text on invoices	2017-03-15 15:03:18 +11:00
Pierre de Lacroix	2d2792225a	change invoice layout to include amount for each relevant tax rate	2017-03-15 15:03:18 +11:00
François Turbelin	be6b09a6e0	Adding i18n keys on JS templates	2017-03-12 12:22:13 +01:00
Matt-Yorkley	ff8ca521ff	Open tos pdf in new tab	2017-02-22 13:40:17 +11:00
Rob Harrington	98f7d52493	Refactor: wrapping registration templates in script tags	2017-02-22 13:40:17 +11:00
Rob Harrington	4815405839	WIP: Moving registration templates in app/views as partials	2017-02-22 13:40:17 +11:00
Matt-Yorkley	beaf54107c	Moved angular template to views folder	2017-02-22 13:40:17 +11:00
Matt-Yorkley	e45d1d42b4	Tidying up	2017-02-22 13:40:17 +11:00
Matt-Yorkley	bc442c7819	Re-adding a line removed in testing	2017-02-22 13:40:17 +11:00
Matt-Yorkley	6a361f2d7b	Specced the new terms of service functionality	2017-02-22 13:40:17 +11:00
Matt-Yorkley	a62998e5f1	Enterprise Terms of Service	2017-02-22 13:40:17 +11:00
François Turbelin	ebcb8ff3e7	Finishing Translations keys implemtentation on Admin ERB views	2017-02-19 22:08:34 +01:00
Continuous Integration	5870927518	Merge remote-tracking branch 'origin/master' into HEAD	2017-02-10 16:42:27 +11:00
Continuous Integration	a2d01b5144	Merge remote-tracking branch 'origin/master' into HEAD	2017-02-08 16:53:53 +11:00
Rob Harrington	8afd5c509b	Using coffescript syntax to check for presence of enterprise_form	2017-02-08 15:59:11 +11:00
Matt-Yorkley	311f72e4cb	Fixing JS spec failure	2017-02-08 15:59:11 +11:00
Matt-Yorkley	78563a7d75	Changed for build failure	2017-02-08 15:59:11 +11:00
Matt-Yorkley	9284dd9b63	Enable save after deleting enterprise manager	2017-02-08 15:59:11 +11:00
Continuous Integration	92981e4fcd	Merge remote-tracking branch 'origin/master' into HEAD	2017-02-08 10:38:47 +11:00