Andy Brett
70ac719725
Merge pull request #7649 from andrewpbrett/payments-when-out-of-stock
...
Check stock before doing anything related to admin payments
2021-05-19 14:45:38 -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
Andy Brett
ca38948e21
check stock before doing anything related to admin payments
2021-05-14 17:42:37 -07:00
Matt-Yorkley
8e10f7af0e
Update payments controller test setup
...
We need to use a completed order in the test setup here or it doesn't behave correctly. `order.completed_at` is nil, for example.
2021-05-04 16:40:10 +01:00
Pau Pérez Fabregat
c1da97527a
Merge pull request #7420 from Matt-Yorkley/adjustments-controller
...
Adjustments controller index
2021-04-22 19:15:28 +02:00
Matt-Yorkley
ecd433b343
Update permissions on adjustments
...
The previous permissions assumed that an adjustment's "adjustable" could only be only line items or orders, and that's no longer true. It's now commonly a shipment or a payment as well.
2021-04-21 18:17:20 +01: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
d29c0cdcb7
Don't show line item adjustments in Admin::OrdersHelper#order_adjustments_for_display
...
Line item adjustments are displayed separately, if we don't filter them here they get displayed twice.
2021-04-15 14:23:37 +01:00
Matt-Yorkley
206d9e06ea
Reinstate old logic for adjustments controller
...
Certain types of adjustments (eg enterprise fees) cannot really be changed arbitrarily; when the order is saved and "recalculated" the values will be reset. The adjustments are still shown in the main order edit tab, but are not editable in the adjustments tab.
2021-04-15 14:00:48 +01:00
Matt-Yorkley
83acc3faac
Improve test setup where checking ineligible payment fee adjustments
2021-04-14 12:01:21 +01:00
Pau Pérez Fabregat
92f45badac
Merge pull request #7340 from Matt-Yorkley/deleted-enterprise-fees
...
Add test coverage: deleted enterprise fees
2021-04-09 09:05:11 +02:00
Maikel Linke
bfa5d443f1
Don't change canceled orders
...
We have a PR already that removes the UI for this when the order is
canceled. Implementing it on controller-side makes sure that it doesn't
happen accidentally if the user has multiple tabs open.
2021-04-08 09:24:39 +10:00
Matt-Yorkley
ea6540838a
Add test coverage for hard-deleted EnterpriseFee case when editing orders
2021-04-07 18:53:24 +01:00
Matt-Yorkley
01e6397e27
Remove Spree::Config[:shipment_inc_vat]
...
This is now done per ShippingMethod instead of globally
2021-04-06 20:29:58 +01:00
Matt-Yorkley
903788903b
Remove Spree::Config[:shipping_tax_rate]
2021-04-04 19:19:06 +01:00
Matt-Yorkley
e81270d0d7
Fix adjustment test setups missing order associations
...
All adjustments must be associated with an order
2021-04-04 19:19:06 +01:00
Matt-Yorkley
3f14694b2b
Merge pull request #6960 from andrewpbrett/namespace-api
...
Namespace existing API endpoints to api/v0/*
2021-03-30 19:45:27 +02: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
5a19a14042
rename to v0
2021-03-27 11:21:18 -07:00
Matt-Yorkley
cbd7c9f4c0
Update adjustments controller collection scope
2021-03-25 15:02:02 +00:00
Pau Perez
ec4bae3995
Reproduce regression in a test
2021-03-22 19:01:17 +01:00
Pau Perez
5815d1a4a4
Make #outstanding_balance return an OrderBalance
...
This will let us branch by abstraction. All existing calls to
`#outstanding_balance` will go through `OrderBalance` hence, will
check the feature toggle.
Note that by default, `OrderBalance` will end up calling
`#old_outstanding_balance`. As the name states, that's exactly what
`#outstanding_balance` was so far. This means no consumers will see any
change in behavior. We just added on item in the call stack (sort of).
2021-03-22 11:45:12 +01:00
Andy Brett
afa7269f48
Merge branch 'master' into render_plain
2021-03-18 10:53:13 -07:00
Matt-Yorkley
3ed8dbe3b3
Merge pull request #7146 from Matt-Yorkley/deprecations
...
Deprecations
2021-03-18 11:25:14 +01:00
Andy Brett
b8629e847c
Merge pull request #7014 from andrewpbrett/canceled-order-payments
...
Add resumed to list of allowable order states to view the payment tab
2021-03-17 10:46:51 -07:00
Matt-Yorkley
237075dd47
Replace deprecated before_filter syntax
2021-03-17 15:15:26 +00:00
Luis Ramos
53d758ca21
Replace render text with render plain for rails 5.1
2021-03-16 23:13:58 +00:00
Andy Brett
ffe9d4737c
Merge pull request #7114 from coopdevs/extract-spec-file
...
Move invoice-related specs to their own file
2021-03-15 15:11:14 -07:00
Matt-Yorkley
657291df90
Update order total when editing admin adjustments
2021-03-15 11:46:14 +00:00
Pau Perez
7a3121b624
Move invoice-related specs to their own file
...
The `Spree::Admin::OrdersController`'s test file quite long (as well as
the controller itself) but it'll grow more in the upcoming commits.
That's just a symptom of that controller having too many
responsibilities. It does much more than CRUD on `Spree::Order` (the
Rails convention).
Things like invoices are an entity on their own and would better fit
into a `InvoicesController`. Hopefully, splitting up the tests is hint
for the next dev to do that.
2021-03-15 12:45:27 +01:00
Matt-Yorkley
3219ea231d
Ensure order association is set correctly when adding admin adjustments
2021-03-15 11:18:14 +00:00
Matt-Yorkley
707d089419
Update type handling in PaymentMethodsController and add tests
2021-03-13 10:57:54 +00:00
Matt-Yorkley
6d51ece69c
Tidy up payment method params
2021-03-13 10:57:51 +00:00
Matt-Yorkley
83278b17db
Fix test controller issue
2021-03-11 12:19:55 +00:00
Matt-Yorkley
ec597aab1a
Fix params issue in ReportsController expectation
2021-03-11 12:19:55 +00:00
Matt-Yorkley
009844bfe7
Update expected params in reports controller tests
2021-03-11 12:06:00 +00:00
Matt-Yorkley
4c64aaed77
Remove callbacks in Adjustment that call order.update!
2021-03-11 11:20:01 +00:00
Matt-Yorkley
791a47d170
Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost
...
[Adjustments] Move shipping adjustment from order to shipment
2021-03-11 12:17:14 +01:00
Andy Brett
05a074d33a
Merge pull request #7041 from Matt-Yorkley/adjustments-set-eligibility
...
[Adjustments] Remove Adjustment#set_eligibility
2021-03-09 13:33:21 -08:00
Pau Perez
333c669fbf
Remove puts debugging in tests
2021-03-09 16:01:55 +01:00
Andy Brett
95c232dfe7
add spec for a resumed order
2021-03-08 08:54:28 -08:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +00:00
Matt-Yorkley
bcbea618e8
Fix adjustment spec
...
The tested adjustment isn't found correctly if it isn't associated to the order...
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f0de09da84
Update order correctly in ReturnAuthorizationsController
2021-03-04 14:27:02 +00:00
Andy Brett
a02065b66f
allow access to payments tab for canceled orders
2021-03-01 19:51:50 -08:00
Matt-Yorkley
9852470ef6
Merge pull request #6913 from Matt-Yorkley/rails-5-backports
...
Rails 5 backports
2021-02-23 11:55:31 +01:00
Matt-Yorkley
0e3429dc35
Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor
...
Enterprise fees refactor
2021-02-22 17:59:18 +01:00
Matt-Yorkley
f858fe3c68
Improve coverage in admin_orders_controller_spec
2021-02-19 11:18:00 +00:00
Maikel Linke
5b94049620
Whitelist params for several settings for Rails 5
...
Rails 5 is a bit stricter and Spree's Config#set method doesn't work
with a Parameters object.
2021-02-19 14:20:15 +11:00
Pau Pérez Fabregat
16140b7b0b
Merge pull request #6843 from Matt-Yorkley/tax-rates-double-take
...
Also soft-delete tax rates when changing `included_in_price`
2021-02-17 09:41:07 +01:00
