Maikel Linke
|
229070a76b
|
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
|
2015-11-13 15:20:58 +11:00 |
|
Rohan Mitchell
|
b6f3e6eca6
|
Fix broken spec
|
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
|
2f4b5bad26
|
Make benchmark more realistic
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
64e8927ae9
|
Add benchmark: add to cart
|
2015-11-13 14:03:07 +11:00 |
|
Rohan Mitchell
|
c932d20ef5
|
Extract multi-sample benchmarking into a helper method
|
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
|
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
|
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
|
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
|
6476ce6ba9
|
Make spec more resilient
|
2015-11-10 15:05:45 +11:00 |
|
Maikel Linke
|
8b29612614
|
Merge remote-tracking branch 'origin/master' into i18n
|
2015-11-05 11:54:06 +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 |
|
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 |
|
Rohan Mitchell
|
f63a80300b
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-29 11:49:24 +11:00 |
|
Maikel Linke
|
0fd29dd32e
|
use expect in bulk_order_management_spec
|
2015-10-22 13:43:15 +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
|
8bd78eb139
|
spec_helper for lib/open_food_network/permissions_spec.rb
|
2015-10-21 10:04:29 +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
|
47fb2270bd
|
Making spec do the right thing
|
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 |
|
Rohan Mitchell
|
ecc3bad8c8
|
Merge branch 'master' into folklabs-producer-emails
|
2015-10-16 12:38:54 +11:00 |
|
Rohan Mitchell
|
a766f007fc
|
Display xero report for account invoices
|
2015-10-15 11:57:51 +11:00 |
|
Rohan Mitchell
|
4fbeb0c3b1
|
Check if an order is an account invoice
|
2015-10-15 10:05:27 +11:00 |
|
Rohan Mitchell
|
92f7b72056
|
Check whether an individual adjustment has tax included
|
2015-10-15 09:58:06 +11:00 |
|
Rob Harrington
|
b22d591775
|
BillablePeriods don't get updated when account_invoice has been finalized
|
2015-10-14 14:36:38 +11:00 |
|
Rob Harrington
|
1ad0f95536
|
Updating Billable Periods job ignores versions of enterprises created in the future
|
2015-10-14 14:36:38 +11:00 |
|
Rob Harrington
|
a71410042f
|
Ensuring that account invoice orders have an address
|
2015-10-14 14:36:37 +11:00 |
|
Rob Harrington
|
815df3d667
|
Only clean up account invoice orders that aren't already complete, don't attempt to destroy persisted account_invoice orders
|
2015-10-14 14:36:37 +11:00 |
|
Maikel Linke
|
d62775a785
|
update specs and fix labels yes and no
|
2015-10-07 18:05:59 +11:00 |
|
Maikel Linke
|
8b40d094ee
|
new translate filter and updated specs for js translations
|
2015-10-07 15:47:51 +11:00 |
|
Maikel Linke
|
91fae79be4
|
Update tests for new label "Login"
|
2015-10-07 14:06:34 +11:00 |
|
Maikel Linke
|
da42032d92
|
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-js
|
2015-10-01 11:15:22 +10:00 |
|
Rohan Mitchell
|
9c6264c4a0
|
On detailed xero report, do not show product totals (xero treats them as additional line items)
|
2015-09-25 13:52:51 +10:00 |
|