1441 Commits

Author	SHA1	Message	Date
Matt-Yorkley	23910dbab4	Use OrderContents in BulkLineItemsController ... We should move towards *all* operations on an order's line items being done exclusively through this service.	2021-06-04 17:10:50 +01:00
Matt-Yorkley	03fc63ad14	Remove #order_update! from line item after_save callback	2021-06-04 17:10:50 +01:00
Matt-Yorkley	d99e598e7a	Delete dead code in CartController ... The two conditionals in #populate_variant_attributes here are never actually true, so the subsequent code paths are never reached.	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
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
Matt-Yorkley	53e3e2b66d	Remove outdated Job test helpers ... This logic around testing jobs is already handled by integrations with ActiveJob since Rails 4.2	2021-05-29 16:37:06 +01:00
Jean-Baptiste Bellet	0306732a3d	Add test for enterprise logo and promo image uploading ... - Add a fixture image to do the upload thanks to `fixture_file_upload` - Check the response status, the content type and the response body for both logo image and promo image	2021-05-25 15:30:29 +02: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	f7726e552a	Adapt code coming from master to the new order api with update_order!	2021-05-19 10:09:42 -07:00
Luis Ramos	a1ac4e85ed	Replace update_attributes with update	2021-05-19 09:54:25 -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
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	e60a513c88	Merge pull request #7571 from coopdevs/make-specs-accurate ... Properly mock validator and extend tests	2021-05-11 22:24:01 +02:00
Matt-Yorkley	902bbf7dc4	Merge pull request #7576 from Matt-Yorkley/bulk-line-items ... Add test coverage to BulkLineItemsController actions	2021-05-11 01:47:17 +02:00
Andy Brett	d29ef0d7b1	Merge branch 'master' into make-specs-accurate	2021-05-10 16:10:33 -07:00
Andy Brett	17a0063b40	Merge pull request #7402 from filipefurtad0/products_spec_add_ons ... Adds coverage for product deletion and cloning	2021-05-10 06:26:11 -07:00
Matt-Yorkley	43e41f4980	Add more explicit test coverage to BulkLineItemsController acitons ... This spec includes taxes on line items, fees on the order and on line items, taxes on fees (inherited and non-inherited), shipping and payment fees and taxes on shipping. It checks all of these things are correctly updated after the order is changed via BOM.	2021-05-07 11:54:04 +01: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
filipefurtad0	a476416dc4	Removes html tr tag; Clarifies it block	2021-05-03 17:03:34 +01:00
Matt-Yorkley	e290c128bf	Fix error in Api::ShipmentController#update with :unlock parameter ... This is a generic issue caused by a clash between state machines trying to define (or failing to define) the #open method on adjustments as part of their state changes interface. This method is already defined in Object. For more details, see: bb42e33bf7/lib/state_machines/machine.rb (L323-L350)	2021-04-30 14:13:22 +01:00
Matt-Yorkley	95a73704a2	Add more test coverage to Api::ShipmentController#update	2021-04-30 14:09:32 +01:00
Matt-Yorkley	b843b871f6	Ensure order totals and payment/shipment states are correct when changing shipping method on a completed order. ... This used to happen via an after_save callback in Shipment, which called `order.update!`. That has recently been removed. After changing a shipment's selected shipping rate (shipping method), we need to ensure the order's totals and states are updated. We don't need to update all of the order's adjustments though (see previous commit). FYI Spree handled this issue like this: 24388485ed, but there are lots of things about that commit that are clearly awful, like: params handling in a model, duplication of Order::Updater logic across the codebase, the Shipment class having responsiblity for knowing which things need to be updated on the order, etc. The result is ultimately the same as what we're doing here though.	2021-04-30 12:57:01 +01:00
Matt-Yorkley	d3f41f14c7	Add test coverage for Api::ShipmentsController#update	2021-04-30 12:45:49 +01:00
Andy Brett	8ba139c6fb	Merge pull request #6825 from julesemmac/6584-map-location-confirm ... 6584 map location confirm	2021-04-29 14:04:06 -07:00
Pau Perez	679de40a41	Move specs to where they belong	2021-04-26 10:15:13 +02:00
Cillian O'Ruanaidh	c41476423b	Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb	2021-04-22 19:43:49 +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
Matt-Yorkley	a3b90f3a63	Merge pull request #7443 from mkllnk/order-cycle-factory ... Spec customer creation during checkout	2021-04-20 10:08:57 +02:00
Pau Pérez Fabregat	87624f4c9f	Merge pull request #7416 from coopdevs/remove-old-balance-implementation ... Remove old balance implementation	2021-04-20 08:51:27 +02:00
Maikel Linke	1753156578	Spec customer creation during checkout ... Expanding the controller spec with real data instead of mocks to test the real callback behaviours.	2021-04-20 16:14:41 +10:00
Andy Brett	aca19edd3b	Merge pull request #7421 from andrewpbrett/rails-5-2-prep-2 ... Prepare for Rails 5.2	2021-04-19 11:32:21 -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
Andy Brett	472b0b5964	Merge pull request #7412 from andrewpbrett/no-zero-unit-values ... Add greater-than-zero validation to variant unit_value	2021-04-15 10:05:38 -07:00
Andy Brett	f85ef86b1b	update spec with valid variant	2021-04-15 09:43:22 -07: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