@@ -82,11 +82,6 @@ class Checkout extends Resolver
82
82
*/
83
83
protected $ orderSender ;
84
84
85
- /**
86
- * @var \Magento\Checkout\Model\Cart
87
- */
88
- protected $ _cartModel ;
89
-
90
85
public function __construct (
91
86
Config $ shippingModelConfig ,
92
87
UrlInterface $ url ,
@@ -102,8 +97,7 @@ public function __construct(
102
97
\Magento \Catalog \Api \ProductRepositoryInterface $ productRepository ,
103
98
\Magento \Customer \Api \CustomerRepositoryInterface $ customerRepository ,
104
99
\Magento \Quote \Model \QuoteManagement $ quoteManagement ,
105
- \Magento \Sales \Model \Order \Email \Sender \OrderSender $ orderSender ,
106
- \Magento \Checkout \Model \Cart $ cartModel
100
+ \Magento \Sales \Model \Order \Email \Sender \OrderSender $ orderSender
107
101
) {
108
102
$ this ->_currencyHelper = $ currencyHelper ;
109
103
$ this ->url = $ url ;
@@ -120,7 +114,6 @@ public function __construct(
120
114
$ this ->customerRepository = $ customerRepository ;
121
115
$ this ->quoteManagement = $ quoteManagement ;
122
116
$ this ->orderSender = $ orderSender ;
123
- $ this ->_cartModel = $ cartModel ;
124
117
}
125
118
126
119
public function link ()
@@ -235,6 +228,11 @@ public function paymentAddress()
235
228
'name ' => 'postcode ' ,
236
229
'required ' => true
237
230
];
231
+ $ fields [] = [
232
+ 'type ' => 'text ' ,
233
+ 'name ' => 'phone ' ,
234
+ 'required ' => true
235
+ ];
238
236
239
237
$ fields [] = [
240
238
'type ' => 'country ' ,
@@ -443,6 +441,7 @@ public function updateOrder($args)
443
441
->setCountryId ($ paymentAddress ['country_id ' ])
444
442
->setRegionId ($ paymentAddress ['zone_id ' ])
445
443
// ->setRegion($region)
444
+ ->setTelephone ($ paymentAddress ['phone ' ])
446
445
->setPostcode ($ paymentAddress ['postcode ' ])
447
446
->setSaveInAddressBook (0 )
448
447
->setSameAsBilling (0 );
@@ -513,51 +512,67 @@ public function confirmOrder()
513
512
$ customer ->save ();
514
513
}
515
514
516
- $ quote =$ this ->_cartModel ->getQuote ();//$this->quote->create(); //Create object of quote
515
+ // $quote=$this->_cartModel->getQuote();//$this->quote->create(); //Create object of quote
516
+ /**
517
+ * @var \Magento\Quote\Model\Quote
518
+ */
519
+ $ quote = $ this ->load ->resolver ('store/cart/getQuote ' );
520
+
517
521
$ quote ->setStore ($ store ); //set store for our quote
518
- /* for registered customer */
522
+ // / * for registered customer */
519
523
520
524
$ customer = $ this ->customerRepository ->getById ($ customer ->getId ());
521
525
$ quote ->setCurrency ();
522
526
$ quote ->assignCustomer ($ customer ); //Assign quote to customer
523
527
528
+ // $this->_cartModel->getQuote()->collectTotals();
524
529
//add items in quote
525
530
526
531
// $results = $this->_cartModel->getItems();
527
532
528
533
// foreach ($results as $value) {
529
- // /** @var \Magento\Catalog\Model\Product $product */
530
- // $product = $value->getProduct();
531
- // $quote->addProduct($product,$value->getQty());
534
+ // var_dump('item');
535
+ // // /** @var \Magento\Catalog\Model\Product $product */
536
+ // // $product = $value->getProduct();
537
+ // // $quote->addProduct($product,$value->getQty());
532
538
// }
533
539
534
- //Set Billing and shipping Address to quote
540
+ // // Set Billing and shipping Address to quote
535
541
$ quote ->setBillingAddress ($ this ->checkoutSession ->getQuote ()->getBillingAddress ());
536
542
$ quote ->setShippingAddress ($ this ->checkoutSession ->getQuote ()->getShippingAddress ());
537
543
538
544
$ methodInfo = explode ('. ' , $ shippingMethod );
545
+ var_dump (count ($ quote ->getAllVisibleItems ()));
539
546
540
547
// set shipping method
541
548
$ shippingAddress =$ quote ->getShippingAddress ();
542
549
$ shippingAddress ->setCollectShippingRates (true )
543
550
->collectShippingRates ()
544
551
->setShippingMethod ($ methodInfo [1 ])->setShippingCarrierCode ($ methodInfo [0 ]); //shipping method, please verify flat rate shipping must be enable
545
- // $quote->setPaymentMethod($paymentMethod); //payment method, please verify checkmo must be enable from admin
546
- $ quote ->setInventoryProcessed (false ); //decrease item stock equal to qty
552
+ // // $quote->setPaymentMethod($paymentMethod); //payment method, please verify checkmo must be enable from admin
553
+ // $quote->setInventoryProcessed(false); //decrease item stock equal to qty
547
554
$ quote ->save (); //quote save
548
- // Set Sales Order Payment, We have taken check/money order
555
+ // // Set Sales Order Payment, We have taken check/money order
549
556
// $quote->getPayment()->importData(['method' => $paymentMethod]);
550
557
551
- // Collect Quote Totals & Save
558
+ // // Collect Quote Totals & Save
552
559
$ quote ->collectTotals ()->save ();
553
- // Create Order From Quote Object
560
+ // // Create Order From Quote Object
554
561
$ order = $ this ->quoteManagement ->submit ($ quote );
555
562
556
- /* for send order email to customer email id */
557
- $ this ->orderSender ->send ($ order );
563
+ var_dump ($ order ? 1 : 0 );
564
+
565
+ $ orderId = null ;
558
566
559
- /* get order real id from order */
560
- $ orderId = $ order ->getIncrementId ();
567
+ // if($order) {
568
+ // // throw new ÷
569
+
570
+ // /* for send order email to customer email id */
571
+ // $this->orderSender->send($order);
572
+
573
+ // /* get order real id from order */
574
+ // $orderId = $order->getIncrementId();
575
+ // }
561
576
562
577
563
578
return [
0 commit comments