Matt-Yorkley
3dd8ed85b4
Implement manual shipping method selection
2021-09-01 14:16:32 +01:00
Matt-Yorkley
e1155277fc
Remove Darkswarm from window
2021-08-02 18:59:42 +01:00
Matt-Yorkley
886e03af2f
Merge pull request #7805 from Matt-Yorkley/adjustments-admin
...
[Adjustments] Admin adjustments
2021-07-27 12:23:29 +02:00
Andy Brett
c6743d8c6b
Merge pull request #7800 from pacodelaluna/improve-dfc-logic
...
Improve DFC Provider logic to use existing business logic
2021-07-16 15:56:09 -07:00
François Turbelin
39bb25e959
Adjust supplied_products id before better data matching
2021-07-15 21:17:14 +02:00
François Turbelin
c4a7c05c05
Use check_enterprise filter in a better way
2021-07-14 14:59:19 +02:00
François Turbelin
155d05265d
Use manually generated values to test urls
2021-07-14 14:24:10 +02:00
François Turbelin
9d1b059835
Fix typo in supplied_products_controller comment
2021-07-14 14:08:09 +02:00
Luis Ramos
01fe6abeed
Result of rubocop -a, safe autocorrect
2021-07-13 22:38:05 +01:00
Matt-Yorkley
3ae31ec1ce
Simplify tax adjustment sums in Order::Updater
2021-07-09 21:49:36 +01:00
Andy Brett
df0c98d013
Merge branch 'master' into rails61
2021-06-24 08:02:58 -07:00
François Turbelin
06c19641b4
Remove return on case
2021-06-22 20:44:51 +02:00
Pau Pérez Fabregat
db993652c4
Merge branch 'master' into payment-states
2021-06-18 12:20:26 +02:00
Pau Pérez Fabregat
6f90a7b07f
Merge pull request #7720 from luisramos0/rubocop_auto_correct
...
Executed rubocop autocorrect (-a for safe corrections plus adding frozen_string_literal comment to all files)
2021-06-18 08:48:03 +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
Andy Brett
4d2235c9cc
Merge pull request #7794 from openfoodfoundation/dependabot/bundler/bigdecimal-3.0.2
...
Bump bigdecimal from 1.4.2 to 3.0.2
2021-06-17 14:21:55 -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
a7d873356d
Fix shady use of BigDecimal
2021-06-17 15:51:06 +01:00
François Turbelin
7f0c5b8a7a
Fix controller specs with be_successful
2021-06-17 09:43:17 +02:00
François Turbelin
bcd2790649
Fix failing spec
2021-06-17 09:18:05 +02:00
François Turbelin
7918c2f37c
Cosmetics
2021-06-17 08:50:52 +02:00
François Turbelin
1ef7247311
Use a service to fetch variants in the engine
2021-06-17 08:50:52 +02:00
François Turbelin
235a2574dc
Add spec for SuppliedProduct serializer
2021-06-17 08:50:52 +02:00
François Turbelin
4dc07d9872
Add spec for CatalogItem serializer
2021-06-17 08:50:52 +02:00
François Turbelin
a87c46843c
Factorize serializer code into Base inherited class
2021-06-17 08:50:52 +02:00
François Turbelin
7ff69d5e6d
Fix entreprise missing issue on Persons controller
2021-06-17 08:50:52 +02:00
Luis Ramos
5948c20326
Fix spec by adding mocked response
2021-06-13 18:19:29 -07: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
a1ac4e85ed
Replace update_attributes with update
2021-05-19 09:54:25 -07: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
Luis Ramos
a2de86c23e
Replace be_success on test_reponse with status 200
...
In rails 6 response.success? is not supported.
2021-05-06 23:51:30 +01:00
Andy Brett
a7331efd67
Merge pull request #7477 from luisramos0/require_dependency
...
Remove require_dependency or use require
2021-05-05 13:24:19 -07: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
e9b6f89ae0
Update params syntax in engine controller specs
2021-05-03 14:17:54 +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
c3c396eaea
Add soft-deletion test coverage to Package#shipping_methods
2021-04-30 11:10:19 +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
