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
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
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
Matt-Yorkley
9235727d45
Merge pull request #5 from mkllnk/pr-1329-enterprise-switcher
...
Re-use NavigationCheck logic
2017-02-02 15:26:01 +00:00
Matt-Yorkley
fc4ead9b05
Ensure on_demand set properly on new products
2017-02-02 01:06:20 +00:00
Maikel Linke
b8622e95b7
Re-use NavigationCheck logic
...
The enterprise switcher now uses the same code as NavigationCheck to
confirm leaving a changed form. This makes FormState obsolete.
Conflicts:
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2017-02-02 10:58:32 +11:00
Continuous Integration
f8341dccd4
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-01 10:35:53 +11:00
Lynne
b8ed7789f0
Merge pull request #1427 from openfoodfoundation/revert-1424-master
...
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 13:18:16 +00:00
Lynne
6d19613ecc
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 12:53:01 +00:00
Lynne
0d56cbf169
Merge pull request #1424 from OliverUK/master
...
translate ABN and ACN to company number, charity number
2017-01-30 12:04:54 +00:00
Lynne
67730e82c3
Update en-GB.yml
2017-01-30 12:04:24 +00:00
OliverUK
940ca7ade1
translate ABN and ACN to company number, charity number
2017-01-27 15:02:38 +00:00
Continuous Integration
05f9747f15
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-25 12:41:02 +11:00
Matt-Yorkley
27903ab744
Merge branch 'master' into uk/switcher
2017-01-22 18:57:25 +00:00
Matt-Yorkley
931e528e14
Code review changes
2017-01-22 18:55:28 +00:00
Matt-Yorkley
6bed94a09b
Include E2E permissions
2017-01-22 18:42:23 +00:00
Paul Mackay
165b437f31
#1226 : fix OSM URL to use HTTPS
2017-01-20 15:59:22 +00:00
