[10.x] Added a receiving wallet to the transfer code

Author: rez1dent3

src/Services/EagerLoaderService.php

@@ -26,6 +26,11 @@ public function loadWalletsByBasket(Customer $customer, BasketDtoInterface $bask
         /** @var array<array-key, array<array-key, int|string>> $productGroupIds */
         $productGroupIds = [];
         foreach ($basketDto->items() as $index => $item) {
+            // If the wallet is installed, then there is no need for lazy loading
+            if ($item->getReceiving() !== null) {
+                continue;
+            }
+
             $model = $this->castService->getModel($item->getProduct());
             if (! $model->relationLoaded('wallet')) {
                 $products[$index] = $item->getProduct();

src/Services/PrepareService.php

@@ -14,6 +14,7 @@
 use Bavix\Wallet\Internal\Dto\TransferLazyDtoInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
 use Bavix\Wallet\Models\Transaction;
+use Bavix\Wallet\Models\Wallet as WalletModel;
 
 /**
  * @internal
@@ -89,21 +90,39 @@ public function transferLazy(
         string $status,
         float|int|string $amount,
         ExtraDtoInterface|array|null $meta = null
+    ): TransferLazyDtoInterface {
+        return $this->transferExtraLazy(
+            $from,
+            $this->castService->getWallet($from),
+            $to,
+            $this->castService->getWallet($to),
+            $status,
+            $amount,
+            $meta
+        );
+    }
+
+    public function transferExtraLazy(
+        Wallet $from,
+        WalletModel $fromWallet,
+        Wallet $to,
+        WalletModel $toWallet,
+        string $status,
+        float|int|string $amount,
+        ExtraDtoInterface|array|null $meta = null
     ): TransferLazyDtoInterface {
         $discount = $this->personalDiscountService->getDiscount($from, $to);
-        $toWallet = $this->castService->getWallet($to);
-        $from = $this->castService->getWallet($from);
         $fee = $this->taxService->getFee($to, $amount);
 
         $amountWithoutDiscount = $this->mathService->sub($amount, $discount, $toWallet->decimal_places);
         $depositAmount = $this->mathService->compare($amountWithoutDiscount, 0) === -1 ? '0' : $amountWithoutDiscount;
-        $withdrawAmount = $this->mathService->add($depositAmount, $fee, $from->decimal_places);
+        $withdrawAmount = $this->mathService->add($depositAmount, $fee, $fromWallet->decimal_places);
         $extra = $this->extraDtoAssembler->create($meta);
         $withdrawOption = $extra->getWithdrawOption();
         $depositOption = $extra->getDepositOption();
 
         $withdraw = $this->withdraw(
-            $from,
+            $fromWallet,
             $withdrawAmount,
             $withdrawOption->getMeta(),
             $withdrawOption->isConfirmed(),
@@ -119,7 +138,7 @@ public function transferLazy(
         );
 
         return $this->transferLazyDtoAssembler->create(
-            $from,
+            $fromWallet,
             $toWallet,
             $discount,
             $fee,

src/Services/PrepareServiceInterface.php

@@ -9,6 +9,7 @@
 use Bavix\Wallet\Interfaces\Wallet;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferLazyDtoInterface;
+use Bavix\Wallet\Models\Wallet as WalletModel;
 
 /**
  * @api
@@ -53,4 +54,19 @@ public function transferLazy(
         float|int|string $amount,
         ExtraDtoInterface|array|null $meta = null
     ): TransferLazyDtoInterface;
+
+    /**
+     * @param ExtraDtoInterface|array<mixed>|null $meta
+     *
+     * @throws AmountInvalid
+     */
+    public function transferExtraLazy(
+        Wallet $from,
+        WalletModel $fromWallet,
+        Wallet $to,
+        WalletModel $toWallet,
+        string $status,
+        float|int|string $amount,
+        ExtraDtoInterface|array|null $meta = null
+    ): TransferLazyDtoInterface;
 }

src/Traits/CartPay.php

@@ -65,16 +65,21 @@ public function payFreeCart(CartInterface $cart): array
             app(ConsistencyServiceInterface::class)->checkPotential($this, 0, true);
 
             $transfers = [];
+            $castService = app(CastServiceInterface::class);
             $prepareService = app(PrepareServiceInterface::class);
             $assistantService = app(AssistantServiceInterface::class);
-            foreach ($basketDto->cursor() as $product) {
-                $transfers[] = $prepareService->transferLazy(
-                    $this,
-                    $product,
-                    Transfer::STATUS_PAID,
-                    0,
-                    $assistantService->getMeta($basketDto, $product)
-                );
+            foreach ($basketDto->items() as $item) {
+                foreach ($item->getItems() as $product) {
+                    $transfers[] = $prepareService->transferExtraLazy(
+                        $this,
+                        $castService->getWallet($this),
+                        $product,
+                        $castService->getWallet($item->getReceiving() ?? $product),
+                        Transfer::STATUS_PAID,
+                        0,
+                        $assistantService->getMeta($basketDto, $product)
+                    );
+                }
             }
 
             assert($transfers !== []);
@@ -134,9 +139,11 @@ public function payCart(CartInterface $cart, bool $force = false): array
                         $pricePerItem = $prices[$productId];
                     }
 
-                    $transfers[] = $prepareService->transferLazy(
+                    $transfers[] = $prepareService->transferExtraLazy(
                         $this,
+                        $castService->getWallet($this),
                         $product,
+                        $castService->getWallet($item->getReceiving() ?? $product),
                         Transfer::STATUS_PAID,
                         $pricePerItem,
                         $assistantService->getMeta($basketDto, $product)