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
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
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
Lynne Davis
cad3464f56
Adjusted BOM spec to reflect currency symbol changes
2016-12-09 11:40:55 +00:00
Rohan Mitchell
dabac50128
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
2016-11-25 14:14:42 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Rohan Mitchell
d574b8943b
WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM
2016-11-04 09:39:17 +11:00
Rob Harrington
261a574da9
Tweaking styling on enterprise change form, and dashboard header row
2016-09-07 11:13:48 +10:00
Rob Harrington
be51a55f16
Only display shopfront trial message on dashboard page. Fixes #1120
2016-09-02 13:45:49 +10:00
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +10:00
Maikel Linke
c34e9c046b
Remove quotes around url
2016-08-17 16:44:27 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +10:00
Rohan Mitchell
6f947380cb
Remove unused overrides and views
2016-07-29 09:18:31 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
Maikel Linke
f984871b23
Inject only needed enterprises into cart and checkout
2016-07-06 11:14:13 +10:00
Lynne
4da7668dfc
Merge pull request #1048 from lin-d-hop/sign_up_email_i18n
...
code cleanup
2016-06-23 15:30:42 +01:00
Lynne Davis
9c29e56fc3
More typo
2016-06-21 17:44:45 +01:00
Lynne Davis
e253590c1c
code cleanup
2016-06-21 17:07:42 +01:00
Lynne
43b5216002
Merge pull request #1046 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
2016-06-20 18:45:31 +01:00
Lynne Davis
fa52712e35
More syntax fixes
2016-06-20 18:32:32 +01:00
Lynne
36093c0f64
Merge pull request #1045 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
Merging so that I can test emails on UK staging.
2016-06-20 17:29:37 +01:00
Lynne Davis
98548e15c5
I18n of enterprise emails
2016-06-20 15:18:25 +01:00
Continuous Integration
9ba07a2afb
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-15 11:26:02 +10:00
Bing Xie
82dc2a8c98
Update bulk products editing page
2016-06-15 10:51:34 +10:00
Bing Xie
860a537f30
Add save bar to bulk editing product page
2016-06-15 10:51:34 +10:00
Maikel Linke
cb679a6aba
Remove duplicate "What's this?" from order cycles overview
2016-06-10 09:18:26 +10:00
Rob Harrington
4d83bf2135
Payment methods can be tagged
2016-05-27 16:25:10 +10:00
Rob Harrington
385fd91e70
Adding angularjs payment method controller, updating payment method edit form
2016-05-27 16:25:10 +10:00
Rob Harrington
b9f6cb8800
Adding translations for all column names
2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474
Default column visibility can be set per user using ColumnPreferences model
2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a
Refactoring save-bar
2016-05-25 08:10:20 +10:00
Rob Harrington
8838a89ecc
Don't typecast product and variant on_hand from DOM when it is 'On demand'
2016-05-25 08:10:20 +10:00
Rob Harrington
e5ca494db8
Replacing bindonce with native Angularjs syntax in Darkswarm
...
Involved changing bo-text -> ng-bind, bo-href-i -> ng-href, bo-src-i -> ng-src and ng-html -> ng-bind-html
2016-05-25 08:10:20 +10:00
Rob Harrington
6a610ff7a4
Merge remote-tracking branch 'origin/master' into uk/trial-length
2016-05-20 12:22:47 +10:00
Bing Xie
f8ec0d316a
Save bar can support cancel button
2016-05-12 11:04:40 +10:00
Bing Xie
78b4a35d12
Keep the action with save button
2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7
Use save_bar on order cycle update form
2016-05-12 10:45:41 +10:00
