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
|
a86cc96452
|
Use pluck instead of map
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
178e5f59e6
|
Update cart by applying differences rather than clear-and-readd every time
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
7fffa03d8d
|
Fix bug: set difference comparison of string with number
|
2015-11-13 14:03:07 +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 |
|
Rohan Mitchell
|
d3c7c46800
|
Add method to remove a variant from an order
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
c432ed9e08
|
Build list of variants removed from the cart when overwriting
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
e175149e76
|
Add method to check whether a passed-in cart value varies from the cart
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
1b5901317d
|
Separate concerns: reading products hash and adding items to cart
|
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
|
f499dd627a
|
with_tax_included_in_price handles exceptions gracefully
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
a32321df68
|
Clarify label
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
5a29311137
|
Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
81a6e07d5c
|
Admin can remove tax on an adjustment
|
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
|
83c0093665
|
Admin can include tax when creating an adjustment
|
2015-11-11 11:53:04 +11:00 |
|
Rohan Mitchell
|
46a9304ae1
|
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
|
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
|
0505a45de5
|
Invalidate I18n asset if locale changes
|
2015-11-05 12:47:15 +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 |
|
Rohan Mitchell
|
015f3eb9ac
|
Display summary rows for admin adjustments
|
2015-11-01 13:42:59 +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
|
bbeeb8a493
|
Merge remote-tracking branch 'origin/master' into i18n
|
2015-10-22 11:03:42 +11:00 |
|
Maikel Linke
|
6c1619ba60
|
i18n more content
|
2015-10-22 11:03:35 +11:00 |
|
Maikel Linke
|
df34f6ef8e
|
using default_locale for precompiled assets
|
2015-10-22 10:50:29 +11:00 |
|
Maikel Linke
|
adf0a84669
|
Use ! version of find_by_permalink to recover on missing resource
|
2015-10-21 15:42:28 +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 |
|
Maikel Linke
|
f152e4054c
|
Remove obsolete deface
|
2015-10-21 10:04:29 +11:00 |
|
Maikel Linke
|
62d31f79ed
|
Remove obsolete deface
|
2015-10-21 10:04:28 +11:00 |
|
Rohan Mitchell
|
421774e46c
|
Do not send producer notifications when the producer has no orders for this order cycle
|
2015-10-17 11:02:47 +11:00 |
|
Rob Harrington
|
5b3e052f78
|
Using a compiled stylesheet for pdf styling
|
2015-10-16 21:36:18 +11:00 |
|
Rob Harrington
|
f12fd7b4a3
|
Adding button for print action to admin orders show page
|
2015-10-16 17:25:40 +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 |
|