Merge branch '1.2-dev' of github.com:akaunting/akaunting into 1.2-dev

public/css/app.css

@@ -600,3 +600,7 @@ input[type="number"] {
     margin-top: 6px;
     margin-left: -20px;
 }
+
+.user.user-menu, .user.user-menu a.dropdown-toggle {
+    min-height: 50px;
+}

resources/views/auth/users/create.blade.php

@@ -18,7 +18,19 @@
 
             {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('general.default_locale')) }}
 
-            {{ Form::fileGroup('picture',  trans_choice('general.pictures', 1)) }}
+            @if (setting('general.use_gravatar', '0') == '1')
+                {{ Form::hidden('picture',  trans_choice('general.pictures', 1)) }}
+                <div class="form-group col-md-6">
+                    {!! Form::label('picture', trans_choice('general.pictures', 1), ['class' => 'control-label']) !!}
+                    <div class="input-group">
+                        <div class="input-group-addon"><i class="fa fa-picture-o"></i></div>
+                        {!! Form::text('fake_picture', null, ['id' => 'fake_picture', 'class' => 'form-control', 'disabled' => 'disabled', 'placeholder' => trans('settings.appearance.use_gravatar')]) !!}
+                        {!! Form::hidden('picture', null, ['id' => 'picture', 'class' => 'form-control']) !!}
+                    </div>
+                </div>
+            @else
+                {{ Form::fileGroup('picture',  trans_choice('general.pictures', 1)) }}
+            @endif
 
             @permission('read-companies-companies')
             {{ Form::checkboxGroup('companies', trans_choice('general.companies', 2), $companies, 'company_name') }}
@@ -60,11 +72,13 @@
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.languages', 1)]) }}"
             });
 
+            @if (setting('general.use_gravatar', '0') != '1')
             $('#picture').fancyfile({
                 text  : '{{ trans('general.form.select.file') }}',
                 style : 'btn-default',
                 placeholder : '{{ trans('general.form.no_file_selected') }}'
             });
+            @endif
 
             $('input[type=checkbox]').iCheck({
                 checkboxClass: 'icheckbox_square-green',

resources/views/auth/users/edit.blade.php

@@ -23,7 +23,18 @@
 
             {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed()) }}
 
-            {{ Form::fileGroup('picture',  trans_choice('general.pictures', 1)) }}
+            @if (setting('general.use_gravatar', '0') == '1')
+            <div class="form-group col-md-6">
+                {!! Form::label('picture', trans_choice('general.pictures', 1), ['class' => 'control-label']) !!}
+                <div class="input-group">
+                    <div class="input-group-addon"><i class="fa fa-picture-o"></i></div>
+                    {!! Form::text('fake_picture', null, ['id' => 'fake_picture', 'class' => 'form-control', 'disabled' => 'disabled', 'placeholder' => trans('settings.appearance.use_gravatar')]) !!}
+                    {!! Form::hidden('picture', null, ['id' => 'picture', 'class' => 'form-control']) !!}
+                </div>
+            </div>
+            @else
+                {{ Form::fileGroup('picture',  trans_choice('general.pictures', 1)) }}
+            @endif
 
             @permission('read-companies-companies')
             {{ Form::checkboxGroup('companies', trans_choice('general.companies', 2), $companies, 'company_name') }}
@@ -68,6 +79,7 @@
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.languages', 1)]) }}"
             });
 
+            @if (setting('general.use_gravatar', '0') != '1')
             $('#picture').fancyfile({
                 text  : '{{ trans('general.form.select.file') }}',
                 style : 'btn-default',
@@ -98,6 +110,7 @@
                     confirmDelete("#picture-{!! $user->picture->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $user->picture->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete')  !!}");
                 });
             @endif
+            @endif
 
             $('input[type=checkbox]').iCheck({
                 checkboxClass: 'icheckbox_square-green',

resources/views/auth/users/index.blade.php

@@ -43,8 +43,12 @@
                     <tr>
                         <td>
                             <a href="{{ url('auth/users/' . $item->id . '/edit') }}">
+                                @if (setting('general.use_gravatar', '0') == '1')
+                                    <img src="{{ $item->picture }}" class="users-image" alt="{{ $item->name }}" title="{{ $item->name }}">
+                                @else
                                 @if ($item->picture)
-                                <img src="{{ Storage::url($item->picture->id) }}" class="users-image" alt="{{ $item->name }}" title="{{ $item->name }}">
+                                    <img src="{{ Storage::url($item->picture->id) }}" class="users-image" alt="{{ $item->name }}" title="{{ $item->name }}">
+                                @endif
                                 @endif
                                 {{ $item->name }}
                             </a>

resources/views/items/items/create.blade.php

@@ -22,7 +22,17 @@
 
             {{ Form::selectGroup('tax_id', trans_choice('general.taxes', 1), 'percent', $taxes, setting('general.default_tax'), []) }}
 
-            {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories, null, []) }}
+            <div class="form-group col-md-6 required {{ $errors->has('category_id') ? 'has-error' : ''}}">
+                {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
+                <div class="input-group">
+                    <div class="input-group-addon"><i class="fa fa-folder-open-o"></i></div>
+                    {!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!}
+                    <div class="input-group-btn">
+                        <button type="button" onclick="createCategory();" class="btn btn-default btn-icon"><i class="fa fa-plus"></i></button>
+                    </div>
+                </div>
+                {!! $errors->first('category_id', '<p class="help-block">:message</p>') !!}
+            </div>
 
             {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }}
 
