Fix cart condition session (#109)

* feat(cart): enhance session key handling and item conversion logic

* feat: update method signatures to include type hints for better clarity

Author: sampoyigi

src/CartCondition.php

@@ -62,7 +62,10 @@ public function __construct(
          */
         protected $config = [])
     {
-        $this->setSessionKey(sprintf('%s.conditions.%s', array_get($this->config, 'cartInstance', 'default'), $this->name));
+        $this->setSessionKey(sprintf('cart-conditions.%s.%s',
+            array_get($this->config, 'cartInstance', 'default'),
+            array_get($this->config, 'name', $this->name),
+        ));
         $this->fillFromConfig($this->config);
     }
 
@@ -72,6 +75,7 @@ public function fillFromConfig($config): void
         $this->name = array_get($config, 'name', $this->name);
         $this->priority = array_get($config, 'priority', $this->priority);
         $this->removeable = array_get($config, 'removeable', $this->removeable);
+        $this->sessionKey = array_get($config, 'sessionKey', $this->sessionKey);
 
         if ($metaData = array_get($config, 'metaData')) {
             Session::put($this->getSessionKey(), $metaData);
@@ -287,6 +291,8 @@ public function toArray()
             'label' => $this->label,
             'priority' => $this->priority,
             'removeable' => $this->removeable,
+            'sessionKey' => $this->sessionKey,
+            'config' => $this->config,
             'metaData' => Session::get($this->getSessionKey(), []),
         ];
     }

src/CartItem.php

@@ -227,12 +227,8 @@ public function associate(mixed $model): static
 
     /**
      * Get an attribute from the cart item or get the associated model.
-     *
-     * @param string $attribute
-     *
-     * @return mixed
      */
-    public function __get($attribute)
+    public function __get(string $attribute): mixed
     {
         if ($attribute === 'subtotal') {
             return $this->subtotal();

src/Classes/CartConditionManager.php

@@ -24,7 +24,7 @@ class CartConditionManager
      */
     protected array $registeredCallbacks = [];
 
-    public function makeCondition($className, array $config = [])
+    public function makeCondition(string $className, array $config = [])
     {
         if (!array_key_exists($className, $this->registeredConditions ?? [])) {
             throw new LogicException(sprintf("The Cart Condition class '%s' has not been registered", $className));
@@ -74,7 +74,7 @@ public function registerConditions(array $conditions): void
         }
     }
 
-    public function registerCondition($className, $conditionInfo = null): void
+    public function registerCondition(string $className, $conditionInfo = null): void
     {
         if ($this->registeredConditions === null) {
             $this->registeredConditions = [];

src/Classes/CartManager.php

@@ -215,7 +215,7 @@ protected function loadCartConditions()
 
             $definition['cartInstance'] = $this->cart->currentInstance();
 
-            $className = array_get($definition, 'className');
+            $className = array_get($definition, 'className', '');
             $condition = $conditionManager->makeCondition($className, $definition);
 
             $this->cart->loadCondition($condition);

src/Concerns/ActsAsItemable.php

@@ -15,7 +15,9 @@ trait ActsAsItemable
      */
     public function toItem(): static
     {
-        return new static($this->toArray());
+        return new static(array_merge($this->toArray(), [
+            'cartInstance' => array_get($this->config, 'cartInstance', 'default'),
+        ]));
     }
 
     public static function isApplicableTo($cartItem) {}

src/Models/CartSettings.php

@@ -23,7 +23,7 @@ class CartSettings extends Model
     // Reference to field configuration
     public string $settingsFieldsConfig = 'cartsettings';
 
-    public function getConditionsAttribute($value)
+    public function getConditionsAttribute(?array $value)
     {
         $result = [];
         $registeredConditions = resolve(CartConditionManager::class)->listRegisteredConditions();

src/Models/Category.php

@@ -76,7 +76,7 @@ class Category extends Model
 
     public $relation = [
         'belongsTo' => [
-            'parent_cat' => [\Igniter\Cart\Models\Category::class, 'foreignKey' => 'parent_id', 'otherKey' => 'category_id'],
+            'parent_cat' => [Category::class, 'foreignKey' => 'parent_id', 'otherKey' => 'category_id'],
         ],
         'belongsToMany' => [
             'menus' => [Menu::class, 'table' => 'menu_categories'],