From a238805ae076b16dced3a7bddc47f2262c3f9f0b Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 24 Jun 2019 18:15:34 +0200
Subject: [PATCH] #2843

---
 src/app/Magic/Fields/BunchOfFields.php      |  2 +-
 src/resources/views/fields/bunch.blade.php  | 50 +++++++++++++++------
 src/resources/views/fields/button.blade.php |  3 ++
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/app/Magic/Fields/BunchOfFields.php b/src/app/Magic/Fields/BunchOfFields.php
index 68054b4..8c0128b 100644
--- a/src/app/Magic/Fields/BunchOfFields.php
+++ b/src/app/Magic/Fields/BunchOfFields.php
@@ -56,7 +56,7 @@ class BunchOfFields extends Field
                 $name .= '-_-' . $item;
             }
             $field->setAttribute('name', $name);
-            $crudfields[] = $field->getDefinition();
+            $crudfields[$name] = $field->getDefinition();
         }
         $this->setAttribute('bunchfields', $crudfields);
     }
diff --git a/src/resources/views/fields/bunch.blade.php b/src/resources/views/fields/bunch.blade.php
index cf4c688..4bd23aa 100644
--- a/src/resources/views/fields/bunch.blade.php
+++ b/src/resources/views/fields/bunch.blade.php
@@ -1,23 +1,41 @@
 <!-- Bunch -->
 
 <?php
+$empty = [];
+$value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $field['default'] ?? $empty;
+if ($value == '') {
+    $value = $empty;
+}
+
+if (is_string($value)) {
+    $value = json_decode($value, true);
+}
+
+foreach ($value as $k => $v) {
+    $ik=$field['name'].'___'.$k;
+    if (isset($field['bunchfields'][$ik])) {
+        $field['bunchfields'][$ik]['value'] = $v;
+    }
+}
 
 
 ?>
-<div class="bunch__wrapper col-xs-12">
-    <div @include('crud::inc.field_wrapper_attributes') >
-        <label>{!! $field['label'] !!}</label>
-        @include('crud::inc.field_translatable_icon')
-        <div class="clearfix"></div>
+<div class="bunch__margin col-xs-12">
+    <div class="bunch__wrapper col-xs-12">
+        <div @include('crud::inc.field_wrapper_attributes') >
+            <label>{!! $field['label'] !!}</label>
+            @include('crud::inc.field_translatable_icon')
+            <div class="clearfix"></div>
 
-        @include('cubist_back::inc.show_bunch_fields', array('bunchfields'=>$field['bunchfields']))
+            @include('cubist_back::inc.show_bunch_fields', array('bunchfields'=>$field['bunchfields']))
 
-        <div class="clearfix"></div>
+            <div class="clearfix"></div>
 
-        {{-- HINT --}}
-        @if (isset($field['hint']))
-            <p class="help-block">{!! $field['hint'] !!}</p>
-        @endif
+            {{-- HINT --}}
+            @if (isset($field['hint']))
+                <p class="help-block">{!! $field['hint'] !!}</p>
+            @endif
+        </div>
     </div>
 </div>
 
@@ -30,17 +48,23 @@
     {{-- FIELD CSS - will be loaded in the after_styles section --}}
     @push('crud_fields_styles')
         <style type="text/css">
+
+            .bunch__margin {
+                margin: 0;
+            }
+
             .bunch__wrapper {
                 padding: 15px;
                 border: 1px solid #eee;
                 background: #fafafa;
                 margin-bottom: 15px;
             }
-            .bunch__wrapper .form-group{
+
+            .bunch__wrapper .form-group {
                 padding: 0;
             }
 
-            .bunch__wrapper > .form-group > label{
+            .bunch__wrapper > .form-group > label {
                 font-size: 1.2em;
                 margin-bottom: 24px;
             }
diff --git a/src/resources/views/fields/button.blade.php b/src/resources/views/fields/button.blade.php
index da70ced..af2b323 100644
--- a/src/resources/views/fields/button.blade.php
+++ b/src/resources/views/fields/button.blade.php
@@ -11,6 +11,9 @@ $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $fie
 if ($value == '') {
     $value = [];
 }
+if (is_string($value)) {
+    $value = json_decode($value,true);
+}
 $value = array_merge($empty, $value);
 
 ?>
-- 
2.39.5