fix method "getMeta"

Author: rez1dent3

src/Services/AssistantService.php

@@ -4,8 +4,8 @@
 
 namespace Bavix\Wallet\Services;
 
-use Bavix\Wallet\Interfaces\CartInterface;
 use Bavix\Wallet\Interfaces\ProductInterface;
+use Bavix\Wallet\Internal\Dto\BasketDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferDtoInterface;
 use Bavix\Wallet\Internal\Service\MathServiceInterface;
@@ -47,19 +47,17 @@ public function getSums(array $transactions): array
         return array_filter($amounts, fn (string $amount): bool => $this->mathService->compare($amount, 0) !== 0);
     }
 
-    public function getMeta(CartInterface $cart, ProductInterface $product): ?array
+    public function getMeta(BasketDtoInterface $basketDto, ProductInterface $product): ?array
     {
-        $metaCart = $cart->getBasketDto()
-            ->meta()
-        ;
+        $metaBasket = $basketDto->meta();
         $metaProduct = $product->getMetaProduct();
 
         if ($metaProduct !== null) {
-            return array_merge($metaCart, $metaProduct);
+            return array_merge($metaBasket, $metaProduct);
         }
 
-        if ($metaCart !== []) {
-            return $metaCart;
+        if ($metaBasket !== []) {
+            return $metaBasket;
         }
 
         return null;

src/Services/AssistantServiceInterface.php

@@ -4,8 +4,8 @@
 
 namespace Bavix\Wallet\Services;
 
-use Bavix\Wallet\Interfaces\CartInterface;
 use Bavix\Wallet\Interfaces\ProductInterface;
+use Bavix\Wallet\Internal\Dto\BasketDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransactionDtoInterface;
 use Bavix\Wallet\Internal\Dto\TransferDtoInterface;
 
@@ -25,5 +25,5 @@ public function getUuids(array $objects): array;
      */
     public function getSums(array $transactions): array;
 
-    public function getMeta(CartInterface $cart, ProductInterface $product): ?array;
+    public function getMeta(BasketDtoInterface $basketDto, ProductInterface $product): ?array;
 }

src/Traits/CartPay.php

@@ -51,9 +51,10 @@ trait CartPay
     public function payFreeCart(CartInterface $cart): array
     {
         return app(AtomicServiceInterface::class)->block($this, function () use ($cart) {
+            $basketDto = $cart->getBasketDto();
             $basketService = app(BasketServiceInterface::class);
             $availabilityAssembler = app(AvailabilityDtoAssemblerInterface::class);
-            if (!$basketService->availability($availabilityAssembler->create($this, $cart->getBasketDto(), false))) {
+            if (!$basketService->availability($availabilityAssembler->create($this, $basketDto, false))) {
                 throw new ProductEnded(
                     app(TranslatorServiceInterface::class)->get('wallet::errors.product_stock'),
                     ExceptionInterface::PRODUCT_ENDED
@@ -65,13 +66,13 @@ public function payFreeCart(CartInterface $cart): array
             $transfers = [];
             $prepareService = app(PrepareServiceInterface::class);
             $assistantService = app(AssistantServiceInterface::class);
-            foreach ($cart->getBasketDto()->cursor() as $product) {
+            foreach ($basketDto->cursor() as $product) {
                 $transfers[] = $prepareService->transferLazy(
                     $this,
                     $product,
                     Transfer::STATUS_PAID,
                     0,
-                    $assistantService->getMeta($cart, $product)
+                    $assistantService->getMeta($basketDto, $product)
                 );
             }
 
@@ -116,6 +117,7 @@ public function payCart(CartInterface $cart, bool $force = false): array
             }
 
             $transfers = [];
+            $basketDto = $cart->getBasketDto();
             $prepareService = app(PrepareServiceInterface::class);
             $assistantService = app(AssistantServiceInterface::class);
             foreach ($cart->getBasketDto()->cursor() as $product) {
@@ -124,7 +126,7 @@ public function payCart(CartInterface $cart, bool $force = false): array
                     $product,
                     Transfer::STATUS_PAID,
                     $product->getAmountProduct($this),
-                    $assistantService->getMeta($cart, $product)
+                    $assistantService->getMeta($basketDto, $product)
                 );
             }
 
@@ -173,8 +175,9 @@ public function safeRefundCart(CartInterface $cart, bool $force = false, bool $g
     public function refundCart(CartInterface $cart, bool $force = false, bool $gifts = false): bool
     {
         return app(AtomicServiceInterface::class)->block($this, function () use ($cart, $force, $gifts) {
-            $transfers = app(PurchaseServiceInterface::class)->already($this, $cart->getBasketDto(), $gifts);
-            if (count($transfers) !== $cart->getBasketDto()->total()) {
+            $basketDto = $cart->getBasketDto();
+            $transfers = app(PurchaseServiceInterface::class)->already($this, $basketDto, $gifts);
+            if (count($transfers) !== $basketDto->total()) {
                 throw new ModelNotFoundException(
                     "No query results for model [{$this->transfers()
                         ->getMorphClass()}]",
@@ -188,14 +191,14 @@ public function refundCart(CartInterface $cart, bool $force = false, bool $gifts
             $transfers = array_values($transfers);
             $prepareService = app(PrepareServiceInterface::class);
             $assistantService = app(AssistantServiceInterface::class);
-            foreach ($cart->getBasketDto()->cursor() as $product) {
+            foreach ($basketDto->cursor() as $product) {
                 $transferIds[] = $transfers[$index]->getKey();
                 $objects[] = $prepareService->transferLazy(
                     $product,
                     $transfers[$index]->withdraw->wallet,
                     Transfer::STATUS_TRANSFER,
                     $transfers[$index]->deposit->amount,
-                    $assistantService->getMeta($cart, $product)
+                    $assistantService->getMeta($basketDto, $product)
                 );
 
                 ++$index;