@@ -9,45 +9,31 @@ define(
9
9
'mage/storage' ,
10
10
'Magento_Checkout/js/model/error-processor' ,
11
11
'Magento_Customer/js/model/customer' ,
12
- 'Magento_Checkout/js/model/full-screen-loader'
12
+ 'Magento_Checkout/js/model/full-screen-loader' ,
13
+ 'Magento_Checkout/js/model/place-order'
13
14
] ,
14
- function ( quote , urlBuilder , storage , errorProcessor , customer , fullScreenLoader ) {
15
+ function ( quote , urlBuilder , storage , errorProcessor , customer , fullScreenLoader , placeOrderService ) {
15
16
'use strict' ;
16
17
17
18
return function ( paymentData , messageContainer ) {
18
- var serviceUrl ,
19
- payload ;
19
+ var serviceUrl , payload ;
20
20
21
- /** Checkout for guest and registered customer. */
22
- if ( ! customer . isLoggedIn ( ) ) {
21
+ payload = {
22
+ cartId : quote . getQuoteId ( ) ,
23
+ billingAddress : quote . billingAddress ( ) ,
24
+ paymentMethod : paymentData
25
+ } ;
26
+
27
+ if ( customer . isLoggedIn ( ) ) {
28
+ serviceUrl = urlBuilder . createUrl ( '/carts/mine/payment-information' , { } ) ;
29
+ } else {
23
30
serviceUrl = urlBuilder . createUrl ( '/guest-carts/:quoteId/payment-information' , {
24
31
quoteId : quote . getQuoteId ( )
25
32
} ) ;
26
- payload = {
27
- cartId : quote . getQuoteId ( ) ,
28
- email : quote . guestEmail ,
29
- paymentMethod : paymentData ,
30
- billingAddress : quote . billingAddress ( )
31
- } ;
32
- } else {
33
- serviceUrl = urlBuilder . createUrl ( '/carts/mine/payment-information' , { } ) ;
34
- payload = {
35
- cartId : quote . getQuoteId ( ) ,
36
- paymentMethod : paymentData ,
37
- billingAddress : quote . billingAddress ( )
38
- } ;
33
+ payload . email = quote . guestEmail ;
39
34
}
40
35
41
- fullScreenLoader . startLoader ( ) ;
42
-
43
- return storage . post (
44
- serviceUrl , JSON . stringify ( payload )
45
- ) . fail (
46
- function ( response ) {
47
- errorProcessor . process ( response , messageContainer ) ;
48
- fullScreenLoader . stopLoader ( ) ;
49
- }
50
- ) ;
36
+ return placeOrderService ( serviceUrl , payload , messageContainer ) ;
51
37
} ;
52
38
}
53
39
) ;
0 commit comments