shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed tax select2

Browse Source
This commit is contained in:
denisdulici 2018-05-07 11:13:15 +03:00
parent 6bb5aab462
commit 1e960ee2a1
5 changed files with 108 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5f370dc6ef41a699b202d89ea626cfa4", "content-hash": "cf4d90d0918a4f1adaf027335295e0e8",
"packages": [ "packages": [
{ {
"name": "akaunting/language", "name": "akaunting/language",
@ -822,30 +822,30 @@
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "v1.4.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "54cacc9b81758b14e3ce750f205a393d52339e97" "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
"reference": "54cacc9b81758b14e3ce750f205a393d52339e97", "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/lexer": "1.*", "doctrine/lexer": "1.*",
"php": "^5.6 || ^7.0" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"doctrine/cache": "1.*", "doctrine/cache": "1.*",
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^6.4"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.4.x-dev" "dev-master": "1.6.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -886,37 +886,41 @@
"docblock", "docblock",
"parser" "parser"
], ],
"time": "2017-02-24T16:22:25+00:00" "time": "2017-12-06T07:11:42+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "v1.6.2", "version": "v1.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b" "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b", "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b", "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "~5.5|~7.0" "php": "~7.1"
}, },
"conflict": { "conflict": {
"doctrine/common": ">2.2,<2.4" "doctrine/common": ">2.2,<2.4"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.8|~5.0", "alcaeus/mongo-php-adapter": "^1.1",
"predis/predis": "~1.0", "mongodb/mongodb": "^1.1",
"satooshi/php-coveralls": "~0.6" "phpunit/phpunit": "^5.7",
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.6.x-dev" "dev-master": "1.7.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -956,24 +960,24 @@
"cache", "cache",
"caching" "caching"
], ],
"time": "2017-07-22T12:49:21+00:00" "time": "2017-08-25T07:02:50+00:00"
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
"version": "v1.4.0", "version": "v1.5.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/collections.git", "url": "https://github.com/doctrine/collections.git",
"reference": "1a4fb7e902202c33cce8c55989b945612943c2ba" "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba", "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"reference": "1a4fb7e902202c33cce8c55989b945612943c2ba", "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.6 || ^7.0" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "~0.1@dev", "doctrine/coding-standard": "~0.1@dev",
@ -1023,7 +1027,7 @@
"collections", "collections",
"iterator" "iterator"
], ],
"time": "2017-01-03T10:49:41+00:00" "time": "2017-07-22T10:37:32+00:00"
}, },
{ {
"name": "doctrine/common", "name": "doctrine/common",
@ -1171,33 +1175,33 @@
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
"version": "v1.1.0", "version": "v1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/inflector.git", "url": "https://github.com/doctrine/inflector.git",
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae" "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.2" "php": "^7.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "4.*" "phpunit/phpunit": "^6.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.1.x-dev" "dev-master": "1.3.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/" "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -1234,7 +1238,7 @@
"singularize", "singularize",
"string" "string"
], ],
"time": "2015-11-06T14:35:42+00:00" "time": "2018-01-09T20:05:19+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
@ -1959,6 +1963,59 @@
], ],
"time": "2016-03-02T22:35:41+00:00" "time": "2016-03-02T22:35:41+00:00"
}, },
{
"name": "josiasmontag/laravel-email-verification",
"version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/josiasmontag/laravel-email-verification.git",
"reference": "72609710a6f996b0aed19ba16813e754a8fac0cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/josiasmontag/laravel-email-verification/zipball/72609710a6f996b0aed19ba16813e754a8fac0cb",
"reference": "72609710a6f996b0aed19ba16813e754a8fac0cb",
"shasum": ""
},
"require": {
"illuminate/auth": "5.4.*|5.5.*|5.6.*",
"illuminate/queue": "5.4.*|5.5.*|5.6.*",
"illuminate/support": "5.4.*|5.5.*|5.6.*",
"nesbot/carbon": "~1.20",
"php": ">=5.6.4"
},
"require-dev": {
"laravel/framework": "5.4.*|5.5.*|5.6.*",
"mockery/mockery": "~0.9",
"orchestra/testbench": "~3.4.2|^3.5.0",
"phpunit/phpunit": "^5.7|6.2|^7.0"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Lunaweb\\EmailVerification\\Providers\\EmailVerificationServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Lunaweb\\EmailVerification\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Josias Montag",
"email": "josias@montag.info"
}
],
"description": "Laravel Email Verification",
"time": "2018-02-08T14:08:45+00:00"
},
{ {
"name": "kkszymanowski/traitor", "name": "kkszymanowski/traitor",
"version": "0.2.5", "version": "0.2.5",
@ -2814,24 +2871,24 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v3.1.5", "version": "v4.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce" "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
"reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": ">=5.5" "php": ">=7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0|~5.0" "phpunit/phpunit": "^6.5 || ^7.0"
}, },
"bin": [ "bin": [
"bin/php-parse" "bin/php-parse"
@ -2839,7 +2896,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.0-dev" "dev-master": "4.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -2861,7 +2918,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2018-02-28T20:30:58+00:00" "time": "2018-03-25T17:35:16+00:00"
}, },
{ {
"name": "nwidart/laravel-menus", "name": "nwidart/laravel-menus",

4
resources/views/expenses/bills/create.blade.php
View File

@ -160,7 +160,7 @@
html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">'; html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
html += ' </td>'; html += ' </td>';
html += ' <td>'; html += ' <td>';
html += ' <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">'; html += ' <select class="form-control tax-select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
html += ' <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>'; html += ' <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
@foreach($taxes as $tax_key => $tax_value) @foreach($taxes as $tax_key => $tax_value)
html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>'; html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
@ -176,7 +176,7 @@
$('[data-toggle="tooltip"]').tooltip('hide'); $('[data-toggle="tooltip"]').tooltip('hide');
$('#item-row-' + item_row + ' .select2').select2({ $('#item-row-' + item_row + ' .tax-select2').select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
}); });

