Matt-Yorkley
3dd8ed85b4
Implement manual shipping method selection
2021-09-01 14:16:32 +01:00
Matt-Yorkley
3ae31ec1ce
Simplify tax adjustment sums in Order::Updater
2021-07-09 21:49:36 +01:00
Pau Pérez Fabregat
db993652c4
Merge branch 'master' into payment-states
2021-06-18 12:20:26 +02:00
Luis Ramos
e52937c113
Use rubocop auto correct to add frozen string literal to all files
...
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Andy Brett
b016337d4f
add requires_authorization as a possible payment_state on Orders
2021-06-17 14:23:59 -07:00
Andy Brett
527f4e2cb3
move payment to requires_authorization if cvv_result is present
2021-06-17 14:23:59 -07:00
Andy Brett
31738ceb49
rename and consolidate authorization? methods
2021-06-17 14:23:59 -07:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Matt-Yorkley
9e1d8ab369
Introduce legacy tax handing in Order::Updater whenever order totals change
...
This will remove legacy tax adjustments, recalculate any relevant taxes for items in the order and re-apply them in non-legacy tax adjustments
2021-06-06 20:20:41 +01:00
Matt-Yorkley
6e9ae0b0db
Update tax totals calculation in Order::Updater
...
Line items, shipments, and fees now all have taxes recorded in a uniform way, so we can drop more complexity here (and the number of queries).
2021-06-06 20:16:03 +01:00
Luis Ramos
b2e97fe1d2
Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
2021-05-19 09:54:22 -07:00
Matt-Yorkley
5dd24623f7
Merge pull request #7479 from Matt-Yorkley/payment-callbacks
...
Update Payment after_save callback
2021-05-18 16:19:29 +02:00
Matt-Yorkley
2e248744c0
Merge pull request #7520 from Matt-Yorkley/shipment-controller
...
Shipment controller: test coverage and improvements
2021-05-13 20:26:51 +02:00
Matt-Yorkley
00c4a28d22
Extract order-updating logic to Order::Updater
2021-05-04 16:40:10 +01:00
Matt-Yorkley
13bb5aa8dd
Update Payment after_save callback
...
Backport from Spree 2.4 stable: 4d652a77fd
2021-05-04 16:40:09 +01:00
Matt-Yorkley
925676f136
Split Order::Updater#update into two methods
...
There are two distinct (and very important) operations happening here. The first is to update all adjustments (which can be *incredibly* expensive) and the second is to ensure the order's totals and shipping/payment states are correct. There are lots of places where we currently do both of these things where in fact we only need to do the latter (and skip the really expensive part).
2021-04-30 12:48:53 +01:00
Matt-Yorkley
c7ce10f998
Handle order objects with no distributor
2021-04-30 11:12:41 +01:00
Matt-Yorkley
5b29243847
Delete unused method Stock::Package#currency
2021-04-30 11:10:20 +01:00
Matt-Yorkley
3897c3af68
Refactor Stock::Package#shipping_methods
2021-04-30 11:10:20 +01:00
Matt-Yorkley
0291a7c471
Merge pull request #7482 from Matt-Yorkley/updater-update
...
Updater update
2021-04-29 21:12:15 +02:00
Pau Pérez Fabregat
6c5db0f836
Merge pull request #7507 from Matt-Yorkley/shipment-state-update
...
Shipment callback state update
2021-04-29 12:01:55 +02:00
Matt-Yorkley
290c1d0ebf
Bring in shipment state updating from Spree 2.2
2021-04-28 21:43:28 +01:00
Matt-Yorkley
f52d03fbf4
Refactor Order::Updater#update so we don't call update_totals twice
...
Calling this method twice on every update is really expensive and not necessary.
2021-04-26 11:46:05 +01:00
Andy Brett
56cf43f1c1
scope variant to take overrides into account in packer
2021-04-22 11:45:12 -07:00
Pau Perez
5bca7d1f8f
Remove the old balance's code branch
...
This keeps the `OrderBalance` abstraction but removes the old code now
that the feature is enabled for all users in all instances and there are
no bugs reported. It's become dead code.
2021-04-19 11:52:41 +02:00
Matt-Yorkley
b6038c01a3
Remove references to Adjustment source
2021-04-14 12:01:21 +01:00
Andy Brett
d00970e05d
Merge pull request #7207 from andrewpbrett/fix-nil-price-subs
...
Report subscription failures
2021-04-09 12:13:11 -07:00
Matt-Yorkley
d635d70add
Update Order::Updater adjustment handling
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a8366a3a72
Update Order::Updater totals counts
2021-04-04 19:19:06 +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
Andy Brett
9d2fd373ce
record subscription issue if no order is generated
2021-03-29 14:53:13 -07:00
Matt-Yorkley
2ccaf80013
Update EnterpriseFeeSummary report scopes
2021-03-23 18:19:06 +00:00
Pau Perez
1a1552a6ed
Make OrderUpdater use new balance implementation
...
In this class we properly calculated the balance taking into account the
orders in cancellation state so we need to use the new implementation if
we don't want to introduce a regression by using
`#old_oustanding_balance`.
I was initially a bit dubious because this method was checking
`order.payments` as well but now I see that was redundant. Is on
`payment_total` to take into account whether or not the order is paid or
any other payment related details.
2021-03-22 11:45:12 +01:00
Pau Perez
9762275555
Use old_outstanding_balance on disabled toggle
...
No need to go through the `OrderBalance` in this context since we
already check for the toggle.
2021-03-22 11:45:12 +01:00
Matt-Yorkley
62a495a42e
Allow line item enterprise fees to be found in EnterpriseFeeSummary report
2021-03-18 13:18:20 +00:00
Matt-Yorkley
be3e184651
Merge pull request #6973 from Matt-Yorkley/adjustments-line-item-taxes
...
[Adjustments] Update line item taxes
2021-03-18 11:50:01 +01:00
Matt-Yorkley
064f7582cc
Update line_item included taxes
...
Drops use of the `spree_adjustments.included_tax` database field (when summing line item tax), which we are slowly deprecating before eventual removal
2021-03-17 22:23:04 +00:00
Matt-Yorkley
237075dd47
Replace deprecated before_filter syntax
2021-03-17 15:15:26 +00:00
Pau Pérez Fabregat
51f63060a4
Merge pull request #6879 from coopdevs/customer-balance-bulk-coop-report
...
Customer balance bulk coop report
2021-03-17 12:08:44 +01:00
Matt-Yorkley
dcf982c1c3
Fix params mangling issues in SubscriptionsController
2021-03-11 12:06:00 +00:00
Matt-Yorkley
9deadc8ae1
Simplify order.adjustment_total sum
2021-03-04 14:27:02 +00:00
Matt-Yorkley
00f116f35f
Update Order::Updater to include shipment adjustments
2021-03-04 14:27:01 +00:00
Matt-Yorkley
9ed6ae588f
Update EnterpriseFeeSummary report adjustment scopes
2021-03-04 14:27:01 +00:00
Pau Perez
b49777062b
Include canceled orders in report when searching
...
It's a code smell to have a boolean control argument.
`Permissions::Order` goes too far and assumes we want to filter out
canceled orders when using report's search params and this is not the
case.
2021-03-03 18:21:44 +01:00
Pau Perez
21fb3f3da6
Extract orders relation as a query object
2021-03-03 18:21:10 +01:00
Pau Perez
3b7f45516c
Toggle bulk coop report balance calculation
...
This will make users hit the new method that implements the new
calculation we are aiming for, only if they have the feature enabled.
2021-03-03 18:19:26 +01:00
Pau Perez
58ffd00f4a
Extract private method
...
This was initially intended to cache the result of the `#map` and
`#uniq` calls but we're not confident enough and don't want to
scopecreep this. It's still worth to point out that this is what we
need, line items' `unique orders`. Hopefully, next time we find a way to
optimize it.
2021-03-03 18:19:26 +01:00
Pau Perez
49dfccfb51
Unit test #columns method
...
At least, this covers what we're investigating now.
2021-03-03 18:19:26 +01:00
Matt-Yorkley
ec7d1d8133
Introduce tax totals in Order::Updater
2021-02-20 19:03:19 +00:00
Matt-Yorkley
899552cfee
Improve summing of line item totals
2021-02-17 16:15:34 +00:00