Merge commit '9e9f8095'

* commit '9e9f8095':
  Squashed 'Modules/Setting/' changes from 56f557f5..7bcb95b

Modules/Setting/Repositories/Eloquent/EloquentSettingRepository.php

@@ -162,8 +162,23 @@ class EloquentSettingRepository extends EloquentBaseRepository implements Settin
      * @param string $module Module name
      * @return mixed
      */
-    private function findByModule($module)
+    public function findByModule($module)
     {
         return $this->model->where('name', 'LIKE', $module . '_%')->get();
     }
+
+    /**
+     * Find the given setting name for the given module
+     * @param $settingName
+     * @param $module
+     * @return mixed
+     */
+    public function findSettingForModule($settingName, $module = null)
+    {
+        if (is_null($module)) {
+            return $this->model->where('name', 'LIKE', "%{$settingName}")->first();
+        }
+
+        return $this->model->where('name', 'LIKE', "{$module}_{$settingName}")->first();
+    }
 }

Modules/Setting/Repositories/SettingRepository.php

@@ -32,4 +32,19 @@ interface SettingRepository extends BaseRepository
      * @return mixed
      */
     public function savedModuleSettings($module);
+
+    /**
+     * Find settings by module name
+     * @param string $module
+     * @return mixed
+     */
+    public function findByModule($module);
+
+    /**
+     * Find the given setting name for the given module
+     * @param $settingName
+     * @param $module
+     * @return mixed
+     */
+    public function findSettingForModule($settingName, $module = null);
 }

Modules/Setting/Resources/views/admin/partials/module-number-field.blade.php

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

Modules/Setting/Resources/views/admin/partials/module-radio-field.blade.php

+<?php $settingName = $module . '_' . $setting; ?>
+<div class="checkbox">
+    <?php foreach($moduleInfo['options'] as $value => $optionName): ?>
+        <label for="{{ $optionName . "[$lang]" }}">
+                <input id="{{ $optionName . "[$lang]" }}"
+                        name="{{ $settingName . "[$lang]" }}"
+                        type="radio"
+                        class="flat-blue"
+                        {{ isset($settings[$settingName]) && (bool)$settings[$settingName]->translate($lang)->value == $value ? 'checked' : '' }}
+                        value="{{ $value }}" />
+                {{ $optionName }}
+        </label>
+    <?php endforeach; ?>
+</div>