Reimplemented forms, added an overdue fix.

app/Exceptions/FireflyException.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace FireflyIII\Exception;
+namespace FireflyIII\Exceptions;
 
 
 /**
  * Class FireflyException
  *
- * @package FireflyIII\Exception
+ * @package FireflyIII\Exceptions
  */
 class FireflyException extends \Exception
 {

app/Exceptions/NotImplementedException.php

@@ -1,11 +1,11 @@
 <?php
-namespace FireflyIII\Exception;
+namespace FireflyIII\Exceptions;
 
 
 /**
  * Class NotImplementedException
  *
- * @package FireflyIII\Exception
+ * @package FireflyIII\Exceptions
  */
 class NotImplementedException extends \Exception
 {

app/Exceptions/ValidationException.php

@@ -1,8 +1,8 @@
 <?php
-namespace FireflyIII\Exception;
+namespace FireflyIII\Exceptions;
 
 /**
- * Class ValidationException
+ * Class ValidationExceptions
  *
  * @package FireflyIII\Exception
  */

app/Http/Controllers/AccountController.php

@@ -3,6 +3,7 @@
 use Auth;
 use Config;
 use FireflyIII\Http\Requests;
+use FireflyIII\Http\Requests\AccountFormRequest;
 use Illuminate\Http\Request;
 use View;
 
@@ -19,6 +20,22 @@ class AccountController extends Controller
         View::share('title', 'Accounts');
     }
 
+    /**
+     * @param string $what
+     *
+     * @return \Illuminate\View\View
+     */
+    public function create($what = 'asset')
+    {
+        $subTitleIcon = Config::get('firefly.subTitlesByIdentifier.' . $what);
+        $subTitle     = 'Create a new ' . e($what) . ' account';
+
+        //\FireflyIII\Forms\Tags::ffAmount('12');
+
+        return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle'));
+
+    }
+
     public function index($what = 'default')
     {
         $subTitle     = Config::get('firefly.subTitlesByIdentifier.' . $what);
@@ -29,4 +46,9 @@ class AccountController extends Controller
         return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
     }
 
+    public function store(AccountFormRequest $request)
+    {
+
+    }
+
 }

