fix

EscolaLMS · Jul 23, 2024 · c6eac70 · c6eac70
1 parent ae1386c
commit c6eac70
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/src/Services/Contracts/CouponServiceContract.php b/src/Services/Contracts/CouponServiceContract.php
@@ -55,7 +55,7 @@ public function cartContainsItemsNotExcludedFromCoupon(Coupon $coupon, Cart $car
     /**
      * @param Coupon $coupon
      * @param Cart $cart
-     * @return Collection<int, CartItem>
+     * @return Collection<int, \Treestoneit\ShoppingCart\Models\CartItem|CartItem>
      */
     public function cartItemsWithoutExcludedFromCoupon(Coupon $coupon, Cart $cart): Collection;
     public function cartItemIsExcludedFromCoupon(Coupon $coupon, CartItem $item): bool;

diff --git a/src/Services/CouponService.php b/src/Services/CouponService.php
@@ -251,7 +251,10 @@ public function cartContainsItemsIncludedInCoupon(Coupon $coupon, Cart $cart): b
      */
     public function cartItemsIncludedInCoupon(Coupon $coupon, Cart $cart): Collection
     {
-        return $cart->items->filter(fn (CartItem $item) => $this->cartItemIsIncludedInCoupon($coupon, $item));
+        /** @var Collection<int, CartItem|\EscolaLms\Vouchers\Models\CartItem> $items */
+        // @phpstan-ignore-next-line
+        $items = $cart->items->filter(fn (CartItem $item) => $this->cartItemIsIncludedInCoupon($coupon, $item));
+        return $items;
     }
 
     public function cartItemIsIncludedInCoupon(Coupon $coupon, CartItem $item): bool
@@ -277,11 +280,14 @@ public function cartContainsItemsNotExcludedFromCoupon(Coupon $coupon, Cart $car
     /**
      * @param Coupon $coupon
      * @param Cart $cart
-     * @return Collection<int, CartItem>
+     * @return Collection<int, CartItem|\EscolaLms\Vouchers\Models\CartItem>
      */
     public function cartItemsWithoutExcludedFromCoupon(Coupon $coupon, Cart $cart): Collection
     {
-        return $cart->items->filter(fn (CartItem $item) => !$this->cartItemIsExcludedFromCoupon($coupon, $item));
+        /** @var Collection<int, CartItem|\EscolaLms\Vouchers\Models\CartItem> $result */
+        // @phpstan-ignore-next-line
+        $result = $cart->items->filter(fn (CartItem $item) => !$this->cartItemIsExcludedFromCoupon($coupon, $item));
+        return $result;
     }
 
     public function cartItemIsExcludedFromCoupon(Coupon $coupon, CartItem $item): bool
@@ -291,6 +297,7 @@ public function cartItemIsExcludedFromCoupon(Coupon $coupon, CartItem $item): bo
 
     public function cartFulfilPromotionConditions(Coupon $coupon, Cart $cart): bool
     {
+        // @phpstan-ignore-next-line
         return !$coupon->exclude_promotions || $cart->items->filter(fn (CartItem $item) => $this->productOnPromotion($coupon, $item))->count() === 0;
     }
 

diff --git a/src/Services/OrderService.php b/src/Services/OrderService.php
@@ -15,6 +15,7 @@
 class OrderService extends BaseOrderService implements OrderServiceContract
 {
     /** @return Order */
+    // @phpstan-ignore-next-line
     public function find($id): Model
     {
         return Order::findOrFail($id);
@@ -28,9 +29,11 @@ public function createOrderFromCart(BaseCart $cart, ?ClientDetailsDto $clientDet
     public function createOrderFromCartManager(BaseCartManager $cartManager, ?ClientDetailsDto $clientDetailsDto = null): Order
     {
         if (!$cartManager instanceof CartManager) {
+            // @phpstan-ignore-next-line
             $cartManager = new CartManager($cartManager->getModel());
         }
         $order = parent::createOrderFromCartManager($cartManager, $clientDetailsDto);
+        /** @var Order $order */
         $order = $order instanceof Order ? $order : Order::find($order->getKey());
         $order->coupon_id = optional($cartManager->getCoupon())->getKey();
         $order->discount = $cartManager->additionalDiscount();

diff --git a/src/Strategies/CartPercentDiscountStrategy.php b/src/Strategies/CartPercentDiscountStrategy.php
@@ -20,6 +20,7 @@ public function calculateDiscountForItem(Cart $cart, CartItem $cartItem): int
         if (app(CouponServiceContract::class)->cartItemIsExcludedFromCoupon($this->coupon, $cartItem)) {
             return 0;
         }
+        // @phpstan-ignore-next-line
         return (int) round($this->coupon->amount * $cartItem->buyable->getBuyablePrice() / 100, 0);
     }
 }
diff --git a/src/Strategies/ProductFixedDiscountStrategy.php b/src/Strategies/ProductFixedDiscountStrategy.php
@@ -24,7 +24,7 @@ public function calculateDiscountForItem(Cart $cart, CartItem $cartItem): int
         $itemValue = $cartItem->basePrice * $tax;
         $discount = $itemValue < $this->coupon->amount ? $itemValue : $this->coupon->amount;
         if ($discount === $itemValue) {
-            return $cartItem->basePrice;
+            return (int) $cartItem->basePrice;
         }
         return (int) round($discount / $tax, 0);
     }

diff --git a/src/Strategies/ProductPercentDiscountStrategy.php b/src/Strategies/ProductPercentDiscountStrategy.php
@@ -20,6 +20,7 @@ public function calculateDiscountForItem(Cart $cart, CartItem $cartItem): int
         if (!app(CouponServiceContract::class)->cartItemIsIncludedInCoupon($this->coupon, $cartItem)) {
             return 0;
         }
+        // @phpstan-ignore-next-line
         return (int) round($this->coupon->amount * $cartItem->buyable->getBuyablePrice() / 100, 0);
     }
 }