Working on list status select

This commit is contained in:
Hillel Coren 2016-11-17 16:29:02 +02:00
parent de2825750d
commit fce46114bc
20 changed files with 78 additions and 21 deletions

View File

@ -45,6 +45,7 @@ class ClientController extends BaseController
'entityType' => ENTITY_CLIENT, 'entityType' => ENTITY_CLIENT,
'title' => trans('texts.clients'), 'title' => trans('texts.clients'),
'sortCol' => '4', 'sortCol' => '4',
'statuses' => Utils::trans(Client::$statuses),
'columns' => Utils::trans([ 'columns' => Utils::trans([
'checkbox', 'checkbox',
'client', 'client',

View File

@ -521,6 +521,10 @@ if (!defined('CONTACT_EMAIL')) {
define('MAX_NUM_VENDORS', 100); define('MAX_NUM_VENDORS', 100);
define('MAX_NUM_VENDORS_PRO', 20000); define('MAX_NUM_VENDORS_PRO', 20000);
define('STATUS_ACTIVE', 'active');
define('STATUS_ARCHIVED', 'archived');
define('STATUS_DELETED', 'deleted');
define('INVOICE_STATUS_DRAFT', 1); define('INVOICE_STATUS_DRAFT', 1);
define('INVOICE_STATUS_SENT', 2); define('INVOICE_STATUS_SENT', 2);
define('INVOICE_STATUS_VIEWED', 3); define('INVOICE_STATUS_VIEWED', 3);
@ -624,7 +628,7 @@ if (!defined('CONTACT_EMAIL')) {
define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'http://docs.invoiceninja.com/en/latest'));
define('NINJA_DATE', '2000-01-01'); define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '2.8.0' . env('NINJA_VERSION_SUFFIX')); define('NINJA_VERSION', '2.8.1' . env('NINJA_VERSION_SUFFIX'));
define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja')); define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));

View File

@ -31,6 +31,15 @@ class EntityModel extends Eloquent
*/ */
public static $notifySubscriptions = true; public static $notifySubscriptions = true;
/**
* @var array
*/
public static $statuses = [
STATUS_ACTIVE,
STATUS_ARCHIVED,
STATUS_DELETED,
];
/** /**
* @param null $context * @param null $context
* @return mixed * @return mixed

View File

@ -32,7 +32,8 @@
"nouislider": "~8.5.1", "nouislider": "~8.5.1",
"bootstrap-daterangepicker": "~2.1.24", "bootstrap-daterangepicker": "~2.1.24",
"sweetalert2": "^5.3.8", "sweetalert2": "^5.3.8",
"jSignature": "brinley/jSignature#^2.1.0" "jSignature": "brinley/jSignature#^2.1.0",
"select2": "select2-dist#^4.0.3"
}, },
"resolutions": { "resolutions": {
"jquery": "~1.11" "jquery": "~1.11"

View File

@ -62,6 +62,10 @@ elixir(function(mix) {
bowerDir + '/bootstrap-daterangepicker/daterangepicker.css' bowerDir + '/bootstrap-daterangepicker/daterangepicker.css'
], 'public/css/daterangepicker.css'); ], 'public/css/daterangepicker.css');
mix.styles([
bowerDir + '/select2/dist/css/select2.css'
], 'public/css/select2.css');
/** /**
* JS configuration * JS configuration
@ -80,6 +84,10 @@ elixir(function(mix) {
bowerDir + '/bootstrap-daterangepicker/daterangepicker.js' bowerDir + '/bootstrap-daterangepicker/daterangepicker.js'
], 'public/js/daterangepicker.min.js'); ], 'public/js/daterangepicker.min.js');
mix.scripts([
bowerDir + '/select2/dist/js/select2.js'
], 'public/js/select2.min.js');
mix.scripts([ mix.scripts([
bowerDir + '/jSignature/libs/jSignature.min.js' bowerDir + '/jSignature/libs/jSignature.min.js'
], 'public/js/jSignature.min.js'); ], 'public/js/jSignature.min.js');

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,21 @@
@extends('header') @extends('header')
@section('head')
@parent
<script src="{{ asset('js/select2.min.js') }}" type="text/javascript"></script>
<link href="{{ asset('css/select2.css') }}" rel="stylesheet" type="text/css"/>
<style type="text/css">
.select2-selection {
border: 1px solid #dfe0e1 !important;
border-radius: 2px;
padding: 2px;
}
</style>
@stop
@section('content') @section('content')
{!! Former::open(Utils::pluralizeEntityType($entityType) . '/bulk')->addClass('listForm') !!} {!! Former::open(Utils::pluralizeEntityType($entityType) . '/bulk')->addClass('listForm') !!}
@ -28,9 +44,17 @@
])->withAttributes(['class'=>'archive'])->split() !!} ])->withAttributes(['class'=>'archive'])->split() !!}
@endif @endif
&nbsp;<label for="trashed" style="font-weight:normal; margin-left: 10px;"> &nbsp;
<label for="trashed" style="font-weight:normal; margin-left: 10px;">
<!--
<input id="trashed" type="checkbox" onclick="setTrashVisible()" <input id="trashed" type="checkbox" onclick="setTrashVisible()"
{{ Session::get("show_trash:{$entityType}") ? 'checked' : ''}}/>&nbsp; {{ trans('texts.show_archived_deleted')}} {{ Session::get("show_trash:{$entityType}") ? 'checked' : ''}}/>&nbsp; {{ trans('texts.show_archived_deleted')}}
-->
{!! Former::multiselect('statuses')
->select('Active')
->style('width: 200px')
->options($statuses)
->raw() !!}
</label> </label>
<div id="top_right_buttons" class="pull-right"> <div id="top_right_buttons" class="pull-right">
@ -154,6 +178,7 @@
} }
@endif @endif
/*
function setTrashVisible() { function setTrashVisible() {
var checked = $('#trashed').is(':checked'); var checked = $('#trashed').is(':checked');
var url = '{{ URL::to('view_archive/' . $entityType) }}' + (checked ? '/true' : '/false'); var url = '{{ URL::to('view_archive/' . $entityType) }}' + (checked ? '/true' : '/false');
@ -162,6 +187,7 @@
refreshDatatable(); refreshDatatable();
}) })
} }
*/
$(function() { $(function() {
var tableFilter = ''; var tableFilter = '';
@ -231,6 +257,14 @@
$('button.archive').not('.dropdown-toggle').text(buttonLabel); $('button.archive').not('.dropdown-toggle').text(buttonLabel);
} }
$('#statuses').select2({
placeholder: "{{ trans('texts.status') }}",
}).on('change', function() {
refreshDatatable();
}).val([0]).trigger('change');
//$('#statuses').select2().val([0,1,2]).trigger('change');
}); });
</script> </script>