From 6a11f130c2dc51f45e923b97ba64802de34dbff4 Mon Sep 17 00:00:00 2001 From: Ethan Brace Date: Sun, 26 Apr 2020 06:07:27 -0400 Subject: [PATCH 01/69] use config helper instead of env in application code --- app/Console/Kernel.php | 4 ++-- app/Exceptions/Handler.php | 2 +- app/Http/Controllers/Auth/Login.php | 2 +- app/Http/Controllers/Install/Database.php | 4 +++- app/Http/ViewComposers/Notifications.php | 2 +- app/Http/ViewComposers/Suggestions.php | 6 +++--- app/Listeners/Update/V20/Version207.php | 2 +- app/Providers/App.php | 4 ++-- app/Traits/DateTime.php | 2 +- app/Utilities/Info.php | 2 +- app/Utilities/Installer.php | 6 +++--- config/app.php | 4 ++++ resources/views/partials/admin/head.blade.php | 2 +- resources/views/partials/auth/head.blade.php | 2 +- resources/views/partials/modules/head.blade.php | 2 +- resources/views/partials/portal/head.blade.php | 2 +- resources/views/partials/signed/head.blade.php | 2 +- resources/views/partials/wizard/head.blade.php | 2 +- 18 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 23f1ab7a0..6a4c03cbf 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -23,11 +23,11 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { // Not installed yet - if (!env('APP_INSTALLED')) { + if (!config('app.installed')) { return; } - $schedule_time = env('APP_SCHEDULE_TIME', '09:00'); + $schedule_time = config('app.schedule_time'); $schedule->command('reminder:invoice')->dailyAt($schedule_time); $schedule->command('reminder:bill')->dailyAt($schedule_time); diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index e24768d9f..4092f98d8 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -54,7 +54,7 @@ class Handler extends ExceptionHandler */ public function render($request, Throwable $exception) { - if (env('APP_DEBUG') === false) { + if (config('app.debug') === false) { return $this->handleExceptions($request, $exception); } diff --git a/app/Http/Controllers/Auth/Login.php b/app/Http/Controllers/Auth/Login.php index dde57b182..d9a188986 100644 --- a/app/Http/Controllers/Auth/Login.php +++ b/app/Http/Controllers/Auth/Login.php @@ -115,7 +115,7 @@ class Login extends Controller auth()->logout(); // Session destroy is required if stored in database - if (env('SESSION_DRIVER') == 'database') { + if (config('session.driver') == 'database') { $request = app('Illuminate\Http\Request'); $request->session()->getHandler()->destroy($request->session()->getId()); } diff --git a/app/Http/Controllers/Install/Database.php b/app/Http/Controllers/Install/Database.php index fb15816fa..aa5ecff3a 100644 --- a/app/Http/Controllers/Install/Database.php +++ b/app/Http/Controllers/Install/Database.php @@ -27,8 +27,10 @@ class Database extends Controller */ public function store(Request $request) { + $connection = config('database.default','mysql'); + $host = $request['hostname']; - $port = env('DB_PORT', '3306'); + $port = config("database.connections.$connection.port", '3306'); $database = $request['database']; $username = $request['username']; $password = $request['password']; diff --git a/app/Http/ViewComposers/Notifications.php b/app/Http/ViewComposers/Notifications.php index da0d56f10..cb7b5ba80 100644 --- a/app/Http/ViewComposers/Notifications.php +++ b/app/Http/ViewComposers/Notifications.php @@ -19,7 +19,7 @@ class Notifications public function compose(View $view) { // No need to add suggestions in console - if (app()->runningInConsole() || !env('APP_INSTALLED') || !user()) { + if (app()->runningInConsole() || !config('app.installed') || !user()) { return; } diff --git a/app/Http/ViewComposers/Suggestions.php b/app/Http/ViewComposers/Suggestions.php index 25c568e34..ef60b0adf 100644 --- a/app/Http/ViewComposers/Suggestions.php +++ b/app/Http/ViewComposers/Suggestions.php @@ -20,7 +20,7 @@ class Suggestions public function compose(View $view) { // No need to add suggestions in console - if (app()->runningInConsole() || !env('APP_INSTALLED')) { + if (app()->runningInConsole() || !config('app.installed')) { return; } @@ -31,10 +31,10 @@ class Suggestions if ($path) { $suggestions = $this->getSuggestions($path); - + if ($suggestions) { $suggestion_modules = $suggestions->modules; - + foreach ($suggestion_modules as $key => $module) { $installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first(); diff --git a/app/Listeners/Update/V20/Version207.php b/app/Listeners/Update/V20/Version207.php index 178b008c3..97f4af5c7 100644 --- a/app/Listeners/Update/V20/Version207.php +++ b/app/Listeners/Update/V20/Version207.php @@ -26,7 +26,7 @@ class Version207 extends Listener // Update .env file Installer::updateEnv([ - 'MAIL_MAILER' => env('MAIL_DRIVER'), + 'MAIL_MAILER' => config('mail.default'), ]); } } diff --git a/app/Providers/App.php b/app/Providers/App.php index 990b6d9ae..e3a0d8f8e 100644 --- a/app/Providers/App.php +++ b/app/Providers/App.php @@ -31,11 +31,11 @@ class App extends Provider */ public function register() { - if (env('APP_INSTALLED') && env('APP_DEBUG')) { + if (config('app.installed') && config('app.debug')) { $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class); } - if (env('APP_ENV') !== 'production') { + if (config('app.env') !== 'production') { $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class); } } diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index f3a81838d..5c4ec6ded 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -17,7 +17,7 @@ trait DateTime $default = 'd M Y'; // Make sure it's installed - if (!env('APP_INSTALLED') && (env('APP_ENV') !== 'testing')) { + if (!config('app.installed') && (config('app.env') !== 'testing')) { return $default; } diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php index 157605abe..ccebe9d3c 100644 --- a/app/Utilities/Info.php +++ b/app/Utilities/Info.php @@ -33,7 +33,7 @@ class Info public static function mysqlVersion() { - if (env('DB_CONNECTION') === 'mysql') { + if (config('database.default') === 'mysql') { return DB::selectOne('select version() as mversion')->mversion; } diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index e671b3b60..cd44b82c6 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -183,8 +183,8 @@ class Installer 'database' => $database, 'username' => $username, 'password' => $password, - 'driver' => env('DB_CONNECTION', 'mysql'), - 'charset' => env('DB_CHARSET', 'utf8mb4'), + 'driver' => $connection = config('database.default', 'mysql'), + 'charset' => config("database.connections.$connection.charset", 'utf8mb4'), ]); try { @@ -213,7 +213,7 @@ class Installer 'DB_PREFIX' => $prefix, ]); - $con = env('DB_CONNECTION', 'mysql'); + $con = config('database.default', 'mysql'); // Change current connection $db = Config::get('database.connections.' . $con); diff --git a/config/app.php b/config/app.php index 58edec322..d8831bcbb 100644 --- a/config/app.php +++ b/config/app.php @@ -14,6 +14,10 @@ return [ 'name' => env('APP_NAME', 'Akaunting'), + 'installed' => env('APP_INSTALLED', false), + + 'schedule_time' => env('APP_SCHEDULE_TIME', '9:00'), + /* |-------------------------------------------------------------------------- | Application Environment diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php index 223ff0781..391d2811b 100644 --- a/resources/views/partials/admin/head.blade.php +++ b/resources/views/partials/admin/head.blade.php @@ -33,7 +33,7 @@ @stack('js') diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php index 573476d90..35aa6f139 100644 --- a/resources/views/partials/auth/head.blade.php +++ b/resources/views/partials/auth/head.blade.php @@ -28,7 +28,7 @@ @stack('js') diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php index 8a2b3b2b0..ec22e4ee5 100644 --- a/resources/views/partials/modules/head.blade.php +++ b/resources/views/partials/modules/head.blade.php @@ -31,7 +31,7 @@ @stack('js') diff --git a/resources/views/partials/portal/head.blade.php b/resources/views/partials/portal/head.blade.php index d6d121250..5e0fac33d 100644 --- a/resources/views/partials/portal/head.blade.php +++ b/resources/views/partials/portal/head.blade.php @@ -30,7 +30,7 @@ @stack('js') diff --git a/resources/views/partials/signed/head.blade.php b/resources/views/partials/signed/head.blade.php index d6d121250..5e0fac33d 100644 --- a/resources/views/partials/signed/head.blade.php +++ b/resources/views/partials/signed/head.blade.php @@ -30,7 +30,7 @@ @stack('js') diff --git a/resources/views/partials/wizard/head.blade.php b/resources/views/partials/wizard/head.blade.php index 4e9272c4b..c73198260 100644 --- a/resources/views/partials/wizard/head.blade.php +++ b/resources/views/partials/wizard/head.blade.php @@ -30,7 +30,7 @@ @stack('js') From ace9c26464433530709ed4b4430e0b90075e5a90 Mon Sep 17 00:00:00 2001 From: Ethan Brace Date: Sun, 26 Apr 2020 06:27:38 -0400 Subject: [PATCH 02/69] call config:cache after updating the env file --- app/Utilities/Installer.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index cd44b82c6..ebc741f5e 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -309,6 +309,8 @@ class Installer file_put_contents(base_path('.env'), $env); + Artisan::call('config:cache'); + return true; } } From 648841c2a5742014f057a6bf9f2e76c4433e2466 Mon Sep 17 00:00:00 2001 From: Ethan Brace Date: Sun, 26 Apr 2020 06:34:27 -0400 Subject: [PATCH 03/69] grab the default value from config if this isnt set to avoid setting this variable to null --- app/Listeners/Update/V20/Version207.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Listeners/Update/V20/Version207.php b/app/Listeners/Update/V20/Version207.php index 97f4af5c7..c783ac319 100644 --- a/app/Listeners/Update/V20/Version207.php +++ b/app/Listeners/Update/V20/Version207.php @@ -26,7 +26,7 @@ class Version207 extends Listener // Update .env file Installer::updateEnv([ - 'MAIL_MAILER' => config('mail.default'), + 'MAIL_MAILER' => env('MAIL_DRIVER', config('mail.default')), ]); } } From 8c4ca9d73cd797be3d5fc988f21e4f8109d2ecf8 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 14:33:41 +0300 Subject: [PATCH 04/69] added tenantable attribute to models --- app/Abstracts/Model.php | 3 ++- app/Models/Auth/Permission.php | 2 ++ app/Models/Auth/Role.php | 2 ++ app/Models/Auth/User.php | 2 ++ app/Models/Common/Company.php | 2 ++ app/Models/Common/Media.php | 2 ++ app/Models/Setting/Setting.php | 13 +++++++++++++ app/Scopes/Company.php | 9 ++++++--- app/Traits/Tenants.php | 18 ++++++++++++++++++ 9 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 app/Traits/Tenants.php diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php index 1f1779c5c..1f7a73aea 100644 --- a/app/Abstracts/Model.php +++ b/app/Abstracts/Model.php @@ -3,6 +3,7 @@ namespace App\Abstracts; use App\Scopes\Company; +use App\Traits\Tenants; use GeneaLabs\LaravelModelCaching\Traits\Cachable; use Illuminate\Database\Eloquent\Model as Eloquent; use Illuminate\Database\Eloquent\SoftDeletes; @@ -11,7 +12,7 @@ use Lorisleiva\LaravelSearchString\Concerns\SearchString; abstract class Model extends Eloquent { - use Cachable, SearchString, SoftDeletes, Sortable; + use Cachable, SearchString, SoftDeletes, Sortable, Tenants; protected $dates = ['deleted_at']; diff --git a/app/Models/Auth/Permission.php b/app/Models/Auth/Permission.php index b9e74e407..fa416efa4 100644 --- a/app/Models/Auth/Permission.php +++ b/app/Models/Auth/Permission.php @@ -13,6 +13,8 @@ class Permission extends LaratrustPermission protected $table = 'permissions'; + protected $tenantable = false; + /** * The accessors to append to the model's array form. * diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php index 8623e41cc..4570d6131 100644 --- a/app/Models/Auth/Role.php +++ b/app/Models/Auth/Role.php @@ -13,6 +13,8 @@ class Role extends LaratrustRole protected $table = 'roles'; + protected $tenantable = false; + /** * The attributes that are mass assignable. * diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 265a677b4..96888d08f 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -19,6 +19,8 @@ class User extends Authenticatable protected $table = 'users'; + protected $tenantable = false; + /** * The attributes that are mass assignable. * diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php index 86de79dbe..313413a30 100644 --- a/app/Models/Common/Company.php +++ b/app/Models/Common/Company.php @@ -14,6 +14,8 @@ class Company extends Eloquent protected $table = 'companies'; + protected $tenantable = false; + protected $dates = ['deleted_at']; protected $fillable = ['domain', 'enabled']; diff --git a/app/Models/Common/Media.php b/app/Models/Common/Media.php index abc998ecf..334430d37 100644 --- a/app/Models/Common/Media.php +++ b/app/Models/Common/Media.php @@ -9,5 +9,7 @@ class Media extends BaseMedia { use SoftDeletes; + protected $tenantable = false; + protected $dates = ['deleted_at']; } diff --git a/app/Models/Setting/Setting.php b/app/Models/Setting/Setting.php index 92d6fed1b..d62ebb931 100644 --- a/app/Models/Setting/Setting.php +++ b/app/Models/Setting/Setting.php @@ -3,10 +3,13 @@ namespace App\Models\Setting; use App\Scopes\Company; +use App\Traits\Tenants; use Illuminate\Database\Eloquent\Model as Eloquent; class Setting extends Eloquent { + use Tenants; + protected $table = 'settings'; public $timestamps = false; @@ -55,4 +58,14 @@ class Setting extends Eloquent { return $query->where($this->table . '.company_id', '=', $company_id); } + + public function isTenantable() + { + return (isset($this->tenantable) && ($this->tenantable === true)); + } + + public function isNotTenantable() + { + return !$this->isTenantable(); + } } diff --git a/app/Scopes/Company.php b/app/Scopes/Company.php index 4017b3143..025dd9df7 100644 --- a/app/Scopes/Company.php +++ b/app/Scopes/Company.php @@ -17,13 +17,16 @@ class Company implements Scope */ public function apply(Builder $builder, Model $model) { + if (method_exists($model, 'isNotTenantable') && $model->isNotTenantable()) { + return; + } + $table = $model->getTable(); // Skip for specific tables $skip_tables = [ - 'companies', 'jobs', 'firewall_ips', 'firewall_logs', 'media', 'mediables', 'migrations', 'notifications', - 'permissions', 'roles', 'role_companies', 'role_permissions', 'sessions', 'users', 'user_companies', - 'user_dashboards', 'user_permissions', 'user_roles', + 'jobs', 'firewall_ips', 'firewall_logs', 'media', 'mediables', 'migrations', 'notifications', 'role_companies', + 'role_permissions', 'sessions', 'user_companies', 'user_dashboards', 'user_permissions', 'user_roles', ]; if (in_array($table, $skip_tables)) { diff --git a/app/Traits/Tenants.php b/app/Traits/Tenants.php new file mode 100644 index 000000000..5a07c3f13 --- /dev/null +++ b/app/Traits/Tenants.php @@ -0,0 +1,18 @@ +tenantable) && ($this->tenantable === true)); + } + + public function isNotTenantable() + { + return !$this->isTenantable(); + } +} From 8120e3f0e34e7cfa5ccadb396d59e8cd917b827a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 14:41:12 +0300 Subject: [PATCH 05/69] removed extras #1433 --- app/Models/Setting/Setting.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/Models/Setting/Setting.php b/app/Models/Setting/Setting.php index d62ebb931..12961c640 100644 --- a/app/Models/Setting/Setting.php +++ b/app/Models/Setting/Setting.php @@ -58,14 +58,4 @@ class Setting extends Eloquent { return $query->where($this->table . '.company_id', '=', $company_id); } - - public function isTenantable() - { - return (isset($this->tenantable) && ($this->tenantable === true)); - } - - public function isNotTenantable() - { - return !$this->isTenantable(); - } } From 93e05ea6f55b8736db25e543a7e7e05add81804e Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 14:53:06 +0300 Subject: [PATCH 06/69] added trait to custom models #1433 --- app/Models/Auth/Permission.php | 3 ++- app/Models/Auth/Role.php | 3 ++- app/Models/Auth/User.php | 3 ++- app/Models/Common/Company.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Models/Auth/Permission.php b/app/Models/Auth/Permission.php index fa416efa4..e70ad7fbd 100644 --- a/app/Models/Auth/Permission.php +++ b/app/Models/Auth/Permission.php @@ -2,6 +2,7 @@ namespace App\Models\Auth; +use App\Traits\Tenants; use Laratrust\Models\LaratrustPermission; use Laratrust\Traits\LaratrustPermissionTrait; use Kyslik\ColumnSortable\Sortable; @@ -9,7 +10,7 @@ use Lorisleiva\LaravelSearchString\Concerns\SearchString; class Permission extends LaratrustPermission { - use LaratrustPermissionTrait, SearchString, Sortable; + use LaratrustPermissionTrait, SearchString, Sortable, Tenants; protected $table = 'permissions'; diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php index 4570d6131..f951568f6 100644 --- a/app/Models/Auth/Role.php +++ b/app/Models/Auth/Role.php @@ -2,6 +2,7 @@ namespace App\Models\Auth; +use App\Traits\Tenants; use Laratrust\Models\LaratrustRole; use Laratrust\Traits\LaratrustRoleTrait; use Kyslik\ColumnSortable\Sortable; @@ -9,7 +10,7 @@ use Lorisleiva\LaravelSearchString\Concerns\SearchString; class Role extends LaratrustRole { - use LaratrustRoleTrait, SearchString, Sortable; + use LaratrustRoleTrait, SearchString, Sortable, Tenants; protected $table = 'roles'; diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 96888d08f..1051d5c7b 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -2,6 +2,7 @@ namespace App\Models\Auth; +use App\Traits\Tenants; use App\Notifications\Auth\Reset; use App\Traits\Media; use Date; @@ -15,7 +16,7 @@ use Lorisleiva\LaravelSearchString\Concerns\SearchString; class User extends Authenticatable { - use LaratrustUserTrait, Notifiable, SearchString, SoftDeletes, Sortable, Media; + use LaratrustUserTrait, Notifiable, SearchString, SoftDeletes, Sortable, Media, Tenants; protected $table = 'users'; diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php index 313413a30..62b3a28ed 100644 --- a/app/Models/Common/Company.php +++ b/app/Models/Common/Company.php @@ -3,6 +3,7 @@ namespace App\Models\Common; use App\Traits\Media; +use App\Traits\Tenants; use Illuminate\Database\Eloquent\Model as Eloquent; use Illuminate\Database\Eloquent\SoftDeletes; use Kyslik\ColumnSortable\Sortable; @@ -10,7 +11,7 @@ use Lorisleiva\LaravelSearchString\Concerns\SearchString; class Company extends Eloquent { - use Media, SearchString, SoftDeletes, Sortable; + use Media, SearchString, SoftDeletes, Sortable, Tenants; protected $table = 'companies'; From 351faf7cfe90f1b0cb25cc2f189bac264895cb00 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 15:13:49 +0300 Subject: [PATCH 07/69] fixed composition check #1433 --- app/Abstracts/Model.php | 2 ++ app/Models/Setting/Setting.php | 2 ++ app/Traits/Tenants.php | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php index 1f7a73aea..951a5963f 100644 --- a/app/Abstracts/Model.php +++ b/app/Abstracts/Model.php @@ -14,6 +14,8 @@ abstract class Model extends Eloquent { use Cachable, SearchString, SoftDeletes, Sortable, Tenants; + protected $tenantable = true; + protected $dates = ['deleted_at']; /** diff --git a/app/Models/Setting/Setting.php b/app/Models/Setting/Setting.php index 12961c640..0ba333fe1 100644 --- a/app/Models/Setting/Setting.php +++ b/app/Models/Setting/Setting.php @@ -12,6 +12,8 @@ class Setting extends Eloquent protected $table = 'settings'; + protected $tenantable = true; + public $timestamps = false; /** diff --git a/app/Traits/Tenants.php b/app/Traits/Tenants.php index 5a07c3f13..a2dcf0960 100644 --- a/app/Traits/Tenants.php +++ b/app/Traits/Tenants.php @@ -4,8 +4,6 @@ namespace App\Traits; trait Tenants { - protected $tenantable = true; - public function isTenantable() { return (isset($this->tenantable) && ($this->tenantable === true)); From dae49d0ea8d40980c892ec6d73b3d283af7c31a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 16:12:17 +0300 Subject: [PATCH 08/69] create user set company and role checked. --- app/Jobs/Auth/CreateUser.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Jobs/Auth/CreateUser.php b/app/Jobs/Auth/CreateUser.php index 239d0a8f2..3b8e23935 100644 --- a/app/Jobs/Auth/CreateUser.php +++ b/app/Jobs/Auth/CreateUser.php @@ -44,18 +44,24 @@ class CreateUser extends Job $user->permissions()->attach($this->request->get('permissions')); } - $user->roles()->attach($this->request->get('roles')); + if ($this->request->has('roles')) { + $user->roles()->attach($this->request->get('roles')); + } - $user->companies()->attach($this->request->get('companies')); + if ($this->request->has('companies')) { + $user->companies()->attach($this->request->get('companies')); + } Artisan::call('cache:clear'); // Add User Dashboard - foreach ($user->companies as $company) { - Artisan::call('user:seed', [ - 'user' => $user->id, - 'company' => $company->id, - ]); + if (!empty($user->companies)) { + foreach ($user->companies as $company) { + Artisan::call('user:seed', [ + 'user' => $user->id, + 'company' => $company->id, + ]); + } } Artisan::call('cache:clear'); From af4888bc914b5a8f54dde671db8ad06ffac68d8f Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 16:36:34 +0300 Subject: [PATCH 09/69] added module purchase description --- resources/views/modules/item/show.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index e1a009b1b..1d5da9ca0 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -188,10 +188,10 @@ @endpermission @endif - @if ($module->purchase_faq) -
- {{ trans('modules.tab.faq')}} -
+ @if (!empty($module->purchase_desc)) +
+ {{ $module->purchase_desc }} +
@endif From 7e672a43cf58830c605dc23891ebc53899f01a05 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 16:45:35 +0300 Subject: [PATCH 10/69] updated translations --- resources/lang/ar-SA/bills.php | 6 +- resources/lang/ar-SA/bulk_actions.php | 3 +- resources/lang/ar-SA/install.php | 1 + resources/lang/ar-SA/invoices.php | 5 ++ resources/lang/ar-SA/settings.php | 6 ++ resources/lang/ar-SA/validation.php | 2 +- resources/lang/es-ES/bills.php | 8 +- resources/lang/es-ES/bulk_actions.php | 6 +- resources/lang/es-ES/install.php | 1 + resources/lang/es-ES/invoices.php | 5 ++ resources/lang/es-ES/messages.php | 2 + resources/lang/es-ES/passwords.php | 1 + resources/lang/es-ES/settings.php | 6 ++ resources/lang/es-ES/validation.php | 7 +- resources/lang/ja-JP/install.php | 2 +- resources/lang/lt-LT/auth.php | 6 +- resources/lang/lt-LT/bills.php | 10 ++- resources/lang/lt-LT/bulk_actions.php | 21 +++++ resources/lang/lt-LT/companies.php | 7 +- resources/lang/lt-LT/customers.php | 8 +- resources/lang/lt-LT/dashboards.php | 11 +++ resources/lang/lt-LT/demo.php | 38 ++++++--- resources/lang/lt-LT/email_templates.php | 50 +++++++++++ resources/lang/lt-LT/errors.php | 23 ++++++ resources/lang/lt-LT/general.php | 63 +++++++++++++- resources/lang/lt-LT/header.php | 2 +- resources/lang/lt-LT/install.php | 1 + resources/lang/lt-LT/invoices.php | 20 +++-- resources/lang/lt-LT/items.php | 10 --- resources/lang/lt-LT/maintenance.php | 11 +++ resources/lang/lt-LT/messages.php | 7 +- resources/lang/lt-LT/modules.php | 45 +++++----- resources/lang/lt-LT/pagination.php | 7 +- resources/lang/lt-LT/passwords.php | 1 + resources/lang/lt-LT/reconciliations.php | 2 +- resources/lang/lt-LT/reports.php | 10 +-- resources/lang/lt-LT/settings.php | 82 ++++++++++++------- resources/lang/lt-LT/taxes.php | 2 +- resources/lang/lt-LT/validation.php | 18 ++-- .../lang/lt-LT/{dashboard.php => widgets.php} | 9 +- 40 files changed, 399 insertions(+), 126 deletions(-) create mode 100644 resources/lang/lt-LT/bulk_actions.php create mode 100644 resources/lang/lt-LT/dashboards.php create mode 100644 resources/lang/lt-LT/email_templates.php create mode 100644 resources/lang/lt-LT/errors.php create mode 100644 resources/lang/lt-LT/maintenance.php rename resources/lang/lt-LT/{dashboard.php => widgets.php} (78%) diff --git a/resources/lang/ar-SA/bills.php b/resources/lang/ar-SA/bills.php index c23460c91..a61546b03 100644 --- a/resources/lang/ar-SA/bills.php +++ b/resources/lang/ar-SA/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'السعر', 'sub_total' => 'المبلغ الإجمالي', 'discount' => 'خصم', + 'item_discount' => 'Line Discount', 'tax_total' => 'إجمالي الضريبة', 'total' => 'المجموع', @@ -30,6 +31,7 @@ return [ 'add_payment' => 'إضافة مدفوعات', 'mark_paid' => 'تم التحديد كمدفوع', 'mark_received' => 'تحديد كمستلم', + 'mark_cancelled' => 'تم إلغاء العلامة', 'download_pdf' => 'تحميل PDF', 'send_mail' => 'إرسال بريد إلكتروني', 'create_bill' => 'إنشاء فاتورة شراء', @@ -43,11 +45,13 @@ return [ 'paid' => 'مدفوع', 'overdue' => 'متأخر', 'unpaid' => 'غير مدفوع', + 'cancelled' => 'Cancelled', ], 'messages' => [ - 'received' => 'تم تحويل فاتورة الشراء إلى فاتورة مستلمة بنجاح!', + 'marked_received' => 'Bill marked as received!', 'marked_paid' => 'الفاتورة عُلّمت كمدفوعة!', + 'marked_cancelled' => 'Bill marked as cancelled!', 'draft' => 'هذة فاتورة شراء عبارة عن مسودة و سوف يتم اظهارها بالنظام بعد ان يتم استحقاقها.', 'status' => [ diff --git a/resources/lang/ar-SA/bulk_actions.php b/resources/lang/ar-SA/bulk_actions.php index 8e7175433..235d9f224 100644 --- a/resources/lang/ar-SA/bulk_actions.php +++ b/resources/lang/ar-SA/bulk_actions.php @@ -4,7 +4,7 @@ return [ 'bulk_actions' => 'الإجراء الجماعي - الإجراءات الجماعية', 'selected' => 'مُحدد', - 'no_action' => 'No action available', + 'no_action' => 'لا يوجد اي اجراء متاح ', 'message' => [ 'duplicate' => 'هل أنت متأكد من مضاعفة السجلات المحددة؟', @@ -15,6 +15,7 @@ return [ 'paid' => 'هل تريد وضع علامة على الفاتورة المحددة على أنها مدفوعة ؟', 'sent' => 'هل تريد وضع علامة على الفاتورة المحددة على أنها تم أرسالها؟', 'received' => 'هل تريد وضع علامة على الفاتورة المحددة على أنها تم استلامها؟', + 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/ar-SA/install.php b/resources/lang/ar-SA/install.php index 405f8cb36..f49145474 100644 --- a/resources/lang/ar-SA/install.php +++ b/resources/lang/ar-SA/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => 'يجب تعطيل :feature!', 'extension' => 'يجب تثبيت وتشغيل ملحق :extension!', 'directory' => 'يجب منح صلاحية الكتابة على مجلد :directory!', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/ar-SA/invoices.php b/resources/lang/ar-SA/invoices.php index 249bf5798..fea76da7a 100644 --- a/resources/lang/ar-SA/invoices.php +++ b/resources/lang/ar-SA/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'السعر', 'sub_total' => 'المجموع الجزئي', 'discount' => 'الخصم', + 'item_discount' => 'Line Discount', 'tax_total' => 'إجمالي الضريبة', 'total' => 'الإجمالي', @@ -30,6 +31,7 @@ return [ 'mark_paid' => 'التحديد كمدفوع', 'mark_sent' => 'التحديد كمرسل', 'mark_viewed' => 'وضع علامة مشاهدة', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'تحميل PDF', 'send_mail' => 'إرسال بريد إلكتروني', 'all_invoices' => 'سجّل الدخول لعرض جميع الفواتير', @@ -47,12 +49,15 @@ return [ 'paid' => 'مدفوع', 'overdue' => 'متأخر', 'unpaid' => 'غير مدفوع', + 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => 'تم إرسال الفاتورة عبر البريد اﻹلكتروني!', 'marked_sent' => 'الفاتورة عُلّمت كمرسلة!', 'marked_paid' => 'الفاتورة عُلّمت كمدفوع!', + 'marked_viewed' => 'Invoice marked as viewed!', + 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => 'لا يوجد عنوان البريد إلكتروني لهذا العميل!', 'draft' => 'هذه مسودة الفاتورة و سوف تظهر في النظام بعد ارسالها.', diff --git a/resources/lang/ar-SA/settings.php b/resources/lang/ar-SA/settings.php index 751122dfd..62c0ed242 100644 --- a/resources/lang/ar-SA/settings.php +++ b/resources/lang/ar-SA/settings.php @@ -29,6 +29,12 @@ return [ 'before' => 'قبل الرقم', 'after' => 'بعد الرقم', ], + 'discount_location' => [ + 'name' => 'Discount Location', + 'item' => 'At line', + 'total' => 'At total', + 'both' => 'Both line and total', + ], ], 'invoice' => [ diff --git a/resources/lang/ar-SA/validation.php b/resources/lang/ar-SA/validation.php index d2d2ecf48..d05ba02fd 100644 --- a/resources/lang/ar-SA/validation.php +++ b/resources/lang/ar-SA/validation.php @@ -104,7 +104,7 @@ return [ ], 'invalid_currency' => 'رمز خانة :attribute غير صحيحة.', 'invalid_amount' => 'خانة المبلغ :attribute غير صالحة.', - 'invalid_extension' => 'The file extension is invalid.', + 'invalid_extension' => 'هذا الملف غير صالح.', ], /* diff --git a/resources/lang/es-ES/bills.php b/resources/lang/es-ES/bills.php index ecba6fa09..6b047a800 100644 --- a/resources/lang/es-ES/bills.php +++ b/resources/lang/es-ES/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Precio', 'sub_total' => 'Subtotal', 'discount' => 'Descuento', + 'item_discount' => 'Descuento de línea', 'tax_total' => 'Total Impuestos', 'total' => 'Total ', @@ -28,7 +29,9 @@ return [ 'histories' => 'Historial', 'payments' => 'Pagos', 'add_payment' => 'Añadir pago', + 'mark_paid' => 'Marcar Como Pagada', 'mark_received' => 'Marcar como recibido', + 'mark_cancelled' => 'Marcar como Cancelado', 'download_pdf' => 'Descargar PDF', 'send_mail' => 'Enviar Email', 'create_bill' => 'Crear Recibo', @@ -42,10 +45,13 @@ return [ 'paid' => 'Pagado', 'overdue' => 'Vencido', 'unpaid' => 'No Pagado', + 'cancelled' => 'Cancelado', ], 'messages' => [ - 'received' => 'Recibo marcado como recibido con éxito!', + 'marked_received' => '¡Recibo marcado como recibido!', + 'marked_paid' => '¡Recibo marcado como pagado!', + 'marked_cancelled' => '¡Recibo marcado como cancelado!', 'draft' => 'Este es unBORRADOR de factura y se reflejará en los gráficos luego de que sea enviada.', 'status' => [ diff --git a/resources/lang/es-ES/bulk_actions.php b/resources/lang/es-ES/bulk_actions.php index 9f28ba811..331a2cb17 100644 --- a/resources/lang/es-ES/bulk_actions.php +++ b/resources/lang/es-ES/bulk_actions.php @@ -2,8 +2,9 @@ return [ - 'bulk_actions' => 'Acción masiva|Acciones masivas', - 'selected' => 'seleccionado', + 'bulk_actions' => 'Acción masiva|Acciones masivas', + 'selected' => 'seleccionado', + 'no_action' => 'Ninguna acción disponible', 'message' => [ 'duplicate' => '¿Está seguro que desea duplicar el registro seleccionado?', @@ -14,6 +15,7 @@ return [ 'paid' => '¿Está seguro de que desea marcar la factura seleccionada como pagada? ¿Está seguro que desea marcar las facturas seleccionadas como pagadas?', 'sent' => '¿Está seguro que desea marcar la factura seleccionada como enviada? ¿Está seguro que desea marcar las facturas seleccionadas como enviadas?', 'received' => '¿Está seguro de que desea marcar el recibo seleccionado como recibido? ¿Está seguro que desea marcar los recibos seleccionados como recibidos?', + 'cancelled' => '¿Está seguro que desea cancelar la factura/recibo seleccionado?|¿Está seguro que desea cancelar las facturas/recibos seleccionados?', ], ]; diff --git a/resources/lang/es-ES/install.php b/resources/lang/es-ES/install.php index 6e894ef08..9cccee5f2 100644 --- a/resources/lang/es-ES/install.php +++ b/resources/lang/es-ES/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature debe estar deshabilitado!', 'extension' => 'La extensión :extension necesita ser instalada y cargada!', 'directory' => 'El directorio :directorio necesita tener permiso de escritura!', + 'executable' => '¡El archivo ejecutable PHP CLI no está definido/funcionando o su versión no es :php_version o superior! Por favor, pida a su compañía de hosting que configure correctamente la variable de entorno PHP_BINARY o PHP_PATH.', ], 'database' => [ diff --git a/resources/lang/es-ES/invoices.php b/resources/lang/es-ES/invoices.php index dd1012b1e..14a8f04af 100644 --- a/resources/lang/es-ES/invoices.php +++ b/resources/lang/es-ES/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'Precio', 'sub_total' => 'Subtotal', 'discount' => 'Descuento', + 'item_discount' => 'Descuento de línea', 'tax_total' => 'Total Impuestos', 'total' => 'Total ', @@ -30,6 +31,7 @@ return [ 'mark_paid' => 'Marcar Como Pagada', 'mark_sent' => 'Marcar Como Enviada', 'mark_viewed' => 'Marcar como visto', + 'mark_cancelled' => 'Marcar como Cancelada', 'download_pdf' => 'Descargar PDF', 'send_mail' => 'Enviar Email', 'all_invoices' => 'Inicie sesión para ver todas las facturas', @@ -47,12 +49,15 @@ return [ 'paid' => 'Pagada', 'overdue' => 'Vencida', 'unpaid' => 'No Pagada', + 'cancelled' => 'Cancelada', ], 'messages' => [ 'email_sent' => '¡El correo electrónico de la factura ha sido enviado!', 'marked_sent' => '¡Factura marcada como enviada!', 'marked_paid' => '¡Factura marcada como pagada!', + 'marked_viewed' => '¡Factura marcada como vista!', + 'marked_cancelled' => '¡Factura marcada como cancelada!', 'email_required' => 'Ninguna dirección de correo electrónico para este cliente!', 'draft' => 'Esta es una factura BORRADOR y se reflejará en los gráficos luego de que sea enviada.', diff --git a/resources/lang/es-ES/messages.php b/resources/lang/es-ES/messages.php index 100a7d625..579abb1df 100644 --- a/resources/lang/es-ES/messages.php +++ b/resources/lang/es-ES/messages.php @@ -28,6 +28,8 @@ return [ 'warning' => [ 'deleted' => 'Advertencia: No puede borrar :name porque tiene :text relacionado.', 'disabled' => 'Advertencia: No se permite desactivar :name porque tiene :text relacionado.', + 'reconciled_tran' => 'Advertencia: No puedes cambiar/eliminar la transacción porque está reconciliada!', + 'reconciled_doc' => 'Advertencia: No puedes modificar/eliminar :type porque tiene transacciones reconciliadas!', 'disable_code' => 'Advertencia: No puede desactivar o cambiar la moneda :name porque tiene :text relacionado.', 'payment_cancel' => 'Advertencia: Ha cancelado su reciente pago de :method!', ], diff --git a/resources/lang/es-ES/passwords.php b/resources/lang/es-ES/passwords.php index 40b370808..b523a1ae7 100644 --- a/resources/lang/es-ES/passwords.php +++ b/resources/lang/es-ES/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => 'Hemos enviado un enlace para resetear su contraseña!', 'token' => 'Ese token de contraseña ya no es válido.', 'user' => "No podemos encontrar un usuario con esa dirección de correo electrónico.", + 'throttle' => 'Por favor, espere antes de reintentar.', ]; diff --git a/resources/lang/es-ES/settings.php b/resources/lang/es-ES/settings.php index 3e39ce834..8ed6cf4b8 100644 --- a/resources/lang/es-ES/settings.php +++ b/resources/lang/es-ES/settings.php @@ -29,6 +29,12 @@ return [ 'before' => 'Antes del Número', 'after' => 'Después del número', ], + 'discount_location' => [ + 'name' => 'Ubicación de descuento', + 'item' => 'En línea', + 'total' => 'En total', + 'both' => 'Línea y total', + ], ], 'invoice' => [ diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php index c6c344b72..8bee86327 100644 --- a/resources/lang/es-ES/validation.php +++ b/resources/lang/es-ES/validation.php @@ -100,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'mensaje personalizado', + 'rule-name' => 'mensaje personalizado', ], - 'invalid_currency' => 'El código de :attribute es incorrecto.', - 'invalid_amount' => 'El monto :attribute es inválido.', + 'invalid_currency' => 'El código de :attribute es incorrecto.', + 'invalid_amount' => 'El monto :attribute es inválido.', + 'invalid_extension' => 'La extensión del archivo no es válida.', ], /* diff --git a/resources/lang/ja-JP/install.php b/resources/lang/ja-JP/install.php index 8138ad440..f5093af2b 100644 --- a/resources/lang/ja-JP/install.php +++ b/resources/lang/ja-JP/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature 無効にする必要があります！', 'extension' => ':extension エクステンション 拡張機能をインストールしてロードする必要があります!', 'directory' => ':directory ディレクトリは書き込み可能である必要があります!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', + 'executable' => 'PHP CLI 実行可能ファイルが定義されていないか、機能していないか、バージョンが :php_version 以降ではありません！ PHP_BINARY または PHP_PATH 環境変数を正しく設定するようにホスティング会社に依頼してください。', ], 'database' => [ diff --git a/resources/lang/lt-LT/auth.php b/resources/lang/lt-LT/auth.php index 7b7fe014b..29dca4fb8 100644 --- a/resources/lang/lt-LT/auth.php +++ b/resources/lang/lt-LT/auth.php @@ -13,16 +13,18 @@ return [ 'current_email' => 'Dabartinis el. paštas', 'reset' => 'Atstatyti', 'never' => 'niekada', - + 'landing_page' => 'Pirmas puslapis', + 'password' => [ 'current' => 'Slaptažodis', 'current_confirm' => 'Slaptažodžio patvirtinimas', 'new' => 'Naujas slaptažodis', 'new_confirm' => 'Naujo slaptažodžio patvirtinimas', ], - + 'error' => [ 'self_delete' => 'Negalite ištrinti savęs!', + 'self_disable' => 'Klaida: negalite išjungti savęs!', 'no_company' => 'Nėra priskirtos kompanijos. Prašome susisiekti su sistemos administratoriumi.', ], diff --git a/resources/lang/lt-LT/bills.php b/resources/lang/lt-LT/bills.php index 9eb9d3d94..edf2c8c35 100644 --- a/resources/lang/lt-LT/bills.php +++ b/resources/lang/lt-LT/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Kaina', 'sub_total' => 'Tarpinė suma', 'discount' => 'Nuolaida', + 'item_discount' => 'Nuolaida', 'tax_total' => 'Mokesčių suma', 'total' => 'Iš viso', @@ -28,7 +29,9 @@ return [ 'histories' => 'Istorijos', 'payments' => 'Mokėjimai', 'add_payment' => 'Pridėti mokėjimą', + 'mark_paid' => 'Pažymėti kaip apmokėtą', 'mark_received' => 'Pažymėti kaip gautą', + 'mark_cancelled' => 'Pažymėti kaip atšauktą', 'download_pdf' => 'Parsisiųsti PDF', 'send_mail' => 'Siųsti laišką', 'create_bill' => 'Sukurti sąskaitą', @@ -40,10 +43,15 @@ return [ 'received' => 'Gauta', 'partial' => 'Dalinis', 'paid' => 'Apmokėta', + 'overdue' => 'Vėluojanti', + 'unpaid' => 'Neapmokėta', + 'cancelled' => 'Atšaukta', ], 'messages' => [ - 'received' => 'Sąskaita gauta sėkmingai!', + 'marked_received' => 'Sąskaita pažymėta kaip gauta!', + 'marked_paid' => 'Sąskaita pažymėta kaip apmokėta!', + 'marked_cancelled' => 'Sąskaita pažymėta kaip atšaukta!', 'draft' => 'Tai yra JUODRAŠTINĖ sąskaita ir ji bus įtraukta į grafikus po to kai bus gauta.', 'status' => [ diff --git a/resources/lang/lt-LT/bulk_actions.php b/resources/lang/lt-LT/bulk_actions.php new file mode 100644 index 000000000..c45c3107a --- /dev/null +++ b/resources/lang/lt-LT/bulk_actions.php @@ -0,0 +1,21 @@ + 'Veiksmas|Veiksmai', + 'selected' => 'pasirinkta', + 'no_action' => 'Nėra veiksmų', + + 'message' => [ + 'duplicate' => 'Ar tikrai norite duplikuoti pasirinktą įrašą?', + 'delete' => 'Ar tikrai norite ištrinti pasirinktą įrašą?|Ar tikrai norite duplikuoti pasirinktus įrašus?', + 'export' => 'Ar tikrai norite eksportuoti pasirinktą įrašą?|Ar tikrai norite eksportuoti pasirinktus įrašus?', + 'enable' => 'Ar tikrai norite įjungti pasirinktą įrašą?|Ar tikrai norite įjungti pasirinktus įrašus?', + 'disable' => 'Ar tikrai norite išjungti pasirinktą įrašą?|Ar tikrai norite išjungti pasirinktus įrašus?', + 'paid' => 'Ar tikrai norite pasirinktą sąskaitą-faktūrą pažymėti kaip apmokėtą?|Ar tikrai norite pasirinktas sąskaitas-faktūras pažymėti kaip apmokėtas?', + 'sent' => 'Ar tikrai norite pasirinktą sąskaitą-faktūrą pažymėti kaip išsiųstą?|Ar tikrai norite pasirinktas sąskaitas-faktūras pažymėti kaip išsiųstas?', + 'received' => 'Ar tikrai norite pasirinktą sąskaitą pažymėti kaip gautą?|Ar tikrai norite pasirinktas sąskaitas pažymėti kaip gautas?', + 'cancelled' => 'Ar tikrai norite atšaukti pasirinktą sąskaitą?|Ar tikrai norite atšaukti pasirinktas sąskaitas?', + ], + +]; diff --git a/resources/lang/lt-LT/companies.php b/resources/lang/lt-LT/companies.php index cbe3111b4..a1f975c85 100644 --- a/resources/lang/lt-LT/companies.php +++ b/resources/lang/lt-LT/companies.php @@ -4,10 +4,11 @@ return [ 'domain' => 'Domenas', 'logo' => 'Logotipas', - 'manage' => 'Valdyti įmones', - 'all' => 'Visos įmonės', + 'error' => [ - 'delete_active' => 'Klaida: Negalite ištrinti aktyvios įmonės, pirma turite pakeisti ją!', + 'not_user_company' => 'Klaida: Jūs neturite teisės valdyti šios kompanijos!', + 'delete_active' => 'Klaida: Negalite ištrinti aktyvios įmonės. Pirma turite pasikeisti ją!', + 'disable_active' => 'Klaida: Negalite atjungti aktyvios įmonės. Pirma turite pasikeisti ją!', ], ]; diff --git a/resources/lang/lt-LT/customers.php b/resources/lang/lt-LT/customers.php index 0bcea13ca..6529516a0 100644 --- a/resources/lang/lt-LT/customers.php +++ b/resources/lang/lt-LT/customers.php @@ -2,15 +2,11 @@ return [ - 'allow_login' => 'Leisti prisijungti?', + 'can_login' => 'Gali prisijungti?', 'user_created' => 'Vartotojas sukurtas', 'error' => [ - 'email' => 'Šis el. paštas jau užimtas.' + 'email' => 'Šis el. paštas jau užimtas.', ], - 'notification' => [ - 'message' => ':customer sumokėjo :amount pagal sąskaitą: :invoice_number.', - 'button' => 'Rodyti', - ], ]; diff --git a/resources/lang/lt-LT/dashboards.php b/resources/lang/lt-LT/dashboards.php new file mode 100644 index 000000000..a570fb12a --- /dev/null +++ b/resources/lang/lt-LT/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'Klaida: Jūs neturite teisės keisti šio puslapio!', + 'delete_last' => 'Error: Can not delete the last dashboard. Please, create a new one first!', + 'disable_last' => 'Error: Can not disable the last dashboard. Please, create a new one first!', + ], + +]; diff --git a/resources/lang/lt-LT/demo.php b/resources/lang/lt-LT/demo.php index 0df5628dc..f8efcba65 100644 --- a/resources/lang/lt-LT/demo.php +++ b/resources/lang/lt-LT/demo.php @@ -2,15 +2,33 @@ return [ - 'accounts_cash' => 'Grynieji pinigai', - 'categories_deposit' => 'Depozitas', - 'categories_sales' => 'Pardavimai', - 'currencies_usd' => 'JAV doleris', - 'currencies_eur' => 'Euras', - 'currencies_gbp' => 'Svarai sterlingai', - 'currencies_try' => 'Turkijos Lira', - 'taxes_exempt' => 'Neapmokestinamos pajamos', - 'taxes_normal' => 'Įprastiniai mokesčiai', - 'taxes_sales' => 'PVM', + 'accounts' => [ + 'cash' => 'Grynieji pinigai', + ], + + 'categories' => [ + 'deposit' => 'Depozitas', + 'sales' => 'Pardavimai', + ], + + 'currencies' => [ + 'usd' => 'JAV doleris', + 'eur' => 'Euras', + 'gbp' => 'Svarai sterlingai', + 'try' => 'Turkijos Lira', + ], + + 'offline_payments' => [ + 'cash' => 'Grynieji pinigai', + 'bank' => 'Bankinis pervedimas', + ], + + 'reports' => [ + 'income' => 'Mėnesio pajamų santrauka pagal kategoriją.', + 'expense' => 'Mėnesio išlaidų santrauka pagal kategoriją.', + 'income_expense' => 'Mėnesio pajamos/išlaidos pagal kategoriją.', + 'tax' => 'Ketvirčio mokesčių santrauka.', + 'profit_loss' => 'Ketvirčio pelnas/nuostolis pagal kategoriją.', + ], ]; diff --git a/resources/lang/lt-LT/email_templates.php b/resources/lang/lt-LT/email_templates.php new file mode 100644 index 000000000..656e154e1 --- /dev/null +++ b/resources/lang/lt-LT/email_templates.php @@ -0,0 +1,50 @@ + [ + 'subject' => 'Sąskaita-faktūra {invoice_number} sukurta', + 'body' => 'Gerb. {customer_name},

Mes jums paruošėme sąskaitą-faktūrą: {invoice_number}.

Galite peržiūrėti sąskaitą-faktūrą ir apmokėti spausdami čia: {invoice_number}.

Prašome kreiptis, jei turite klausimų.

Linkėjimai,
{company_name}', + ], + + 'invoice_remind_customer' => [ + 'subject' => 'Priminimas del {invoice_number} sąskaitos-faktūros', + 'body' => 'Dear {customer_name},

This is an overdue notice for {invoice_number} invoice.

The invoice total is {invoice_total} and was due {invoice_due_date}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Best Regards,
{company_name}', + ], + + 'invoice_remind_admin' => [ + 'subject' => '{invoice_number} invoice overdue notice', + 'body' => 'Hello,

{customer_name} has received an overdue notice for {invoice_number} invoice.

The invoice total is {invoice_total} and was due {invoice_due_date}.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', + ], + + 'invoice_recur_customer' => [ + 'subject' => 'Sąskaita-faktūra {invoice_number} sukurta', + 'body' => 'Dear {customer_name},

Based on your recurring circle, we have prepared the following invoice for you: {invoice_number}.

You can see the invoice details and proceed with the payment from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', + ], + + 'invoice_recur_admin' => [ + 'subject' => '{invoice_number} recurring invoice created', + 'body' => 'Hello,

Based on {customer_name} recurring circle, {invoice_number} invoice has been automatically created.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', + ], + + 'invoice_payment_customer' => [ + 'subject' => 'Payment received for {invoice_number} invoice', + 'body' => 'Dear {customer_name},

Thank you for the payment. Find the payment details below:

-------------------------------------------------
Amount: {transaction_total}
Date: {transaction_paid_date}
Invoice Number: {invoice_number}
-------------------------------------------------

You can always see the invoice details from the following link: {invoice_number}.

Feel free to contact us for any question.

Best Regards,
{company_name}', + ], + + 'invoice_payment_admin' => [ + 'subject' => 'Payment received for {invoice_number} invoice', + 'body' => 'Hello,

{customer_name} recorded a payment for {invoice_number} invoice.

You can see the invoice details from the following link: {invoice_number}.

Best Regards,
{company_name}', + ], + + 'bill_remind_admin' => [ + 'subject' => '{bill_number} bill reminding notice', + 'body' => 'Hello,

This is a reminding notice for {bill_number} bill to {vendor_name}.

The bill total is {bill_total} and is due {bill_due_date}.

You can see the bill details from the following link: {bill_number}.

Best Regards,
{company_name}', + ], + + 'bill_recur_admin' => [ + 'subject' => '{bill_number} recurring bill created', + 'body' => 'Hello,

Based on {vendor_name} recurring circle, {bill_number} invoice has been automatically created.

You can see the bill details from the following link: {bill_number}.

Best Regards,
{company_name}', + ], + +]; diff --git a/resources/lang/lt-LT/errors.php b/resources/lang/lt-LT/errors.php new file mode 100644 index 000000000..6e47c4f8f --- /dev/null +++ b/resources/lang/lt-LT/errors.php @@ -0,0 +1,23 @@ + [ + '403' => 'Negalima Prieiga', + '404' => 'Puslapis nerastas', + '500' => 'Oi... Kažkas įvyko ne taip', + ], + + 'header' => [ + '403' => '403 Negalima', + '404' => '404 Nerasta', + '500' => '500 Vidinė serverio klaida', + ], + + 'message' => [ + '403' => 'Negalite matyti šio puslapio.', + '404' => 'Negalėjome rasti puslapio kurio ieškojote.', + '500' => 'Mes tuoj pat stengsimės tai sutvarkyti.', + ], + +]; diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php index cc8e57a00..221056cc8 100644 --- a/resources/lang/lt-LT/general.php +++ b/resources/lang/lt-LT/general.php @@ -2,6 +2,7 @@ return [ + 'dashboards' => 'Pagrindinis|Pagrindinis', 'items' => 'Prekės', 'incomes' => 'Pajamos', 'invoices' => 'Sąskaitos', @@ -41,8 +42,17 @@ return [ 'contacts' => 'Kontaktai', 'reconciliations' => 'Reconciliation|Reconciliations', 'developers' => 'Kūrėjas|Kūrėjai', + 'schedules' => 'Kalendorius|Kalendoriai', + 'groups' => 'Grupė|Grupės', + 'charts' => 'Lentelė|Lentelės', + 'localisations' => 'Lokalizacija|Lokalizacijos', + 'defaults' => 'Numatytasis|Numatytieji', + 'widgets' => 'Widget|Widgets', + 'templates' => 'Šablonas|Šablonai', + 'sales' => 'Pardavimas|Pardavimai', + 'purchases' => 'Pirkimas|Pirkimai', - 'dashboard' => 'Pradžia', + 'welcome' => 'Sveiki', 'banking' => 'Bankai ir finansai', 'general' => 'Bendras', 'no_records' => 'Nėra įrašų.', @@ -54,15 +64,19 @@ return [ 'no' => 'Ne', 'na' => 'N/D', 'daily' => 'Kasdien', + 'weekly' => 'Savaitinis', 'monthly' => 'Kas mėnesį', 'quarterly' => 'Kas ketvirtį', 'yearly' => 'Kasmet', 'add' => 'Pridėti', 'add_new' => 'Pridėti naują', + 'add_income' => 'Pridėti Pajamas', + 'add_expense' => 'Pridėti Išlaidas', 'show' => 'Rodyti', 'edit' => 'Redaguoti', 'delete' => 'Ištrinti', 'send' => 'Siųsti', + 'share' => 'Dalintis', 'download' => 'Parsisiųsti', 'delete_confirm' => 'Ar tikrai norite ištrinti?', 'name' => 'Vardas', @@ -80,9 +94,11 @@ return [ 'reference' => 'Nuoroda', 'attachment' => 'Priedai', 'change' => 'Pakeisti', + 'change_type' => 'Pakeisti :type', 'switch' => 'Perjungti', 'color' => 'Spalva', 'save' => 'Išsaugoti', + 'confirm' => 'Patvirtinti', 'cancel' => 'Atšaukti', 'loading' => 'Kraunama...', 'from' => 'Nuo', @@ -112,20 +128,47 @@ return [ 'disable' => 'Išjungti', 'select_all' => 'Pažymėti viską', 'unselect_all' => 'Panaikinti visų žymėjimą', - 'go_to' => 'Eiti į :name', 'created_date' => 'Sukūrimo data', 'period' => 'Periodas', + 'frequency' => 'Dažnumas', 'start' => 'Pradžia', 'end' => 'Pabaiga', 'clear' => 'Išvalyti', 'difference' => 'Skirtumas', + 'footer' => 'Apačia', + 'start_date' => 'Pradžios Data', + 'end_date' => 'Pabaigos Data', + 'basis' => 'Basis', + 'accrual' => 'Accrual', + 'cash' => 'Grynieji pinigai', + 'group_by' => 'Grupuoti pagal', + 'accounting' => 'Buhalterija', + 'sort' => 'Rikiuoti', + 'width' => 'Plotis', + 'month' => 'Mėnuo', + 'year' => 'Metai', + 'type_item_name' => 'Įveskite pavadinimą', + 'no_data' => 'Nėra duomenų', + 'no_matching_data' => 'Nieko nerasta', + 'clear_cache' => 'Išvalyti talpyklą', + 'go_to_dashboard' => 'Eiti į pagrindinį', + + 'card' => [ + 'name' => 'Vardas (ant kortelės)', + 'number' => 'Kortelės numeris', + 'expiration_date' => 'Galiojimo data', + 'cvv' => 'Kortelės CVV kodas', + ], 'title' => [ 'new' => 'Naujas :type', 'edit' => 'Redaguoti :type', + 'delete' => 'Ištrinti :type', 'create' => 'Sukurti :type', 'send' => 'Siųsti :type', 'get' => 'Gauti :type', + 'add' => 'Pridėti :type', + 'manage' => 'Valdyti :type', ], 'form' => [ @@ -134,6 +177,7 @@ return [ 'field' => '- Pasirinkite :field -', 'file' => 'Pasirinkti failą', ], + 'add_new' => 'Pridėti naują :field', 'no_file_selected' => 'Nepasirinktas failas...', ], @@ -144,4 +188,19 @@ return [ 'this_month' => 'Šis mėnuo', 'last_month' => 'Praėjęs mėnuo', ], + + 'empty' => [ + 'documentation' => 'Peržiūrėkite dokumentaciją.', + 'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.', + 'invoices' => 'Sąskaitos-faktūros gali būti vienkartinės arba pasikartojančios. Jūs galite siųsti jas savo klientams ir gauti apmokėjimus.', + 'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.', + 'customers' => 'Customers are required if you want to create invoices. They may also log in to Client Portal and see their balance.', + 'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.', + 'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.', + 'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.', + 'transfers' => 'Transfers allow you to move money from one account to another, whether they use the same currency or not.', + 'taxes' => 'Taxes are used to apply extra fees to invoices and bills. Your financials are affected by these regulatory taxes.', + 'reconciliations' => 'Bank reconciliation is a process performed to ensure that your company bank records are also correct.', + ], + ]; diff --git a/resources/lang/lt-LT/header.php b/resources/lang/lt-LT/header.php index 0ec4cec2a..2ef22909c 100644 --- a/resources/lang/lt-LT/header.php +++ b/resources/lang/lt-LT/header.php @@ -8,9 +8,9 @@ return [ 'counter' => '{0} Pranešimų nėra|{1} Turite :count pranešimą|[2,*] Turite :count pranešimus', 'overdue_invoices' => '{1} :count vėluojanti sąskaita|[2,*] :count vėluojančios sąskaitos', 'upcoming_bills' => '{1} :count artėjantis mokėjimasl|[2,*] :count artėjantys mokėjimai', - 'items_stock' => '{1} :count prekės nebėra|[2,*] :count prekių nebėra', 'view_all' => 'Peržiūrėti visus' ], 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/support', ]; diff --git a/resources/lang/lt-LT/install.php b/resources/lang/lt-LT/install.php index eef0204c3..c7859a049 100644 --- a/resources/lang/lt-LT/install.php +++ b/resources/lang/lt-LT/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ': feature turi būti išjungta!', 'extension' => ':extension turi būti įrašytas ir įjungtas!', 'directory' => ':directory direktorijoje turi būti leidžiama įrašyti!', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/lt-LT/invoices.php b/resources/lang/lt-LT/invoices.php index 897b401cc..149539b75 100644 --- a/resources/lang/lt-LT/invoices.php +++ b/resources/lang/lt-LT/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'Kaina', 'sub_total' => 'Tarpinė suma', 'discount' => 'Nuolaida', + 'item_discount' => 'Nuolaida', 'tax_total' => 'Mokesčių suma', 'total' => 'Iš viso', @@ -29,12 +30,15 @@ return [ 'add_payment' => 'Pridėti mokėjimą', 'mark_paid' => 'Pažymėti kaip apmokėtą', 'mark_sent' => 'Pažymėti kaip išsiųstą', + 'mark_viewed' => 'Pažymėti kaip peržiūrėtą', + 'mark_cancelled' => 'Pažymėti kaip atšauktą', 'download_pdf' => 'Parsisiųsti PDF', 'send_mail' => 'Siųsti laišką', 'all_invoices' => 'Prisijunkite norėdami peržiūrėti visas sąskaitas faktūras', 'create_invoice' => 'Sukurti sąskaitą-faktūrą', 'send_invoice' => 'Siųsti sąskaitą-faktūrą', 'get_paid' => 'Gauti apmokėjimą', + 'accept_payments' => 'Priimti atsiskaitymus internetu', 'statuses' => [ 'draft' => 'Juodraštis', @@ -43,16 +47,23 @@ return [ 'approved' => 'Patvirtinta', 'partial' => 'Dalinis', 'paid' => 'Apmokėta', + 'overdue' => 'Vėluojanti', + 'unpaid' => 'Neapmokėta', + 'cancelled' => 'Atšaukta', ], 'messages' => [ - 'email_sent' => 'Sąskaitą-faktūrą išsiųsta sėkmingai!', - 'marked_sent' => 'SF pažymėta kaip išsiųsta sėkmingai!', + 'email_sent' => 'Sąskaita-faktūra išsiųsta el. paštu!', + 'marked_sent' => 'Sąskaita-faktūra pažymėta kaip išsiųsta!', + 'marked_paid' => 'Sąskaita-faktūra pažymėta kaip apmokėta!', + 'marked_viewed' => 'Sąskaita-faktūra pažymėta kaip peržiūrėta!', + 'marked_cancelled' => 'Sąskaita-faktūra pažymėta kaip atšaukta!', 'email_required' => 'Klientas neturi el. pašto!', 'draft' => 'Tai yra JUODRAŠTINĖ sąskaita ir ji bus įtraukta į grafikus po to kai bus išsiųsta.', 'status' => [ 'created' => 'Sukurta :date', + 'viewed' => 'Peržiūrėta', 'send' => [ 'draft' => 'Neišsiųsta', 'sent' => 'Išsiųsta :date', @@ -63,9 +74,4 @@ return [ ], ], - 'notification' => [ - 'message' => 'Jūs gavote šį laišką, nes :customer jums išrašė sąskaitą už :amount.', - 'button' => 'Apmokėti dabar', - ], - ]; diff --git a/resources/lang/lt-LT/items.php b/resources/lang/lt-LT/items.php index c4229e72b..0e79d33d1 100644 --- a/resources/lang/lt-LT/items.php +++ b/resources/lang/lt-LT/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'Kiekis|Kiekiai', 'sales_price' => 'Pardavimo kaina', 'purchase_price' => 'Pirkimo kaina', - 'sku' => 'Prekės kodas', - - 'notification' => [ - 'message' => [ - 'reminder' => 'Jūs gavote šį laišką, nes :name liko tik :quantity vnt.', - 'out_of_stock' => 'Jūs gavote šį laišką, nes baigiasi :name likutis.', - ], - 'button' => 'Peržiūrėti dabar', - ], ]; diff --git a/resources/lang/lt-LT/maintenance.php b/resources/lang/lt-LT/maintenance.php new file mode 100644 index 000000000..ac8ab8f86 --- /dev/null +++ b/resources/lang/lt-LT/maintenance.php @@ -0,0 +1,11 @@ + 'puslapis tvarkomas', + + 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', + + 'last-updated' => 'This message was last updated :timestamp.', + +]; diff --git a/resources/lang/lt-LT/messages.php b/resources/lang/lt-LT/messages.php index 679ae5d23..9a3d48a47 100644 --- a/resources/lang/lt-LT/messages.php +++ b/resources/lang/lt-LT/messages.php @@ -8,6 +8,7 @@ return [ 'deleted' => ':type ištrintas!', 'duplicated' => ':type duplikuotas!', 'imported' => ':type importuotas!', + 'exported' => ':type išeksportuotas!', 'enabled' => ':type įjungtas!', 'disabled' => ':type išjungtas!', ], @@ -18,7 +19,8 @@ return [ 'customer' => 'Klaida: Vartotojas nebuvo sukurtas! :name jau naudoja šį el. pašto adresą.', 'no_file' => 'Klaida: Nepasirinktas failas!', 'last_category' => 'Klaida: Negalite ištrinti paskutinės :type kategorijos!', - 'invalid_apikey' => 'Klaida: Neteisingas raktas!', + 'change_type' => 'Klaida: Negalima pakeisti tipo, nes jis yra susijęs su :text!', + 'invalid_apikey' => 'Klaida: Neteisingas raktas!', 'import_column' => 'Klaida: :message :sheet lape. Eilutė: :line.', 'import_sheet' => 'Klaida: Lapo pavadinimas neteisingas Peržiūrėkite pavyzdį.', ], @@ -26,7 +28,10 @@ return [ 'warning' => [ 'deleted' => 'Negalima ištrinti :name, nes jis yra susijęs su :text.', 'disabled' => 'Negalima išjungti :name, nes jis yra susijęs su :text.', + 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', + 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', 'disable_code' => 'Įspėjimas: Negalima išjungti arba pakeisti valiutos :name, nes ji susijusi su :text.', + 'payment_cancel' => 'Warning: You have cancelled your recent :method payment!', ], ]; diff --git a/resources/lang/lt-LT/modules.php b/resources/lang/lt-LT/modules.php index 4d7948d2d..e7b4f3ad3 100644 --- a/resources/lang/lt-LT/modules.php +++ b/resources/lang/lt-LT/modules.php @@ -2,9 +2,9 @@ return [ - 'title' => 'API raktas', - 'api_token' => 'Raktas', + 'api_key' => 'API Raktas', 'my_apps' => 'Mano programėlės', + 'pre_sale' => 'Pre-Sale', 'top_paid' => 'Geriausios mokamos', 'new' => 'Nauji', 'top_free' => 'Geriausios nemokamos', @@ -12,10 +12,9 @@ return [ 'search' => 'Paieška', 'install' => 'Įrašyti', 'buy_now' => 'Pirkti dabar', - 'token_link' => 'Spauskite čia, kad gautumėte savo API raktą.', + 'get_api_key' => 'Norėdami gauti API Raktą spauskite čia.', 'no_apps' => 'Nėra programėlių šioje kategorijoje.', - 'developer' => 'Ar esate kūrėjas? Čia galite sužinoti, kaip sukurti programėlę ir pradėti pardavinėti šiandien!', - + 'become_developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', 'recommended_apps' => 'Rekomenduojamos programėlės', 'about' => 'Apie', @@ -37,30 +36,30 @@ return [ 'installation' => 'Įrašymas', 'faq' => 'DUK', 'changelog' => 'Pakeitimų sąrašas', - 'reviews' => 'Atsiliepimai', + 'reviews' => 'Atsiliepimai', ], 'installation' => [ 'header' => 'Įrašymas', - 'download' => 'Parsisiunčiamas :module failas.', + 'download' => 'Parsisiunčiamas :module', 'unzip' => 'Išskleidžiami :module failai.', 'file_copy' => 'Kopijuojami :module failai.', - 'migrate' => 'Įrašomi :module atnaujinimai.', - 'finish' => 'Atnaujinimai įrašyti. Jūs būsite nukreipti į Atnaujinimų Centrą.', - 'install' => 'Įrašomi :module failai.', + 'finish' => 'Užbaigiamas :module įrašymas', + 'redirect' => ':module įrašytas, nukreipiam į atnuajinimų puslapį', + 'install' => 'Įrašomas :module', ], 'errors' => [ - 'download' => 'Negalima parsisiųsti :module!', - 'upload' => 'Negalima įrašyti parsiųsto modulio :module!', - 'unzip' => 'Nagelima išpakuoti (unzip) :module!', - 'file_copy' => 'Negalima kopijuoti :module failų!', - 'migrate' => ':module migracija sugadinta!', - 'migrate core' => ':module yra naujausios versijos.', + 'download' => 'Negalima parsisiųsti :module', + 'zip' => 'Not able to create :module zip file', + 'unzip' => 'Not able to unzip :module', + 'file_copy' => 'Not able to copy :module files', + 'finish' => 'Not able to finalize :module installation', ], 'badge' => [ - 'installed' => 'Įrašytas', + 'installed' => 'Įrašytas', + 'pre_sale' => 'Pre-Sale', ], 'button' => [ @@ -70,14 +69,16 @@ return [ ], 'my' => [ - 'purchased' => 'Nupirkta', - 'installed' => 'Įrašyta', + 'purchased' => 'Nupirkta', + 'installed' => 'Įrašyta', ], 'reviews' => [ 'button' => [ - 'add' => 'Pridėti apžvalgą' + 'add' => 'Pridėti apžvalgą' ], - 'na' => 'Nėra apžvalgų.' - ] + + 'na' => 'Nėra apžvalgų.' + ], + ]; diff --git a/resources/lang/lt-LT/pagination.php b/resources/lang/lt-LT/pagination.php index a69c048e3..b78a134bf 100644 --- a/resources/lang/lt-LT/pagination.php +++ b/resources/lang/lt-LT/pagination.php @@ -2,8 +2,9 @@ return [ - 'previous' => '« Ankstesnis', - 'next' => 'Sekantis »', - 'showing' => 'Rodoma nuo :first iki :last iš :total :type', + 'previous' => 'Ankstesnis', + 'next' => 'Sekantis', + 'showing' => ':first-:last iš :total.', + 'page' => 'puslapyje.', ]; diff --git a/resources/lang/lt-LT/passwords.php b/resources/lang/lt-LT/passwords.php index 4fb2c8538..83f06b1da 100644 --- a/resources/lang/lt-LT/passwords.php +++ b/resources/lang/lt-LT/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => 'Slaptažodžio keitimo nuoroda išsiųsta!', 'token' => 'Šis slaptažodžio atnaujinimas negaliojantis.', 'user' => "Vartotojas su tokiu el. pašu nerastas.", + 'throttle' => 'Prašome palaukti prieš bandant dar kartą.', ]; diff --git a/resources/lang/lt-LT/reconciliations.php b/resources/lang/lt-LT/reconciliations.php index 02ab28038..9f500f992 100644 --- a/resources/lang/lt-LT/reconciliations.php +++ b/resources/lang/lt-LT/reconciliations.php @@ -6,7 +6,7 @@ return [ 'reconciled' => 'Reconciled', 'closing_balance' => 'Galutinis likutis', 'unreconciled' => 'Unreconciled', - 'list_transactions' => 'Operacijos', + 'transactions' => 'Transactions', 'start_date' => 'Pradžios data', 'end_date' => 'Pabaigos data', 'cleared_amount' => 'Cleared Amount', diff --git a/resources/lang/lt-LT/reports.php b/resources/lang/lt-LT/reports.php index 18653f3c1..d7940c729 100644 --- a/resources/lang/lt-LT/reports.php +++ b/resources/lang/lt-LT/reports.php @@ -12,6 +12,7 @@ return [ 'net_profit' => 'Pelnas prieš mokesčius', 'total_expenses' => 'Iš viso išlaidų', 'net' => 'NET', + 'income_expense' => 'Pajamos / išlaidos', 'summary' => [ 'income' => 'Pajamų suvestinė', @@ -20,11 +21,10 @@ return [ 'tax' => 'Mokesčių suvestinė', ], - 'quarter' => [ - '1' => 'Sau-Kov', - '2' => 'Bal-Bir', - '3' => 'Lie-Rugs', - '4' => 'Spa-Gruo', + 'charts' => [ + 'line' => 'Eilutė', + 'bar' => 'Stulpelis', + 'pie' => 'Skritulinė', ], ]; diff --git a/resources/lang/lt-LT/settings.php b/resources/lang/lt-LT/settings.php index a783c27e7..2db080738 100644 --- a/resources/lang/lt-LT/settings.php +++ b/resources/lang/lt-LT/settings.php @@ -3,14 +3,16 @@ return [ 'company' => [ + 'description' => 'Pakeisti kompanijos pavadinimą, el. paštą, adresą ir t.t.', 'name' => 'Pavadinimas', 'email' => 'El. paštas', 'phone' => 'Telefonas', 'address' => 'Adresas', 'logo' => 'Logotipas', ], + 'localisation' => [ - 'tab' => 'Lokalizacija', + 'description' => 'Nustatyti biudžetinius metus, laiko juostas, datos formatą ir kitus lokalizacijos nustatymus.', 'financial_start' => 'Finansinių metų pradžia', 'timezone' => 'Laiko juosta', 'date' => [ @@ -27,9 +29,16 @@ return [ 'before' => 'Prieš skaičių', 'after' => 'Po skaičiaus', ], + 'discount_location' => [ + 'name' => 'Nuolaidos vieta', + 'item' => 'Eilutėje', + 'total' => 'Iš viso', + 'both' => 'Both line and total', + ], ], + 'invoice' => [ - 'tab' => 'Sąskaita faktūra', + 'description' => 'Customize invoice prefix, number, terms, footer etc', 'prefix' => 'Sąskaitos serija', 'digit' => 'Skaitmenų kiekis', 'next' => 'Kitas numeris', @@ -44,16 +53,25 @@ return [ 'rate' => 'Kursas', 'quantity_name' => 'Kiekio pavadinimas', 'quantity' => 'Kiekis', + 'payment_terms' => 'Mokėjimo Sąlygos', + 'title' => 'Pavadinimas', + 'subheading' => 'Poraštė', + 'due_receipt' => 'Due upon receipt', + 'due_days' => 'Due within :days days', + 'choose_template' => 'Pasirinkite sąskaitos-faktūros šabloną.', + 'default' => 'Numatytas', + 'classic' => 'Klasikinis', + 'modern' => 'Modernus', ], + 'default' => [ - 'tab' => 'Numatytieji', - 'account' => 'Numatytoji įmonė', - 'currency' => 'Numatytoji valiuta', - 'tax' => 'Numatytasis mokesčių tarifas', - 'payment' => 'Numatytasis mokėjimo būdas', - 'language' => 'Numatytoji kalba', + 'description' => 'Numatytoji sąskaita, valuta, kalba', + 'list_limit' => 'Įrašų puslapyje', + 'use_gravatar' => 'Naudoti Gravatar', ], + 'email' => [ + 'description' => 'Change the sending protocol and email templates', 'protocol' => 'Protokolas', 'php' => 'PHP Mail', 'smtp' => [ @@ -68,36 +86,44 @@ return [ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail kelias', 'log' => 'Prisijungti el. Paštu', + + 'templates' => [ + 'subject' => 'Tema', + 'body' => 'Tekstas', + 'tags' => 'Available Tags: :tag_list', + 'invoice_new_customer' => 'New Invoice Template (sent to customer)', + 'invoice_remind_customer' => 'Invoice Reminder Template (sent to customer)', + 'invoice_remind_admin' => 'Invoice Reminder Template (sent to admin)', + 'invoice_recur_customer' => 'Invoice Recurring Template (sent to customer)', + 'invoice_recur_admin' => 'Invoice Recurring Template (sent to admin)', + 'invoice_payment_customer' => 'Payment Received Template (sent to customer)', + 'invoice_payment_admin' => 'Payment Received Template (sent to admin)', + 'bill_remind_admin' => 'Bill Reminder Template (sent to admin)', + 'bill_recur_admin' => 'Bill Recurring Template (sent to admin)', + ], ], + 'scheduling' => [ - 'tab' => 'Planavimas', + 'name' => 'Planavimas', + 'description' => 'Automatic reminders and command for recurring', 'send_invoice' => 'Siųsti SF priminimą', 'invoice_days' => 'Siųsti pavėlavus', 'send_bill' => 'Siųsti sąskaitos priminimą', 'bill_days' => 'Siųsti prieš pavėlavimą', 'cron_command' => 'Cron komanda', 'schedule_time' => 'Paleidimo valanda', - 'send_item_reminder'=> 'Siųsti priminimą', - 'item_stocks' => 'Siųsti kai atsiras prekių', ], - 'appearance' => [ - 'tab' => 'Išvaizda', - 'theme' => 'Tema', - 'light' => 'Šviesi', - 'dark' => 'Tamsi', - 'list_limit' => 'Įrašų puslapyje', - 'use_gravatar' => 'Naudoti Gravatar', + + 'categories' => [ + 'description' => 'Unlimited categories for income, expense, and item', ], - 'system' => [ - 'tab' => 'Sistema', - 'session' => [ - 'lifetime' => 'Sesijos galiojimo laikas (min)', - 'handler' => 'Sesijos valdiklis', - 'file' => 'Failas', - 'database' => 'Duomenų bazė', - ], - 'file_size' => 'Maksimalus failo dydis (MB)', - 'file_types' => 'Leidžiami failų tipai', + + 'currencies' => [ + 'description' => 'Create and manage currencies and set their rates', + ], + + 'taxes' => [ + 'description' => 'Fixed, normal, inclusive, and compound tax rates', ], ]; diff --git a/resources/lang/lt-LT/taxes.php b/resources/lang/lt-LT/taxes.php index 52809a77f..c574f8080 100644 --- a/resources/lang/lt-LT/taxes.php +++ b/resources/lang/lt-LT/taxes.php @@ -7,5 +7,5 @@ return [ 'normal' => 'Normalus', 'inclusive' => 'Imtinai', 'compound' => 'Sudėtinis', - + 'fixed' => 'Fiksuota', ]; diff --git a/resources/lang/lt-LT/validation.php b/resources/lang/lt-LT/validation.php index 0207badb5..aea160f61 100644 --- a/resources/lang/lt-LT/validation.php +++ b/resources/lang/lt-LT/validation.php @@ -16,13 +16,13 @@ return [ 'accepted' => ':Attribute turi būti pažymėtas.', 'active_url' => ':Attribute nėra galiojantis internetinis adresas.', 'after' => ':Attribute reikšmė turi būti po :date datos.', - 'after_or_equal' => ':Attribute privalo būti data lygi arba vėlesnė už :date.', + 'after_or_equal' => 'Lauko :attribute reikšmė privalo būti data lygi arba vėlesnė negu :date.', 'alpha' => ':Attribute gali turėti tik raides.', 'alpha_dash' => ':Attribute gali turėti tik raides, skaičius ir brūkšnelius.', 'alpha_num' => 'Laukas :attribute gali turėti tik raides ir skaičius.', 'array' => ':Attribute turi būti masyvas.', 'before' => ':Attribute turi būti data prieš :date.', - 'before_or_equal' => ':Attribute privalo būti data ankstenė arba lygi :date.', + 'before_or_equal' => 'Lauko :attribute reikšmė privalo būti data lygi arba ankstesnė negu :date.', 'between' => [ 'numeric' => ':Attribute reikšmė turi būti tarp :min ir :max.', 'file' => ':Attribute failo dydis turi būti tarp :min ir :max kilobaitų.', @@ -39,13 +39,14 @@ return [ 'dimensions' => 'Lauke :attribute įkeltas paveiksliukas neatitinka išmatavimų reikalavimo.', 'distinct' => 'Laukas :attribute pasikartoja.', 'email' => 'Lauko :attribute reikšmė turi būti galiojantis el. pašto adresas.', + 'ends_with' => 'Laukas :attribute turi baigtis vienu iš: :values', 'exists' => 'Pasirinkta negaliojanti :attribute reikšmė.', - 'file' => ':Attribute privalo būti failas.', + 'file' => ':attribute turi būti failas.', 'filled' => 'Laukas :attribute turi būti užpildytas.', 'image' => 'Lauko :attribute reikšmė turi būti paveikslėlis.', 'in' => 'Pasirinkta negaliojanti :attribute reikšmė.', 'in_array' => 'Laukas :attribute neegzistuoja :other lauke.', - 'integer' => 'Lauko :attribute reikšmė turi būti veikasis skaičius.', + 'integer' => 'Lauko :attribute reikšmė turi būti sveikasis skaičius.', 'ip' => 'Lauko :attribute reikšmė turi būti galiojantis IP adresas.', 'json' => 'Lauko :attribute reikšmė turi būti JSON tekstas.', 'max' => [ @@ -83,7 +84,7 @@ return [ 'string' => 'Laukas :attribute turi būti tekstinis.', 'timezone' => 'Lauko :attribute reikšmė turi būti galiojanti laiko zona.', 'unique' => 'Tokia :attribute reikšmė jau pasirinkta.', - 'uploaded' => 'Nepavyko įkelti :attribute.', + 'uploaded' => 'Nepavyko įkelti :attribute lauko.', 'url' => 'Negaliojantis lauko :attribute formatas.', /* @@ -99,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'Pasirinktinis pranešimas', + 'rule-name' => 'Pasirinktinis pranešimas', ], - 'invalid_currency' => ':Attribute kodas neteisingas.', - 'invalid_amount' => ':Attribute kiekis yra neteisingas.', + 'invalid_currency' => ':Attribute kodas neteisingas.', + 'invalid_amount' => ':Attribute kiekis yra neteisingas.', + 'invalid_extension' => 'Negalimas failo tipas.', ], /* diff --git a/resources/lang/lt-LT/dashboard.php b/resources/lang/lt-LT/widgets.php similarity index 78% rename from resources/lang/lt-LT/dashboard.php rename to resources/lang/lt-LT/widgets.php index d61df9240..785d28894 100644 --- a/resources/lang/lt-LT/dashboard.php +++ b/resources/lang/lt-LT/widgets.php @@ -2,7 +2,7 @@ return [ - 'total_incomes' => 'Iš viso pajamų', + 'total_income' => 'Iš viso pajamų', 'receivables' => 'Gautinos sumos', 'open_invoices' => 'Neapmokėtos sąskaitos faktūros', 'overdue_invoices' => 'Vėluojančios sąskaitos faktūros', @@ -11,14 +11,13 @@ return [ 'open_bills' => 'Neapmokėtos sąskaitas', 'overdue_bills' => 'Vėluojančios sąskaitos', 'total_profit' => 'Pelnas iš viso', - 'open_profit' => 'Pelnas prieš mokesčius', + 'open_profit' => 'Open Profit', 'overdue_profit' => 'Vėluojantis pelnas', 'cash_flow' => 'Grynųjų pinigų srautai', 'no_profit_loss' => 'Nėra nuostolių', - 'incomes_by_category' => 'Pajamos pagal kategoriją', + 'income_by_category' => 'Pajamos pagal kategoriją', 'expenses_by_category' => 'Išlaidos pagal kategoriją', 'account_balance' => 'Sąskaitos likutis', - 'latest_incomes' => 'Naujausios pajamos', + 'latest_income' => 'Naujausios pajamos', 'latest_expenses' => 'Paskutinis išlaidos', - ]; From 998983ca0fccaa93f456a96510b557db0c9c85bc Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 17:04:17 +0300 Subject: [PATCH 11/69] fixed default start/end date of new reconciliation --- app/Http/Controllers/Banking/Reconciliations.php | 5 +++-- resources/views/banking/reconciliations/create.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Banking/Reconciliations.php b/app/Http/Controllers/Banking/Reconciliations.php index 1309127f0..81f0f8229 100644 --- a/app/Http/Controllers/Banking/Reconciliations.php +++ b/app/Http/Controllers/Banking/Reconciliations.php @@ -11,6 +11,7 @@ use App\Jobs\Banking\UpdateReconciliation; use App\Models\Banking\Account; use App\Models\Banking\Reconciliation; use App\Models\Banking\Transaction; +use Date; class Reconciliations extends Controller { @@ -48,8 +49,8 @@ class Reconciliations extends Controller $accounts = Account::enabled()->pluck('name', 'id'); $account_id = request('account_id', setting('default.account')); - $started_at = request('started_at', '0000-00-00'); - $ended_at = request('ended_at', '0000-00-00'); + $started_at = request('started_at', Date::now()->firstOfMonth()->toDateString()); + $ended_at = request('ended_at', Date::now()->endOfMonth()->toDateString()); $account = Account::find($account_id); diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php index 2dbb5c4f7..0d8c8214b 100644 --- a/resources/views/banking/reconciliations/create.blade.php +++ b/resources/views/banking/reconciliations/create.blade.php @@ -16,9 +16,9 @@
- {{ Form::dateGroup('started_at', trans('reconciliations.start_date'), 'calendar', ['id' => 'started_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('started_at'), 'col-xl-3') }} + {{ Form::dateGroup('started_at', trans('reconciliations.start_date'), 'calendar', ['id' => 'started_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('started_at', Date::now()->firstOfMonth()->toDateString()), 'col-xl-3') }} - {{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at'), 'col-xl-3') }} + {{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }} {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], request('closing_balance', 0.00), 'col-xl-2') }} From 23a684d95950731387d5a60d70f4df4a740d5d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 17:13:31 +0300 Subject: [PATCH 12/69] User can not delete own.. --- resources/views/auth/users/index.blade.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index 83f44bc26..7267a4c65 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -87,10 +87,12 @@
{{ trans('general.edit') }} - @permission('delete-auth-users') -
- {!! Form::deleteLink($item, 'users.destroy') !!} - @endpermission + @if (user()->id != $item->id) + @permission('delete-auth-users') +
+ {!! Form::deleteLink($item, 'users.destroy') !!} + @endpermission + @endif
From 75722a4b3540a7b5ebbaa15d3cc098598bda0c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 19:47:31 +0300 Subject: [PATCH 13/69] close #1436 Fixed: Dashboard switch issue --- app/Http/Controllers/Common/Dashboards.php | 2 +- app/Listeners/Menu/AddAdminItems.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index 9e35852ba..7fb15a2b6 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -51,7 +51,7 @@ class Dashboards extends Controller { $dashboard_id = session('dashboard_id', 0); - if ($dashboard) { + if (!empty($dashboard->id)) { $dashboard_id = $dashboard->id; } diff --git a/app/Listeners/Menu/AddAdminItems.php b/app/Listeners/Menu/AddAdminItems.php index 52436c76e..c17c4bb38 100644 --- a/app/Listeners/Menu/AddAdminItems.php +++ b/app/Listeners/Menu/AddAdminItems.php @@ -26,9 +26,11 @@ class AddAdminItems if ($dashboards->count() > 1) { $menu->dropdown(trim(trans_choice('general.dashboards', 2)), function ($sub) use ($user, $attr, $dashboards) { foreach ($dashboards as $key => $dashboard) { - $path = (session('dashboard_id') == $dashboard->id) ? '/' : '/?dashboard_id=' . $dashboard->id; - - $sub->url($path, $dashboard->name, $key, $attr); + if (session('dashboard_id') != $dashboard->id) { + $sub->route('dashboards.switch', $dashboard->name, ['dashboard' => $dashboard->id], $key, $attr); + } else { + $sub->url('/', $dashboard->name, $key, $attr); + } } }, 1, [ 'url' => '/', From 6e01709eda8dee1c88975f8dc560cdc39069f561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 21:36:02 +0300 Subject: [PATCH 14/69] update composer.lock file --- composer.lock | 218 +++++++++++++++++++++++++------------------------- 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/composer.lock b/composer.lock index e840e5cbb..84e0988b9 100644 --- a/composer.lock +++ b/composer.lock @@ -323,16 +323,16 @@ }, { "name": "akaunting/setting", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/akaunting/setting.git", - "reference": "231b673a19f96fba050e9c005d3cbc7e428c914b" + "reference": "194f8c60285f66835f70e0a8e87e1a66d989b111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/setting/zipball/231b673a19f96fba050e9c005d3cbc7e428c914b", - "reference": "231b673a19f96fba050e9c005d3cbc7e428c914b", + "url": "https://api.github.com/repos/akaunting/setting/zipball/194f8c60285f66835f70e0a8e87e1a66d989b111", + "reference": "194f8c60285f66835f70e0a8e87e1a66d989b111", "shasum": "" }, "require": { @@ -382,7 +382,7 @@ "laravel", "persistent" ], - "time": "2019-12-31T21:50:36+00:00" + "time": "2020-04-29T07:18:49+00:00" }, { "name": "akaunting/version", @@ -2140,16 +2140,16 @@ }, { "name": "fruitcake/laravel-cors", - "version": "v1.0.5", + "version": "v1.0.6", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-cors.git", - "reference": "0e0500133dbb6325266133dd72f040617c9cdbd0" + "reference": "1d127dbec313e2e227d65e0c483765d8d7559bf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/0e0500133dbb6325266133dd72f040617c9cdbd0", - "reference": "0e0500133dbb6325266133dd72f040617c9cdbd0", + "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/1d127dbec313e2e227d65e0c483765d8d7559bf6", + "reference": "1d127dbec313e2e227d65e0c483765d8d7559bf6", "shasum": "" }, "require": { @@ -2204,20 +2204,20 @@ "crossdomain", "laravel" ], - "time": "2020-03-11T21:05:07+00:00" + "time": "2020-04-28T08:47:37+00:00" }, { "name": "genealabs/laravel-model-caching", - "version": "0.8.3", + "version": "0.8.4", "source": { "type": "git", "url": "https://github.com/GeneaLabs/laravel-model-caching.git", - "reference": "a76e9f143905fca08690fdf2421b0132e8881af4" + "reference": "cdb7152a80ae774214108a717e5a405207f2d033" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/a76e9f143905fca08690fdf2421b0132e8881af4", - "reference": "a76e9f143905fca08690fdf2421b0132e8881af4", + "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/cdb7152a80ae774214108a717e5a405207f2d033", + "reference": "cdb7152a80ae774214108a717e5a405207f2d033", "shasum": "" }, "require": { @@ -2229,12 +2229,13 @@ "illuminate/database": "^7.0", "illuminate/http": "^7.0", "illuminate/support": "^7.0", - "php": ">=7.2.5", + "php": ">=7.3", "predis/predis": "^1.1" }, "require-dev": { + "doctrine/dbal": "^2.10", "fzaninotto/faker": "^1.9", - "laravel/nova": "3.*", + "laravel/nova": "^3.0", "orchestra/testbench": "^5.0", "orchestra/testbench-browser-kit": "^5.0", "php-coveralls/php-coveralls": "^2.2", @@ -2268,7 +2269,7 @@ } ], "description": "Automatic caching for Eloquent models.", - "time": "2020-04-15T18:52:17+00:00" + "time": "2020-04-29T13:16:59+00:00" }, { "name": "genealabs/laravel-pivot-events", @@ -2989,16 +2990,16 @@ }, { "name": "laravel/framework", - "version": "v7.8.1", + "version": "v7.9.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "cdc6d7e6c744f4d8f7d61102aea9b111550cd297" + "reference": "757b155658ae6da429065ba8f22242fe599824f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/cdc6d7e6c744f4d8f7d61102aea9b111550cd297", - "reference": "cdc6d7e6c744f4d8f7d61102aea9b111550cd297", + "url": "https://api.github.com/repos/laravel/framework/zipball/757b155658ae6da429065ba8f22242fe599824f7", + "reference": "757b155658ae6da429065ba8f22242fe599824f7", "shasum": "" }, "require": { @@ -3137,7 +3138,7 @@ "framework", "laravel" ], - "time": "2020-04-24T17:21:56+00:00" + "time": "2020-04-28T16:09:20+00:00" }, { "name": "laravel/tinker", @@ -3205,16 +3206,16 @@ }, { "name": "laravel/ui", - "version": "v2.0.1", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83" + "reference": "15368c5328efb7ce94f35ca750acde9b496ab1b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83", - "reference": "47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83", + "url": "https://api.github.com/repos/laravel/ui/zipball/15368c5328efb7ce94f35ca750acde9b496ab1b1", + "reference": "15368c5328efb7ce94f35ca750acde9b496ab1b1", "shasum": "" }, "require": { @@ -3256,7 +3257,7 @@ "laravel", "ui" ], - "time": "2020-03-03T20:16:46+00:00" + "time": "2020-04-29T15:06:45+00:00" }, { "name": "laravelcollective/html", @@ -4131,21 +4132,22 @@ }, { "name": "nesbot/carbon", - "version": "2.32.2", + "version": "2.33.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc" + "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f10e22cf546704fab1db4ad4b9dedbc5c797a0dc", - "reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", + "reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", "shasum": "" }, "require": { "ext-json": "*", "php": "^7.1.8 || ^8.0", + "symfony/polyfill-mbstring": "^1.0", "symfony/translation": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { @@ -4198,7 +4200,7 @@ "datetime", "time" ], - "time": "2020-03-31T13:43:19+00:00" + "time": "2020-04-20T15:05:43+00:00" }, { "name": "nikic/php-parser", @@ -4392,24 +4394,21 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "shasum": "" }, "require": { "php": ">=7.1" }, - "require-dev": { - "phpunit/phpunit": "~6" - }, "type": "library", "extra": { "branch-alias": { @@ -4440,7 +4439,7 @@ "reflection", "static analysis" ], - "time": "2018-08-07T13:53:10+00:00" + "time": "2020-04-27T09:25:28+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -4543,16 +4542,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "c2a205e82f9cf1cc9fab86b79e808d86dd680470" + "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c2a205e82f9cf1cc9fab86b79e808d86dd680470", - "reference": "c2a205e82f9cf1cc9fab86b79e808d86dd680470", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/f79611d6dc1f6b7e8e30b738fc371b392001dbfd", + "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd", "shasum": "" }, "require": { @@ -4632,7 +4631,7 @@ "xls", "xlsx" ], - "time": "2020-03-02T13:09:03+00:00" + "time": "2020-04-27T08:12:48+00:00" }, { "name": "phpoption/phpoption", @@ -5407,16 +5406,16 @@ }, { "name": "santigarcor/laratrust", - "version": "5.2.8", + "version": "5.2.9", "source": { "type": "git", "url": "https://github.com/santigarcor/laratrust.git", - "reference": "c709f44509cf1371b777a01b6eca210bc34a06f8" + "reference": "454a338500ea5ab2807da5ee0a799c9c3d01cc05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/c709f44509cf1371b777a01b6eca210bc34a06f8", - "reference": "c709f44509cf1371b777a01b6eca210bc34a06f8", + "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/454a338500ea5ab2807da5ee0a799c9c3d01cc05", + "reference": "454a338500ea5ab2807da5ee0a799c9c3d01cc05", "shasum": "" }, "require": { @@ -5426,7 +5425,7 @@ }, "require-dev": { "mockery/mockery": ">=0.9.9", - "orchestra/testbench": "~3.6.0|~3.7.0|~3.8.0|~3.9.0", + "orchestra/testbench": "~3.6.0|~3.7.0|~3.8.0|~3.9.0|4.*|5.*", "phpunit/phpunit": ">=4.1" }, "type": "library", @@ -5468,24 +5467,24 @@ "rbac", "roles" ], - "time": "2020-03-09T08:19:36+00:00" + "time": "2020-04-29T23:28:02+00:00" }, { "name": "seld/jsonlint", - "version": "1.7.2", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19" + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19", - "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", "shasum": "" }, "require": { - "php": "^5.3 || ^7.0" + "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" @@ -5517,7 +5516,7 @@ "parser", "validator" ], - "time": "2019-10-24T14:27:39+00:00" + "time": "2020-04-30T19:05:18+00:00" }, { "name": "seld/phar-utils", @@ -5768,7 +5767,7 @@ }, { "name": "symfony/console", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -5844,7 +5843,7 @@ }, { "name": "symfony/css-selector", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -5897,7 +5896,7 @@ }, { "name": "symfony/debug", - "version": "v4.4.7", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", @@ -5953,7 +5952,7 @@ }, { "name": "symfony/error-handler", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", @@ -6008,7 +6007,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -6136,16 +6135,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "ca3b87dd09fff9b771731637f5379965fbfab420" + "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/ca3b87dd09fff9b771731637f5379965fbfab420", - "reference": "ca3b87dd09fff9b771731637f5379965fbfab420", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91", + "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91", "shasum": "" }, "require": { @@ -6182,11 +6181,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-04-12T14:40:17+00:00" }, { "name": "symfony/finder", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -6235,16 +6234,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "26fb006a2c7b6cdd23d52157b05f8414ffa417b6" + "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/26fb006a2c7b6cdd23d52157b05f8414ffa417b6", - "reference": "26fb006a2c7b6cdd23d52157b05f8414ffa417b6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d", + "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d", "shasum": "" }, "require": { @@ -6286,20 +6285,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2020-03-30T14:14:32+00:00" + "time": "2020-04-18T20:50:06+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "ad574c55d451127cab1c45b4ac51bf283e340cf0" + "reference": "3565e51eecd06106304baba5ccb7ba89db2d7d2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad574c55d451127cab1c45b4ac51bf283e340cf0", - "reference": "ad574c55d451127cab1c45b4ac51bf283e340cf0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3565e51eecd06106304baba5ccb7ba89db2d7d2b", + "reference": "3565e51eecd06106304baba5ccb7ba89db2d7d2b", "shasum": "" }, "require": { @@ -6315,6 +6314,7 @@ "symfony/browser-kit": "<4.4", "symfony/cache": "<5.0", "symfony/config": "<5.0", + "symfony/console": "<4.4", "symfony/dependency-injection": "<4.4", "symfony/doctrine-bridge": "<5.0", "symfony/form": "<5.0", @@ -6382,20 +6382,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2020-03-30T15:04:59+00:00" + "time": "2020-04-28T18:53:25+00:00" }, { "name": "symfony/mime", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "481b7d6da88922fb1e0d86a943987722b08f3955" + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955", - "reference": "481b7d6da88922fb1e0d86a943987722b08f3955", + "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b", + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b", "shasum": "" }, "require": { @@ -6444,7 +6444,7 @@ "mime", "mime-type" ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-04-17T03:29:44+00:00" }, { "name": "symfony/polyfill-ctype", @@ -6799,16 +6799,16 @@ }, { "name": "symfony/process", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c5ca4a0fc16a0c888067d43fbcfe1f8a53d8e70e" + "reference": "3179f68dff5bad14d38c4114a1dab98030801fd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c5ca4a0fc16a0c888067d43fbcfe1f8a53d8e70e", - "reference": "c5ca4a0fc16a0c888067d43fbcfe1f8a53d8e70e", + "url": "https://api.github.com/repos/symfony/process/zipball/3179f68dff5bad14d38c4114a1dab98030801fd7", + "reference": "3179f68dff5bad14d38c4114a1dab98030801fd7", "shasum": "" }, "require": { @@ -6844,20 +6844,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-04-15T15:59:10+00:00" }, { "name": "symfony/routing", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d98a95d0a684caba47a47c1c50c602a669dc973b" + "reference": "9b18480a6e101f8d9ab7c483ace7c19441be5111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d98a95d0a684caba47a47c1c50c602a669dc973b", - "reference": "d98a95d0a684caba47a47c1c50c602a669dc973b", + "url": "https://api.github.com/repos/symfony/routing/zipball/9b18480a6e101f8d9ab7c483ace7c19441be5111", + "reference": "9b18480a6e101f8d9ab7c483ace7c19441be5111", "shasum": "" }, "require": { @@ -6920,7 +6920,7 @@ "uri", "url" ], - "time": "2020-03-30T11:42:42+00:00" + "time": "2020-04-21T21:02:50+00:00" }, { "name": "symfony/service-contracts", @@ -6982,16 +6982,16 @@ }, { "name": "symfony/translation", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "99b831770e10807dca0979518e2c89edffef5978" + "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/99b831770e10807dca0979518e2c89edffef5978", - "reference": "99b831770e10807dca0979518e2c89edffef5978", + "url": "https://api.github.com/repos/symfony/translation/zipball/c3879db7a68fe3e12b41263b05879412c87b27fd", + "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd", "shasum": "" }, "require": { @@ -7055,7 +7055,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-04-12T16:45:47+00:00" }, { "name": "symfony/translation-contracts", @@ -7116,16 +7116,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f74a126acd701392eef2492a17228d42552c86b5" + "reference": "09de28632f16f81058a85fcf318397218272a07b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f74a126acd701392eef2492a17228d42552c86b5", - "reference": "f74a126acd701392eef2492a17228d42552c86b5", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/09de28632f16f81058a85fcf318397218272a07b", + "reference": "09de28632f16f81058a85fcf318397218272a07b", "shasum": "" }, "require": { @@ -7187,7 +7187,7 @@ "debug", "dump" ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-04-12T16:45:47+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -7240,20 +7240,20 @@ }, { "name": "vlucas/phpdotenv", - "version": "v4.1.4", + "version": "v4.1.5", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "feb6dad5ae24b1380827aee1629b730080fde500" + "reference": "539bb6927c101a5605d31d11a2d17185a2ce2bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/feb6dad5ae24b1380827aee1629b730080fde500", - "reference": "feb6dad5ae24b1380827aee1629b730080fde500", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/539bb6927c101a5605d31d11a2d17185a2ce2bf1", + "reference": "539bb6927c101a5605d31d11a2d17185a2ce2bf1", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0", + "php": "^5.5.9 || ^7.0 || ^8.0", "phpoption/phpoption": "^1.7.2", "symfony/polyfill-ctype": "^1.9" }, @@ -7300,7 +7300,7 @@ "env", "environment" ], - "time": "2020-04-12T15:20:09+00:00" + "time": "2020-05-02T14:08:57+00:00" }, { "name": "voku/portable-ascii", From a4f470aba4e1550b13e8bbf739e27f9e2bf2763c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 21:42:28 +0300 Subject: [PATCH 15/69] update package-lock.json file --- package-lock.json | 238 ++++++++++++++++++++++++---------------------- 1 file changed, 124 insertions(+), 114 deletions(-) diff --git a/package-lock.json b/package-lock.json index ba5d6a59a..2069014a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,19 +14,19 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -46,12 +46,12 @@ } }, "@babel/generator": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", - "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", "dev": true, "requires": { - "@babel/types": "^7.9.5", + "@babel/types": "^7.9.6", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -85,16 +85,16 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz", - "integrity": "sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz", + "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==", "dev": true, "requires": { "@babel/helper-function-name": "^7.9.5", "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", + "@babel/helper-replace-supers": "^7.9.6", "@babel/helper-split-export-declaration": "^7.8.3" } }, @@ -229,15 +229,15 @@ } }, "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", + "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" } }, "@babel/helper-simple-access": { @@ -278,14 +278,14 @@ } }, "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", "dev": true, "requires": { "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" } }, "@babel/highlight": { @@ -300,9 +300,9 @@ } }, "@babel/parser": { - "version": "7.9.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz", - "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { @@ -348,9 +348,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", - "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.3", @@ -571,38 +571,38 @@ } }, "@babel/plugin-transform-modules-amd": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz", - "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz", + "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz", - "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz", + "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==", "dev": true, "requires": { "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz", - "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz", + "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==", "dev": true, "requires": { "@babel/helper-hoist-variables": "^7.8.3", "@babel/helper-module-transforms": "^7.9.0", "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.0" + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { @@ -663,9 +663,9 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz", - "integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz", + "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.8.3", @@ -783,9 +783,9 @@ } }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" @@ -800,9 +800,9 @@ } }, "@babel/runtime-corejs2": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.9.2.tgz", - "integrity": "sha512-ayjSOxuK2GaSDJFCtLgHnYjuMyIpViNujWrZo8GUpN60/n7juzJKK5yOo6RFVb0zdU9ACJFK+MsZrUnj3OmXMw==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.9.6.tgz", + "integrity": "sha512-TcdM3xc7weMrwTawuG3BTjtVE3mQLXUPQ9CxTbSKOrhn3QAcqCJ2fz+IIv25wztzUnhNZat7hr655YJa61F3zg==", "dev": true, "requires": { "core-js": "^2.6.5", @@ -829,26 +829,26 @@ } }, "@babel/traverse": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", - "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", "dev": true, "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.5", + "@babel/generator": "^7.9.6", "@babel/helper-function-name": "^7.9.5", "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.0", - "@babel/types": "^7.9.5", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz", - "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.9.5", @@ -1042,9 +1042,9 @@ "dev": true }, "@types/node": { - "version": "13.13.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz", - "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==", + "version": "13.13.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz", + "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==", "dev": true }, "@types/normalize-package-data": { @@ -2745,9 +2745,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001046", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz", - "integrity": "sha512-CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g==", + "version": "1.0.30001048", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001048.tgz", + "integrity": "sha512-g1iSHKVxornw0K8LG9LLdf+Fxnv7T1Z+mMsf0/YYLclQX4Cd522Ap0Lrw6NFqHgezit78dtyWxzlV2Xfc7vgRg==", "dev": true }, "case-sensitive-paths-webpack-plugin": { @@ -4667,9 +4667,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.416", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.416.tgz", - "integrity": "sha512-fmSrpOQC1dEXzsznzAMXbhQLkpAr21WtaUfRXnIbh8kblZIaMwSL6A8u2RZHAzZliSoSOM3FzS2z/j8tVqrAAw==", + "version": "1.3.427", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz", + "integrity": "sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==", "dev": true }, "element-ui": { @@ -6698,9 +6698,9 @@ "integrity": "sha512-pj4En0cWKG+lcBvC7qrzu5ItiMsYNTgjG2capsPzAbAM/O8ftugGpUUftTTwdGL8KlNvB4CEZ6IBWwpWYzUEpw==" }, "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", "dev": true }, "growly": { @@ -6816,13 +6816,33 @@ } }, "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "dev": true + } } }, "hash-sum": { @@ -7729,13 +7749,6 @@ "isobject": "^3.0.1" } }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true, - "optional": true - }, "is-regex": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", @@ -8773,9 +8786,9 @@ } }, "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", "dev": true }, "mime-db": { @@ -8911,9 +8924,9 @@ } }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.25.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.1.tgz", + "integrity": "sha512-nRKMf9wDS4Fkyd0C9LXh2FFXinD+iwbJ5p/lh3CHitW9kZbRbJ8hCruiadiIXZVbeAqKZzqcTvHnK3mRhFjb6w==" }, "move-concurrently": { "version": "1.0.1", @@ -9964,9 +9977,9 @@ "dev": true }, "portfinder": { - "version": "1.0.25", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", - "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", + "version": "1.0.26", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", + "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", "dev": true, "requires": { "async": "^2.6.2", @@ -9992,9 +10005,9 @@ "dev": true }, "postcss": { - "version": "7.0.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz", - "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==", + "version": "7.0.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.28.tgz", + "integrity": "sha512-YU6nVhyWIsVtlNlnAj1fHTsUKW5qxm3KEgzq2Jj6KTEFOTK8QWR12eIDvrlWhiSTK8WIBFTBhOJV4DY6dUuEbw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -10614,9 +10627,9 @@ } }, "postcss-value-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz", - "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, "prelude-ls": { @@ -11487,14 +11500,11 @@ } }, "run-async": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz", - "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, - "optional": true, - "requires": { - "is-promise": "^2.1.0" - } + "optional": true }, "run-queue": { "version": "1.0.3", @@ -12846,9 +12856,9 @@ } }, "terser": { - "version": "4.6.12", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.12.tgz", - "integrity": "sha512-fnIwuaKjFPANG6MAixC/k1TDtnl1YlPLUlLVIxxGZUn1gfUx2+l3/zGNB72wya+lgsb50QBi2tUV75RiODwnww==", + "version": "4.6.13", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz", + "integrity": "sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==", "dev": true, "requires": { "commander": "^2.20.0", @@ -13565,9 +13575,9 @@ "dev": true }, "vue-loader": { - "version": "15.9.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.1.tgz", - "integrity": "sha512-IaPU2KOPjs/QjMlxFs/TiTtQUSbftQ7lsAvoxe21rtcQohsMhx+1AltXCNhZIpIn46PtODiAgz+o8RbMpKtmJw==", + "version": "15.9.2", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.2.tgz", + "integrity": "sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA==", "dev": true, "requires": { "@vue/component-compiler-utils": "^3.1.0", From b9d19e7fcfe3c993053bbffbff98f8d618bb302d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 21:58:20 +0300 Subject: [PATCH 16/69] version update 2.0.10 to 2.0.11 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index b4921ec6d..4e0b822fc 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '0', - 'patch' => '10', + 'patch' => '11', 'build' => '', 'status' => 'Stable', - 'date' => '24-April-2020', + 'date' => '2-May-2020', - 'time' => '22:00', + 'time' => '21:00', 'zone' => 'GMT +3', From 70bfe8c52471b4551a04bd77a612d63cf568fde1 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sun, 3 May 2020 00:54:41 +0300 Subject: [PATCH 17/69] updated composer --- composer.lock | 427 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 420 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 84e0988b9..176f23d61 100644 --- a/composer.lock +++ b/composer.lock @@ -934,6 +934,16 @@ "ssl", "tls" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-04-08T08:27:21+00:00" }, { @@ -2204,20 +2214,26 @@ "crossdomain", "laravel" ], + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], "time": "2020-04-28T08:47:37+00:00" }, { "name": "genealabs/laravel-model-caching", - "version": "0.8.4", + "version": "0.8.5", "source": { "type": "git", "url": "https://github.com/GeneaLabs/laravel-model-caching.git", - "reference": "cdb7152a80ae774214108a717e5a405207f2d033" + "reference": "f0fd38601ed3537b00a5eaffc074db9371d6c3a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/cdb7152a80ae774214108a717e5a405207f2d033", - "reference": "cdb7152a80ae774214108a717e5a405207f2d033", + "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/f0fd38601ed3537b00a5eaffc074db9371d6c3a8", + "reference": "f0fd38601ed3537b00a5eaffc074db9371d6c3a8", "shasum": "" }, "require": { @@ -2229,7 +2245,7 @@ "illuminate/database": "^7.0", "illuminate/http": "^7.0", "illuminate/support": "^7.0", - "php": ">=7.3", + "php": ">=7.2.5", "predis/predis": "^1.1" }, "require-dev": { @@ -2269,7 +2285,13 @@ } ], "description": "Automatic caching for Eloquent models.", - "time": "2020-04-29T13:16:59+00:00" + "funding": [ + { + "url": "https://github.com/mikebronner", + "type": "github" + } + ], + "time": "2020-05-02T21:30:24+00:00" }, { "name": "genealabs/laravel-pivot-events", @@ -3399,6 +3421,32 @@ "md", "parser" ], + "funding": [ + { + "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", + "type": "custom" + }, + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + }, + { + "url": "https://www.patreon.com/colinodell", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/commonmark", + "type": "tidelift" + } + ], "time": "2020-04-24T13:39:56+00:00" }, { @@ -4200,6 +4248,16 @@ "datetime", "time" ], + "funding": [ + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], "time": "2020-04-20T15:05:43+00:00" }, { @@ -5516,6 +5574,16 @@ "parser", "validator" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], "time": "2020-04-30T19:05:18+00:00" }, { @@ -5839,6 +5907,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -5892,6 +5974,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5948,6 +6044,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:54:36+00:00" }, { @@ -6003,6 +6113,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T14:14:32+00:00" }, { @@ -6073,6 +6197,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6181,6 +6319,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-12T14:40:17+00:00" }, { @@ -6230,6 +6382,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6285,6 +6451,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-18T20:50:06+00:00" }, { @@ -6382,6 +6562,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-28T18:53:25+00:00" }, { @@ -6444,6 +6638,20 @@ "mime", "mime-type" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-17T03:29:44+00:00" }, { @@ -6502,6 +6710,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -6561,6 +6783,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -6623,6 +6859,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -6682,6 +6932,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -6737,6 +7001,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -6795,6 +7073,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -6844,6 +7136,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-15T15:59:10+00:00" }, { @@ -6920,6 +7226,20 @@ "uri", "url" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-21T21:02:50+00:00" }, { @@ -7055,6 +7375,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-12T16:45:47+00:00" }, { @@ -7187,6 +7521,20 @@ "debug", "dump" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-04-12T16:45:47+00:00" }, { @@ -7300,6 +7648,16 @@ "env", "environment" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], "time": "2020-05-02T14:08:57+00:00" }, { @@ -7349,6 +7707,24 @@ "clean", "php" ], + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], "time": "2020-03-13T01:23:26+00:00" }, { @@ -7570,6 +7946,12 @@ "flare", "reporting" ], + "funding": [ + { + "url": "https://www.patreon.com/spatie", + "type": "patreon" + } + ], "time": "2020-03-02T15:52:04+00:00" }, { @@ -8027,6 +8409,20 @@ "php", "symfony" ], + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -8527,6 +8923,16 @@ "testing", "xunit" ], + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-04-23T04:39:42+00:00" }, { @@ -8596,6 +9002,12 @@ "highlight.php", "syntax" ], + "funding": [ + { + "url": "https://github.com/allejo", + "type": "github" + } + ], "time": "2020-03-02T05:59:21+00:00" }, { @@ -9263,5 +9675,6 @@ "php": "^7.2.5", "ext-bcmath": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From 430c092ebe7d0b0b7f86c9e88ae9ade654fdeb08 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sun, 3 May 2020 11:15:56 +0300 Subject: [PATCH 18/69] added more scopes --- app/Exports/Purchases/Payments.php | 2 +- .../Purchases/Sheets/BillTransactions.php | 2 +- app/Exports/Sales/Revenues.php | 2 +- .../Sales/Sheets/InvoiceTransactions.php | 2 +- app/Http/Controllers/Common/Items.php | 4 +- app/Http/Controllers/Common/Search.php | 4 +- app/Http/Controllers/Modals/Items.php | 2 +- app/Http/Controllers/Portal/Invoices.php | 2 +- app/Http/Controllers/Portal/Payments.php | 2 +- app/Http/Controllers/Purchases/Bills.php | 8 ++-- app/Http/Controllers/Purchases/Payments.php | 8 ++-- app/Http/Controllers/Purchases/Vendors.php | 2 +- app/Http/Controllers/Sales/Customers.php | 2 +- app/Http/Controllers/Sales/Invoices.php | 8 ++-- app/Http/Controllers/Sales/Revenues.php | 8 ++-- app/Models/Banking/Transaction.php | 22 +++++++++ app/Models/Setting/Category.php | 46 ++++++++++++++++++- app/Reports/ExpenseSummary.php | 2 +- app/Reports/IncomeExpenseSummary.php | 4 +- app/Reports/IncomeSummary.php | 2 +- app/Reports/ProfitLoss.php | 4 +- app/Reports/TaxSummary.php | 4 +- app/Widgets/ExpensesByCategory.php | 2 +- app/Widgets/IncomeByCategory.php | 2 +- app/Widgets/LatestExpenses.php | 2 +- app/Widgets/LatestIncome.php | 2 +- app/Widgets/TotalExpenses.php | 2 +- app/Widgets/TotalIncome.php | 2 +- database/factories/Bill.php | 2 +- database/factories/Invoice.php | 2 +- database/factories/Item.php | 2 +- database/factories/Transaction.php | 4 +- 32 files changed, 115 insertions(+), 49 deletions(-) diff --git a/app/Exports/Purchases/Payments.php b/app/Exports/Purchases/Payments.php index 4a903ad17..dba57e593 100644 --- a/app/Exports/Purchases/Payments.php +++ b/app/Exports/Purchases/Payments.php @@ -9,7 +9,7 @@ class Payments extends Export { public function collection() { - $model = Model::with(['account', 'bill', 'category', 'contact'])->type('expense')->usingSearchString(request('search')); + $model = Model::with(['account', 'bill', 'category', 'contact'])->expense()->usingSearchString(request('search')); if (!empty($this->ids)) { $model->whereIn('id', (array) $this->ids); diff --git a/app/Exports/Purchases/Sheets/BillTransactions.php b/app/Exports/Purchases/Sheets/BillTransactions.php index be3eb613e..40af135a9 100644 --- a/app/Exports/Purchases/Sheets/BillTransactions.php +++ b/app/Exports/Purchases/Sheets/BillTransactions.php @@ -9,7 +9,7 @@ class BillTransactions extends Export { public function collection() { - $model = Model::with(['account', 'category', 'contact', 'bill'])->type('expense')->isDocument()->usingSearchString(request('search')); + $model = Model::with(['account', 'category', 'contact', 'bill'])->expense()->isDocument()->usingSearchString(request('search')); if (!empty($this->ids)) { $model->whereIn('document_id', (array) $this->ids); diff --git a/app/Exports/Sales/Revenues.php b/app/Exports/Sales/Revenues.php index 47f9f384f..edf74c71b 100644 --- a/app/Exports/Sales/Revenues.php +++ b/app/Exports/Sales/Revenues.php @@ -9,7 +9,7 @@ class Revenues extends Export { public function collection() { - $model = Model::with(['account', 'category', 'contact', 'invoice'])->type('income')->usingSearchString(request('search')); + $model = Model::with(['account', 'category', 'contact', 'invoice'])->income()->usingSearchString(request('search')); if (!empty($this->ids)) { $model->whereIn('id', (array) $this->ids); diff --git a/app/Exports/Sales/Sheets/InvoiceTransactions.php b/app/Exports/Sales/Sheets/InvoiceTransactions.php index cdb3ab71c..2855d8f06 100644 --- a/app/Exports/Sales/Sheets/InvoiceTransactions.php +++ b/app/Exports/Sales/Sheets/InvoiceTransactions.php @@ -9,7 +9,7 @@ class InvoiceTransactions extends Export { public function collection() { - $model = Model::with(['account', 'category', 'contact', 'invoice'])->type('income')->isDocument()->usingSearchString(request('search')); + $model = Model::with(['account', 'category', 'contact', 'invoice'])->income()->isDocument()->usingSearchString(request('search')); if (!empty($this->ids)) { $model->whereIn('document_id', (array) $this->ids); diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php index 30f5312fd..a33e42bda 100644 --- a/app/Http/Controllers/Common/Items.php +++ b/app/Http/Controllers/Common/Items.php @@ -50,7 +50,7 @@ class Items extends Controller */ public function create() { - $categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id'); @@ -131,7 +131,7 @@ class Items extends Controller */ public function edit(Item $item) { - $categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id'); diff --git a/app/Http/Controllers/Common/Search.php b/app/Http/Controllers/Common/Search.php index 21fb486a5..f8d0040ab 100644 --- a/app/Http/Controllers/Common/Search.php +++ b/app/Http/Controllers/Common/Search.php @@ -65,7 +65,7 @@ class Search extends Controller } }/* - $income_transactions = Transaction::type('income')->usingSearchString($keyword)->get(); + $income_transactions = Transaction::income()->usingSearchString($keyword)->get(); if ($income_transactions->count()) { foreach ($income_transactions as $transaction) { @@ -107,7 +107,7 @@ class Search extends Controller } } /* - $payments = Transaction::type('expense')->usingSearchString($keyword)->get(); + $payments = Transaction::expense()->usingSearchString($keyword)->get(); if ($revenues->count()) { foreach ($revenues as $revenue) { diff --git a/app/Http/Controllers/Modals/Items.php b/app/Http/Controllers/Modals/Items.php index 8eb73ca7c..176d8a743 100644 --- a/app/Http/Controllers/Modals/Items.php +++ b/app/Http/Controllers/Modals/Items.php @@ -30,7 +30,7 @@ class Items extends Controller */ public function create(IRequest $request) { - $categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id'); $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id'); diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php index 24cb48447..a843bb564 100644 --- a/app/Http/Controllers/Portal/Invoices.php +++ b/app/Http/Controllers/Portal/Invoices.php @@ -27,7 +27,7 @@ class Invoices extends Controller ->accrued()->where('contact_id', user()->contact->id) ->collect(['invoice_number'=> 'desc']); - $categories = collect(Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id')); + $categories = collect(Category::income()->enabled()->orderBy('name')->pluck('name', 'id')); $statuses = $this->getInvoiceStatuses(); diff --git a/app/Http/Controllers/Portal/Payments.php b/app/Http/Controllers/Portal/Payments.php index dc1525473..df42e1a55 100644 --- a/app/Http/Controllers/Portal/Payments.php +++ b/app/Http/Controllers/Portal/Payments.php @@ -16,7 +16,7 @@ class Payments extends Controller */ public function index() { - $payments = Transaction::type('income')->where('contact_id', '=', user()->contact->id)->paginate(); + $payments = Transaction::income()->where('contact_id', '=', user()->contact->id)->paginate(); $payment_methods = Modules::getPaymentMethods('all'); diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php index 4660f5753..bf3061883 100644 --- a/app/Http/Controllers/Purchases/Bills.php +++ b/app/Http/Controllers/Purchases/Bills.php @@ -41,7 +41,7 @@ class Bills extends Controller $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); $statuses = $this->getBillStatuses(); @@ -67,7 +67,7 @@ class Bills extends Controller $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); @@ -106,7 +106,7 @@ class Bills extends Controller $taxes = Tax::enabled()->orderBy('name')->get(); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); $number = $this->getNextBillNumber(); @@ -202,7 +202,7 @@ class Bills extends Controller $taxes = Tax::enabled()->orderBy('name')->get(); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories')); } diff --git a/app/Http/Controllers/Purchases/Payments.php b/app/Http/Controllers/Purchases/Payments.php index cbf50467e..95cdd672a 100644 --- a/app/Http/Controllers/Purchases/Payments.php +++ b/app/Http/Controllers/Purchases/Payments.php @@ -30,11 +30,11 @@ class Payments extends Controller */ public function index() { - $payments = Transaction::type('expense')->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']); + $payments = Transaction::expense()->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']); $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); @@ -68,7 +68,7 @@ class Payments extends Controller $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); @@ -156,7 +156,7 @@ class Payments extends Controller $vendors = Contact::vendor()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::expense()->enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); diff --git a/app/Http/Controllers/Purchases/Vendors.php b/app/Http/Controllers/Purchases/Vendors.php index 17a0829db..59340a7d3 100644 --- a/app/Http/Controllers/Purchases/Vendors.php +++ b/app/Http/Controllers/Purchases/Vendors.php @@ -78,7 +78,7 @@ class Vendors extends Controller } // Handle payments - $transactions = Transaction::where('contact_id', $vendor->id)->type('expense')->get(); + $transactions = Transaction::where('contact_id', $vendor->id)->expense()->get(); $counts['transactions'] = $transactions->count(); diff --git a/app/Http/Controllers/Sales/Customers.php b/app/Http/Controllers/Sales/Customers.php index f52e241ae..1857b9f30 100644 --- a/app/Http/Controllers/Sales/Customers.php +++ b/app/Http/Controllers/Sales/Customers.php @@ -76,7 +76,7 @@ class Customers extends Controller } // Handle transactions - $transactions = Transaction::where('contact_id', $customer->id)->type('income')->get(); + $transactions = Transaction::where('contact_id', $customer->id)->income()->get(); $counts['transactions'] = $transactions->count(); diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php index aaf7834a0..7af09cee0 100644 --- a/app/Http/Controllers/Sales/Invoices.php +++ b/app/Http/Controllers/Sales/Invoices.php @@ -42,7 +42,7 @@ class Invoices extends Controller $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); $statuses = $this->getInvoiceStatuses(); @@ -68,7 +68,7 @@ class Invoices extends Controller $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); @@ -109,7 +109,7 @@ class Invoices extends Controller $taxes = Tax::enabled()->orderBy('name')->get(); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); $number = $this->getNextInvoiceNumber(); @@ -205,7 +205,7 @@ class Invoices extends Controller $taxes = Tax::enabled()->orderBy('name')->get(); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories')); } diff --git a/app/Http/Controllers/Sales/Revenues.php b/app/Http/Controllers/Sales/Revenues.php index b0146538c..5eed29da2 100644 --- a/app/Http/Controllers/Sales/Revenues.php +++ b/app/Http/Controllers/Sales/Revenues.php @@ -30,11 +30,11 @@ class Revenues extends Controller */ public function index() { - $revenues = Transaction::type('income')->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']); + $revenues = Transaction::income()->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']); $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); @@ -68,7 +68,7 @@ class Revenues extends Controller $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); @@ -156,7 +156,7 @@ class Revenues extends Controller $customers = Contact::customer()->enabled()->orderBy('name')->pluck('name', 'id'); - $categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index 6f85c8255..f82e36f86 100644 --- a/app/Models/Banking/Transaction.php +++ b/app/Models/Banking/Transaction.php @@ -96,6 +96,28 @@ class Transaction extends Model return $query->whereIn($this->table . '.type', (array) $types); } + /** + * Scope to include only income. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeIncome($query) + { + return $query->where($this->table . '.type', '=', 'income'); + } + + /** + * Scope to include only expense. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeExpense($query) + { + return $query->where($this->table . '.type', '=', 'expense'); + } + /** * Get only transfers. * diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php index b627a811a..3ad11959b 100644 --- a/app/Models/Setting/Category.php +++ b/app/Models/Setting/Category.php @@ -68,6 +68,50 @@ class Category extends Model return $query->whereIn($this->table . '.type', (array) $types); } + /** + * Scope to include only income. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeIncome($query) + { + return $query->where($this->table . '.type', '=', 'income'); + } + + /** + * Scope to include only expense. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeExpense($query) + { + return $query->where($this->table . '.type', '=', 'expense'); + } + + /** + * Scope to include only item. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeItem($query) + { + return $query->where($this->table . '.type', '=', 'item'); + } + + /** + * Scope to include only other. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeOther($query) + { + return $query->where($this->table . '.type', '=', 'other'); + } + public function scopeName($query, $name) { return $query->where('name', '=', $name); @@ -81,6 +125,6 @@ class Category extends Model */ public function scopeTransfer($query) { - return $query->where('type', 'other')->pluck('id')->first(); + return $query->where($this->table . '.type', '=', 'other')->pluck('id')->first(); } } diff --git a/app/Reports/ExpenseSummary.php b/app/Reports/ExpenseSummary.php index 9335c730a..1c1069e27 100644 --- a/app/Reports/ExpenseSummary.php +++ b/app/Reports/ExpenseSummary.php @@ -30,7 +30,7 @@ class ExpenseSummary extends Report public function setData() { - $transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']); + $transactions = $this->applyFilters(Transaction::expense()->isNotTransfer(), ['date_field' => 'paid_at']); switch ($this->model->settings->basis) { case 'cash': diff --git a/app/Reports/IncomeExpenseSummary.php b/app/Reports/IncomeExpenseSummary.php index 2e74f99c5..19abe176d 100644 --- a/app/Reports/IncomeExpenseSummary.php +++ b/app/Reports/IncomeExpenseSummary.php @@ -16,8 +16,8 @@ class IncomeExpenseSummary extends Report public function setData() { - $income_transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at']); - $expense_transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']); + $income_transactions = $this->applyFilters(Transaction::income()->isNotTransfer(), ['date_field' => 'paid_at']); + $expense_transactions = $this->applyFilters(Transaction::expense()->isNotTransfer(), ['date_field' => 'paid_at']); switch ($this->model->settings->basis) { case 'cash': diff --git a/app/Reports/IncomeSummary.php b/app/Reports/IncomeSummary.php index acc6608f7..5bde4b9d8 100644 --- a/app/Reports/IncomeSummary.php +++ b/app/Reports/IncomeSummary.php @@ -30,7 +30,7 @@ class IncomeSummary extends Report public function setData() { - $transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at']); + $transactions = $this->applyFilters(Transaction::income()->isNotTransfer(), ['date_field' => 'paid_at']); switch ($this->model->settings->basis) { case 'cash': diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index af944e645..2169a61a6 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -40,8 +40,8 @@ class ProfitLoss extends Report public function setData() { - $income_transactions = $this->applyFilters(Transaction::type('income')->isNotTransfer(), ['date_field' => 'paid_at']); - $expense_transactions = $this->applyFilters(Transaction::type('expense')->isNotTransfer(), ['date_field' => 'paid_at']); + $income_transactions = $this->applyFilters(Transaction::income()->isNotTransfer(), ['date_field' => 'paid_at']); + $expense_transactions = $this->applyFilters(Transaction::expense()->isNotTransfer(), ['date_field' => 'paid_at']); switch ($this->model->settings->basis) { case 'cash': diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index f9abe6b38..007d294e8 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -47,11 +47,11 @@ class TaxSummary extends Report switch ($this->model->settings->basis) { case 'cash': // Invoice Payments - $invoices = $this->applyFilters(Transaction::with(['invoice', 'invoice.totals'])->type('income')->isDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get(); + $invoices = $this->applyFilters(Transaction::with(['invoice', 'invoice.totals'])->income()->isDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get(); $this->setTotals($invoices, 'paid_at'); // Bill Payments - $bills = $this->applyFilters(Transaction::with(['bill', 'bill.totals'])->type('expense')->isDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get(); + $bills = $this->applyFilters(Transaction::with(['bill', 'bill.totals'])->expense()->isDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get(); $this->setTotals($bills, 'paid_at'); break; diff --git a/app/Widgets/ExpensesByCategory.php b/app/Widgets/ExpensesByCategory.php index fcf068b05..b44ef7e15 100644 --- a/app/Widgets/ExpensesByCategory.php +++ b/app/Widgets/ExpensesByCategory.php @@ -15,7 +15,7 @@ class ExpensesByCategory extends Widget public function show() { - Category::with('expense_transactions')->type('expense')->each(function ($category) { + Category::with('expense_transactions')->expense()->each(function ($category) { $amount = 0; $this->applyFilters($category->expense_transactions())->each(function ($transaction) use (&$amount) { diff --git a/app/Widgets/IncomeByCategory.php b/app/Widgets/IncomeByCategory.php index ee532420a..8d34286e0 100644 --- a/app/Widgets/IncomeByCategory.php +++ b/app/Widgets/IncomeByCategory.php @@ -15,7 +15,7 @@ class IncomeByCategory extends Widget public function show() { - Category::with('income_transactions')->type('income')->each(function ($category) { + Category::with('income_transactions')->income()->each(function ($category) { $amount = 0; $this->applyFilters($category->income_transactions())->each(function ($transaction) use (&$amount) { diff --git a/app/Widgets/LatestExpenses.php b/app/Widgets/LatestExpenses.php index ffdfb521e..9f5810136 100644 --- a/app/Widgets/LatestExpenses.php +++ b/app/Widgets/LatestExpenses.php @@ -11,7 +11,7 @@ class LatestExpenses extends Widget public function show() { - $transactions = $this->applyFilters(Transaction::with('category')->type('expense')->orderBy('paid_at', 'desc')->isNotTransfer()->take(5))->get(); + $transactions = $this->applyFilters(Transaction::with('category')->expense()->orderBy('paid_at', 'desc')->isNotTransfer()->take(5))->get(); return $this->view('widgets.latest_expenses', [ 'transactions' => $transactions, diff --git a/app/Widgets/LatestIncome.php b/app/Widgets/LatestIncome.php index 89334b9ee..d883fcdf5 100644 --- a/app/Widgets/LatestIncome.php +++ b/app/Widgets/LatestIncome.php @@ -11,7 +11,7 @@ class LatestIncome extends Widget public function show() { - $transactions = $this->applyFilters(Transaction::with('category')->type('income')->orderBy('paid_at', 'desc')->isNotTransfer()->take(5))->get(); + $transactions = $this->applyFilters(Transaction::with('category')->income()->orderBy('paid_at', 'desc')->isNotTransfer()->take(5))->get(); return $this->view('widgets.latest_income', [ 'transactions' => $transactions, diff --git a/app/Widgets/TotalExpenses.php b/app/Widgets/TotalExpenses.php index 82014f0d9..90787c309 100644 --- a/app/Widgets/TotalExpenses.php +++ b/app/Widgets/TotalExpenses.php @@ -18,7 +18,7 @@ class TotalExpenses extends Widget { $current = $open = $overdue = 0; - $this->applyFilters(Transaction::type('expense')->isNotTransfer())->each(function ($transaction) use (&$current) { + $this->applyFilters(Transaction::expense()->isNotTransfer())->each(function ($transaction) use (&$current) { $current += $transaction->getAmountConvertedToDefault(); }); diff --git a/app/Widgets/TotalIncome.php b/app/Widgets/TotalIncome.php index e48bd42f8..9f8edcef1 100644 --- a/app/Widgets/TotalIncome.php +++ b/app/Widgets/TotalIncome.php @@ -18,7 +18,7 @@ class TotalIncome extends Widget { $current = $open = $overdue = 0; - $this->applyFilters(Transaction::type('income')->isNotTransfer())->each(function ($transaction) use (&$current) { + $this->applyFilters(Transaction::income()->isNotTransfer())->each(function ($transaction) use (&$current) { $current += $transaction->getAmountConvertedToDefault(); }); diff --git a/database/factories/Bill.php b/database/factories/Bill.php index c63624cfd..3392bdee7 100644 --- a/database/factories/Bill.php +++ b/database/factories/Bill.php @@ -41,7 +41,7 @@ $factory->define(Bill::class, function (Faker $faker) use ($company) { 'currency_code' => setting('default.currency'), 'currency_rate' => '1', 'notes' => $faker->text(5), - 'category_id' => $company->categories()->type('expense')->get()->random(1)->pluck('id')->first(), + 'category_id' => $company->categories()->expense()->get()->random(1)->pluck('id')->first(), 'contact_id' => $contact->id, 'contact_name' => $contact->name, 'contact_email' => $contact->email, diff --git a/database/factories/Invoice.php b/database/factories/Invoice.php index 59c06e806..78e09ad33 100644 --- a/database/factories/Invoice.php +++ b/database/factories/Invoice.php @@ -42,7 +42,7 @@ $factory->define(Invoice::class, function (Faker $faker) use ($company) { 'currency_code' => setting('default.currency'), 'currency_rate' => '1', 'notes' => $faker->text(5), - 'category_id' => $company->categories()->type('income')->get()->random(1)->pluck('id')->first(), + 'category_id' => $company->categories()->income()->get()->random(1)->pluck('id')->first(), 'contact_id' => $contact->id, 'contact_name' => $contact->name, 'contact_email' => $contact->email, diff --git a/database/factories/Item.php b/database/factories/Item.php index d61ccaf77..61664c320 100644 --- a/database/factories/Item.php +++ b/database/factories/Item.php @@ -16,7 +16,7 @@ $factory->define(Item::class, function (Faker $faker) use ($company) { 'description' => $faker->text(100), 'purchase_price' => $faker->randomFloat(2, 10, 20), 'sale_price' => $faker->randomFloat(2, 10, 20), - 'category_id' => $company->categories()->type('item')->get()->random(1)->pluck('id')->first(), + 'category_id' => $company->categories()->item()->get()->random(1)->pluck('id')->first(), 'tax_id' => null, 'enabled' => $faker->boolean ? 1 : 0, ]; diff --git a/database/factories/Transaction.php b/database/factories/Transaction.php index 3a5a85a58..2bdc0c6ff 100644 --- a/database/factories/Transaction.php +++ b/database/factories/Transaction.php @@ -31,13 +31,13 @@ $factory->define(Transaction::class, function (Faker $faker) use ($company) { $factory->state(Transaction::class, 'income', function (Faker $faker) use ($company) { return [ 'type' => 'income', - 'category_id' => $company->categories()->type('income')->get()->random(1)->pluck('id')->first(), + 'category_id' => $company->categories()->income()->get()->random(1)->pluck('id')->first(), ]; }); $factory->state(Transaction::class, 'expense', function (Faker $faker) use ($company) { return [ 'type' => 'expense', - 'category_id' => $company->categories()->type('expense')->get()->random(1)->pluck('id')->first(), + 'category_id' => $company->categories()->expense()->get()->random(1)->pluck('id')->first(), ]; }); From 8f8c070272a81e9621d8b0b8a93da75f4a660cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 3 May 2020 12:56:52 +0300 Subject: [PATCH 19/69] App show page style.. --- resources/views/modules/item/pre_sale.blade.php | 7 +++---- resources/views/modules/item/show.blade.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php index b41da218d..12fa1ed55 100644 --- a/resources/views/modules/item/pre_sale.blade.php +++ b/resources/views/modules/item/pre_sale.blade.php @@ -87,10 +87,9 @@ @endif @endpermission - @if ($module->purchase_faq) -
-
- {{ trans('modules.tab.faq')}} + @if (!empty($module->purchase_desc)) +
+ {!! $module->purchase_desc !!}
@endif
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 1d5da9ca0..09bebbdde 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -190,7 +190,7 @@ @if (!empty($module->purchase_desc))
- {{ $module->purchase_desc }} + {!! $module->purchase_desc !!}
@endif
From 8f37813256e15049e6e760a4cd6506899bd3e74d Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 7 May 2020 16:56:33 +0300 Subject: [PATCH 20/69] use routes --- app/Http/Controllers/Modules/Item.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index 4b842ad7e..8339a423c 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -84,19 +84,19 @@ class Item extends Controller // Download $steps[] = [ 'text' => trans('modules.installation.download', ['module' => $name]), - 'url' => url('apps/download') + 'url' => route('apps.download') ]; // Unzip $steps[] = [ 'text' => trans('modules.installation.unzip', ['module' => $name]), - 'url' => url('apps/unzip') + 'url' => route('apps.unzip') ]; // Download $steps[] = [ 'text' => trans('modules.installation.install', ['module' => $name]), - 'url' => url('apps/install') + 'url' => route('apps.install') ]; return response()->json([ From 87e4b20dc5f87f1207218f2c9e0baaeba32e2590 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 7 May 2020 17:17:04 +0300 Subject: [PATCH 21/69] added ai to module installation --- app/Traits/Modules.php | 50 +++++++++++++++++++++++++++++++++++++----- config/module.php | 8 +++---- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 195d9012b..3fae4a89d 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -293,11 +293,20 @@ trait Modules public function downloadModule($path) { + if (empty($path)) { + return [ + 'success' => false, + 'error' => true, + 'message' => trans('modules.errors.download', ['module' => '']), + 'data' => null, + ]; + } + if (!$response = static::getResponse('GET', $path)) { return [ 'success' => false, 'error' => true, - 'message' => null, + 'message' => trans('modules.errors.download', ['module' => '']), 'data' => null, ]; } @@ -321,7 +330,7 @@ trait Modules return [ 'success' => false, 'error' => true, - 'message' => null, + 'message' => trans('modules.errors.download', ['module' => '']), 'data' => null, ]; } @@ -338,6 +347,15 @@ trait Modules public function unzipModule($path) { + if (empty($path)) { + return [ + 'success' => false, + 'error' => true, + 'message' => trans('modules.errors.unzip', ['module' => '']), + 'data' => null, + ]; + } + $temp_path = storage_path('app/temp') . '/' . $path; $file = $temp_path . '/upload.zip'; @@ -349,7 +367,7 @@ trait Modules return [ 'success' => false, 'error' => true, - 'message' => null, + 'message' => trans('modules.errors.unzip', ['module' => '']), 'data' => null, ]; } @@ -373,9 +391,18 @@ trait Modules public function installModule($path) { + if (empty($path)) { + return [ + 'success' => false, + 'error' => true, + 'message' => trans('modules.errors.finish', ['module' => '']), + 'data' => null, + ]; + } + $temp_path = storage_path('app/temp') . '/' . $path; - $modules_path = base_path() . '/modules'; + $modules_path = config('module.paths.modules'); // Create modules directory if (!File::isDirectory($modules_path)) { @@ -406,11 +433,22 @@ trait Modules Cache::forget('installed.' . $company_id . '.module'); - Console::run("module:install {$module->alias} {$company_id} {$locale}"); + $command = "module:install {$module->alias} {$company_id} {$locale}"; + + if (true !== $result = Console::run($command)) { + $message = !empty($result) ? $result : trans('modules.errors.finish', ['module' => $module->alias]); + + return [ + 'success' => false, + 'error' => true, + 'message' => $message, + 'data' => null, + ]; + } return [ 'success' => true, - 'redirect' => url('apps/' . $module->alias), + 'redirect' => route('apps.app.show', $module->alias), 'error' => false, 'message' => null, 'data' => $data, diff --git a/config/module.php b/config/module.php index f822699ce..8c226d0e8 100644 --- a/config/module.php +++ b/config/module.php @@ -22,7 +22,7 @@ return [ */ 'stubs' => [ 'enabled' => true, - 'path' => base_path() . '/app/Console/Stubs/Modules', + 'path' => base_path('app/Console/Stubs/Modules'), 'files' => [ 'listeners/install' => 'Listeners/InstallModule.php', 'providers/event' => 'Providers/Event.php', @@ -67,7 +67,7 @@ return [ | automatically to list of scanned folders. | */ - 'modules' => base_path('modules'), + 'modules' => base_path(env('MODULE_PATHS_MODULES', 'modules')), /* |-------------------------------------------------------------------------- @@ -77,7 +77,7 @@ return [ | Here you may update the modules assets path. | */ - 'assets' => public_path('modules'), + 'assets' => public_path(env('MODULE_PATHS_ASSETS', 'modules')), /* |-------------------------------------------------------------------------- @@ -88,7 +88,7 @@ return [ | the migration files? | */ - 'migration' => base_path('database/migrations'), + 'migration' => base_path(env('MODULE_PATHS_MIGRATION', 'database/migrations')), /* |-------------------------------------------------------------------------- From 0e73a2bf6928e995030bc6490733373216e730df Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 8 May 2020 16:35:03 +0300 Subject: [PATCH 22/69] removed config caching #1429 --- app/Utilities/Installer.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index ebc741f5e..cd44b82c6 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -309,8 +309,6 @@ class Installer file_put_contents(base_path('.env'), $env); - Artisan::call('config:cache'); - return true; } } From 88c4861c0aff45794441ce740c5bb1c2ea28b963 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 9 May 2020 16:12:57 +0300 Subject: [PATCH 23/69] improved bin finder --- app/Utilities/Console.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Utilities/Console.php b/app/Utilities/Console.php index 808739682..b35eb4bf3 100644 --- a/app/Utilities/Console.php +++ b/app/Utilities/Console.php @@ -29,7 +29,9 @@ class Console public static function getPhpBinary() { - return (new PhpExecutableFinder)->find(false) ?? 'php'; + $bin = (new PhpExecutableFinder)->find(false); + + return !empty($bin) ? $bin : 'php'; } public static function getArtisanBinary() From 0fb16de851d1d3abf62b9c47181bde2791b3e7a8 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 9 May 2020 16:44:58 +0300 Subject: [PATCH 24/69] added event to global search --- app/Events/Common/GlobalSearched.php | 22 ++++++++++++ app/Http/Controllers/Common/Search.php | 47 ++++++++++++++------------ 2 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 app/Events/Common/GlobalSearched.php diff --git a/app/Events/Common/GlobalSearched.php b/app/Events/Common/GlobalSearched.php new file mode 100644 index 000000000..11134ce81 --- /dev/null +++ b/app/Events/Common/GlobalSearched.php @@ -0,0 +1,22 @@ +search = $search; + } +} diff --git a/app/Http/Controllers/Common/Search.php b/app/Http/Controllers/Common/Search.php index f8d0040ab..4e514aa48 100644 --- a/app/Http/Controllers/Common/Search.php +++ b/app/Http/Controllers/Common/Search.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Common; use App\Abstracts\Http\Controller; +use App\Events\Common\GlobalSearched; use App\Models\Banking\Account; use App\Models\Banking\Transaction; use App\Models\Common\Contact; @@ -19,48 +20,48 @@ class Search extends Controller */ public function index() { - $results = array(); + $search = new \stdClass(); + $search->results = []; + $search->keyword = request('keyword'); - $keyword = request('keyword'); - - $accounts = Account::enabled()->usingSearchString($keyword)->get(); + $accounts = Account::enabled()->usingSearchString($search->keyword)->get(); if ($accounts->count()) { foreach ($accounts as $account) { - $results[] = (object)[ + $search->results[] = (object) [ 'id' => $account->id, 'name' => $account->name, 'type' => trans_choice('general.accounts', 1), 'color' => '#55588b', - 'href' => url('banking/accounts/' . $account->id . '/edit'), + 'href' => route('accounts.edit', $account->id), ]; } } - $items = Item::enabled()->usingSearchString($keyword)->get(); + $items = Item::enabled()->usingSearchString($search->keyword)->get(); if ($items->count()) { foreach ($items as $item) { - $results[] = (object)[ + $search->results[] = (object) [ 'id' => $item->id, 'name' => $item->name, 'type' => trans_choice('general.items', 1), 'color' => '#efad32', - 'href' => url('common/items/' . $item->id . '/edit'), + 'href' => route('items.edit', $item->id), ]; } } - $invoices = Invoice::usingSearchString($keyword)->get(); + $invoices = Invoice::usingSearchString($search->keyword)->get(); if ($invoices->count()) { foreach ($invoices as $invoice) { - $results[] = (object)[ + $search->results[] = (object) [ 'id' => $invoice->id, 'name' => $invoice->invoice_number . ' - ' . $invoice->contact_name, 'type' => trans_choice('general.invoices', 1), 'color' => '#6da252', - 'href' => url('sales/invoices/' . $invoice->id), + 'href' => route('invoices.show', $invoice->id), ]; } }/* @@ -79,30 +80,30 @@ class Search extends Controller } }*/ - $customers = Contact::customer()->enabled()->usingSearchString($keyword)->get(); + $customers = Contact::customer()->enabled()->usingSearchString($search->keyword)->get(); if ($customers->count()) { foreach ($customers as $customer) { - $results[] = (object)[ + $search->results[] = (object) [ 'id' => $customer->id, 'name' => $customer->name, 'type' => trans_choice('general.customers', 1), 'color' => '#328aef', - 'href' => url('sales/customers/' . $customer->id), + 'href' => route('customers.show', $customer->id), ]; } } - $bills = Bill::usingSearchString($keyword)->get(); + $bills = Bill::usingSearchString($search->keyword)->get(); if ($bills->count()) { foreach ($bills as $bill) { - $results[] = (object)[ + $search->results[] = (object) [ 'id' => $bill->id, 'name' => $bill->bill_number . ' - ' . $bill->contact_name, 'type' => trans_choice('general.bills', 1), 'color' => '#ef3232', - 'href' => url('purchases/bills/' . $bill->id), + 'href' => route('bills.show', $bill->id), ]; } } @@ -121,20 +122,22 @@ class Search extends Controller } }*/ - $vendors = Contact::vendor()->enabled()->usingSearchString($keyword)->get(); + $vendors = Contact::vendor()->enabled()->usingSearchString($search->keyword)->get(); if ($vendors->count()) { foreach ($vendors as $vendor) { - $results[] = (object)[ + $search->results[] = (object) [ 'id' => $vendor->id, 'name' => $vendor->name, 'type' => trans_choice('general.vendors', 1), 'color' => '#efef32', - 'href' => url('purchases/vendors/' . $vendor->id), + 'href' => route('vendors.show', $vendor->id), ]; } } - return response()->json((object) $results); + event(new GlobalSearched($search)); + + return response()->json((object) $search->results); } } From a8fe77258171a9294dc263abfc69a8608bb8eb37 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sun, 10 May 2020 08:13:27 +0300 Subject: [PATCH 25/69] items of invoices and bills moved to partials path --- .../partials/documents/item/print.blade.php | 22 +++++++++++++ .../partials/documents/item/show.blade.php | 28 +++++++++++++++++ .../views/purchases/bills/print.blade.php | 25 ++------------- .../views/purchases/bills/show.blade.php | 31 ++----------------- .../sales/invoices/print_classic.blade.php | 25 ++------------- .../sales/invoices/print_default.blade.php | 25 ++------------- .../sales/invoices/print_modern.blade.php | 25 ++------------- resources/views/sales/invoices/show.blade.php | 31 ++----------------- 8 files changed, 62 insertions(+), 150 deletions(-) create mode 100644 resources/views/partials/documents/item/print.blade.php create mode 100644 resources/views/partials/documents/item/show.blade.php diff --git a/resources/views/partials/documents/item/print.blade.php b/resources/views/partials/documents/item/print.blade.php new file mode 100644 index 000000000..493901f6a --- /dev/null +++ b/resources/views/partials/documents/item/print.blade.php @@ -0,0 +1,22 @@ + + @stack('name_td_start') + + {{ $item->name }} + @if (!empty($item->item->description)) +
{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!} + @endif + + @stack('name_td_end') + + @stack('quantity_td_start') + {{ $item->quantity }} + @stack('quantity_td_end') + + @stack('price_td_start') + @money($item->price, $invoice->currency_code, true) + @stack('price_td_end') + + @stack('total_td_start') + @money($item->total, $invoice->currency_code, true) + @stack('total_td_end') + \ No newline at end of file diff --git a/resources/views/partials/documents/item/show.blade.php b/resources/views/partials/documents/item/show.blade.php new file mode 100644 index 000000000..5d78417c9 --- /dev/null +++ b/resources/views/partials/documents/item/show.blade.php @@ -0,0 +1,28 @@ + + @stack('name_td_start') + + {{ $item->name }} + @if (!empty($item->item->description)) +
{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!} + @endif + + @stack('name_td_end') + + @stack('quantity_td_start') + {{ $item->quantity }} + @stack('quantity_td_end') + + @stack('price_td_start') + @money($item->price, $invoice->currency_code, true) + @stack('price_td_end') + + @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) + @stack('discount_td_start') + {{ $item->discount }} + @stack('discount_td_end') + @endif + + @stack('total_td_start') + @money($item->total, $invoice->currency_code, true) + @stack('total_td_end') + \ No newline at end of file diff --git a/resources/views/purchases/bills/print.blade.php b/resources/views/purchases/bills/print.blade.php index 330e0f86b..ba18f40a8 100644 --- a/resources/views/purchases/bills/print.blade.php +++ b/resources/views/purchases/bills/print.blade.php @@ -128,29 +128,8 @@ - @foreach($bill->items as $bill_item) - - @stack('name_td_start') - - {{ $bill_item->name }} - @if (!empty($bill_item->item->description)) -
{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!} - @endif - - @stack('name_td_end') - - @stack('quantity_td_start') - {{ $bill_item->quantity }} - @stack('quantity_td_end') - - @stack('price_td_start') - @money($bill_item->price, $bill->currency_code, true) - @stack('price_td_end') - - @stack('total_td_start') - @money($bill_item->total, $bill->currency_code, true) - @stack('total_td_end') - + @foreach($bill->items as $item) + @include('partials.documents.item.print') @endforeach diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index 322e17203..69a1c25eb 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -349,35 +349,8 @@ {{ trans('bills.total') }} @stack('total_th_end') - @foreach($bill->items as $bill_item) - - @stack('name_td_start') - - {{ $bill_item->name }} - @if (!empty($bill_item->item->description)) -
{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!} - @endif - - @stack('name_td_end') - - @stack('quantity_td_start') - {{ $bill_item->quantity }} - @stack('quantity_td_end') - - @stack('price_td_start') - @money($bill_item->price, $bill->currency_code, true) - @stack('price_td_end') - - @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) - @stack('discount_td_start') - {{ $bill_item->discount }} - @stack('discount_td_end') - @endif - - @stack('total_td_start') - @money($bill_item->total, $bill->currency_code, true) - @stack('total_td_end') - + @foreach($bill->items as $item) + @include('partials.documents.item.show') @endforeach diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php index 83cca35a7..5c8306903 100644 --- a/resources/views/sales/invoices/print_classic.blade.php +++ b/resources/views/sales/invoices/print_classic.blade.php @@ -145,29 +145,8 @@ - @foreach($invoice->items as $invoice_item) - - @stack('name_td_start') - - {{ $invoice_item->name }} - @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} - @endif - - @stack('name_td_end') - - @stack('quantity_td_start') - {{ $invoice_item->quantity }} - @stack('quantity_td_end') - - @stack('price_td_start') - @money($invoice_item->price, $invoice->currency_code, true) - @stack('price_td_end') - - @stack('total_td_start') - @money($invoice_item->total, $invoice->currency_code, true) - @stack('total_td_end') - + @foreach($invoice->items as $item) + @include('partials.documents.item.print') @endforeach diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 0fcf537eb..444b13004 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -132,29 +132,8 @@ - @foreach($invoice->items as $invoice_item) - - @stack('name_td_start') - - {{ $invoice_item->name }} - @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} - @endif - - @stack('name_td_end') - - @stack('quantity_td_start') - {{ $invoice_item->quantity }} - @stack('quantity_td_end') - - @stack('price_td_start') - @money($invoice_item->price, $invoice->currency_code, true) - @stack('price_td_end') - - @stack('total_td_start') - @money($invoice_item->total, $invoice->currency_code, true) - @stack('total_td_end') - + @foreach($invoice->items as $item) + @include('partials.documents.item.print') @endforeach diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php index dade8bec3..cfb7b0ec5 100644 --- a/resources/views/sales/invoices/print_modern.blade.php +++ b/resources/views/sales/invoices/print_modern.blade.php @@ -114,29 +114,8 @@ - @foreach($invoice->items as $invoice_item) - - @stack('name_td_start') - - {{ $invoice_item->name }} - @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} - @endif - - @stack('name_td_end') - - @stack('quantity_td_start') - {{ $invoice_item->quantity }} - @stack('quantity_td_end') - - @stack('price_td_start') - @money($invoice_item->price, $invoice->currency_code, true) - @stack('price_td_end') - - @stack('total_td_start') - @money($invoice_item->total, $invoice->currency_code, true) - @stack('total_td_end') - + @foreach($invoice->items as $item) + @include('partials.documents.item.print') @endforeach diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index f11cbae79..5a566e315 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -366,35 +366,8 @@ {{ trans('invoices.total') }} @stack('total_th_end') - @foreach($invoice->items as $invoice_item) - - @stack('name_td_start') - - {{ $invoice_item->name }} - @if (!empty($invoice_item->item->description)) -
{!! \Illuminate\Support\Str::limit($invoice_item->item->description, 500) !!} - @endif - - @stack('name_td_end') - - @stack('quantity_td_start') - {{ $invoice_item->quantity }} - @stack('quantity_td_end') - - @stack('price_td_start') - @money($invoice_item->price, $invoice->currency_code, true) - @stack('price_td_end') - - @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) - @stack('discount_td_start') - {{ $invoice_item->discount }} - @stack('discount_td_end') - @endif - - @stack('total_td_start') - @money($invoice_item->total, $invoice->currency_code, true) - @stack('total_td_end') - + @foreach($invoice->items as $item) + @include('partials.documents.item.show') @endforeach From f916d6a2006a1714118d2f928ae2e1520a3837f1 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sun, 10 May 2020 08:49:36 +0300 Subject: [PATCH 26/69] minor change in items of invoices and bills moved to partials path --- resources/views/partials/documents/item/print.blade.php | 4 ++-- resources/views/partials/documents/item/show.blade.php | 4 ++-- resources/views/purchases/bills/print.blade.php | 2 +- resources/views/purchases/bills/show.blade.php | 2 +- resources/views/sales/invoices/print_classic.blade.php | 2 +- resources/views/sales/invoices/print_default.blade.php | 2 +- resources/views/sales/invoices/print_modern.blade.php | 2 +- resources/views/sales/invoices/show.blade.php | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/views/partials/documents/item/print.blade.php b/resources/views/partials/documents/item/print.blade.php index 493901f6a..326a2ec1c 100644 --- a/resources/views/partials/documents/item/print.blade.php +++ b/resources/views/partials/documents/item/print.blade.php @@ -13,10 +13,10 @@ @stack('quantity_td_end') @stack('price_td_start') - @money($item->price, $invoice->currency_code, true) + @money($item->price, $document->currency_code, true) @stack('price_td_end') @stack('total_td_start') - @money($item->total, $invoice->currency_code, true) + @money($item->total, $document->currency_code, true) @stack('total_td_end') \ No newline at end of file diff --git a/resources/views/partials/documents/item/show.blade.php b/resources/views/partials/documents/item/show.blade.php index 5d78417c9..3da8c29f9 100644 --- a/resources/views/partials/documents/item/show.blade.php +++ b/resources/views/partials/documents/item/show.blade.php @@ -13,7 +13,7 @@ @stack('quantity_td_end') @stack('price_td_start') - @money($item->price, $invoice->currency_code, true) + @money($item->price, $document->currency_code, true) @stack('price_td_end') @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) @@ -23,6 +23,6 @@ @endif @stack('total_td_start') - @money($item->total, $invoice->currency_code, true) + @money($item->total, $document->currency_code, true) @stack('total_td_end') \ No newline at end of file diff --git a/resources/views/purchases/bills/print.blade.php b/resources/views/purchases/bills/print.blade.php index ba18f40a8..d4467f16d 100644 --- a/resources/views/purchases/bills/print.blade.php +++ b/resources/views/purchases/bills/print.blade.php @@ -129,7 +129,7 @@ @foreach($bill->items as $item) - @include('partials.documents.item.print') + @include('partials.documents.item.print', ['document' => $bill]) @endforeach diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index 69a1c25eb..9aa7006d8 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -350,7 +350,7 @@ @stack('total_th_end') @foreach($bill->items as $item) - @include('partials.documents.item.show') + @include('partials.documents.item.show', ['document' => $bill]) @endforeach diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php index 5c8306903..052c9d6a2 100644 --- a/resources/views/sales/invoices/print_classic.blade.php +++ b/resources/views/sales/invoices/print_classic.blade.php @@ -146,7 +146,7 @@ @foreach($invoice->items as $item) - @include('partials.documents.item.print') + @include('partials.documents.item.print', ['document' => $invoice]) @endforeach diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 444b13004..5431ec817 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -133,7 +133,7 @@ @foreach($invoice->items as $item) - @include('partials.documents.item.print') + @include('partials.documents.item.print', ['document' => $invoice]) @endforeach diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php index cfb7b0ec5..d8a65626c 100644 --- a/resources/views/sales/invoices/print_modern.blade.php +++ b/resources/views/sales/invoices/print_modern.blade.php @@ -115,7 +115,7 @@ @foreach($invoice->items as $item) - @include('partials.documents.item.print') + @include('partials.documents.item.print', ['document' => $invoice]) @endforeach diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index 5a566e315..ebecd242c 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -367,7 +367,7 @@ @stack('total_th_end') @foreach($invoice->items as $item) - @include('partials.documents.item.show') + @include('partials.documents.item.show', ['document' => $invoice]) @endforeach From 0c3e09f424092892ae21df0f44b46d0fbf81bd26 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 11 May 2020 18:30:31 +0300 Subject: [PATCH 27/69] updated cloner version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fb6a4890e..8441d6e35 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "barryvdh/laravel-debugbar": "3.2.*", "barryvdh/laravel-dompdf": "0.*", "barryvdh/laravel-ide-helper": "2.6.*", - "bkwld/cloner": "3.6.*", + "bkwld/cloner": "3.7.*", "consoletvs/charts": "6.5.*", "dingo/api": "3.0.*", "doctrine/dbal": "2.9.*", From e15473cc7e198e2ad917a5c8c0a7efbd5a38cac1 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 12 May 2020 23:47:06 +0300 Subject: [PATCH 28/69] formatting --- app/Http/Controllers/Modules/Tiles.php | 2 +- resources/lang/en-GB/modules.php | 1 - resources/views/partials/modules/bar.blade.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Modules/Tiles.php b/app/Http/Controllers/Modules/Tiles.php index f7601605c..4cca6ac8a 100644 --- a/app/Http/Controllers/Modules/Tiles.php +++ b/app/Http/Controllers/Modules/Tiles.php @@ -146,7 +146,7 @@ class Tiles extends Controller ] ]; - $title = trans('modules.search'); + $title = trans('general.search'); $modules = $this->getSearchModules($data); $installed = Module::all()->pluck('enabled', 'alias')->toArray(); diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php index 512f112f5..95a815669 100644 --- a/resources/lang/en-GB/modules.php +++ b/resources/lang/en-GB/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'New', 'top_free' => 'Top Free', 'free' => 'FREE', - 'search' => 'Search', 'install' => 'Install', 'buy_now' => 'Buy Now', 'get_api_key' => 'Click here to get your API key.', diff --git a/resources/views/partials/modules/bar.blade.php b/resources/views/partials/modules/bar.blade.php index c40722ec7..1081dfb4b 100644 --- a/resources/views/partials/modules/bar.blade.php +++ b/resources/views/partials/modules/bar.blade.php @@ -21,7 +21,7 @@
{!! Form::open(['route' => 'apps.search', 'role' => 'form', 'method' => 'GET', 'class' => 'm-0']) !!} - + {!! Form::close() !!}
From af66baa22638b8aecab211d81a22d036feb22afb Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 14 May 2020 21:04:39 +0300 Subject: [PATCH 29/69] renamed module events --- .../Stubs/Modules/listeners/install.stub | 2 +- ...stallModule.php => FinishInstallation.php} | 2 +- ...mentMethod.php => ShowAsPaymentMethod.php} | 2 +- ...ShowSetting.php => ShowInSettingsPage.php} | 2 +- modules/OfflinePayments/Providers/Event.php | 12 +++++------ ...mentMethod.php => ShowAsPaymentMethod.php} | 2 +- modules/PaypalStandard/Providers/Event.php | 20 +++++++++++++++++++ modules/PaypalStandard/Providers/Main.php | 12 ----------- modules/PaypalStandard/module.json | 1 + 9 files changed, 32 insertions(+), 23 deletions(-) rename modules/OfflinePayments/Listeners/{InstallModule.php => FinishInstallation.php} (96%) rename modules/OfflinePayments/Listeners/{ShowPaymentMethod.php => ShowAsPaymentMethod.php} (94%) rename modules/OfflinePayments/Listeners/{ShowSetting.php => ShowInSettingsPage.php} (95%) rename modules/PaypalStandard/Listeners/{ShowPaymentMethod.php => ShowAsPaymentMethod.php} (93%) create mode 100644 modules/PaypalStandard/Providers/Event.php diff --git a/app/Console/Stubs/Modules/listeners/install.stub b/app/Console/Stubs/Modules/listeners/install.stub index a7276dd59..a762c4e8f 100644 --- a/app/Console/Stubs/Modules/listeners/install.stub +++ b/app/Console/Stubs/Modules/listeners/install.stub @@ -5,7 +5,7 @@ namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners; use App\Events\Module\Installed as Event; use App\Traits\Permissions; -class InstallModule +class FinishInstallation { use Permissions; diff --git a/modules/OfflinePayments/Listeners/InstallModule.php b/modules/OfflinePayments/Listeners/FinishInstallation.php similarity index 96% rename from modules/OfflinePayments/Listeners/InstallModule.php rename to modules/OfflinePayments/Listeners/FinishInstallation.php index 2308f0b4d..89a7804ef 100644 --- a/modules/OfflinePayments/Listeners/InstallModule.php +++ b/modules/OfflinePayments/Listeners/FinishInstallation.php @@ -5,7 +5,7 @@ namespace Modules\OfflinePayments\Listeners; use App\Events\Module\Installed as Event; use App\Traits\Permissions; -class InstallModule +class FinishInstallation { use Permissions; diff --git a/modules/OfflinePayments/Listeners/ShowPaymentMethod.php b/modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php similarity index 94% rename from modules/OfflinePayments/Listeners/ShowPaymentMethod.php rename to modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php index ea7e776a7..66fa8f26d 100644 --- a/modules/OfflinePayments/Listeners/ShowPaymentMethod.php +++ b/modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php @@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Listeners; use App\Events\Module\PaymentMethodShowing as Event; -class ShowPaymentMethod +class ShowAsPaymentMethod { /** * Handle the event. diff --git a/modules/OfflinePayments/Listeners/ShowSetting.php b/modules/OfflinePayments/Listeners/ShowInSettingsPage.php similarity index 95% rename from modules/OfflinePayments/Listeners/ShowSetting.php rename to modules/OfflinePayments/Listeners/ShowInSettingsPage.php index 7e8c06138..a69afc123 100644 --- a/modules/OfflinePayments/Listeners/ShowSetting.php +++ b/modules/OfflinePayments/Listeners/ShowInSettingsPage.php @@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Listeners; use App\Events\Module\SettingShowing as Event; -class ShowSetting +class ShowInSettingsPage { /** * Handle the event. diff --git a/modules/OfflinePayments/Providers/Event.php b/modules/OfflinePayments/Providers/Event.php index 81c49182b..a83f4d980 100644 --- a/modules/OfflinePayments/Providers/Event.php +++ b/modules/OfflinePayments/Providers/Event.php @@ -3,9 +3,9 @@ namespace Modules\OfflinePayments\Providers; use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider; -use Modules\OfflinePayments\Listeners\InstallModule; -use Modules\OfflinePayments\Listeners\ShowPaymentMethod; -use Modules\OfflinePayments\Listeners\ShowSetting; +use Modules\OfflinePayments\Listeners\FinishInstallation; +use Modules\OfflinePayments\Listeners\ShowAsPaymentMethod; +use Modules\OfflinePayments\Listeners\ShowInSettingsPage; class Event extends Provider { @@ -16,13 +16,13 @@ class Event extends Provider */ protected $listen = [ \App\Events\Module\Installed::class => [ - InstallModule::class, + FinishInstallation::class, ], \App\Events\Module\PaymentMethodShowing::class => [ - ShowPaymentMethod::class, + ShowAsPaymentMethod::class, ], \App\Events\Module\SettingShowing::class => [ - ShowSetting::class, + ShowInSettingsPage::class, ], ]; } diff --git a/modules/PaypalStandard/Listeners/ShowPaymentMethod.php b/modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php similarity index 93% rename from modules/PaypalStandard/Listeners/ShowPaymentMethod.php rename to modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php index 9d11bb115..76fc7e445 100644 --- a/modules/PaypalStandard/Listeners/ShowPaymentMethod.php +++ b/modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php @@ -4,7 +4,7 @@ namespace Modules\PaypalStandard\Listeners; use App\Events\Module\PaymentMethodShowing as Event; -class ShowPaymentMethod +class ShowAsPaymentMethod { /** * Handle the event. diff --git a/modules/PaypalStandard/Providers/Event.php b/modules/PaypalStandard/Providers/Event.php new file mode 100644 index 000000000..ee4fa3008 --- /dev/null +++ b/modules/PaypalStandard/Providers/Event.php @@ -0,0 +1,20 @@ + [ + ShowAsPaymentMethod::class, + ], + ]; +} diff --git a/modules/PaypalStandard/Providers/Main.php b/modules/PaypalStandard/Providers/Main.php index e98704dab..e046d9eca 100644 --- a/modules/PaypalStandard/Providers/Main.php +++ b/modules/PaypalStandard/Providers/Main.php @@ -3,7 +3,6 @@ namespace Modules\PaypalStandard\Providers; use Illuminate\Support\ServiceProvider as Provider; -use Modules\PaypalStandard\Listeners\ShowPaymentMethod; class Main extends Provider { @@ -16,7 +15,6 @@ class Main extends Provider { $this->loadTranslations(); $this->loadViews(); - $this->loadEvents(); } /** @@ -49,16 +47,6 @@ class Main extends Provider $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'paypal-standard'); } - /** - * Load events. - * - * @return void - */ - public function loadEvents() - { - $this->app['events']->listen(\App\Events\Module\PaymentMethodShowing::class, ShowPaymentMethod::class); - } - /** * Load routes. * diff --git a/modules/PaypalStandard/module.json b/modules/PaypalStandard/module.json index fc7ed3410..a4a262a9e 100644 --- a/modules/PaypalStandard/module.json +++ b/modules/PaypalStandard/module.json @@ -5,6 +5,7 @@ "category": "payment-method", "active": 1, "providers": [ + "Modules\\PaypalStandard\\Providers\\Event", "Modules\\PaypalStandard\\Providers\\Main" ], "aliases": {}, From ce84e47705fb009d2fdda20d4c80017d7e0045fb Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 16 May 2020 11:37:56 +0300 Subject: [PATCH 30/69] removed tax from profit & loss --- app/Abstracts/Report.php | 4 ++-- app/Reports/ProfitLoss.php | 12 ++++++------ app/Reports/TaxSummary.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index 9b16044a3..d4206499f 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -329,7 +329,7 @@ abstract class Report event(new RowsShowing($this)); } - public function setTotals($items, $date_field, $check_type = false, $table = 'default') + public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true) { foreach ($items as $item) { // Make groups extensible @@ -347,7 +347,7 @@ abstract class Report continue; } - $amount = $item->getAmountConvertedToDefault(); + $amount = $item->getAmountConvertedToDefault(false, $with_tax); $type = (($item instanceof Invoice) || (($item instanceof Transaction) && ($item->type == 'income'))) ? 'income' : 'expense'; diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index 2169a61a6..f96aac242 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -47,33 +47,33 @@ class ProfitLoss extends Report case 'cash': // Revenues $revenues = $income_transactions->get(); - $this->setTotals($revenues, 'paid_at', true, $this->tables['income']); + $this->setTotals($revenues, 'paid_at', true, $this->tables['income'], false); // Payments $payments = $expense_transactions->get(); - $this->setTotals($payments, 'paid_at', true, $this->tables['expense']); + $this->setTotals($payments, 'paid_at', true, $this->tables['expense'], false); break; default: // Invoices $invoices = $this->applyFilters(Invoice::accrued(), ['date_field' => 'invoiced_at'])->get(); Recurring::reflect($invoices, 'invoiced_at'); - $this->setTotals($invoices, 'invoiced_at', true, $this->tables['income']); + $this->setTotals($invoices, 'invoiced_at', true, $this->tables['income'], false); // Revenues $revenues = $income_transactions->isNotDocument()->get(); Recurring::reflect($revenues, 'paid_at'); - $this->setTotals($revenues, 'paid_at', true, $this->tables['income']); + $this->setTotals($revenues, 'paid_at', true, $this->tables['income'], false); // Bills $bills = $this->applyFilters(Bill::accrued(), ['date_field' => 'billed_at'])->get(); Recurring::reflect($bills, 'bill', 'billed_at'); - $this->setTotals($bills, 'billed_at', true, $this->tables['expense']); + $this->setTotals($bills, 'billed_at', true, $this->tables['expense'], false); // Payments $payments = $expense_transactions->isNotDocument()->get(); Recurring::reflect($payments, 'paid_at'); - $this->setTotals($payments, 'paid_at', true, $this->tables['expense']); + $this->setTotals($payments, 'paid_at', true, $this->tables['expense'], false); break; } diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 007d294e8..15baa5679 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -70,7 +70,7 @@ class TaxSummary extends Report } } - public function setTotals($items, $date_field, $check_type = false, $table = 'default') + public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true) { foreach ($items as $item) { // Make groups extensible From 26d84e9ec4f703aa109110fe7319c2b333b5aeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 16 May 2020 11:45:16 +0300 Subject: [PATCH 31/69] Progress text style fixed.. --- resources/views/install/updates/edit.blade.php | 2 +- resources/views/modules/item/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/install/updates/edit.blade.php b/resources/views/install/updates/edit.blade.php index 824b7ca28..b37f2ec92 100644 --- a/resources/views/install/updates/edit.blade.php +++ b/resources/views/install/updates/edit.blade.php @@ -16,7 +16,7 @@

-

+
{{ Form::hidden('page', 'update', ['id' => 'page']) }} {{ Form::hidden('name', $name, ['id' => 'name']) }} diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 09bebbdde..224c0bd9e 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -263,7 +263,7 @@
-
+