Merge pull request #3 from AuroraWebSoftware/all-shapes

All shapes
AuroraWebSoftware · Sep 30, 2024 · be51ea4 · be51ea4
2 parents 149b2f5 + 1298b06
commit be51ea4
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Traits/Flexy.php b/src/Traits/Flexy.php
@@ -162,13 +162,13 @@ public function flexy(): Attribute
                     $this->fields->_model_type = static::getModelType();
                     $this->fields->_model_id = $this->id;
 
-                    $values = Value::leftJoin('ff_shapes', 'ff_values.model_type', '=', 'ff_shapes.model_type')
-                        ->where(
-                            [
-                                'ff_values.model_type' => static::getModelType(),
-                                'ff_values.model_id' => $this->id,
-                            ]
-                        )->orderBy('ff_shapes.sort')->get();
+                    //                    leftJoin('ff_shapes', 'ff_values.model_type', '=', 'ff_shapes.model_type')
+                    $values = Value::where(
+                        [
+                            'ff_values.model_type' => static::getModelType(),
+                            'ff_values.model_id' => $this->id,
+                        ]
+                    )->get();
 
                     $values->each(function ($value) {
                         $this->fields[$value->field_name] =