Fix issues when cart is empty or not saved

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.3 - 2021-01-06
+### Fixed
+- Fix issues when cart is empty or not saved
+
 ## 1.0.2 - 2019-08-02
 ### Fixed
 - Fix CP edit url not linking to the admin

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "ether/cart-notices",
   "description": "Automatically show notices based off cart details",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "craft-plugin",
   "license": "proprietary",
   "minimum-stability": "dev",

src/elements/db/NoticeQuery.php

@@ -196,14 +196,19 @@ protected function beforePrepare (): bool
 			$this->_lineItemProductIds($cart->lineItems)
 		);
 
+		if (empty($productIds))
+			$productIds = -1;
+
+		$cartId = $cart->id ?? -1;
+
 		$sql = <<<SQL
 [[cart-notices.type]] = :type4 AND 
 [[cart-notices.id]] IN (
 	SELECT [[np.noticeId]]
 	FROM {{%cart-notices_notice_product}} [[np]]
 	INNER JOIN {{%cart-notices}} [[cn]] ON [[cn.id]] = [[np.noticeId]]
 	INNER JOIN {{%commerce_variants}} [[cv]] ON [[np.productId]] = [[cv.productId]]
-	INNER JOIN {{%commerce_lineitems}} [[li]] ON [[li.purchasableId]] = [[cv.id]] AND [[li.orderId]] = '$cart->id'
+	INNER JOIN {{%commerce_lineitems}} [[li]] ON [[li.purchasableId]] = [[cv.id]] AND [[li.orderId]] = '$cartId'
 	WHERE [[np.productId]] IN ('$productIds')
 	AND ([[li.qty]] BETWEEN COALESCE([[cn.minQty]], 0) AND COALESCE([[cn.maxQty]], 99999999))
 )
@@ -225,6 +230,9 @@ protected function beforePrepare (): bool
 			$this->_lineItemPurchasableIds($cart->lineItems)
 		);
 
+		if (empty($purchasableIds))
+			$purchasableIds = -2;
+
 		$sql = <<<SQL
 [[cart-notices.type]] = :type5 AND
 [[cart-notices.id]] IN (