Merge branch 'master' of https://github.com/brkcvn/akaunting into show-loading
This commit is contained in:
Burak Civan
commit
2dbc815073
123
composer.lock
generated
123
composer.lock
generated
@ -4481,16 +4481,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v9.34.0",
|
||||
"version": "v9.35.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "b7af7ff35497eb1c4e61652f522a862164dbba5a"
|
||||
"reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/b7af7ff35497eb1c4e61652f522a862164dbba5a",
|
||||
"reference": "b7af7ff35497eb1c4e61652f522a862164dbba5a",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/79aed20f54b6ab75f926bf7d0dd7a5043ceb774a",
|
||||
"reference": "79aed20f54b6ab75f926bf7d0dd7a5043ceb774a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -4663,7 +4663,7 @@
|
||||
"issues": "https://github.com/laravel/framework/issues",
|
||||
"source": "https://github.com/laravel/framework"
|
||||
},
|
||||
"time": "2022-10-04T13:33:43+00:00"
|
||||
"time": "2022-10-11T17:30:47+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/sanctum",
|
||||
@ -9137,16 +9137,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "8f14753b865651c2aad107ef97475740a9b0730f"
|
||||
"reference": "1f89cab8d52c84424f798495b3f10342a7b1a070"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/8f14753b865651c2aad107ef97475740a9b0730f",
|
||||
"reference": "8f14753b865651c2aad107ef97475740a9b0730f",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/1f89cab8d52c84424f798495b3f10342a7b1a070",
|
||||
"reference": "1f89cab8d52c84424f798495b3f10342a7b1a070",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -9212,7 +9212,7 @@
|
||||
"terminal"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/console/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/console/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -9228,7 +9228,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-03T14:23:25+00:00"
|
||||
"time": "2022-10-07T08:02:12+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
@ -9364,16 +9364,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/error-handler",
|
||||
"version": "v6.0.11",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/error-handler.git",
|
||||
"reference": "cb302377e1b862540436f22be9ff07079a5836ae"
|
||||
"reference": "81e57c793d9a573f29f8b5296d5d8ee4602badcb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/error-handler/zipball/cb302377e1b862540436f22be9ff07079a5836ae",
|
||||
"reference": "cb302377e1b862540436f22be9ff07079a5836ae",
|
||||
"url": "https://api.github.com/repos/symfony/error-handler/zipball/81e57c793d9a573f29f8b5296d5d8ee4602badcb",
|
||||
"reference": "81e57c793d9a573f29f8b5296d5d8ee4602badcb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -9415,7 +9415,7 @@
|
||||
"description": "Provides tools to manage errors and ease debugging PHP code",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/error-handler/tree/v6.0.11"
|
||||
"source": "https://github.com/symfony/error-handler/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -9431,7 +9431,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-07-29T07:39:48+00:00"
|
||||
"time": "2022-10-07T08:02:12+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
@ -9658,16 +9658,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-client",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-client.git",
|
||||
"reference": "2067d3c398d47292f3b413fcc4f56385c1afd0d4"
|
||||
"reference": "ec183a587e3ad47f03cf1572d4b8437e0fc3e923"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-client/zipball/2067d3c398d47292f3b413fcc4f56385c1afd0d4",
|
||||
"reference": "2067d3c398d47292f3b413fcc4f56385c1afd0d4",
|
||||
"url": "https://api.github.com/repos/symfony/http-client/zipball/ec183a587e3ad47f03cf1572d4b8437e0fc3e923",
|
||||
"reference": "ec183a587e3ad47f03cf1572d4b8437e0fc3e923",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -9722,7 +9722,7 @@
|
||||
"description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/http-client/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/http-client/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -9738,7 +9738,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-09T09:33:56+00:00"
|
||||
"time": "2022-10-11T15:20:43+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-client-contracts",
|
||||
@ -9820,16 +9820,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "294208f37a73b7ae64b4297d936e890d5b514902"
|
||||
"reference": "e8aa505d35660877e6695d68be53df2ceac7cf57"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/294208f37a73b7ae64b4297d936e890d5b514902",
|
||||
"reference": "294208f37a73b7ae64b4297d936e890d5b514902",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8aa505d35660877e6695d68be53df2ceac7cf57",
|
||||
"reference": "e8aa505d35660877e6695d68be53df2ceac7cf57",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -9875,7 +9875,7 @@
|
||||
"description": "Defines an object-oriented layer for the HTTP specification",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/http-foundation/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/http-foundation/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -9891,20 +9891,20 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-17T07:33:45+00:00"
|
||||
"time": "2022-10-02T08:16:40+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-kernel.git",
|
||||
"reference": "5939a039103580d8d86a4c80e245258ad50c91b2"
|
||||
"reference": "f9fc93c4f12e2fd7dea37f7b5840deb34e9037fc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/5939a039103580d8d86a4c80e245258ad50c91b2",
|
||||
"reference": "5939a039103580d8d86a4c80e245258ad50c91b2",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/f9fc93c4f12e2fd7dea37f7b5840deb34e9037fc",
|
||||
"reference": "f9fc93c4f12e2fd7dea37f7b5840deb34e9037fc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -9984,7 +9984,7 @@
|
||||
"description": "Provides a structured process for converting a Request into a Response",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/http-kernel/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/http-kernel/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -10000,7 +10000,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-30T08:03:37+00:00"
|
||||
"time": "2022-10-12T07:43:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/mailer",
|
||||
@ -10143,16 +10143,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/mime",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/mime.git",
|
||||
"reference": "c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c"
|
||||
"reference": "c01b88b63418131daf2edd0bdc17fc8a6d1c939a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/mime/zipball/c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c",
|
||||
"reference": "c1d6eba531d956c23b3127dc6ae6f5ac4a90db6c",
|
||||
"url": "https://api.github.com/repos/symfony/mime/zipball/c01b88b63418131daf2edd0bdc17fc8a6d1c939a",
|
||||
"reference": "c01b88b63418131daf2edd0bdc17fc8a6d1c939a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -10164,7 +10164,8 @@
|
||||
"egulias/email-validator": "~3.0.0",
|
||||
"phpdocumentor/reflection-docblock": "<3.2.2",
|
||||
"phpdocumentor/type-resolver": "<1.4.0",
|
||||
"symfony/mailer": "<5.4"
|
||||
"symfony/mailer": "<5.4",
|
||||
"symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6"
|
||||
},
|
||||
"require-dev": {
|
||||
"egulias/email-validator": "^2.1.10|^3.1",
|
||||
@ -10172,7 +10173,7 @@
|
||||
"symfony/dependency-injection": "^5.4|^6.0",
|
||||
"symfony/property-access": "^5.4|^6.0",
|
||||
"symfony/property-info": "^5.4|^6.0",
|
||||
"symfony/serializer": "^5.4|^6.0"
|
||||
"symfony/serializer": "^5.4.14|~6.0.14|^6.1.6"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
@ -10204,7 +10205,7 @@
|
||||
"mime-type"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/mime/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/mime/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -10220,7 +10221,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-02T08:05:03+00:00"
|
||||
"time": "2022-10-07T08:02:12+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
@ -11322,16 +11323,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/string",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/string.git",
|
||||
"reference": "65e99fb179e7241606377e4042cd2161f3dd1c05"
|
||||
"reference": "3db7da820a6e4a584b714b3933c34c6a7db4d86c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/string/zipball/65e99fb179e7241606377e4042cd2161f3dd1c05",
|
||||
"reference": "65e99fb179e7241606377e4042cd2161f3dd1c05",
|
||||
"url": "https://api.github.com/repos/symfony/string/zipball/3db7da820a6e4a584b714b3933c34c6a7db4d86c",
|
||||
"reference": "3db7da820a6e4a584b714b3933c34c6a7db4d86c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -11387,7 +11388,7 @@
|
||||
"utf8"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/string/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/string/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -11403,20 +11404,20 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-02T08:05:03+00:00"
|
||||
"time": "2022-10-10T09:34:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v6.0.12",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "5e71973b4991e141271465dacf4bf9e719941424"
|
||||
"reference": "6f99eb179aee4652c0a7cd7c11f2a870d904330c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/5e71973b4991e141271465dacf4bf9e719941424",
|
||||
"reference": "5e71973b4991e141271465dacf4bf9e719941424",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/6f99eb179aee4652c0a7cd7c11f2a870d904330c",
|
||||
"reference": "6f99eb179aee4652c0a7cd7c11f2a870d904330c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -11482,7 +11483,7 @@
|
||||
"description": "Provides tools to internationalize your application",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/translation/tree/v6.0.12"
|
||||
"source": "https://github.com/symfony/translation/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -11498,7 +11499,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-08-02T16:01:06+00:00"
|
||||
"time": "2022-10-07T08:02:12+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation-contracts",
|
||||
@ -11654,16 +11655,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/var-dumper",
|
||||
"version": "v6.0.13",
|
||||
"version": "v6.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/var-dumper.git",
|
||||
"reference": "367522dc769072f2abe554013e073eb079593829"
|
||||
"reference": "72af925ddd41ca0372d166d004bc38a00c4608cc"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/367522dc769072f2abe554013e073eb079593829",
|
||||
"reference": "367522dc769072f2abe554013e073eb079593829",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/72af925ddd41ca0372d166d004bc38a00c4608cc",
|
||||
"reference": "72af925ddd41ca0372d166d004bc38a00c4608cc",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -11722,7 +11723,7 @@
|
||||
"dump"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/var-dumper/tree/v6.0.13"
|
||||
"source": "https://github.com/symfony/var-dumper/tree/v6.0.14"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -11738,7 +11739,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2022-09-08T09:32:44+00:00"
|
||||
"time": "2022-10-07T08:02:12+00:00"
|
||||
},
|
||||
{
|
||||
"name": "tijsverkoyen/css-to-inline-styles",
|
||||
|
||||
@ -10,13 +10,13 @@ return [
|
||||
|
||||
'minor' => '0',
|
||||
|
||||
'patch' => '6',
|
||||
'patch' => '7',
|
||||
|
||||
'build' => '',
|
||||
|
||||
'status' => 'Stable',
|
||||
|
||||
'date' => '10-August-2022',
|
||||
'date' => '11-October-2022',
|
||||
|
||||
'time' => '12:00',
|
||||
|
||||
|
||||
5
resources/assets/js/plugins/form.js
vendored
5
resources/assets/js/plugins/form.js
vendored
@ -478,9 +478,12 @@ export default class Form {
|
||||
if (response.data.redirect) {
|
||||
this.loading = true;
|
||||
|
||||
// Empty hash because /sale/customer/1#transaction redirect to sale/invoice/create.
|
||||
window.location.hash = '';
|
||||
|
||||
window.location.href = response.data.redirect;
|
||||
|
||||
if (window.location.hash !== undefined) {
|
||||
if (typeof window.location.hash != "undefined" && window.location.hash.length) {
|
||||
location.reload();
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,6 +39,7 @@ return [
|
||||
'error' => [
|
||||
'self_delete' => 'Error: Cuenta actual!',
|
||||
'self_disable' => 'error: deshabilitado',
|
||||
'unassigned' => 'Error: Can not unassigned company! The :company company must be assigned at least one user.',
|
||||
'no_company' => 'Error: No hay compañías asignadas a su cuenta. Por favor contacte al administrador del sistema.',
|
||||
],
|
||||
|
||||
|
||||
@ -39,6 +39,7 @@ return [
|
||||
'error' => [
|
||||
'self_delete' => 'Erreur : Vous ne pouvez pas vous supprimer vous-même !',
|
||||
'self_disable' => 'Erreur : Vous ne pouvez pas vous désactiver vous-même !',
|
||||
'unassigned' => 'Erreur: La société :company ne peut pas être désassignée ! La société :company doit être assignée au moins un utilisateur.',
|
||||
'no_company' => 'Erreur : Aucune entreprise associée à votre compte. Veuillez contacter votre administrateur système.',
|
||||
],
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ return [
|
||||
'currencies' => 'Devises',
|
||||
|
||||
'view_report' => 'Voir le rapport',
|
||||
'total_unpaid_invoices' => 'Montant des factures impayées',
|
||||
'total_unpaid_invoices' => 'Montant total des factures impayées',
|
||||
'total_unpaid_bills' => 'Montant des achats impayés',
|
||||
|
||||
'description' => [
|
||||
|
||||
@ -14,6 +14,14 @@ return [
|
||||
'position' => 'Posisi Simbol',
|
||||
'before' => 'Sebelum Jumlah',
|
||||
'after' => 'Setelah Jumlah',
|
||||
]
|
||||
],
|
||||
|
||||
'form_description' => [
|
||||
'general' => 'Mata uang bawaan saat ini digunakan pada Dasbor dan Laporan. Bagi mata uang yang lain, nilai tukar harus lebih rendah dari 1 untuk mata uang yang lebih lemah dan lebih dari 1 untuk mata uang yang lebih kuat.',
|
||||
],
|
||||
|
||||
'no_currency' => 'Tanpa Mata Uang',
|
||||
'create_currency' => 'Buat mata uang baru dan edit kapan saja melalui pengaturan.',
|
||||
'new_currency' => 'Mata Uang Baru',
|
||||
|
||||
];
|
||||
|
||||
@ -39,6 +39,7 @@ return [
|
||||
'error' => [
|
||||
'self_delete' => 'Erro: não pode se excluir!',
|
||||
'self_disable' => 'Erro: Você não pode desativar você mesmo!',
|
||||
'unassigned' => 'Erro: não pode deixar de ser atribuído empresa! A :company deve ser atribuída pelo menos um usuário.',
|
||||
'no_company' => 'Erro: Nenhuma empresa atribuída à sua conta. Por favor, entre em contato com o administrador do sistema.',
|
||||
],
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user