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
2af0afafe9
Update Order#shipping_tax
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
8fccdbf92f
Introduce TaxCategories to ShippingMethods
2021-04-04 19:19:06 +01:00
Matt-Yorkley
c895153b58
Remove dead code: #ensure_updated_shipments
2021-04-03 19:47:34 +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
Jean-Baptiste Bellet
6756ffcf42
Add non-breaking space to avoid unwanted line breaks
2021-04-02 16:59:50 +02: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
c40928d805
Merge pull request #7167 from Matt-Yorkley/adjustments-returns
...
[Adjustments] Update return adjustments
2021-03-31 21:33:45 +02:00
Matt-Yorkley
7882c427f7
Simplify creation of negative amounts
2021-03-30 16:39:40 +01:00
Matt-Yorkley
e71f47a2e3
Use underscore in unused arguments
2021-03-30 16:39:40 +01:00
Matt-Yorkley
fcb8145a6c
Bring in changes to Adjustment#update! and CalculatedAdjustments#update_adjustment
2021-03-30 16:39:40 +01:00
Matt-Yorkley
c480d43bda
Override #compute_amount in ReturnAuthorization
...
In some cases adjustments are updated (recalculated) via their originator. In the case of return adjustments, there's no calculation (and no calculator).
2021-03-30 16:39:40 +01:00
Matt-Yorkley
3c1883dac2
Remove use of :source polymorphic association for return adjustments
2021-03-30 16:39:40 +01:00
Matt-Yorkley
8db598bff7
Simplify return adjustment creation
2021-03-30 16:39:40 +01:00
Matt-Yorkley
558457993a
Update Price#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
2c1305b99e
Update StockItem#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
9f4b825d46
Update InventoryUnit#variant
2021-03-29 18:41:09 +01:00
Matt-Yorkley
eccfcbc396
Update Variant#default_price
2021-03-29 18:41:09 +01:00
Matt-Yorkley
581217ea2d
Merge pull request #7239 from Matt-Yorkley/paranoia-scopes
...
Update default scopes with acts_as_paranoid
2021-03-29 15:24:44 +02:00
Matt-Yorkley
e8ddbc0449
Merge pull request #7228 from andrewpbrett/freeze-canceled-orders
...
Remove UI for modifying line items on canceled orders
2021-03-29 15:24:24 +02:00
Pau Pérez Fabregat
b8815d2c56
Merge pull request #7159 from Matt-Yorkley/dead-code-adjustment
...
DCOTW: LineItemBasedAdjustmentHandling
2021-03-29 11:46:23 +02:00
Matt-Yorkley
a46a0b609e
Remove dead code in Order::Checkout module
...
🔥
2021-03-28 23:57:16 +01:00
Matt-Yorkley
593764851f
Remove LineItemBasedAdjustmentHandling
2021-03-27 18:59:49 +00:00
Matt-Yorkley
1b19d4bdee
Update default scopes with acts_as_paranoid
...
Fixes an issue where the LineItem :sorted_by_name_and_unit_value scope was not working with removal of the default scopes on line item and variant, which meant that the join in the scope was excluding soft-deleted items that should not have been excluded.
2021-03-26 18:22:05 +00:00
Andy Brett
563a2758a6
remove UI for modifying line items on canceled orders
2021-03-25 16:52:56 -07:00
Andy Brett
691dd05028
Merge pull request #6956 from andrewpbrett/unit-price-backend
...
Provide actual unit price values in front end shop
2021-03-25 12:50:59 -07:00
Andy Brett
2490861639
show correct values in line_item.rb
2021-03-25 12:26:02 -07:00
Matt-Yorkley
0f5af2d9f1
Merge pull request #6927 from Matt-Yorkley/adjustments-payment-fee
...
[Adjustments] Payment fee adjustment
2021-03-25 17:40:53 +01:00
Pau Pérez Fabregat
56d2db8c58
Merge pull request #7194 from Matt-Yorkley/deprecations-validates-id
...
Deprecations: validation definitions
2021-03-25 12:39:33 +01:00
Matt-Yorkley
ba3984104b
Replace deprecated #alias_method_chain in Spree::Product
2021-03-24 17:51:22 +00:00
Matt-Yorkley
26ed44412f
Update #validates definitions
...
Where the presence of an object is being validated and that object comes from an *association*, we should use `validates :object, presence: true` instead of `validates :object_id, presence: true`.
This does not apply in the same way to validations on uniqueness of certain attributes, such as `validates :object_id, uniqueness...`
2021-03-24 15:43:09 +00:00
Maikel Linke
b27ecb3465
Replace ActiveMerchant's deprecated gateway_mode
...
It's now just called `mode`. This avoids the warning:
../app/models/spree/gateway.rb:31:in `provider': Base#gateway_mode is deprecated in favor of Base#mode and will be removed in a future version
2021-03-24 15:27:44 +11:00
Andy Brett
1cb9504a2c
Merge pull request #7187 from luisramos0/uniq
...
[Rails 5.2] Relation#Uniq is deprecated, distinct is recommended instead
2021-03-23 20:52:47 -07:00
Luis Ramos
c2364b3528
Relation#Uniq is deprecated, distinct is recommended instead
2021-03-23 20:57:58 +00:00
Luis Ramos
708c99fe9b
Fix validation to work in rails 5.2
2021-03-23 20:33:04 +00:00
Matt-Yorkley
5840b0e33c
Adapt adjustment interface for payment's adjustment being singular
...
Payments only have one adjustment, all other adjustable objects have adjustments (plural).
2021-03-23 18:19:37 +00:00
Matt-Yorkley
a42651d543
Update Payment fee adjustment
2021-03-23 18:17:50 +00:00
Matt-Yorkley
525fef14b1
Merge pull request #6974 from Matt-Yorkley/adjustments-line-item-fees
...
[Adjustments] Update line item enteprise fees
2021-03-23 19:06:02 +01:00
Andy Brett
b539015647
Merge pull request #7025 from Matt-Yorkley/adjustments-order-taxes
...
[Adjustments] Simplify order tax adjustments
2021-03-23 09:37:44 -07:00
Andy Brett
e8f00f3d8c
Merge branch 'master' into rails52commits
2021-03-22 17:43:34 -07:00
Andy Brett
aab1a5e5d5
Merge pull request #7147 from Matt-Yorkley/deprecations-2
...
Deprecations 2
2021-03-22 17:28:11 -07:00
