Maikel Linke
600c8fcd4c
Send confirmation emails immediately
...
Using deferred methods on the user model breaks delayed jobs when the
user is deleted while the job still exists. We could create a proper job
referencing a user id for sending these emails instead. But since the
user has to wait for the confirmation email anyway, we can send it
within the current request. This should be revised if performance
becomes an issue.
Sending the email directly also has the advantage that we can tell the
user if emailing failed. See the following commits.
This change impacts a bunch of specs as we now need a working email
setup to create unconfirmed users. This commit introduces a custom
matcher to unify testing for confirmation emails.
2018-09-27 13:33:08 +10:00
luisramos0
921105301c
Move angular-templates route and controller into Web engine
...
The route and controller were in the main app and the views in the engine, with this commit they stay all inside the engine
This is done to keep it simple and remove the unnecessary dependency between main app and engine
If we use this mechanism in the future for other things in the main app or other engines, we can find a way to extract/abstract this
2018-09-26 12:39:51 +01:00
Pau Pérez Fabregat
037432d1a7
Merge pull request #2767 from luisramos0/order_empty
...
[Spree Upgrade] Destroy all shipments when clearing order
2018-09-26 08:54:11 +02:00
Matt-Yorkley
e93d46e75a
Use .find instead of .select().first
2018-09-25 09:35:05 +01:00
Maikel
267edbdb45
Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
...
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-25 11:37:46 +10:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
Matt-Yorkley
1d9243af19
DRY and clarify serializer and service
2018-09-24 16:58:43 +01:00
Matt-Yorkley
6f2760cf92
Move translations into their namespace and use '.key' format
2018-09-24 15:54:05 +01:00
Pau Perez
eb64569c9a
Destroy all shipments when clearing order
...
Now we only clear the order's shipping_method, and in Spree 2.0 it can
have many shipments.
2018-09-24 15:25:33 +01:00
Pau Perez
f743b5f02f
Extract Settings from Product Import processor
...
This encapsulates the data structure used by the entry processor to
check various settings. It still requires a lot of work to move more
logic to this new class.
2018-09-24 13:55:33 +02:00
Hugo Daniel
06ee75981a
Add require_shipping_address to shipping_methods_form
2018-09-24 12:35:40 +02:00
Pau Pérez Fabregat
b8417058b4
Merge pull request #2741 from coopdevs/refactor-checkout-process-bits
...
Refactor checkout process bits
2018-09-24 12:08:19 +02:00
Pau Pérez Fabregat
52a412a218
Merge pull request #2638 from coopdevs/unit-test-variant-stock
...
Unit test variant stock
2018-09-24 11:14:03 +02:00
Maikel
26eb79f5f2
Merge pull request #2729 from luisramos0/2-0-ship-method-curr-order-ser
...
[Spree Upgrade] Replace order.shipping_method_id in current_order_serializer
2018-09-24 08:56:21 +10:00
Maikel
9b10fbde2d
Merge pull request #2728 from luisramos0/2-0-ship-method-ctrl
...
[Spree Upgrade] Remove use of Order#shipping_method_id from ShippingMethodsControllerDecorator
2018-09-24 08:54:03 +10:00
Matt-Yorkley
9f57b43a13
Move sortble header elements to a partial
2018-09-23 22:14:12 +01:00
Pau Pérez Fabregat
3c4ec62352
Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit
...
[Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-21 16:16:25 +02:00
Pau Pérez Fabregat
33fa687c28
Merge pull request #2755 from HugsDaniel/apply_overrides_to_shipping_methods_form
...
[Spree Upgrade] Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-21 15:35:41 +02:00
Hugo Daniel
f9c5e732d8
Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-20 19:21:02 +02:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Hugo Daniel
0d7e24e554
Change to new ruby hash syntax
2018-09-20 14:34:10 +02:00
Hugo Daniel
b0fa76f519
Change to new ruby hash syntax
2018-09-20 14:32:27 +02:00
Hugo Daniel
07cbb08b42
Change to new ruby hash syntax
2018-09-20 14:28:20 +02:00
Hugo Daniel
56c1b073ee
Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-20 12:37:26 +02:00
Hugo Daniel
493da83378
Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-20 12:35:49 +02:00
Hugo Daniel
a14337df5c
Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-20 12:34:16 +02:00
Matt-Yorkley
897e43fe0b
Remove Spree's Deface data-hooks from new view
2018-09-20 11:33:22 +01:00
Matt-Yorkley
fc68e28e4d
Add :description to non-updatable attributes list
2018-09-19 22:30:10 +01:00
Matt-Yorkley
ebb18e9394
Remove unneccesary method
2018-09-19 21:12:30 +01:00
Matt-Yorkley
cc98cc832c
Prefer #public_send over #send
2018-09-19 21:12:30 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
luisramos0
57bb1fec9a
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
2018-09-19 16:21:12 +01:00
Pau Perez
a2b3d8372e
Reduce complexity of OrderUpdater decorator
2018-09-19 16:03:33 +02:00
Pau Pérez Fabregat
99ba9d7d1b
Merge branch '2-0-stable' into unit-test-variant-stock
2018-09-19 15:41:21 +02:00
Pau Perez
b77dd41eb0
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
...
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Pau Perez
0491a96d44
Ask to use backorderable? instead of on_demand
2018-09-19 15:12:38 +02:00
Matt-Yorkley
3cbb576b4f
Move payment object logic out of order serializer and delete code
2018-09-19 13:00:30 +01:00
Matt-Yorkley
ba254802f8
Move angular_pagination to /views/admin/shared/
2018-09-19 13:00:30 +01:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
luisramos0
edcdf59621
In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec.
2018-09-18 16:11:01 +01:00
Pau Perez
314ad5400f
Move variant_stock.rb to concerns/
2018-09-18 12:18:50 +02:00
Pau Pérez Fabregat
9f7d24934d
Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters
...
Translate "Any Enterprise" and "Any Schedule" in OC filters
2018-09-18 11:42:19 +02:00
Pau Perez
2a0e0eed73
Move state_machine's additions inside class_eval
...
And also cover them with tests.
2018-09-18 11:20:32 +02:00
