Maikel Linke
|
229070a76b
|
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
|
2015-11-13 15:20:58 +11:00 |
|
Maikel Linke
|
8bfe459241
|
i18n fixes of html display
|
2015-11-13 14:22:17 +11:00 |
|
Rohan Mitchell
|
bb6fb2f5e8
|
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
|
2015-11-13 14:03:32 +11:00 |
|
Rohan Mitchell
|
6de44877c8
|
Update link for uber-style sell food dropdown
|
2015-11-13 14:03:14 +11:00 |
|
Rohan Mitchell
|
888e4d80ef
|
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
|
2015-11-13 14:03:07 +11:00 |
|
Maikel Linke
|
5d5fda3a25
|
Merge remote-tracking branch 'origin/master' into i18n
Conflicts:
config/locales/en.yml
|
2015-11-13 10:07:29 +11:00 |
|
Rohan Mitchell
|
e20d8d3e95
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-11 14:20:25 +11:00 |
|
Rohan Mitchell
|
fb3e292e20
|
Formatting
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
a32321df68
|
Clarify label
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
727ecae62b
|
Admin can modify a taxed adjustment on an order
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
85e45fa558
|
Use select2
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
d794981ecf
|
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
|
2015-11-11 11:53:04 +11:00 |
|
Maikel Linke
|
5e59048705
|
i18n typo
|
2015-11-05 14:39:33 +11:00 |
|
Maikel Linke
|
8b29612614
|
Merge remote-tracking branch 'origin/master' into i18n
|
2015-11-05 11:54:06 +11:00 |
|
Rob Harrington
|
d731d4e803
|
Making sure flash is a hash so that is can be used to initialize OpenStuct
|
2015-11-05 11:09:21 +11:00 |
|
Rohan Mitchell
|
65589d25c6
|
Display more verbose product and variant name
|
2015-11-05 09:50:00 +11:00 |
|
Rohan Mitchell
|
5ffad4d343
|
Fix quantity calculation
|
2015-11-05 09:43:44 +11:00 |
|
Rohan Mitchell
|
a3d638df67
|
Merge branch 'master' into folklabs-producer-emails
|
2015-11-04 11:15:01 +11:00 |
|
Lynne Davis
|
7350dbb75e
|
Adding tweaks that have been missed from merges
|
2015-10-30 11:54:06 +11:00 |
|
Maikel Linke
|
4eed222f18
|
Fixed several i18n issues reported by Myriam
|
2015-10-29 14:55:38 +11:00 |
|
Rohan Mitchell
|
f63a80300b
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-29 11:49:24 +11:00 |
|
Rohan Mitchell
|
87cf3eda41
|
Amend 'Detailed orders breakdown' heading with missing content
|
2015-10-29 11:48:12 +11:00 |
|
Maikel Linke
|
6c1619ba60
|
i18n more content
|
2015-10-22 11:03:35 +11:00 |
|
Maikel Linke
|
2053fbecda
|
Merge branch 'i18n-replace-strings-in-js' into i18n
Conflicts:
.travis.yml
app/views/spree/order_mailer/confirm_email_for_customer.html.haml
config/locales/en.yml
|
2015-10-21 14:09:43 +11:00 |
|
Rob Harrington
|
5b3e052f78
|
Using a compiled stylesheet for pdf styling
|
2015-10-16 21:36:18 +11:00 |
|
Rob Harrington
|
40d627cb34
|
Adding new route for printing an order to pdf
|
2015-10-16 17:25:40 +11:00 |
|
Rob Harrington
|
6e7fc6a0f7
|
Adding invoice action to orders controller, to allow sending of invoice email
|
2015-10-16 17:25:40 +11:00 |
|
Rob Harrington
|
104b100fe6
|
Pulling distributor signoff out into separate partial
|
2015-10-16 17:25:39 +11:00 |
|
Rohan Mitchell
|
ecc3bad8c8
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-16 12:38:54 +11:00 |
|
Maikel Linke
|
31e7ca9fa2
|
locale data as js asset
|
2015-10-01 15:54:46 +10:00 |
|
Maikel Linke
|
da42032d92
|
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-js
|
2015-10-01 11:15:22 +10:00 |
|
Maikel Linke
|
ae96541112
|
Internationalisation of Javascript views
|
2015-10-01 11:13:45 +10:00 |
|
Rohan Mitchell
|
b5bc4701fa
|
Detailed xero report
|
2015-09-22 09:15:55 +10:00 |
|
Rob Harrington
|
1c6f3f4877
|
Translating words on admin accounts page
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
2dcbe2b4f2
|
Updating the admin account view to show use the new account_invoice model to display data
|
2015-09-17 22:38:29 +10:00 |
|
Rob Harrington
|
ae30007fed
|
Redesignating all references to user_invoices as account_invoices
|
2015-09-17 22:38:28 +10:00 |
|
Rob Harrington
|
5eb20fd8cd
|
Adding tax settings for billing enterprise users
|
2015-09-17 22:38:13 +10:00 |
|
Rob Harrington
|
01c9560a19
|
Account page reads from created at date of invoice
|
2015-09-17 22:38:13 +10:00 |
|
Rob Harrington
|
6cc403cd92
|
Preventing double creation of invoices by recognising completed invoices within the specifed period
|
2015-09-17 22:38:13 +10:00 |
|
Rob Harrington
|
448bd12e9f
|
Adding billing tasks to whenever schedule
|
2015-09-17 22:38:12 +10:00 |
|
Rob Harrington
|
6665f9b4a0
|
Adding global settings for controlling automatic scheduling of accounts tasks
|
2015-09-17 22:38:12 +10:00 |
|
Rob Harrington
|
619c4959ff
|
Removing button for updating billable periods from accounts and billing settings page
|
2015-09-17 22:38:12 +10:00 |
|
Rob Harrington
|
128b6853f4
|
Styling tweaks to the admin account page
|
2015-09-17 22:38:11 +10:00 |
|
Rob Harrington
|
7c5816af82
|
Switching accounts interface over to showing invoices
|
2015-09-17 22:38:10 +10:00 |
|
Rob Harrington
|
c53b5f3edb
|
Adding finalize step to accounts and billing settigns page + controller
|
2015-09-17 22:38:10 +10:00 |
|
Rob Harrington
|
8bbda5715d
|
Adding basic template for account page
|
2015-09-17 22:38:10 +10:00 |
|
Rob Harrington
|
c2c0c3684d
|
Refactoring accounts and billing settings controller, adding start_job action
|
2015-09-17 22:38:09 +10:00 |
|
Rob Harrington
|
e6f6a3ad81
|
Commenting out global configs for nightly job switches, use a button to manually run jobs instead (for now)
|
2015-09-17 22:38:09 +10:00 |
|
Rob Harrington
|
0812643136
|
Adding views and feature spec for updating default payment and shipping method
|
2015-09-17 22:38:08 +10:00 |
|
Rob Harrington
|
fa8c3d65dc
|
Adding settings for global accounts and billing setup
|
2015-09-17 22:37:56 +10:00 |
|