raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 21 Branches 450 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

624 Commits

Author SHA1 Message Date
Matt-Yorkley
7e3b9be506 Allow StripeSCA Gateway to actually void payments 2021-07-30 11:48:57 +01:00
Matt-Yorkley
091bfc710f Add test for applying multiple tax rates per tax zone 2021-07-25 22:47:40 +01:00
Matt-Yorkley
fe92c31f4a Update AdjustmentsController specs 2021-07-09 21:49:36 +01:00
Andy Brett
9b1da14380 mark payment failed after failed authorization 2021-06-29 11:54:51 -07:00
Andy Brett
aa8067f96b process payments separately from completing the order 2021-06-29 11:54:48 -07:00
Pau Pérez Fabregat
db993652c4 Merge branch 'master' into payment-states 2021-06-18 12:20:26 +02:00
Andy Brett
d9aa1b054a update payments to be in requires_authorization state in specs 2021-06-17 18:10:41 -07:00
Andy Brett
2699e17b63 update specs to create payment in requires_authorization state 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
Pau Pérez Fabregat
a8efbffca6 Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate 
[Adjustments] TaxRate changes
 2021-06-17 11:51:01 +02:00
Andy Brett
ba6ebdee15 Merge pull request #7686 from shen-sat/7470-add-delete-action-test-to-shipping-categories-controller-spec 
[7470] Add delete action test to ShippingCategoriesController spec
 2021-06-08 10:31:26 -07:00
Matt-Yorkley
8e0a84a502 Merge pull request #7729 from Matt-Yorkley/delayed-cleanup 
Delayed::Cleanup
 2021-06-07 19:11:37 +02:00
Matt-Yorkley
00988dc1e7 Use :order_with_totals factory in payments controller spec 
This factory makes an order that actually has a line item 👍
 2021-06-06 20:20:41 +01:00
Matt-Yorkley
f791f6fa20 Add test coverage to recalculating fees and taxes on completed orders 2021-06-06 20:17:03 +01:00
Matt-Yorkley
0f5c39317a Re-apply taxes in Admin::OrdersController#update 
Ensures taxes are updated properly when hitting the "Update and Recalculate Fees" button on the order edit page.
 2021-06-06 20:16:03 +01:00
Matt-Yorkley
42ff2307fa Update specs that use removed #add_variant and #remove_variant methods in test setup 2021-06-04 17:10:50 +01:00
Matt-Yorkley
d5d76d9b9a Move private controller methods to private 2021-06-04 17:10:50 +01:00
Matt-Yorkley
d66b6f7192 Fix InvoicesController spec and change from pending to active 2021-06-03 12:51:15 +01:00
Shen
80ae211b72 Use correct syntax for change matcher in spec/controllers/spree/admin/shipping_categories_controller_spec.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-06-02 13:17:49 +01:00
Shen Sat
99a4be134b Add delete action test to ShippingCategoriesController spec 2021-06-02 13:17:49 +01:00
Andy Brett
77c384633b specify payment intent ID in stripe stub 2021-06-01 22:34:04 +01:00
Andy Brett
b3e08b47b9 set Stripe api key directly instead of using allow 2021-06-01 22:33:12 +01:00
Luis Ramos
85508f45b4 Replace be_success on test_reponse with status 200 
In rails 6 response.success? is not supported.
 2021-06-01 22:33:12 +01:00
Andy Brett
b367001b95 Merge pull request #7641 from luisramos0/order_path 
[Rails 6.1] Fix view specs
 2021-05-24 14:41:32 -07:00
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
fb560089b9 Replace usages of update_attributes! with usage of 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
794216713a Ensure payment is processed if order is in completed state 2021-05-16 23:03:07 +01:00
Matt-Yorkley
16e3af9b49 Update OrderController spec 2021-05-16 20:11:45 +01:00
Andy Brett
ca38948e21 check stock before doing anything related to admin payments 2021-05-14 17:42:37 -07:00
Luis Ramos
b1896733ca Fix routes 2021-05-14 00:08:20 +01:00
Andy Brett
d29ef0d7b1 Merge branch 'master' into make-specs-accurate 2021-05-10 16:10:33 -07:00
Pau Perez
fd5e0fd60f Properly mock validator and extend tests 
Tests were passing but not due to the expected reason. While at it, we
extended the assertions to be more precise.
 2021-05-07 08:35:54 +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
Pau Perez
2147584daf Validate intents against Stripe and display errors 
Now the existing validation is redundant. It's Stripe's API who does
that now. It's up to them to decide what's a valid intent.
 2021-05-06 16:19:01 +02: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
bef3f8c51f Merge pull request #7452 from Matt-Yorkley/adjustments-permissions 
Update CanCan permissions on adjustments
 2021-04-22 18:07:18 +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
Andy Brett
479897fcbd Merge pull request #7315 from Matt-Yorkley/double-checkout 
Double checkout
 2021-04-20 10:44:32 -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
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
Matt-Yorkley
0dde8112d2 Add redirect specs for PaypalController#express 2021-04-12 17:23:49 +01:00
Matt-Yorkley
06c01955f5 Rename describe block names to controller actions 2021-04-12 16:44:45 +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