Andy Brett
2aeed30775
Merge pull request #7265 from andrewpbrett/freeze-adjustments
...
Don't allow edits to adjustments for canceled orders
2021-04-06 10:56:27 -07:00
Matt-Yorkley
61b41491fe
Remove included_tax scope from Adjustment
...
This scope is no longer used, and it's name is exactly the same as other method names and database columns on multiple objects, which is quite confusing.
2021-04-06 12:42:14 +01:00
Matt-Yorkley
03c36dfd7f
Remove Bugherd
...
🔥
2021-04-05 13:31:13 +01:00
Andy Brett
c30ced2060
put Time.zone back
2021-04-04 12:27:46 -07:00
Matt-Yorkley
e442187672
Delete unused private method OrderTaxAdjustmentsFetcher#table
2021-04-04 19:19:06 +01:00
Matt-Yorkley
821be3eef5
Update combined queries to use #or
2021-04-04 19:19:06 +01:00
Matt-Yorkley
96d8de35f2
Delete dead code Adjustment#set_included_tax!
2021-04-04 19:19:06 +01:00
Matt-Yorkley
903788903b
Remove Spree::Config[:shipping_tax_rate]
2021-04-04 19:19:06 +01:00
Matt-Yorkley
bbd4a33a87
Tax adjustments should be open when created
...
All adjustments get closed during `order.finalize!`, but before that point they should be open.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
6d48471368
Update shipment totals updating
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ac67f7391e
Update tax charging in checkout flow
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2f19428b40
Update orders controller
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
8b0a9ddb2f
Update OrderTaxAdjustmentsFetcher
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
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
25a739ea75
Remove Shipment #update_adjustment_included_tax
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
8fccdbf92f
Introduce TaxCategories to ShippingMethods
2021-04-04 19:19:06 +01: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
dd73af8e7a
Remove duplicate checkout controller
2021-04-03 18:52:05 +01: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
Andy Brett
c0cbd1e688
remove new adjustment button for canceled orders
2021-04-02 12:26:59 -07:00
Jean-Baptiste Bellet
6756ffcf42
Add non-breaking space to avoid unwanted line breaks
2021-04-02 16:59:50 +02: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
Jean-Baptiste Bellet
608a28316c
Specify right for attribute for <label /> element
...
- So, `<label />` is rightly linked to its `<input />`
2021-04-02 15:22:01 +02:00
Jean-Baptiste Bellet
76fbb2be84
Use custom input text (instead of :price one)
...
- Use `variant_unit_price` for `id` attribute and `variant[unit_price]` for `name` attribute
- Previously, there was an duplicated `#id` on the page because we used `:price`
2021-04-02 15:22:01 +02:00
Cillian O'Ruanaidh
413896af5d
Add enterprise name to subject and body of shipment shipped email
...
Fixes #7052
2021-04-02 11:44:40 +01:00
Konrad
7c47102869
Use new independent label for 'update cart'
...
orders_form_update_cart
2021-04-01 23:30:00 +02:00
Pau Pérez Fabregat
003b45d4b9
Merge pull request #7294 from Matt-Yorkley/balance-missing-methods
...
OrderBalance missing methods
2021-04-01 19:34:57 +02:00
Andy Brett
1eb5ee9266
Merge pull request #7174 from Matt-Yorkley/dead-code-callbacks
...
Remove Spree ResourceController callbacks
2021-04-01 07:24:44 -07:00
Andy Brett
a9c7f84bd3
Merge pull request #7197 from guidoDutra/5916-fix-content-moves-when-cart-open
...
fix content moving when cart is open
2021-04-01 07:23:32 -07:00
Andy Brett
4efcd8457c
Merge pull request #7227 from jibees/7215-fix-page-content-up/down-move-when-opening-the-unit-price-tooltip
...
Add some CSS specification to avoid page content up/down move
2021-04-01 07:21:13 -07:00
Andy Brett
8261a33ae4
Merge pull request #7226 from jibees/7223-fix-display-issue-on-unit-price-tooltip-in-cart-sidebar-
...
Add 'context' variable: used to specify display of the unit price tooltip inside cart sidebar
2021-04-01 07:20:46 -07:00
Andy Brett
7312341fc4
Merge pull request #7233 from jibees/7224-add-unit-price-to-previously-orders-in-the-cart-page
...
Add unit price for already bought products in cart page
2021-04-01 07:19:36 -07:00
Matt-Yorkley
f94fe452f0
Merge pull request #7191 from mkllnk/fix-deprecation-gateway-mode
...
Replace ActiveMerchant's deprecated gateway_mode
2021-04-01 13:29:10 +02:00
Matt-Yorkley
2292deebe6
Merge pull request #7232 from mkllnk/7231-timeout
...
Keep status bar with message without auto-close
2021-04-01 13:23:12 +02:00
Andy Brett
9f0f88de4e
allow any quantity if variant is set to on demand
2021-03-31 22:02:32 -07:00
Andy Brett
38f5bfdca2
update fees after changing a line item
2021-03-31 14:17:10 -07:00
Matt-Yorkley
c40928d805
Merge pull request #7167 from Matt-Yorkley/adjustments-returns
...
[Adjustments] Update return adjustments
2021-03-31 21:33:45 +02:00
Matt-Yorkley
bb0cf65ecc
Handle OrderBalance comparison operators
...
These operators get used on the object returned by order_balance in a few places, and were not working correctly.
2021-03-31 13:23:13 +01:00
Matt-Yorkley
a02c505e62
Delegate #to_f and #to_d to #amount in OrderBalance
2021-03-31 13:23:13 +01:00
Matt-Yorkley
77506caca1
Rename OrderBalance methods for clarity
2021-03-31 13:09:17 +01:00
