7711 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matt-Yorkley	052d6c6b02	Product Import basic specs	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
Matt-Yorkley	2ad433590d	Add roo gem	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	8582e6d6b4	Add robustness check against intermittent spec failure	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
Maikel Linke	8107f49373	Merge remote-tracking branch 'origin/master' into transifex ... Conflicts: config/locales/fr.yml	2017-03-16 09:30:22 +11:00
Rob Harrington	7ef0964af2	Adding shortcuts for both sales tax reports to the reports index v1.8.8-rc1	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	9a69951136	Using correct key for invoice_settings title translation	2017-03-15 16:12:50 +11:00
Rob Harrington	e19bab1aa2	Fixing translations for invoice settings edit template	2017-03-15 15:06:28 +11:00
Rob Harrington	8e2a111a0b	Changing ofn-qz to openfoodfoundation fork	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	963f0d601f	fix test for tax report	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	6f59751582	change i18n fallbacks parameter to EN in production settings	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
Maikel Linke	a079a64cbe	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n2	2017-03-15 12:35:39 +11:00
Maikel Linke	656be690a3	Remove space from permalink tip	2017-03-15 12:11:56 +11:00
Maikel Linke	167045f695	Remove forgotten " character	2017-03-15 12:01:31 +11:00
François Turbelin	dbe968afbb	Fixing translated interpolation in fr locale	2017-03-12 12:42:00 +01:00
François Turbelin	179b995fa0	Fixing wrong string interpolation in i18n files	2017-03-12 12:41:06 +01:00
François Turbelin	4791086207	Fixing i18n multiline issues	2017-03-12 12:39:29 +01:00
François Turbelin	be6b09a6e0	Adding i18n keys on JS templates	2017-03-12 12:22:13 +01:00
Transifex-Openfoodnetwork	f235099859	Updating translations for config/locales/fr.yml [skip ci]	2017-03-11 16:50:17 +11: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
Rob Harrington	42a6e35185	Making registration spec click_and_ensure assertions more generic ... Assertions can be made about checking checkboxes	2017-02-22 13:40:17 +11:00
Matt-Yorkley	408a57479e	Flaky tests	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
Maikel Linke	da8c107331	Merge remote-tracking branch 'origin/master' into transifex ... Conflicts: config/locales/fr.yml	2017-02-15 15:47:25 +11:00
Continuous Integration	5870927518	Merge remote-tracking branch 'origin/master' into HEAD	2017-02-10 16:42:27 +11:00
Transifex-Openfoodnetwork	e008a154e5	Updating translations for config/locales/sv.yml [skip ci]	2017-02-09 02:36:14 +11:00
Continuous Integration	a2d01b5144	Merge remote-tracking branch 'origin/master' into HEAD	2017-02-08 16:53:53 +11:00