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
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
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
Pau Pérez Fabregat
9c468f0557
Merge pull request #7240 from Matt-Yorkley/escalating-paranoia
...
Escalating paranoia
2021-03-30 22:24:13 +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
Pau Pérez Fabregat
7d5726b6c7
Merge pull request #7150 from coopdevs/use-order-balance-object
...
Feature-toggle all remaining parts of the app where the order balance is shown
2021-03-30 15:58:12 +02:00
Matt-Yorkley
9c2010a43e
Update SubscriptionLineItem#variant
2021-03-29 18:41:09 +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
Pau Pérez Fabregat
914e6d5f21
Merge pull request #7196 from Matt-Yorkley/deprecations-uniq
...
Deprecations: certain uses of #uniq
2021-03-25 12:12:36 +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
Matt-Yorkley
f1e4612c05
Update deprecated uses of #uniq
...
Enumerable#uniq is fine (eg calling #uniq on an Array object), but now using #uniq on an ActiveRecord::Relation is deprecated in favour of #distinct (which modifies the query itself, as opposed to iterating over the results of the query).
2021-03-24 11:42:24 +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
Andy Brett
28ad3a5f1d
Merge pull request #7186 from luisramos0/tax_rate_validation_fix
...
[Rails 5.2] Fix tax_category validation to work in rails 5.2
2021-03-23 20:52:13 -07:00
Luis Ramos
b3d10cfb60
Fix validation of inventory item
2021-03-23 21:22:03 +00: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
Pau Perez
c7b85a3591
Sum balances in Payments report implementing #+
...
This avoids consumers of `OrderBalance` having to couple with the inner
details of this abstraction, which makes the code more changeable.
2021-03-23 09:28:40 +01: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
Luis Ramos
13b8b3d4a5
Fix rubocop issues
2021-03-22 23:24:01 +00:00
Luis Ramos
3853aed718
Make validator work in rails 5 and rails 5.2 by adding a proc
2021-03-22 22:45:04 +00:00
Andy Brett
dbe06e206c
Merge pull request #7048 from andrewpbrett/fix-sub-manifests
...
Verify line item when placing sub order (Fix #6680 )
2021-03-22 10:24:20 -07:00
