wip

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

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/Models/CartItem.php b/src/Models/CartItem.php
@@ -55,7 +55,7 @@ public function cart(): BelongsTo
         return $this->belongsTo(Cart::class);
     }
 
-    public function getSubtotalAttribute(): int
+    public function getSubtotalAttribute(): float
     {
         return parent::getSubtotalAttribute() - $this->discountSubtotal;
     }

diff --git a/src/Models/CouponCategory.php b/src/Models/CouponCategory.php
@@ -32,6 +32,9 @@ class CouponCategory extends Pivot
 {
     use HasTimestamps;
 
+    /**
+     * @var array<int, string>
+     */
     public $guarded = ['id'];
 
     protected $table = 'coupons_categories';
@@ -40,11 +43,17 @@ class CouponCategory extends Pivot
         'excluded' => 'bool'
     ];
 
+    /**
+     * @return BelongsTo<Coupon, self>
+     */
     public function coupon(): BelongsTo
     {
         return $this->belongsTo(Coupon::class);
     }
 
+    /**
+     * @return BelongsTo<Category, self>
+     */
     public function category(): BelongsTo
     {
         return $this->belongsTo(Category::class);

diff --git a/src/Services/Contracts/CouponServiceContract.php b/src/Services/Contracts/CouponServiceContract.php
@@ -43,7 +43,7 @@ public function cartContainsItemsIncludedInCoupon(Coupon $coupon, Cart $cart): b
     /**
      * @param Coupon $coupon
      * @param Cart $cart
-     * @return Collection<int, CartItem>
+     * @return Collection<int, \Treestoneit\ShoppingCart\Models\CartItem|CartItem>
      */
     public function cartItemsIncludedInCoupon(Coupon $coupon, Cart $cart): Collection;
     public function cartItemIsIncludedInCoupon(Coupon $coupon, CartItem $item): bool;

diff --git a/src/Services/CouponService.php b/src/Services/CouponService.php
@@ -247,7 +247,7 @@ public function cartContainsItemsIncludedInCoupon(Coupon $coupon, Cart $cart): b
     /**
      * @param Coupon $coupon
      * @param Cart $cart
-     * @return Collection<int, CartItem>
+     * @return Collection<int, CartItem|\EscolaLms\Vouchers\Models\CartItem>
      */
     public function cartItemsIncludedInCoupon(Coupon $coupon, Cart $cart): Collection
     {