PurchaseService fix

Author: rez1dent3

changelog.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [9.0.1] - 2022-05-19
+### Fixed
+- Fixed a bug that prevented items from being returned via `Cart::withItem`
+
 ## [9.0.0] - 2022-05-02 [#481](https://github.com/bavix/laravel-wallet/pull/481)
 ### Added
 - ExtraDtoInterface #479
@@ -868,7 +872,8 @@ The operation is now executed in the transaction and updates the new `refund` fi
 - Exceptions: AmountInvalid, BalanceIsEmpty.
 - Models: Transfer, Transaction.
 
-[Unreleased]: https://github.com/bavix/laravel-wallet/compare/9.0.0...develop
+[Unreleased]: https://github.com/bavix/laravel-wallet/compare/9.0.1...develop
+[9.0.1]: https://github.com/bavix/laravel-wallet/compare/9.0.0...9.0.1
 [9.0.0]: https://github.com/bavix/laravel-wallet/compare/8.4.1...9.0.0
 [8.4.1]: https://github.com/bavix/laravel-wallet/compare/8.4.0...8.4.1
 [8.4.0]: https://github.com/bavix/laravel-wallet/compare/8.3.0...8.4.0

src/Services/PurchaseService.php

@@ -21,10 +21,17 @@ public function already(Customer $customer, BasketDtoInterface $basketDto, bool
             : [Transfer::STATUS_PAID];
 
         $arrays = [];
+        $wallets = [];
+        $productCounts = [];
         $query = $customer->transfers();
         foreach ($basketDto->items() as $itemDto) {
             $wallet = $this->castService->getWallet($itemDto->getProduct());
+            $wallets[$wallet->uuid] = $wallet;
 
+            $productCounts[$wallet->uuid] = ($productCounts[$wallet->uuid] ?? 0) + count($itemDto);
+        }
+
+        foreach ($wallets as $wallet) {
             /**
              * As part of my work, "with" was added, it gives a 50x boost for a huge number of returns. In this case,
              * it's a crutch. It is necessary to come up with a more correct implementation of the internal and external
@@ -36,7 +43,7 @@ public function already(Customer $customer, BasketDtoInterface $basketDto, bool
                 ->where('to_id', $wallet->getKey())
                 ->whereIn('status', $status)
                 ->orderBy('id', 'desc')
-                ->limit(count($itemDto))
+                ->limit($productCounts[$wallet->uuid])
                 ->get()
                 ->all()
             ;

tests/Units/Domain/ProductTest.php

@@ -290,6 +290,8 @@ public function testPayCustomPrice(): void
         self::assertSame(2, $cart->getQuantity($productIn));
         self::assertSame(0, $buyer->balanceInt);
         self::assertCount(2, $transfers);
+
+        self::assertTrue($buyer->refundCart($cart));
     }
 
     /**