Merge pull request #1125 from buckaroo-it/BP-3885-Apple-Pay-transaction-screen-is-disappearing-on-the-product-page

Bp 3885 apple pay transaction screen is disappearing on the product page

Author: AlbinaBaraliu

Model/Applepay.php

@@ -31,4 +31,4 @@ public function processAddressFromWallet($wallet, $type = 'shipping')
 
         return $address;
     }
-}
+}

Service/Applepay/Add.php

@@ -80,7 +80,7 @@ class Add
      * @param ShippingAddressManagementInterface $shippingAddressManagement
      * @param QuoteRepository|null $quoteRepository
      * @param ShippingMethod $appleShippingMethod
-     */
+    */
     public function __construct(
         CartRepositoryInterface $cartRepository,
         CartInterface $cart,
@@ -105,16 +105,16 @@ public function __construct(
         $this->quoteRepository = $quoteRepository
             ?? ObjectManager::getInstance()->get(QuoteRepository::class);
         $this->appleShippingMethod = $appleShippingMethod;
-
     }
 
     public function process($request)
     {
         $cart_hash = $request->getParam('id');
 
-        if($cart_hash) {
+        if ($cart_hash) {
             $cartId = $this->maskedQuoteIdToQuoteId->execute($cart_hash);
             $cart = $this->cartRepository->get($cartId);
+
         } else {
             $checkoutSession = ObjectManager::getInstance()->get(\Magento\Checkout\Model\Session::class);
             $cart = $checkoutSession->getQuote();
@@ -127,7 +127,6 @@ public function process($request)
             throw new \Exception('Product data is missing or invalid.');
         }
 
-
         $cart->removeAllItems();
 
         try {
@@ -141,7 +140,7 @@ public function process($request)
             $product['qty']
         );
 
-        if(isset($product['selected_options'])) {
+        if (isset($product['selected_options'])) {
             $cartItem->setSelectedOptions($product['selected_options']);
         }
 
@@ -154,6 +153,9 @@ public function process($request)
         if (!$cart->getIsVirtual()) {
             $shippingAddressData = $this->applepayModel->processAddressFromWallet($wallet, 'shipping');
 
+            $cart->getShippingAddress()->addData($shippingAddressData);
+
+            $cart->setShippingAddress($cart->getShippingAddress());
 
             $shippingAddress = $this->quoteAddressFactory->create();
             $shippingAddress->addData($shippingAddressData);
@@ -168,27 +170,26 @@ public function process($request)
             }
             $this->quoteRepository->save($cart);
             //this delivery address is already assigned to the cart
-
             try {
                 $shippingMethods = $this->appleShippingMethod->getAvailableMethods($cart);
             } catch (\Exception $e) {
                 throw new \Exception(__('Unable to retrieve shipping methods.'));
             }
+            if (count($shippingMethods) == 0) {
+                return [];
 
-            foreach ($shippingMethods as $method) {
-                $shippingMethodsResult[] = [
-                    'carrier_title' => $method['carrier_title'],
-                    'price_incl_tax' => round($method['amount']['value'], 2),
-                    'method_code' => $method['carrier_code'] . '__SPLIT__' .  $method['method_code'],
-                    'method_title' => $method['method_title'],
-                ];
-            }
+            } else {
+
+                foreach ($shippingMethods as $shippingMethod) {
+                    $shippingMethodsResult[] = [
+                        'carrier_title' => $shippingMethod->getCarrierTitle(),
+                        'price_incl_tax' => round($shippingMethod->getAmount(), 2),
+                        'method_code' => $shippingMethod->getCarrierCode() . '_' .  $shippingMethod->getMethodCode(),
+                        'method_title' => $shippingMethod->getMethodTitle(),
+                    ];
+                }
 
-            if (!empty($shippingMethodsResult)) {
-                // Set the first available shipping method
                 $cart->getShippingAddress()->setShippingMethod($shippingMethodsResult[0]['method_code']);
-            } else {
-                throw new \Exception(__('No shipping methods are available for the provided address.'));
             }
         }
         $cart->setTotalsCollectedFlag(false);
@@ -198,13 +199,17 @@ public function process($request)
             $totals['discount'] = round($cart->getSubtotalWithDiscount() - $cart->getSubtotal(), 2);
         }
 
-
-
-        return [
+        $data = [
             'shipping_methods' => $shippingMethodsResult,
             'totals' => $totals
         ];
+
+        $this->quoteRepository->save($cart);
+        $this->cart->save();
+
+        return $data;
     }
+
     public function gatherTotals($address, $quoteTotals)
     {
         $shippingTotalInclTax = 0;

Service/Applepay/ShippingMethod.php

@@ -36,36 +36,32 @@ public function __construct(
         ExtensibleDataObjectConverter $dataObjectConverter,
         ShippingMethodConverter $shippingMethodConverter,
         TotalsCollector $totalsCollector
+
     ) {
         $this->dataObjectConverter = $dataObjectConverter;
         $this->shippingMethodConverter = $shippingMethodConverter;
         $this->totalsCollector = $totalsCollector;
+
     }
 
     public function getAvailableMethods($cart)
     {
         $address = $cart->getShippingAddress();
-
         $address->setLimitCarrier(null);
+
         $address->setQuote($cart);
         $address->setCollectShippingRates(true);
         $this->totalsCollector->collectAddressTotals($cart, $address);
-        $methods = [];
 
+        $methods = [];
         $shippingRates = $address->getGroupedAllShippingRates();
+
         foreach ($shippingRates as $carrierRates) {
             foreach ($carrierRates as $rate) {
-                $methodData = $this->dataObjectConverter->toFlatArray(
-                    $this->shippingMethodConverter->modelToDataObject($rate, $cart->getQuoteCurrencyCode()),
-                    [],
-                    ShippingMethodInterface::class
-                );
-                $methods[] = $this->processMoneyTypeData(
-                    $methodData,
-                    $cart->getQuoteCurrencyCode()
-                );
+                $methods[] = $this->shippingMethodConverter->modelToDataObject($rate, $cart->getQuoteCurrencyCode());
             }
         }
+
         return $methods;
     }
     private function processMoneyTypeData(array $data, string $quoteCurrencyCode): array
@@ -86,4 +82,4 @@ private function processMoneyTypeData(array $data, string $quoteCurrencyCode): a
         }
         return $data;
     }
-}
+}