Skip to content

Commit 5a605f3

Browse files
committed
fix: fix bug
1 parent 9c9bc08 commit 5a605f3

File tree

2 files changed

+42
-23
lines changed

2 files changed

+42
-23
lines changed

Model/Api/Resolver/Store/Cart.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ public function remove($args)
9090
return $this->get($args);
9191
}
9292

93+
public function getQuote() {
94+
return $this->_cartModel->getQuote();
95+
}
96+
9397
public function get($args)
9498
{
9599
$this->_cartModel->getQuote()->collectTotals();

Model/Api/Resolver/Store/Checkout.php

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,6 @@ class Checkout extends Resolver
8282
*/
8383
protected $orderSender;
8484

85-
/**
86-
* @var \Magento\Checkout\Model\Cart
87-
*/
88-
protected $_cartModel;
89-
9085
public function __construct(
9186
Config $shippingModelConfig,
9287
UrlInterface $url,
@@ -102,8 +97,7 @@ public function __construct(
10297
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
10398
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
10499
\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
107101
) {
108102
$this->_currencyHelper = $currencyHelper;
109103
$this->url = $url;
@@ -120,7 +114,6 @@ public function __construct(
120114
$this->customerRepository = $customerRepository;
121115
$this->quoteManagement = $quoteManagement;
122116
$this->orderSender = $orderSender;
123-
$this->_cartModel = $cartModel;
124117
}
125118

126119
public function link()
@@ -235,6 +228,11 @@ public function paymentAddress()
235228
'name' => 'postcode',
236229
'required' => true
237230
];
231+
$fields[] = [
232+
'type' => 'text',
233+
'name' => 'phone',
234+
'required' => true
235+
];
238236

239237
$fields[] = [
240238
'type' => 'country',
@@ -443,6 +441,7 @@ public function updateOrder($args)
443441
->setCountryId($paymentAddress['country_id'])
444442
->setRegionId($paymentAddress['zone_id'])
445443
// ->setRegion($region)
444+
->setTelephone($paymentAddress['phone'])
446445
->setPostcode($paymentAddress['postcode'])
447446
->setSaveInAddressBook(0)
448447
->setSameAsBilling(0);
@@ -513,51 +512,67 @@ public function confirmOrder()
513512
$customer->save();
514513
}
515514

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+
517521
$quote->setStore($store); //set store for our quote
518-
/* for registered customer */
522+
// /* for registered customer */
519523

520524
$customer= $this->customerRepository->getById($customer->getId());
521525
$quote->setCurrency();
522526
$quote->assignCustomer($customer); //Assign quote to customer
523527

528+
// $this->_cartModel->getQuote()->collectTotals();
524529
//add items in quote
525530

526531
// $results = $this->_cartModel->getItems();
527532

528533
// 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());
532538
// }
533539

534-
//Set Billing and shipping Address to quote
540+
// //Set Billing and shipping Address to quote
535541
$quote->setBillingAddress($this->checkoutSession->getQuote()->getBillingAddress());
536542
$quote->setShippingAddress($this->checkoutSession->getQuote()->getShippingAddress());
537543

538544
$methodInfo = explode('.', $shippingMethod);
545+
var_dump(count($quote->getAllVisibleItems()));
539546

540547
// set shipping method
541548
$shippingAddress=$quote->getShippingAddress();
542549
$shippingAddress->setCollectShippingRates(true)
543550
->collectShippingRates()
544551
->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
547554
$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
549556
// $quote->getPayment()->importData(['method' => $paymentMethod]);
550557

551-
// Collect Quote Totals & Save
558+
// // Collect Quote Totals & Save
552559
$quote->collectTotals()->save();
553-
// Create Order From Quote Object
560+
// // Create Order From Quote Object
554561
$order = $this->quoteManagement->submit($quote);
555562

556-
/* for send order email to customer email id */
557-
$this->orderSender->send($order);
563+
var_dump($order ? 1 : 0);
564+
565+
$orderId = null;
558566

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+
// }
561576

562577

563578
return [

0 commit comments

Comments
 (0)