app/Http/Requests/AccountFormRequest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+
+/**
+ * Class AccountFormRequest
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class AccountFormRequest extends Request
+{
+    public function authorize()
+    {
+        // Only allow logged in users
+        return Auth::check();
+    }
+
+    public function rules()
+    {
+        return [
+            'name'          => 'required|between:1,100|uniqueForUser:accounts,name',
+            'openingBalance' => 'required|numeric'
+        ];
+    }
+}

app/Http/routes.php

@@ -18,6 +18,9 @@ Route::group(
     Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
     Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
     Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
+    Route::post('/accounts/store', ['uses' => 'AccountController@store', 'as' => 'accounts.store']);
+//    Route::post('/accounts/update/{account}', ['uses' => 'AccountController@update', 'as' => 'accounts.update']);
+//    Route::post('/accounts/destroy/{account}', ['uses' => 'AccountController@destroy', 'as' => 'accounts.destroy']);
 
     /**
      * Bills Controller

app/Providers/FireflyServiceProvider.php

@@ -3,9 +3,22 @@
 namespace FireflyIII\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Validator;
+use FireflyIII\Validation\FireflyValidator;
 
+/**
+ * Class FireflyServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
 class FireflyServiceProvider extends ServiceProvider
 {
+    public function boot() {
+        Validator::resolver(function($translator, $data, $rules, $messages)
+        {
+            return new FireflyValidator($translator, $data, $rules, $messages);
+        });
+    }
     public function register()
     {
         $this->app->bind(
@@ -29,6 +42,11 @@ class FireflyServiceProvider extends ServiceProvider
             return new \FireflyIII\Support\Steam;
         }
         );
+        $this->app->bind(
+            'expandedform', function () {
+            return new \FireflyIII\Support\ExpandedForm;
+        }
+        );
     }
 
 }

app/Support/Amount.php

@@ -122,4 +122,12 @@ class Amount
 
         return $currency->code;
     }
+
+    public function getDefaultCurrency()
+    {
+        $currencyPreference = Prefs::get('currencyPreference', 'EUR');
+        $currency           = TransactionCurrency::whereCode($currencyPreference->data)->first();
+
+        return $currency;
+    }
 }

app/Support/ExpandedForm.php

@@ -0,0 +1,213 @@
+<?php
+
+namespace FireflyIII\Support;
+
+use Amount;
+use FireflyIII\Models\TransactionCurrency;
+use Illuminate\Support\MessageBag;
+use Input;
+use Session;
+use View;
+
+/**
+ * Class ExpandedForm
+ *
+ * @package FireflyIII\Support
+ */
+class ExpandedForm
+{
+
+    /**
+     * @param       $name
+     * @param null  $value
+     * @param array $options
+     *
+     * @return string
+     */
+    public function balance($name, $value = null, array $options = [])
+    {
+        $label           = $this->label($name, $options);
+        $options         = $this->expandOptionArray($name, $label, $options);
+        $classes         = $this->getHolderClasses($name);
+        $value           = $this->fillFieldValue($name, $value);
+        $options['step'] = 'any';
+        $defaultCurrency = isset($options['currency']) ? $options['currency'] : Amount::getDefaultCurrency();
+        $currencies      = TransactionCurrency::orderBy('code', 'ASC')->get();
+        $html            = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+    }
+
+    /**
+     * @param $name
+     * @param $options
+     *
+     * @return mixed
+     */
+    public function label($name, $options)
+    {
+        if (isset($options['label'])) {
+            return $options['label'];
+        }
+        $labels = ['amount_min'      => 'Amount (min)', 'amount_max' => 'Amount (max)', 'match' => 'Matches on', 'repeat_freq' => 'Repetition',
+                   'account_from_id' => 'Account from', 'account_to_id' => 'Account to', 'account_id' => 'Asset account', 'budget_id' => 'Budget'
+                   , 'piggy_bank_id' => 'Piggy bank'];
+
+
+        return isset($labels[$name]) ? $labels[$name] : str_replace('_', ' ', ucfirst($name));
+
+    }
+
+    /**
+     * @param       $name
+     * @param       $label
+     * @param array $options
+     *
+     * @return array
+     */
+    public function expandOptionArray($name, $label, array $options)
+    {
+        $options['class']        = 'form-control';
+        $options['id']           = 'ffInput_' . $name;
+        $options['autocomplete'] = 'off';
+        $options['placeholder']  = ucfirst($label);
+
+        return $options;
+    }
+
+    /**
+     * @param $name
+     *
+     * @return string
+     */
+    public function getHolderClasses($name)
+    {
+        /*
+       * Get errors, warnings and successes from session:
+       */
+        /** @var MessageBag $errors */
+        $errors = Session::get('errors');
+
+        /** @var MessageBag $successes */
+        $successes = Session::get('successes');
+
+        switch (true) {
+            case (!is_null($errors) && $errors->has($name)):
+                $classes = 'form-group has-error has-feedback';
+                break;
+            case (!is_null($successes) && $successes->has($name)):
+                $classes = 'form-group has-success has-feedback';
+                break;
+            default:
+                $classes = 'form-group';
+                break;
+        }
+
+        return $classes;
+    }
+
+    /**
+     * @param $name
+     * @param $value
+     *
+     * @return mixed
+     */
+    public function fillFieldValue($name, $value)
+    {
+        if (Session::has('preFilled')) {
+            $preFilled = \Session::get('preFilled');
+            $value     = isset($preFilled[$name]) && is_null($value) ? $preFilled[$name] : $value;
+        }
+        if (!is_null(Input::old($name))) {
+            $value = Input::old($name);
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param       $name
+     * @param int   $value
+     * @param null  $checked
+     * @param array $options
+     *
+     * @return string
+     */
+    public function checkbox($name, $value = 1, $checked = null, $options = [])
+    {
+        $options['checked'] = $checked === true ? true : null;
+        $label              = $this->label($name, $options);
+        $options            = $this->expandOptionArray($name, $label, $options);
+        $classes            = $this->getHolderClasses($name);
+        $value              = $this->fillFieldValue($name, $value);
+
+        unset($options['placeholder'], $options['autocomplete'], $options['class']);
+
+        $html = View::make('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+    }
+
+    /**
+     * @param       $name
+     * @param null  $value
+     * @param array $options
+     *
+     * @return string
+     */
+    public function date($name, $value = null, array $options = [])
+    {
+        $label   = $this->label($name, $options);
+        $options = $this->expandOptionArray($name, $label, $options);
+        $classes = $this->getHolderClasses($name);
+        $value   = $this->fillFieldValue($name, $value);
+        $html    = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+    }
+
+    /**
+     * @param $type
+     * @param $name
+     *
+     * @return string
+     */
+    public function optionsList($type, $name)
+    {
+        $previousValue = \Input::old('post_submit_action');
+        $previousValue = is_null($previousValue) ? 'store' : $previousValue;
+        $html          = \View::make('form.options', compact('type', 'name', 'previousValue'))->render();
+
+        return $html;
+    }
+
+    public function select($name, array $list = [], $selected = null, array $options = [])
+    {
+        $label    = $this->label($name, $options);
+        $options  = $this->expandOptionArray($name, $label, $options);
+        $classes  = $this->getHolderClasses($name);
+        $selected = $this->fillFieldValue($name, $selected);
+        $html     = \View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
+
+        return $html;
+    }
+
+    /**
+     * @param       $name
+     * @param null  $value
+     * @param array $options
+     *
+     * @return string
+     */
+    public function text($name, $value = null, array $options = [])
+    {
+        $label   = $this->label($name, $options);
+        $options = $this->expandOptionArray($name, $label, $options);
+        $classes = $this->getHolderClasses($name);
+        $value   = $this->fillFieldValue($name, $value);
+        $html    = View::make('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+
+    }
+}

app/Support/Facades/ExpandedForm.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace FireflyIII\Support\Facades;
+
+use Illuminate\Support\Facades\Facade;
+/**
+ * Class Amount
+ *
+ * @package FireflyIII\Support\Facades
+ */
+class ExpandedForm extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'expandedform';
+    }
+
+}

app/Validation/FireflyValidator.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace FireflyIII\Validation;
+
+use Illuminate\Validation\Validator;
+use DB;
+
+class FireflyValidator extends Validator
+{
+
+    public function validateUniqueForUser($attribute, $value, $parameters)
+    {
+        $count = DB::table($parameters[0])->where($parameters[1],$value)->count();
+        if($count == 0) {
+            return true;
+        }
+        return false;
+
+    }
+}
+