refs #1075

resources/views/partials/admin/content.blade.php

@@ -6,26 +6,5 @@
 
         @stack('content_content_end')
         <notifications></notifications>
-
-        <akaunting-modal
-            v-if="addNew.modal"
-            :show="addNew.modal"
-            :title="addNew.title"
-            :message="addNew.html">
-
-            <template #card-footer>
-                <div class="float-right">
-                    <button type="button" class="btn btn-outline-secondary" @click="onCancelNewItem()">
-                        <span>{{ trans('general.cancel') }}</span>
-                    </button>
-    
-                    <button type="button" class="btn btn-success button-submit" @click="onNewItemSubmit()">
-                        <div class="aka-loader d-none"></div>
-                        <span>{{ trans('general.confirm') }}</span>
-                    </button>
-                </div>
-            </template>
-    
-        </akaunting-modal>
     </div>
 @stack('content_end')

resources/views/partials/auth/head.blade.php

@@ -36,7 +36,7 @@
     <script type="text/javascript"><!--
         window.Laravel = <?php echo json_encode([
             'csrfToken' => csrf_token(),
-        ]); ?>
+        ]); ?>;
 
         var aka_currency = 'false';
 

resources/views/partials/form/multi_select_add_new_group.blade.php

@@ -10,15 +10,16 @@
     :value="{{ json_encode(old($name, $selected)) }}"
     :icon="'{{ $icon }}'"
     :multiple="true"
-    :add-new="true"
-    :add-new-text="'{{ trans('general.form.add_new', ['field' => $text]) }}'"
+    :add-new="{{ json_encode([
+        'status' => true,
+        'text' => trans('general.form.add_new', ['field' => $text]),
+        'path' => isset($attributes['path']) ? $attributes['path']: false,
+        'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
+        'field' => isset($attributes['field']) ? $attributes['field'] : 'name'
+    ])}}"
     @if (!empty($attributes['collapse']))
     :collapse="true"
     @endif
-    @if (!empty($attributes['path']))
-    :add-new-path="'{{ $attributes['path'] }}'"
-    @endif
-    @new_item="onNewItem($event)"
     @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : 'form.' . $name . ' = $event' }}"
     @if (!empty($attributes['change']))
     @change="{{ $attributes['change'] }}($event)"

resources/views/partials/form/select_add_new_group.blade.php

@@ -8,13 +8,14 @@
         :options="{{ json_encode($values) }}"
         :value="'{{ old($name, $selected) }}'"
         :icon="'{{ $icon }}'"
-        :add-new="true"
-        :add-new-text="'{{ trans('general.form.add_new', ['field' => $text]) }}'"
-        @if (!empty($attributes['path']))
-        :add-new-path="'{{ $attributes['path'] }}'"
-        @endif
-        @new_item="onNewItem($event)"
-        @interface="form.{{ $name }} = $event"
+        :add-new="{{ json_encode([
+            'status' => true,
+            'text' => trans('general.form.add_new', ['field' => $text]),
+            'path' => isset($attributes['path']) ? $attributes['path']: false,
+            'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
+            'field' => isset($attributes['field']) ? $attributes['field'] : 'name'
+        ])}}"
+        @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : 'form.' . $name . ' = $event' }}"
         @if (!empty($attributes['change']))
         @change="{{ $attributes['change'] }}($event)"
         @endif

resources/views/partials/form/select_group_add_new_group.blade.php

@@ -8,10 +8,15 @@
         :options="{{ json_encode($values) }}"
         :value="'{{ old($name, $selected) }}'"
         :icon="'{{ $icon }}'"
-        :add-new="true"
-        :add-new-text="'{{ trans('general.form.add_new', ['field' => $text]) }}'"
+        :add-new="{{ json_encode([
+            'status' => true,
+            'text' => trans('general.form.add_new', ['field' => $text]),
+            'path' => isset($attributes['path']) ? $attributes['path']: false,
+            'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
+            'field' => isset($attributes['field']) ? $attributes['field'] : 'name'
+        ])}}"
         :group="true"
-        @interface="form.{{ $name }} = $event"
+        @interface="{{ !empty($attributes['v-model']) ? $attributes['v-model'] . ' = $event' : 'form.' . $name . ' = $event' }}"
         @if (!empty($attributes['change']))
         @change="{{ $attributes['change'] }}($event)"
         @endif

resources/views/partials/portal/content.blade.php

@@ -6,12 +6,5 @@
 
         @stack('content_content_end')
         <notifications></notifications>
-
-        <akaunting-modal
-            v-if="addNew.modal"
-            :show="addNew.modal"
-            :title="addNew.title"
-            :message="addNew.html">
-        </akaunting-modal>
     </div>
 @stack('content_end')

resources/views/partials/signed/content.blade.php

@@ -19,12 +19,5 @@
 
         @stack('content_content_end')
         <notifications></notifications>
-
-        <akaunting-modal
-            v-if="addNew.modal"
-            :show="addNew.modal"
-            :title="addNew.title"
-            :message="addNew.html">
-        </akaunting-modal>
     </div>
 @stack('content_end')

resources/views/partials/wizard/content.blade.php

@@ -15,11 +15,4 @@
     @stack('content_content_end')
 
     <notifications></notifications>
-
-    <akaunting-modal
-        v-if="addNew.modal"
-        :show="addNew.modal"
-        :title="addNew.title"
-        :message="addNew.html">
-    </akaunting-modal>
 @stack('content_end')