4
resources/views/expenses/bills/edit.blade.php
View File

@ -166,7 +166,7 @@
html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">'; html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
html += ' </td>'; html += ' </td>';
html += ' <td>'; html += ' <td>';
html += ' <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">'; html += ' <select class="form-control tax-select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
html += ' <option selected="selected" value="">{{ trans('general.form.select.filed', ['field' => trans_choice('general.taxes', 1)]) }}</option>'; html += ' <option selected="selected" value="">{{ trans('general.form.select.filed', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
@foreach($taxes as $tax_key => $tax_value) @foreach($taxes as $tax_key => $tax_value)
html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>'; html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
@ -182,7 +182,7 @@
$('[data-toggle="tooltip"]').tooltip('hide'); $('[data-toggle="tooltip"]').tooltip('hide');
$('#item-row-' + item_row + ' .select2').select2({ $('#item-row-' + item_row + ' .tax-select2').select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
}); });

4
resources/views/incomes/invoices/create.blade.php
View File

@ -161,7 +161,7 @@
html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">'; html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
html += ' </td>'; html += ' </td>';
html += ' <td>'; html += ' <td>';
html += ' <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">'; html += ' <select class="form-control tax-select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
html += ' <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>'; html += ' <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
@foreach($taxes as $tax_key => $tax_value) @foreach($taxes as $tax_key => $tax_value)
html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>'; html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
@ -177,7 +177,7 @@
$('[data-toggle="tooltip"]').tooltip('hide'); $('[data-toggle="tooltip"]').tooltip('hide');
$('#item-row-' + item_row + ' .select2').select2({ $('#item-row-' + item_row + ' .tax-select2').select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
}); });

4
resources/views/incomes/invoices/edit.blade.php
View File

@ -165,7 +165,7 @@
html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">'; html += ' <input class="form-control text-right" required="required" name="item[' + item_row + '][price]" type="text" id="item-price-' + item_row + '">';
html += ' </td>'; html += ' </td>';
html += ' <td>'; html += ' <td>';
html += ' <select class="form-control select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">'; html += ' <select class="form-control tax-select2" name="item[' + item_row + '][tax_id]" id="item-tax-' + item_row + '">';
html += ' <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>'; html += ' <option selected="selected" value="">{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}</option>';
@foreach($taxes as $tax_key => $tax_value) @foreach($taxes as $tax_key => $tax_value)
html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>'; html += ' <option value="{{ $tax_key }}">{{ $tax_value }}</option>';
@ -181,7 +181,7 @@
$('[data-toggle="tooltip"]').tooltip('hide'); $('[data-toggle="tooltip"]').tooltip('hide');
$('#item-row-' + item_row + ' .select2').select2({ $('#item-row-' + item_row + ' .tax-select2').select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
}); });