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
8e1bade355
Move adjustment specs to their own spec file
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
3e7a12cca1
Rename spec support method for faster tab completion on save_and_open_page
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
Rohan Mitchell
6476ce6ba9
Make spec more resilient
2015-11-10 15:05:45 +11:00
Maikel Linke
a06b452e7e
updated norwegian locale
2015-11-07 16:42:35 +11:00
Maikel Linke
0b6cbb43d6
updated locale nb.yml
2015-11-06 11:56:25 +11:00
Maikel Linke
5e59048705
i18n typo
2015-11-05 14:39:33 +11:00
Maikel Linke
38d2616ea0
No need to empty cache if I18n asset depends on locale
2015-11-05 12:50:11 +11:00
Rohan Mitchell
5db64b6f21
Update travis config and README with new ruby version
2015-11-05 12:48:22 +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
Maikel Linke
90d52151b6
Updated fr.yml
2015-11-05 11:53:38 +11:00
Rohan Mitchell
6666de96b2
Update ruby version used in CI
2015-11-05 11:24:12 +11:00
Rob Harrington
b7d92786d0
Bumping ruby version to 2.1.5
2015-11-05 11:09:22 +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
Rob Harrington
2277b9f5a6
Changing ruby version in version manager config
2015-11-05 11:09:21 +11:00
Rob Harrington
aef8b9648e
Initial upgrade of Gemfile
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
9227df54b6
Display detail rows for admin adjustments
2015-11-01 15:19:03 +11:00
Rohan Mitchell
015f3eb9ac
Display summary rows for admin adjustments
2015-11-01 13:42:59 +11:00
Maikel Linke
fd747f9012
Updated French locale
2015-10-30 12:20:12 +11:00
Lynne Davis
7350dbb75e
Adding tweaks that have been missed from merges
2015-10-30 11:54:06 +11:00
Rohan Mitchell
94e1264aef
Add rspec-retry for inconsistently failing spec
2015-10-29 16:01:39 +11:00
Maikel Linke
aec3980a93
Merge remote-tracking branch 'origin/master' into i18n
2015-10-29 14:56:17 +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
0fd29dd32e
use expect in bulk_order_management_spec
2015-10-22 13:43:15 +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
dc8166ec84
New CI script to check test state via GitHub API
2015-10-21 16:29:41 +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
7163664725
updated locales fr and nb
2015-10-21 14:36:02 +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
6781051fe6
enabling Travis container-based infrastucture
2015-10-21 10:27:16 +11:00
Maikel Linke
2357f46a4e
CI scripts use env vars
...
The CI scripts are configurable through the environment. They had
hardcoded configurations before. The Australian BuildKite setup will
need global environment variables like this:
STAGING_SSH_HOST=ofn-staging2
STAGING_CURRENT_PATH=/home/openfoodweb/apps/openfoodweb/current
STAGING_SERVICE=unicorn_openfoodweb
STAGING_DB_HOST=localhost
STAGING_DB_USER=openfoodweb
STAGING_DB=openfoodweb_production
PRODUCTION_REMOTE=production:/home/openfoodweb/apps/openfoodweb/current
2015-10-21 10:04:29 +11:00
