Matt-Yorkley
1f897b1e44
Update sales tax report spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
1d1b842e08
Delete dead code
2021-04-04 19:19:06 +01:00
Matt-Yorkley
889b357408
Update Order#total_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2af0afafe9
Update Order#shipping_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ead85e71de
Update shipping tax in checkout spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a8366a3a72
Update Order::Updater totals counts
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a060b9fe5a
Update LineItemsController and order factory
2021-04-04 19:19:06 +01:00
Matt-Yorkley
8b0a9ddb2f
Update OrderTaxAdjustmentsFetcher
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7d3288ca53
Remove #to_package calls on shipment calculations
2021-04-04 19:19:06 +01:00
Matt-Yorkley
db07a73bd7
Ensure Adjustment#update! returns an amount
2021-04-04 19:19:06 +01:00
Matt-Yorkley
232286b0be
Add adjustment_total to spree_shipments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7e0aad7c7e
Adapt current tax setup to work with shipment taxes
...
This is a temporary step...
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7425ad5c4a
Include ItemAdjustments handling in Adjustment class
...
Currently only applies to shipments, but will later include line items, etc
2021-04-04 19:19:06 +01:00
Matt-Yorkley
0d5d4aca11
Update tax_rate_factory
...
The amount is a decimal, so `0.1` here is actually a 10% tax rate. `100` is ridiculous (10000% tax).
Also, the factory fails without a calculator, and it should explicitly be a DefaultTax calculator or it will not be correct.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
0fea92b63d
Add :default_tax_calculator factory
2021-04-04 19:19:06 +01:00
Matt-Yorkley
25a739ea75
Remove Shipment #update_adjustment_included_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
385b12d83b
Add tax total fields to spree_shipments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
9bbe57afda
Extract method
2021-04-04 19:19:06 +01:00
Matt-Yorkley
89889bc280
Record tax totals in ItemAdjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
605a94e3c9
Use Spree::ItemAdjustments in Shipment callbacks for updating adjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ac9ecdfcbc
Introduce Spree::ItemAdjustments class
2021-04-04 19:19:06 +01:00
Matt-Yorkley
45f0082321
Add tax_category_id to shipping method permitted params
2021-04-04 19:19:06 +01:00
Matt-Yorkley
431706b704
Add tax_category_id to spree_shipping_methods
2021-04-04 19:19:06 +01:00
Matt-Yorkley
8fccdbf92f
Introduce TaxCategories to ShippingMethods
2021-04-04 19:19:06 +01:00
Transifex-Openfoodnetwork
180fa0beb0
Updating translations for config/locales/en_IE.yml
2021-04-04 08:34:05 +10:00
Transifex-Openfoodnetwork
953756bf2a
Updating translations for config/locales/en_US.yml
2021-04-04 08:34:04 +10:00
Transifex-Openfoodnetwork
875105373a
Updating translations for config/locales/it.yml
2021-04-04 08:31:04 +10:00
Transifex-Openfoodnetwork
2aa549fe33
Updating translations for config/locales/en_FR.yml
2021-04-04 08:31:00 +10:00
Transifex-Openfoodnetwork
33875a528f
Updating translations for config/locales/en_IE.yml
2021-04-04 08:30:59 +10:00
Transifex-Openfoodnetwork
ee056561eb
Updating translations for config/locales/fr.yml
2021-04-04 08:30:58 +10:00
Andy Brett
2ee15838d9
Merge pull request #7213 from Matt-Yorkley/optional-bullet
...
Make bullet activation optional
2021-04-03 13:48:21 -07:00
Andy Brett
b5846592b1
Merge pull request #7260 from jibees/7069-add-automated-tests-for-unit-price-in-backoffice
...
Add automated tests for unit price in backoffice
2021-04-03 13:43:32 -07:00
Andy Brett
f2e238d0ea
refactor view logic to helper
2021-04-03 13:33:09 -07:00
Matt-Yorkley
c895153b58
Remove dead code: #ensure_updated_shipments
2021-04-03 19:47:34 +01:00
Matt-Yorkley
e2e943e394
Update uses of checkout_state route
2021-04-03 19:13:41 +01:00
Matt-Yorkley
fe507f63fc
Move checkout_state route from spree to main_app
2021-04-03 19:13:41 +01:00
Andy Brett
5bfd6fd2ba
add spec for fee recalculation
2021-04-03 10:54:57 -07:00
Matt-Yorkley
dd73af8e7a
Remove duplicate checkout controller
2021-04-03 18:52:05 +01:00
Matt-Yorkley
cb0644ce47
Merge pull request #7312 from openfoodfoundation/transifex
...
Transifex
2021-04-03 17:32:13 +02:00
Matt-Yorkley
2d647be8b4
Rename #charge_shipping_and_payment_fees! to #set_payment_amount!
...
This method sets the order's payment amount during the checkout. It doesn't really have anything to do with shipping or payment fees...
2021-04-03 16:14:38 +01:00
Transifex-Openfoodnetwork
9b2255cb20
Updating translations for config/locales/en_US.yml
2021-04-03 14:03:44 +11:00
Transifex-Openfoodnetwork
1159c425b9
Updating translations for config/locales/en_US.yml
2021-04-03 14:03:09 +11:00
Andy Brett
c0cbd1e688
remove new adjustment button for canceled orders
2021-04-02 12:26:59 -07:00
filipefurtad0
a01493725d
Merge pull request #7309 from openfoodfoundation/filipefurtad0-add-QA-info
...
Update README.md
2021-04-02 16:00:16 +01:00
Jean-Baptiste Bellet
6756ffcf42
Add non-breaking space to avoid unwanted line breaks
2021-04-02 16:59:50 +02:00
Transifex-Openfoodnetwork
d7787261ed
Updating translations for config/locales/en_IE.yml
2021-04-03 01:54:41 +11:00
Matt-Yorkley
d68b73dd07
Exclude /lib/tasks/sample_data from CodeCov
...
We will almost certainly *never* invest the required amount of dev time to cover all this non-critical code with tests, so we may as well drop it from the report.
2021-04-02 15:50:01 +01:00
Cillian O'Ruanaidh
7e2d9ff381
The Resend Confirmation and Send/Print Invoice links should display for resumed orders too
...
These are links inside the Actions drop down menu on the edit order view. Before they were missing if an order was in a resumed state.
Fixes #5946
2021-04-02 15:41:59 +01:00
filipefurtad0
857611d232
Update README.md
...
Adding a line about our new QAs board.
2021-04-02 15:23:15 +01:00
Jean-Baptiste Bellet
9126901578
Add missing key for unit price in new variant form
2021-04-02 15:22:01 +02:00