Bugfix'es: #45 and #52 plus bug with radio input values fix

Author: ModestasV

composer.json

@@ -12,7 +12,7 @@
       "email": "[email protected]"
     }
   ],
-  "version": "1.1.5",
+  "version": "1.1.6",
   "require": {
     "laravelcollective/html": "5.2.*",
     "intervention/image": "^2.3",

src/Builders/ModelBuilder.php

@@ -283,7 +283,11 @@ private function datetimepickers()
      */
     public function set' . $camel . 'Attribute($input)
     {
-        $this->attributes[\'' . $field->title . '\'] = Carbon::createFromFormat(config(\'quickadmin.date_format\') . \' \' . config(\'quickadmin.time_format\'), $input)->format(\'Y-m-d H:i:s\');
+        if($input != \'\') {
+            $this->attributes[\'' . $field->title . '\'] = Carbon::createFromFormat(config(\'quickadmin.date_format\') . \' \' . config(\'quickadmin.time_format\'), $input)->format(\'Y-m-d H:i:s\');
+        }else{
+            $this->attributes[\'' . $field->title . '\'] = \'\';
+        }
     }
 
     /**
@@ -294,7 +298,11 @@ public function set' . $camel . 'Attribute($input)
      */
     public function get' . $camel . 'Attribute($input)
     {
-        return Carbon::createFromFormat(\'Y-m-d H:i:s\', $input)->format(config(\'quickadmin.date_format\') . \' \' .config(\'quickadmin.time_format\'));
+        if($input != \'0000-00-00\') {
+            return Carbon::createFromFormat(\'Y-m-d H:i:s\', $input)->format(config(\'quickadmin.date_format\') . \' \' .config(\'quickadmin.time_format\'));
+        }else{
+            return \'\';
+        }
     }' . "\r\n\r\n";
             }
         }

src/Builders/ViewsBuilder.php

@@ -42,7 +42,7 @@ public function build()
         $this->fields   = $cached['fields'];
         $this->files    = $cached['files'];
         $this->names();
-        $template = (array) $this->loadTemplate();
+        $template = (array)$this->loadTemplate();
         $template = $this->buildParts($template);
         $this->publish($template);
     }
@@ -56,7 +56,7 @@ public function buildCustom($name)
             2 => ''
         ];
         $this->names();
-        $template = (array) $this->loadTemplate();
+        $template = (array)$this->loadTemplate();
         $this->publishCustom($template);
 
     }
@@ -141,7 +141,7 @@ private function buildTable()
         foreach ($this->fields as $field) {
             // Check if there is no duplication for radio and checkbox.
             // Password fields are excluded from the table too.
-            if (!in_array($field->title, $used)
+            if (! in_array($field->title, $used)
                 && $field->type != 'password'
                 && $field->type != 'textarea'
                 && $field->show == 1
@@ -173,12 +173,17 @@ private function buildEditForm()
         foreach ($this->fields as $field) {
             $title = $field->label;
             $label = $field->title;
-            if (in_array($field->validation, $this->starred) && $field->type != 'password' && $field->type != 'file' && $field->type != 'photo') {
+            if (in_array($field->validation,
+                    $this->starred) && $field->type != 'password' && $field->type != 'file' && $field->type != 'photo'
+            ) {
                 $title .= '*';
             }
             if ($field->type == 'relationship') {
                 $label = $field->relationship_name . '_id';
             }
+            if ($field->type == 'checkbox') {
+                $field->default = '$' . $this->model . '->' . $label . ' == 1';
+            }
             $temp = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'Templates' . DIRECTORY_SEPARATOR . 'fields' . DIRECTORY_SEPARATOR . $field->type);
             $temp = str_replace([
                 'old(\'$LABEL$\')',
@@ -195,7 +200,9 @@ private function buildEditForm()
                 'old(\'$LABEL$\',$' . $this->resource . '->' . $label . ')',
                 $label,
                 $title,
-                $field->value != '' ? ', "' . $field->value . '"' : '',
+                $field->type != 'radio' ?
+                    $field->value != '' ? ', "' . $field->value . '"' : ''
+                    : "'$field->value'",
                 $field->default,
                 '$' . $field->relationship_name,
                 $field->texteditor == 1 ? ' ckeditor' : '',
@@ -237,7 +244,9 @@ private function buildCreateForm()
             ], [
                 $key,
                 $title,
-                $field->value != '' ? ', ' . $field->value : '',
+                $field->type != 'radio' ?
+                    $field->value != '' ? ', ' . $field->value : ''
+                    : "'$field->value'",
                 $field->default,
                 '$' . $field->relationship_name,
                 $field->texteditor == 1 ? ' ckeditor' : '',
@@ -283,7 +292,7 @@ private function helper($value)
      */
     private function publish($template)
     {
-        if (!file_exists(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $this->path))) {
+        if (! file_exists(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $this->path))) {
             mkdir(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $this->path));
             chmod(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin'), 0777);
         }
@@ -297,7 +306,7 @@ private function publish($template)
 
     private function publishCustom($template)
     {
-        if (!file_exists(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $this->path))) {
+        if (! file_exists(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $this->path))) {
             mkdir(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR . $this->path));
             chmod(base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin'), 0777);
         }