Preparing for multiple settings input types

Resources/views/admin/module-settings.blade.php

@@ -25,13 +25,27 @@
                     </ul>
                     <div class="tab-content">
                         <div class="tab-pane {{ App::getLocale() == 'en' ? 'active' : '' }}" id="tab_1-1">
-                            <?php foreach($moduleSettings as $moduleInfo): ?>
-                                @include("setting::admin.partials.module-{$moduleInfo['type']}-field", ['lang' => 'en', 'moduleSettings' => $moduleSettings, 'settings' => $settings, 'module' => $module])
+                            <?php foreach($moduleSettings as $settingName => $moduleInfo): ?>
+                                @include("setting::admin.partials.module-{$moduleInfo['type']}-field", [
+                                    'lang' => 'en',
+                                    'moduleSettings' => $moduleSettings,
+                                    'settings' => $settings,
+                                    'module' => $module,
+                                    'setting' => $settingName,
+                                    'moduleInfo' => $moduleInfo,
+                                ])
                             <?php endforeach; ?>
                         </div>
                         <div class="tab-pane {{ App::getLocale() == 'fr' ? 'active' : '' }}" id="tab_2-2">
-                            <?php foreach($moduleSettings as $moduleInfo): ?>
-                                @include("setting::admin.partials.module-{$moduleInfo['type']}-field", ['lang' => 'fr', 'moduleSettings' => $moduleSettings, 'settings' => $settings, 'module' => $module])
+                            <?php foreach($moduleSettings as $settingName => $moduleInfo): ?>
+                                @include("setting::admin.partials.module-{$moduleInfo['type']}-field", [
+                                    'lang' => 'fr',
+                                    'moduleSettings' => $moduleSettings,
+                                    'settings' => $settings,
+                                    'module' => $module,
+                                    'setting' => $settingName,
+                                    'moduleInfo' => $moduleInfo,
+                                ])
                             <?php endforeach; ?>
                         </div>
                     </div>

Resources/views/admin/partials/module-checkbox-field.blade.php

+<?php $settingName = $module . '_' . $setting; ?>
+<div class='form-group'>
+    {!! Form::label($settingName . "[$lang]", $moduleInfo['description']) !!}
+    <?php if (isset($settings[$settingName])): ?>
+        {!! Form::text($settingName . "[$lang]", Input::old($settingName . "[$lang]", $settings[$settingName]->translate($lang)->value), ['class' => 'form-control', 'placeholder' => $moduleInfo['description']]) !!}
+    <?php else: ?>
+        {!! Form::text($settingName . "[$lang]", Input::old($settingName . "[$lang]"), ['class' => 'form-control', 'placeholder' => $moduleInfo['description']]) !!}
+    <?php endif; ?>
+</div>

Resources/views/admin/partials/module-text-field.blade.php

-<?php foreach($moduleSettings as $setting => $moduleInfo): ?>
-    <?php $settingName = $module . '_' . $setting; ?>
-    <div class='form-group'>
-        {!! Form::label($settingName . "[$lang]", $moduleInfo['description']) !!}
-        <?php if (isset($settings[$settingName])): ?>
-            {!! Form::text($settingName . "[$lang]", Input::old($settingName . "[$lang]", $settings[$settingName]->translate($lang)->value), ['class' => 'form-control', 'placeholder' => $moduleInfo['description']]) !!}
-        <?php else: ?>
-            {!! Form::text($settingName . "[$lang]", Input::old($settingName . "[$lang]"), ['class' => 'form-control', 'placeholder' => $moduleInfo['description']]) !!}
-        <?php endif; ?>
-    </div>
-<?php endforeach; ?>
+<?php $settingName = $module . '_' . $setting; ?>
+<div class='form-group'>
+    {!! Form::label($settingName . "[$lang]", $moduleInfo['description']) !!}
+    <?php if (isset($settings[$settingName])): ?>
+        {!! Form::text($settingName . "[$lang]", Input::old($settingName . "[$lang]", $settings[$settingName]->translate($lang)->value), ['class' => 'form-control', 'placeholder' => $moduleInfo['description']]) !!}
+    <?php else: ?>
+        {!! Form::text($settingName . "[$lang]", Input::old($settingName . "[$lang]"), ['class' => 'form-control', 'placeholder' => $moduleInfo['description']]) !!}
+    <?php endif; ?>
+</div>