@@ -41,10 +51,12 @@
 
 @push('js')
     <script src="{{ asset('public/js/bootstrap-fancyfile.js') }}"></script>
+    <script src="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.js') }}"></script>
 @endpush
 
 @push('css')
     <link rel="stylesheet" href="{{ asset('public/css/bootstrap-fancyfile.css') }}">
+    <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/colorpicker/bootstrap-colorpicker.css') }}">
 @endpush
 
 @push('scripts')
@@ -71,5 +83,89 @@
                 placeholder : '{{ trans('general.form.no_file_selected') }}'
             });
         });
+
+        function createCategory() {
+            $('#modal-create-category').remove();
+
+            modal  = '<div class="modal fade" id="modal-create-category" style="display: none;">';
+            modal += '  <div class="modal-dialog  modal-lg">';
+            modal += '      <div class="modal-content">';
+            modal += '          <div class="modal-header">';
+            modal += '              <h4 class="modal-title">{{ trans('general.title.new', ['type' => trans_choice('general.categories', 1)]) }}</h4>';
+            modal += '          </div>';
+            modal += '          <div class="modal-body">';
+            modal += '              {!! Form::open(['id' => 'form-create-category', 'role' => 'form']) !!}';
+            modal += '              <div class="row">';
+            modal += '                  <div class="form-group col-md-6 required">';
+            modal += '                      <label for="name" class="control-label">{{ trans('general.name') }}</label>';
+            modal += '                      <div class="input-group">';
+            modal += '                          <div class="input-group-addon"><i class="fa fa-id-card-o"></i></div>';
+            modal += '                          <input class="form-control" placeholder="{{ trans('general.name') }}" required="required" name="name" type="text" id="name">';
+            modal += '                      </div>';
+            modal += '                  </div>';
+            modal += '                  <div class="form-group col-md-6 required">';
+            modal += '                      <label for="color" class="control-label">{{ trans('general.color') }}</label>';
+            modal += '                      <div  id="category-color-picker" class="input-group colorpicker-component">';
+            modal += '                          <div class="input-group-addon"><i></i></div>';
+            modal += '                          <input class="form-control" value="#00a65a" placeholder="{{ trans('general.color') }}" required="required" name="color" type="text" id="color">';
+            modal += '                      </div>';
+            modal += '                  </div>';
+            modal += '                  {!! Form::hidden('type', 'item', []) !!}';
+            modal += '                  {!! Form::hidden('enabled', '1', []) !!}';
+            modal += '              </div>';
+            modal += '              {!! Form::close() !!}';
+            modal += '          </div>';
+            modal += '          <div class="modal-footer">';
+            modal += '              <div class="pull-left">';
+            modal += '              {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' =>'button-create-category', 'class' => 'btn btn-success']) !!}';
+            modal += '              <button type="button" class="btn btn-default" data-dismiss="modal"><span class="fa fa-times-circle"></span> &nbsp;{{ trans('general.cancel') }}</button>';
+            modal += '              </div>';
+            modal += '          </div>';
+            modal += '      </div>';
+            modal += '  </div>';
+            modal += '</div>';
+
+            $('body').append(modal);
+
+            $('#category-color-picker').colorpicker();
+
+            $('#modal-create-category').modal('show');
+        }
+
+        $(document).on('click', '#button-create-category', function (e) {
+            $('#modal-create-category .modal-header').before('<span id="span-loading" style="position: absolute; height: 100%; width: 100%; z-index: 99; background: #6da252; opacity: 0.4;"><i class="fa fa-spinner fa-spin" style="font-size: 10em !important;margin-left: 35%;margin-top: 8%;"></i></span>');
+
+            $.ajax({
+                url: '{{ url("settings/categories/category") }}',
+                type: 'POST',
+                dataType: 'JSON',
+                data: $("#form-create-category").serialize(),
+                beforeSend: function () {
+                    $(".form-group").removeClass("has-error");
+                    $(".help-block").remove();
+                },
+                success: function(data) {
+                    $('#span-loading').remove();
+
+                    $('#modal-create-category').modal('hide');
+
+                    $("#category_id").append('<option value="' + data.id + '" selected="selected">' + data.name + '</option>');
+                    $("#category_id").select2('refresh');
+                },
+                error: function(error, textStatus, errorThrown) {
+                    $('#span-loading').remove();
+
+                    if (error.responseJSON.name) {
+                        $("input[name='name']").parent().parent().addClass('has-error');
+                        $("input[name='name']").parent().after('<p class="help-block">' + error.responseJSON.name + '</p>');
+                    }
+
+                    if (error.responseJSON.color) {
+                        $("input[name='color']").parent().parent().addClass('has-error');
+                        $("input[name='color']").parent().after('<p class="help-block">' + error.responseJSON.color + '</p>');
+                    }
+                }
+            });
+        });
     </script>
 @endpush