Small fixes

Author: Jade-GG

src/Models/AbstractAttribute.php

@@ -35,15 +35,15 @@ protected function value(): Attribute
     {
         return Attribute::get(function ($value) {
             if ($this->frontend_input === 'select') {
-                return $this->options[$value]?->value ?? $this->castAttribute('value', $value);
+                return $this->options[$value]?->value ?? $value;
             }
 
             $class = config('rapidez.attribute-models')[$this->backend_model] ?? null;
             if ($class) {
                 return $class::value($value, $this);
             }
 
-            return $this->castAttribute('value', $value);
+            return array_key_exists('value', $this->getCasts()) ? $this->castAttribute('value', $value) : $value;
         });
     }
 }

src/Models/Scopes/Product/ForCurrentWebsiteScope.php

@@ -10,7 +10,7 @@ class ForCurrentWebsiteScope implements Scope
 {
     public function apply(Builder $builder, Model $model)
     {
-        $builder->leftJoin('catalog_product_website', 'product_id', '=', $model->getQualifiedKeyName());
+        $builder->leftJoin('catalog_product_website', 'catalog_product_website.product_id', '=', $model->getQualifiedKeyName());
         $builder->where('website_id', config('rapidez.website'));
     }
 }

src/Models/Traits/HasCustomAttributes.php

@@ -99,7 +99,7 @@ public function hasManyWithAttributeTypeTable($class, $type, $foreignKey = null,
     public function customAttributes(): Attribute
     {
         return Attribute::get(function () {
-            if (@! $this->attributeDatetime) {
+            if (!$this->relationLoaded('attributeDatetime')) {
                 return collect();
             }