From ce90285a3900084b1fd1a52f46ee26aa64506de5 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 16 Mar 2018 16:16:14 +0300 Subject: [PATCH 01/94] fixed #268 #269 --- app/Models/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Model.php b/app/Models/Model.php index 47efe52c5..0ffda8779 100644 --- a/app/Models/Model.php +++ b/app/Models/Model.php @@ -91,7 +91,7 @@ class Model extends Eloquent $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } /** From 16ddfaa35d2d5cd01e206ca8a26aeea9e591ac85 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 16 Mar 2018 16:24:42 +0300 Subject: [PATCH 02/94] fixed collect scope --- app/Models/Auth/Permission.php | 2 +- app/Models/Auth/Role.php | 2 +- app/Models/Auth/User.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/Auth/Permission.php b/app/Models/Auth/Permission.php index 5303bf74b..4350d5911 100644 --- a/app/Models/Auth/Permission.php +++ b/app/Models/Auth/Permission.php @@ -65,6 +65,6 @@ class Permission extends LaratrustPermission $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } } diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php index f45c9de01..ebb4a1297 100644 --- a/app/Models/Auth/Role.php +++ b/app/Models/Auth/Role.php @@ -64,6 +64,6 @@ class Role extends LaratrustRole $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } } diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index d9ddabf01..0a985bbc5 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -177,7 +177,7 @@ class User extends Authenticatable $input = $request->input(); $limit = $request->get('limit', setting('general.list_limit', '25')); - return $this->filter($input)->sortable($sort)->paginate($limit); + return $query->filter($input)->sortable($sort)->paginate($limit); } /** From 94351e2663db1a80acb7c642deeef8169a0d8c13 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 16 Mar 2018 16:25:35 +0300 Subject: [PATCH 03/94] fixed #270 --- resources/views/expenses/payments/create.blade.php | 4 ++-- resources/views/incomes/revenues/create.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index 6b78af2ea..823e3e440 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -130,11 +130,11 @@ modal += ' '; modal += ' '; modal += ' '; - modal += '
'; + modal += '
'; modal += ' '; modal += '
'; modal += '
'; - modal += ' '; + modal += ' '; modal += '
'; modal += '
'; modal += '
'; diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index 16b697287..e3cc4b0ec 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -130,11 +130,11 @@ modal += ' '; modal += '
'; modal += '
'; - modal += '
'; + modal += '
'; modal += ' '; modal += '
'; modal += '
'; - modal += ' '; + modal += ' '; modal += '
'; modal += '
'; modal += '
'; From 76ed900bc9eefcf4d84283a875807655ff201107 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 19 Mar 2018 15:07:43 +0300 Subject: [PATCH 04/94] fixed #275 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aef46974e..3aaab5d36 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "fideloper/proxy": "3.3.*", "guzzlehttp/guzzle": "6.3.*", "intervention/image": "2.3.*", - "jenssegers/date": "3.2.*", + "jenssegers/date": "3.3.*", "kyslik/column-sortable": "5.4.*", "laracasts/flash": "3.0.*", "laravel/framework": "5.4.*", From f3587963884089474959d587d9d9c7fd589d2c4c Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 21 Mar 2018 16:21:51 +0300 Subject: [PATCH 05/94] language fix --- app/Http/Controllers/Expenses/Bills.php | 2 +- app/Http/Controllers/Incomes/Invoices.php | 2 +- resources/lang/en-GB/messages.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 6aff04f61..7cbf5f471 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -536,7 +536,7 @@ class Bills extends Controller } if ($amount > $total_amount) { - $message = trans('messages.error.payment_add'); + $message = trans('messages.error.over_payment'); return response()->json([ 'success' => false, diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 35974fcc8..0a925974b 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -669,7 +669,7 @@ class Invoices extends Controller } if ($amount > $total_amount) { - $message = trans('messages.error.payment_add'); + $message = trans('messages.error.over_payment'); return response()->json([ 'success' => false, diff --git a/resources/lang/en-GB/messages.php b/resources/lang/en-GB/messages.php index cc59366e2..491beb1c2 100644 --- a/resources/lang/en-GB/messages.php +++ b/resources/lang/en-GB/messages.php @@ -10,9 +10,9 @@ return [ 'imported' => ':type imported!', ], 'error' => [ - 'payment_add' => 'Error: You can not add payment! You should check add amount.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Error: You are not allowed to manage this company!', - 'customer' => 'Error: You can not created user! :name use this email address.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: No file selected!', ], 'warning' => [ From 4d05971b50cebaf0622df5cbe359260d4eea3961 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 23 Mar 2018 18:02:37 +0300 Subject: [PATCH 06/94] fixed #262 --- app/Http/Controllers/Expenses/Bills.php | 12 +++++------- app/Http/Controllers/Incomes/Invoices.php | 10 ++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 7cbf5f471..9a838940e 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -589,25 +589,23 @@ class Bills extends Controller { $bill = Bill::find($payment->bill_id); - $status = 'received'; - if ($bill->payments()->count() > 1) { $bill->bill_status_code = 'partial'; + } else { + $bill->bill_status_code = 'received'; } - $bill->bill_status_code = $status; - $bill->save(); $desc_amount = money((float) $payment->amount, (string) $payment->currency_code, true)->format(); $description = $desc_amount . ' ' . trans_choice('general.payments', 1); - // Add invoice history + // Add bill history BillHistory::create([ 'company_id' => $bill->company_id, - 'invoice_id' => $bill->id, - 'status_code' => $status, + 'bill_id' => $bill->id, + 'status_code' => $bill->bill_status_code, 'notify' => 0, 'description' => trans('messages.success.deleted', ['type' => $description]), ]); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 0a925974b..8eb71b2df 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -722,14 +722,12 @@ class Invoices extends Controller { $invoice = Invoice::find($payment->invoice_id); - $status = 'sent'; - if ($invoice->payments()->count() > 1) { - $status = 'partial'; + $invoice->invoice_status_code = 'partial'; + } else { + $invoice->invoice_status_code = 'sent'; } - $invoice->invoice_status_code = $status; - $invoice->save(); $desc_amount = money((float) $payment->amount, (string) $payment->currency_code, true)->format(); @@ -740,7 +738,7 @@ class Invoices extends Controller InvoiceHistory::create([ 'company_id' => $invoice->company_id, 'invoice_id' => $invoice->id, - 'status_code' => $status, + 'status_code' => $invoice->invoice_status_code, 'notify' => 0, 'description' => trans('messages.success.deleted', ['type' => $description]), ]); From 6dec413786b42604fe2256ec07385661d65cfa17 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 28 Mar 2018 15:30:00 +0300 Subject: [PATCH 07/94] get api invoice by number --- app/Http/Controllers/Api/Incomes/Invoices.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php index 818061b39..fb78c9d46 100644 --- a/app/Http/Controllers/Api/Incomes/Invoices.php +++ b/app/Http/Controllers/Api/Incomes/Invoices.php @@ -36,11 +36,18 @@ class Invoices extends ApiController /** * Display the specified resource. * - * @param Invoice $invoice + * @param $id * @return \Dingo\Api\Http\Response */ - public function show(Invoice $invoice) + public function show($id) { + // Check if we're querying by id or number + if (is_numeric($id)) { + $invoice = Invoice::find($id); + } else { + $invoice = Invoice::where('invoice_number', $id)->first(); + } + return $this->response->item($invoice, new Transformer()); } From 88d78d54afb15d053569f6dfaf49d4f81f717f3b Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 29 Mar 2018 18:50:13 +0300 Subject: [PATCH 08/94] fixed #278 --- app/Http/Controllers/Banking/Accounts.php | 37 +++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php index 59a373bd6..4e43d9bd2 100644 --- a/app/Http/Controllers/Banking/Accounts.php +++ b/app/Http/Controllers/Banking/Accounts.php @@ -84,19 +84,34 @@ class Accounts extends Controller */ public function update(Account $account, Request $request) { - $account->update($request->all()); - - // Set default account - if ($request['default_account']) { - setting()->set('general.default_account', $account->id); - setting()->save(); + // Check if we can disable it + if (!$request['enabled']) { + if ($account->id == setting('general.default_account')) { + $relationships[] = strtolower(trans_choice('general.companies', 1)); + } } - $message = trans('messages.success.updated', ['type' => trans_choice('general.accounts', 1)]); + if (empty($relationships)) { + $account->update($request->all()); - flash($message)->success(); + // Set default account + if ($request['default_account']) { + setting()->set('general.default_account', $account->id); + setting()->save(); + } - return redirect('banking/accounts'); + $message = trans('messages.success.updated', ['type' => trans_choice('general.accounts', 1)]); + + flash($message)->success(); + + return redirect('banking/accounts'); + } else { + $message = trans('messages.warning.disabled', ['name' => $account->name, 'text' => implode(', ', $relationships)]); + + flash($message)->warning(); + + return redirect('banking/accounts/' . $account->id . '/edit'); + } } /** @@ -115,6 +130,10 @@ class Accounts extends Controller 'revenues' => 'revenues', ]); + if ($account->id == setting('general.default_account')) { + $relationships[] = strtolower(trans_choice('general.companies', 1)); + } + if (empty($relationships)) { $account->delete(); From 778006d2a4b92ab1bac61178e63505986ebceb9a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 30 Mar 2018 11:39:37 +0300 Subject: [PATCH 09/94] fixed #279 --- resources/views/expenses/bills/create.blade.php | 4 ++-- resources/views/expenses/bills/edit.blade.php | 4 ++-- resources/views/incomes/invoices/create.blade.php | 4 ++-- resources/views/incomes/invoices/edit.blade.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index c46071d5f..12b9a7928 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -51,7 +51,7 @@ - + @@ -123,7 +123,7 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' '; diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index 7d4d36ab7..8c11bfa36 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -42,7 +42,7 @@ - + @@ -141,7 +141,7 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' '; diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index cff4e31aa..dbb2db7dd 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -51,7 +51,7 @@ - + @@ -124,7 +124,7 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' '; diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index a5b949116..aa2e8c37f 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -65,7 +65,7 @@ - + @@ -140,7 +140,7 @@ html += ' '; html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' '; html += ' '; From a57f446d92a924795eafc81e263836ee28a92eaf Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 30 Mar 2018 17:46:50 +0300 Subject: [PATCH 10/94] fixed #284 --- public/css/app.css | 6 ++++++ resources/views/banking/accounts/index.blade.php | 4 ++-- resources/views/banking/transactions/index.blade.php | 4 ++-- resources/views/banking/transfers/index.blade.php | 4 ++-- resources/views/expenses/bills/index.blade.php | 6 +++--- resources/views/expenses/payments/index.blade.php | 4 ++-- resources/views/incomes/invoices/index.blade.php | 6 +++--- resources/views/incomes/revenues/index.blade.php | 4 ++-- resources/views/items/items/index.blade.php | 8 ++++---- resources/views/partials/admin/head.blade.php | 6 +++--- resources/views/partials/customer/head.blade.php | 6 +++--- 11 files changed, 32 insertions(+), 26 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 850703770..5fef5c91b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -505,6 +505,12 @@ ul.add-new.nav.navbar-nav.pull-left { } } +@media only screen and (min-width : 768px) { + .amount-space { + padding-right: 30px !important; + } +} + .text-disabled { opacity: 0.4; } diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php index 7992ef947..bc5206a05 100644 --- a/resources/views/banking/accounts/index.blade.php +++ b/resources/views/banking/accounts/index.blade.php @@ -33,7 +33,7 @@ @sortablelink('name', trans('general.name')) @sortablelink('number', trans('accounts.number')) - @sortablelink('opening_balance', trans('accounts.current_balance')) + @sortablelink('opening_balance', trans('accounts.current_balance')) @sortablelink('enabled', trans_choice('general.statuses', 1)) {{ trans('general.actions') }} @@ -43,7 +43,7 @@ {{ $item->name }} {{ $item->number }} - @money($item->balance, $item->currency_code, true) + @money($item->balance, $item->currency_code, true) @if ($item->enabled) {{ trans('general.enabled') }} diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index e4790a7a8..d25de5eb3 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -32,7 +32,7 @@ @sortablelink('type', trans_choice('general.types', 1)) @sortablelink('category_name', trans_choice('general.categories', 1)) @sortablelink('description', trans('general.description')) - @sortablelink('amount', trans('general.amount')) + @sortablelink('amount', trans('general.amount')) @@ -43,7 +43,7 @@ {{ $item->type }} {{ $item->category_name }} {{ $item->description }} - @money($item->amount, $item->currency_code, true) + @money($item->amount, $item->currency_code, true) @endforeach diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index 58e329840..1dba80657 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -35,7 +35,7 @@ @sortablelink('payment.paid_at', trans('general.date')) @sortablelink('payment.name', trans('transfers.from_account')) @sortablelink('revenue.name', trans('transfers.to_account')) - @sortablelink('payment.amount', trans('general.amount')) + @sortablelink('payment.amount', trans('general.amount')) @@ -44,7 +44,7 @@ {{ Date::parse($item->paid_at)->format($date_format) }} {{ $item->from_account }} {{ $item->to_account }} - @money($item->amount, $item->currency_code, true) + @money($item->amount, $item->currency_code, true) @endforeach diff --git a/resources/views/expenses/bills/index.blade.php b/resources/views/expenses/bills/index.blade.php index 278e76be2..f6b762195 100644 --- a/resources/views/expenses/bills/index.blade.php +++ b/resources/views/expenses/bills/index.blade.php @@ -35,8 +35,8 @@ @sortablelink('bill_number', trans_choice('general.numbers', 1)) - @sortablelink('vendor_name', trans_choice('general.vendors', 1)) - @sortablelink('amount', trans('general.amount')) + @sortablelink('vendor_name', trans_choice('general.vendors', 1)) + @sortablelink('amount', trans('general.amount')) @sortablelink('billed_at', trans('bills.bill_date')) @sortablelink('due_at', trans('bills.due_date')) @sortablelink('bill_status_code', trans_choice('general.statuses', 1)) @@ -48,7 +48,7 @@ {{ $item->bill_number }} {{ $item->vendor_name }} - @money($item->amount, $item->currency_code, true) + @money($item->amount, $item->currency_code, true) {{ Date::parse($item->billed_at)->format($date_format) }} {{ Date::parse($item->due_at)->format($date_format) }} {{ $item->status->name }} diff --git a/resources/views/expenses/payments/index.blade.php b/resources/views/expenses/payments/index.blade.php index b2d6598fe..987b8a851 100644 --- a/resources/views/expenses/payments/index.blade.php +++ b/resources/views/expenses/payments/index.blade.php @@ -35,7 +35,7 @@ @sortablelink('paid_at', trans('general.date')) - @sortablelink('amount', trans('general.amount')) + @sortablelink('amount', trans('general.amount')) @sortablelink('vendor.name', trans_choice('general.vendors', 1)) @sortablelink('category.name', trans_choice('general.categories', 1)) @sortablelink('account.name', trans_choice('general.accounts', 1)) @@ -46,7 +46,7 @@ @foreach($payments as $item) {{ Date::parse($item->paid_at)->format($date_format) }} - @money($item->amount, $item->currency_code, true) + @money($item->amount, $item->currency_code, true) {{ !empty($item->vendor->name) ? $item->vendor->name : trans('general.na') }} {{ $item->category->name }} {{ $item->account->name }} diff --git a/resources/views/incomes/invoices/index.blade.php b/resources/views/incomes/invoices/index.blade.php index 66f863cc2..635be1ee7 100644 --- a/resources/views/incomes/invoices/index.blade.php +++ b/resources/views/incomes/invoices/index.blade.php @@ -34,8 +34,8 @@ @sortablelink('invoice_number', trans_choice('general.numbers', 1)) - @sortablelink('customer_name', trans_choice('general.customers', 1)) - @sortablelink('amount', trans('general.amount')) + @sortablelink('customer_name', trans_choice('general.customers', 1)) + @sortablelink('amount', trans('general.amount')) @sortablelink('invoiced_at', trans('invoices.invoice_date')) @sortablelink('due_at', trans('invoices.due_date')) @sortablelink('invoice_status_code', trans_choice('general.statuses', 1)) @@ -47,7 +47,7 @@ {{ $item->invoice_number }} {{ $item->customer_name }} - @money($item->amount, $item->currency_code, true) + @money($item->amount, $item->currency_code, true) {{ Date::parse($item->invoiced_at)->format($date_format) }} {{ Date::parse($item->due_at)->format($date_format) }} {{ $item->status->name }} diff --git a/resources/views/incomes/revenues/index.blade.php b/resources/views/incomes/revenues/index.blade.php index 8c79d2ece..40421bf7b 100644 --- a/resources/views/incomes/revenues/index.blade.php +++ b/resources/views/incomes/revenues/index.blade.php @@ -35,7 +35,7 @@ @sortablelink('paid_at', trans('general.date')) - @sortablelink('amount', trans('general.amount')) + @sortablelink('amount', trans('general.amount')) @sortablelink('customer.name', trans_choice('general.customers', 1)) @sortablelink('category.name', trans_choice('general.categories', 1)) @sortablelink('account.name', trans_choice('general.accounts', 1)) @@ -46,7 +46,7 @@ @foreach($revenues as $item) {{ Date::parse($item->paid_at)->format($date_format) }} - @money($item->amount, $item->currency_code, true) + @money($item->amount, $item->currency_code, true) {{ !empty($item->customer->name) ? $item->customer->name : trans('general.na') }} {{ $item->category->name }} {{ $item->account->name }} diff --git a/resources/views/items/items/index.blade.php b/resources/views/items/items/index.blade.php index bedfa54b6..59ff6cfe5 100644 --- a/resources/views/items/items/index.blade.php +++ b/resources/views/items/items/index.blade.php @@ -37,8 +37,8 @@ @sortablelink('name', trans('general.name')) @sortablelink('category', trans_choice('general.categories', 1)) @sortablelink('quantity', trans_choice('items.quantities', 1)) - @sortablelink('sale_price', trans('items.sales_price')) - @sortablelink('purchase_price', trans('items.purchase_price')) + @sortablelink('sale_price', trans('items.sales_price')) + @sortablelink('purchase_price', trans('items.purchase_price')) @sortablelink('enabled', trans_choice('general.statuses', 1)) {{ trans('general.actions') }} @@ -50,8 +50,8 @@ {{ $item->name }} {{ $item->category ? $item->category->name : trans('general.na') }} {{ $item->quantity }} - {{ money($item->sale_price, setting('general.default_currency'), true) }} - {{ money($item->purchase_price, setting('general.default_currency'), true) }} + {{ money($item->sale_price, setting('general.default_currency'), true) }} + {{ money($item->purchase_price, setting('general.default_currency'), true) }} @if ($item->enabled) {{ trans('general.enabled') }} diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php index a2095e49e..9976e3aa9 100644 --- a/resources/views/partials/admin/head.blade.php +++ b/resources/views/partials/admin/head.blade.php @@ -19,13 +19,13 @@ @else - + @endif - - + + diff --git a/resources/views/partials/customer/head.blade.php b/resources/views/partials/customer/head.blade.php index b2bdc073b..dc64f5fa3 100644 --- a/resources/views/partials/customer/head.blade.php +++ b/resources/views/partials/customer/head.blade.php @@ -19,15 +19,15 @@ @else - + @endif - - + + From b864875533784b9b76c67f3f070ba04bd5099387 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 31 Mar 2018 11:12:31 +0300 Subject: [PATCH 11/94] fixed #285 --- resources/views/expenses/bills/show.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 597ebff8e..adffc2fc4 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -220,9 +220,9 @@ @foreach($bill->histories as $history) - {{ Date::parse($bill->created_at)->format($date_format) }} - {{ $bill->status->name }} - {{ $bill->description }} + {{ Date::parse($history->created_at)->format($date_format) }} + {{ $history->status->name }} + {{ $history->description }} @endforeach From fcc61078713cff699d13fca5df7ddf5b5d7626b6 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 31 Mar 2018 11:13:49 +0300 Subject: [PATCH 12/94] formatting --- app/Http/Controllers/Expenses/Bills.php | 2 +- app/Http/Controllers/Incomes/Invoices.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 9a838940e..cde227a81 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -569,7 +569,7 @@ class Bills extends Controller BillHistory::create($request->input()); - $message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]); + $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]); return response()->json([ 'success' => true, diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 8eb71b2df..7df620606 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -702,7 +702,7 @@ class Invoices extends Controller InvoiceHistory::create($request->input()); - $message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]); + $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]); return response()->json([ 'success' => true, From 7ecf6914a8f127888c649c5d1e285e291951545d Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 7 Apr 2018 12:00:39 +0300 Subject: [PATCH 13/94] print reports --- .../Controllers/Reports/ExpenseSummary.php | 13 ++- .../Reports/IncomeExpenseSummary.php | 13 ++- .../Controllers/Reports/IncomeSummary.php | 13 ++- public/css/app.css | 4 + resources/views/layouts/print.blade.php | 7 ++ .../reports/expense_summary/body.blade.php | 48 ++++++++++ .../reports/expense_summary/index.blade.php | 53 ++--------- .../reports/expense_summary/print.blade.php | 7 ++ .../income_expense_summary/body.blade.php | 66 ++++++++++++++ .../income_expense_summary/index.blade.php | 73 ++------------- .../income_expense_summary/print.blade.php | 7 ++ .../reports/income_summary/body.blade.php | 48 ++++++++++ .../reports/income_summary/index.blade.php | 89 +++++-------------- .../reports/income_summary/print.blade.php | 7 ++ .../charts/chartjs/multi/line_print.blade.php | 58 ++++++++++++ 15 files changed, 319 insertions(+), 187 deletions(-) create mode 100644 resources/views/layouts/print.blade.php create mode 100644 resources/views/reports/expense_summary/body.blade.php create mode 100644 resources/views/reports/expense_summary/print.blade.php create mode 100644 resources/views/reports/income_expense_summary/body.blade.php create mode 100644 resources/views/reports/income_expense_summary/print.blade.php create mode 100644 resources/views/reports/income_summary/body.blade.php create mode 100644 resources/views/reports/income_summary/print.blade.php create mode 100644 resources/views/vendor/consoletvs/charts/chartjs/multi/line_print.blade.php diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 10408cb22..dbae1aea3 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -91,6 +91,15 @@ class ExpenseSummary extends Controller $this->setAmount($expenses_graph, $totals, $expenses, $payments, 'payment', 'paid_at'); } + // Check if it's a print or normal request + if (request('print')) { + $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print'; + $view_template = 'reports.expense_summary.print'; + } else { + $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line'; + $view_template = 'reports.expense_summary.index'; + } + // Expenses chart $chart = Charts::multi('line', 'chartjs') ->dimensions(0, 300) @@ -98,12 +107,12 @@ class ExpenseSummary extends Controller ->dataset(trans_choice('general.expenses', 1), $expenses_graph) ->labels($dates) ->credits(false) - ->view('vendor.consoletvs.charts.chartjs.multi.line'); + ->view($chart_template); // Expenses Graph $expenses_graph = json_encode($expenses_graph); - return view('reports.expense_summary.index', compact('chart', 'dates', 'categories', 'expenses', 'totals')); + return view($view_template, compact('chart', 'dates', 'categories', 'expenses', 'totals')); } private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field) diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 5e8352d6e..86c7b138c 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -141,6 +141,15 @@ class IncomeExpenseSummary extends Controller $this->setAmount($profit_graph, $totals, $compares, $payments, 'payment', 'paid_at'); } + // Check if it's a print or normal request + if (request('print')) { + $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print'; + $view_template = 'reports.income_expense_summary.print'; + } else { + $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line'; + $view_template = 'reports.income_expense_summary.index'; + } + // Profit chart $chart = Charts::multi('line', 'chartjs') ->dimensions(0, 300) @@ -148,9 +157,9 @@ class IncomeExpenseSummary extends Controller ->dataset(trans_choice('general.profits', 1), $profit_graph) ->labels($dates) ->credits(false) - ->view('vendor.consoletvs.charts.chartjs.multi.line'); + ->view($chart_template); - return view('reports.income_expense_summary.index', compact('chart', 'dates', 'income_categories', 'expense_categories', 'compares', 'totals')); + return view($view_template, compact('chart', 'dates', 'income_categories', 'expense_categories', 'compares', 'totals')); } private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field) diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 390c2cede..338d677c1 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -91,6 +91,15 @@ class IncomeSummary extends Controller $this->setAmount($incomes_graph, $totals, $incomes, $revenues, 'revenue', 'paid_at'); } + // Check if it's a print or normal request + if (request('print')) { + $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line_print'; + $view_template = 'reports.income_summary.print'; + } else { + $chart_template = 'vendor.consoletvs.charts.chartjs.multi.line'; + $view_template = 'reports.income_summary.index'; + } + // Incomes chart $chart = Charts::multi('line', 'chartjs') ->dimensions(0, 300) @@ -98,9 +107,9 @@ class IncomeSummary extends Controller ->dataset(trans_choice('general.incomes', 1), $incomes_graph) ->labels($dates) ->credits(false) - ->view('vendor.consoletvs.charts.chartjs.multi.line'); + ->view($chart_template); - return view('reports.income_summary.index', compact('chart', 'dates', 'categories', 'incomes', 'totals')); + return view($view_template, compact('chart', 'dates', 'categories', 'incomes', 'totals')); } private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field) diff --git a/public/css/app.css b/public/css/app.css index 5fef5c91b..67f89e918 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -515,6 +515,10 @@ ul.add-new.nav.navbar-nav.pull-left { opacity: 0.4; } +.print-width { + max-width: 1500px; +} + /* .tooltip > .tooltip-inner { background-color: #6da252; diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php new file mode 100644 index 000000000..6b213602e --- /dev/null +++ b/resources/views/layouts/print.blade.php @@ -0,0 +1,7 @@ + + @include('partials.admin.head') + + + @yield('content') + + diff --git a/resources/views/reports/expense_summary/body.blade.php b/resources/views/reports/expense_summary/body.blade.php new file mode 100644 index 000000000..ba036df75 --- /dev/null +++ b/resources/views/reports/expense_summary/body.blade.php @@ -0,0 +1,48 @@ +
+ {!! $chart->render() !!} + +
+ +
+ + + + + @foreach($dates as $date) + + @endforeach + + + + @if ($expenses) + @foreach($expenses as $category_id => $category) + + + @foreach($category as $item) + + @endforeach + + @endforeach + @else + + + + @endif + + + + + @foreach($totals as $total) + + @endforeach + + +
{{ trans_choice('general.categories', 1) }}{{ $date }}
{{ $categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
+
{{ trans('general.no_records') }}
+
{{ trans_choice('general.totals', 1) }}@money($total['amount'], $total['currency_code'], true)
+
+
+ +@push('js') +{!! Charts::assets() !!} +@endpush \ No newline at end of file diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php index b5504c7a9..1b2d0444b 100644 --- a/resources/views/reports/expense_summary/index.blade.php +++ b/resources/views/reports/expense_summary/index.blade.php @@ -2,6 +2,10 @@ @section('title', trans('reports.summary.expense')) +@section('new_button') +  {{ trans('general.print') }} +@endsection + @section('content')
@@ -17,55 +21,8 @@
{!! Form::close() !!}
-
- {!! $chart->render() !!} -
- -
- - - - - @foreach($dates as $date) - - @endforeach - - - - @if ($expenses) - @foreach($expenses as $category_id => $category) - - - @foreach($category as $item) - - @endforeach - - @endforeach - @else - - - - @endif - - - - - @foreach($totals as $total) - - @endforeach - - -
{{ trans_choice('general.categories', 1) }}{{ $date }}
{{ $categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
-
{{ trans('general.no_records') }}
-
{{ trans_choice('general.totals', 1) }}@money($total['amount'], $total['currency_code'], true)
-
-
- + @include('reports.expense_summary.body')
@endsection - -@push('js') -{!! Charts::assets() !!} -@endpush diff --git a/resources/views/reports/expense_summary/print.blade.php b/resources/views/reports/expense_summary/print.blade.php new file mode 100644 index 000000000..e1d4f9651 --- /dev/null +++ b/resources/views/reports/expense_summary/print.blade.php @@ -0,0 +1,7 @@ +@extends('layouts.print') + +@section('title', trans('reports.summary.expense')) + +@section('content') + @include('reports.expense_summary.body') +@endsection \ No newline at end of file diff --git a/resources/views/reports/income_expense_summary/body.blade.php b/resources/views/reports/income_expense_summary/body.blade.php new file mode 100644 index 000000000..a5f54f4f3 --- /dev/null +++ b/resources/views/reports/income_expense_summary/body.blade.php @@ -0,0 +1,66 @@ +
+ {!! $chart->render() !!} + +
+ +
+ + + + + @foreach($dates as $date) + + @endforeach + + + + @if ($compares) + @foreach($compares as $type => $categories) + @foreach($categories as $category_id => $category) + + @if($type == 'income') + + @else + + @endif + @foreach($category as $item) + @if($type == 'income') + + @else + + @endif + @endforeach + + @endforeach + @endforeach + @else + + + + @endif + + + + + @foreach($totals as $total) + + @endforeach + + +
{{ trans_choice('general.categories', 1) }}{{ $date }}
{{ $income_categories[$category_id] }}{{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)@money(-$item['amount'], $item['currency_code'], true)
+
{{ trans('general.no_records') }}
+
{{ trans_choice('general.totals', 1) }} + @if($total['amount'] == 0) + @money($total['amount'], $total['currency_code'], true) + @elseif($total['amount'] > 0) + @money($total['amount'], $total['currency_code'], true) + @else + @money($total['amount'], $total['currency_code'], true) + @endif +
+
+
+ +@push('js') +{!! Charts::assets() !!} +@endpush diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php index d8d1cd3c6..e969e5598 100644 --- a/resources/views/reports/income_expense_summary/index.blade.php +++ b/resources/views/reports/income_expense_summary/index.blade.php @@ -1,6 +1,10 @@ @extends('layouts.admin') -@section('title', trans_choice('reports.summary.income_expense', 1)) +@section('title', trans('reports.summary.income_expense')) + +@section('new_button') +  {{ trans('general.print') }} +@endsection @section('content') @@ -17,73 +21,8 @@ {!! Form::close() !!} -
- {!! $chart->render() !!} -
- -
- - - - - @foreach($dates as $date) - - @endforeach - - - - @if ($compares) - @foreach($compares as $type => $categories) - @foreach($categories as $category_id => $category) - - @if($type == 'income') - - @else - - @endif - @foreach($category as $item) - @if($type == 'income') - - @else - - @endif - @endforeach - - @endforeach - @endforeach - @else - - - - @endif - - - - - @foreach($totals as $total) - - @endforeach - - -
{{ trans_choice('general.categories', 1) }}{{ $date }}
{{ $income_categories[$category_id] }}{{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)@money(-$item['amount'], $item['currency_code'], true)
-
{{ trans('general.no_records') }}
-
{{ trans_choice('general.totals', 1) }} - @if($total['amount'] == 0) - @money($total['amount'], $total['currency_code'], true) - @elseif($total['amount'] > 0) - @money($total['amount'], $total['currency_code'], true) - @else - @money($total['amount'], $total['currency_code'], true) - @endif -
-
-
- + @include('reports.income_expense_summary.body') @endsection - -@push('js') -{!! Charts::assets() !!} -@endpush diff --git a/resources/views/reports/income_expense_summary/print.blade.php b/resources/views/reports/income_expense_summary/print.blade.php new file mode 100644 index 000000000..fa13bd103 --- /dev/null +++ b/resources/views/reports/income_expense_summary/print.blade.php @@ -0,0 +1,7 @@ +@extends('layouts.print') + +@section('title', trans('reports.summary.income_expense')) + +@section('content') + @include('reports.income_expense_summary.body') +@endsection \ No newline at end of file diff --git a/resources/views/reports/income_summary/body.blade.php b/resources/views/reports/income_summary/body.blade.php new file mode 100644 index 000000000..c42f7c3ea --- /dev/null +++ b/resources/views/reports/income_summary/body.blade.php @@ -0,0 +1,48 @@ +
+ {!! $chart->render() !!} + +
+ +
+ + + + + @foreach($dates as $date) + + @endforeach + + + + @if ($incomes) + @foreach($incomes as $category_id => $category) + + + @foreach($category as $item) + + @endforeach + + @endforeach + @else + + + + @endif + + + + + @foreach($totals as $total) + + @endforeach + + +
{{ trans_choice('general.categories', 1) }}{{ $date }}
{{ $categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
+
{{ trans('general.no_records') }}
+
{{ trans_choice('general.totals', 1) }}@money($total['amount'], $total['currency_code'], true)
+
+
+ +@push('js') +{!! Charts::assets() !!} +@endpush diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php index c29a7f83e..a3cb75b9c 100644 --- a/resources/views/reports/income_summary/index.blade.php +++ b/resources/views/reports/income_summary/index.blade.php @@ -1,71 +1,28 @@ @extends('layouts.admin') -@section('title', trans_choice('reports.summary.income', 1)) +@section('title', trans('reports.summary.income')) -@section('content') - -
-
-
- {{ trans('general.all') }} - {{ trans('invoices.paid') }} - {{ trans('dashboard.receivables') }} -
- {!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!} -
- {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} -
- {!! Form::close() !!} -
-
- {!! $chart->render() !!} - -
- -
- - - - - @foreach($dates as $date) - - @endforeach - - - - @if ($incomes) - @foreach($incomes as $category_id => $category) - - - @foreach($category as $item) - - @endforeach - - @endforeach - @else - - - - @endif - - - - - @foreach($totals as $total) - - @endforeach - - -
{{ trans_choice('general.categories', 1) }}{{ $date }}
{{ $categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
-
{{ trans('general.no_records') }}
-
{{ trans_choice('general.totals', 1) }}@money($total['amount'], $total['currency_code'], true)
-
-
- -
- +@section('new_button') +  {{ trans('general.print') }} @endsection -@push('js') -{!! Charts::assets() !!} -@endpush +@section('content') + +
+
+
+ {{ trans('general.all') }} + {{ trans('invoices.paid') }} + {{ trans('dashboard.receivables') }} +
+ {!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!} +
+ {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} +
+ {!! Form::close() !!} +
+ + @include('reports.income_summary.body') +
+ +@endsection diff --git a/resources/views/reports/income_summary/print.blade.php b/resources/views/reports/income_summary/print.blade.php new file mode 100644 index 000000000..14f408335 --- /dev/null +++ b/resources/views/reports/income_summary/print.blade.php @@ -0,0 +1,7 @@ +@extends('layouts.print') + +@section('title', trans('reports.summary.income')) + +@section('content') + @include('reports.income_summary.body') +@endsection \ No newline at end of file diff --git a/resources/views/vendor/consoletvs/charts/chartjs/multi/line_print.blade.php b/resources/views/vendor/consoletvs/charts/chartjs/multi/line_print.blade.php new file mode 100644 index 000000000..bd2b2e887 --- /dev/null +++ b/resources/views/vendor/consoletvs/charts/chartjs/multi/line_print.blade.php @@ -0,0 +1,58 @@ +@if(!$model->customId) + @include('charts::_partials.container.canvas2') +@endif + + From a7bf8651f5405def305580749df3c6d989e786af Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 7 Apr 2018 17:14:34 +0300 Subject: [PATCH 14/94] customer/vendor show page --- app/Http/Controllers/Expenses/Vendors.php | 99 ++++++++++++ app/Http/Controllers/Incomes/Customers.php | 101 +++++++++++- .../views/expenses/vendors/index.blade.php | 3 +- .../views/expenses/vendors/show.blade.php | 152 ++++++++++++++++++ .../views/incomes/customers/index.blade.php | 3 +- .../views/incomes/customers/show.blade.php | 152 ++++++++++++++++++ 6 files changed, 507 insertions(+), 3 deletions(-) create mode 100644 resources/views/expenses/vendors/show.blade.php create mode 100644 resources/views/incomes/customers/show.blade.php diff --git a/app/Http/Controllers/Expenses/Vendors.php b/app/Http/Controllers/Expenses/Vendors.php index 76aa73dc1..0cd4fb7fb 100644 --- a/app/Http/Controllers/Expenses/Vendors.php +++ b/app/Http/Controllers/Expenses/Vendors.php @@ -4,10 +4,16 @@ namespace App\Http\Controllers\Expenses; use App\Http\Controllers\Controller; use App\Http\Requests\Expense\Vendor as Request; +use App\Models\Expense\Bill; +use App\Models\Expense\Payment; use App\Models\Expense\Vendor; use App\Models\Setting\Currency; use App\Traits\Uploads; use App\Utilities\ImportFile; +use Date; +use Illuminate\Pagination\Paginator; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; class Vendors extends Controller { @@ -25,6 +31,80 @@ class Vendors extends Controller return view('expenses.vendors.index', compact('vendors')); } + /** + * Show the form for viewing the specified resource. + * + * @param Vendor $vendor + * + * @return Response + */ + public function show(Vendor $vendor) + { + $amounts = [ + 'paid' => 0, + 'open' => 0, + 'overdue' => 0, + ]; + + $counts = [ + 'bills' => 0, + 'payments' => 0, + ]; + + // Handle bills + $bills = Bill::with(['status', 'payments'])->where('vendor_id', $vendor->id)->get(); + + $counts['bills'] = $bills->count(); + + $bill_payments = []; + + $today = Date::today()->toDateString(); + + foreach ($bills as $item) { + $payments = 0; + + foreach ($item->payments as $payment) { + $payment->category = new \stdClass(); + $payment->category->id = 0; + $payment->category->name = trans_choice('general.bills', 2); + + $bill_payments[] = $payment; + + $amount = $payment->getConvertedAmount(); + + $amounts['paid'] += $amount; + + $payments += $amount; + } + + if ($item->bill_status_code == 'paid') { + continue; + } + + // Check if it's open or overdue invoice + if ($item->due_at > $today) { + $amounts['open'] += $item->getConvertedAmount() - $payments; + } else { + $amounts['overdue'] += $item->getConvertedAmount() - $payments; + } + } + + // Handle payments + $payments = Payment::with(['account', 'category'])->where('vendor_id', $vendor->id)->get(); + + $counts['payments'] = $payments->count(); + + // Prepare data + $items = collect($payments)->each(function ($item) use (&$amounts) { + $amounts['paid'] += $item->getConvertedAmount(); + }); + + $limit = request('limit', setting('general.list_limit', '25')); + $transactions = $this->paginate($items->merge($bill_payments)->sortByDesc('paid_at'), $limit); + + return view('expenses.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions')); + } + /** * Show the form for creating a new resource. * @@ -206,4 +286,23 @@ class Vendors extends Controller return response()->json($vendor); } + + /** + * Generate a pagination collection. + * + * @param array|Collection $items + * @param int $perPage + * @param int $page + * @param array $options + * + * @return LengthAwarePaginator + */ + public function paginate($items, $perPage = 15, $page = null, $options = []) + { + $page = $page ?: (Paginator::resolveCurrentPage() ?: 1); + + $items = $items instanceof Collection ? $items : Collection::make($items); + + return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options); + } } diff --git a/app/Http/Controllers/Incomes/Customers.php b/app/Http/Controllers/Incomes/Customers.php index 5fc0f692b..273030037 100644 --- a/app/Http/Controllers/Incomes/Customers.php +++ b/app/Http/Controllers/Incomes/Customers.php @@ -4,11 +4,17 @@ namespace App\Http\Controllers\Incomes; use App\Http\Controllers\Controller; use App\Http\Requests\Income\Customer as Request; -use Illuminate\Http\Request as FRequest; use App\Models\Auth\User; use App\Models\Income\Customer; +use App\Models\Income\Invoice; +use App\Models\Income\Revenue; use App\Models\Setting\Currency; use App\Utilities\ImportFile; +use Date; +use Illuminate\Http\Request as FRequest; +use Illuminate\Pagination\Paginator; +use Illuminate\Pagination\LengthAwarePaginator; +use Illuminate\Support\Collection; class Customers extends Controller { @@ -25,6 +31,80 @@ class Customers extends Controller return view('incomes.customers.index', compact('customers', 'emails')); } + /** + * Show the form for viewing the specified resource. + * + * @param Customer $customer + * + * @return Response + */ + public function show(Customer $customer) + { + $amounts = [ + 'paid' => 0, + 'open' => 0, + 'overdue' => 0, + ]; + + $counts = [ + 'invoices' => 0, + 'revenues' => 0, + ]; + + // Handle invoices + $invoices = Invoice::with(['status', 'payments'])->where('customer_id', $customer->id)->get(); + + $counts['invoices'] = $invoices->count(); + + $invoice_payments = []; + + $today = Date::today()->toDateString(); + + foreach ($invoices as $item) { + $payments = 0; + + foreach ($item->payments as $payment) { + $payment->category = new \stdClass(); + $payment->category->id = 0; + $payment->category->name = trans_choice('general.invoices', 2); + + $invoice_payments[] = $payment; + + $amount = $payment->getConvertedAmount(); + + $amounts['paid'] += $amount; + + $payments += $amount; + } + + if ($item->invoice_status_code == 'paid') { + continue; + } + + // Check if it's open or overdue invoice + if ($item->due_at > $today) { + $amounts['open'] += $item->getConvertedAmount() - $payments; + } else { + $amounts['overdue'] += $item->getConvertedAmount() - $payments; + } + } + + // Handle revenues + $revenues = Revenue::with(['account', 'category'])->where('customer_id', $customer->id)->get(); + + $counts['revenues'] = $revenues->count(); + + // Prepare data + $items = collect($revenues)->each(function ($item) use (&$amounts) { + $amounts['paid'] += $item->getConvertedAmount(); + }); + + $limit = request('limit', setting('general.list_limit', '25')); + $transactions = $this->paginate($items->merge($invoice_payments)->sortByDesc('paid_at'), $limit); + + return view('incomes.customers.show', compact('customer', 'counts', 'amounts', 'transactions')); + } + /** * Show the form for creating a new resource. * @@ -266,4 +346,23 @@ class Customers extends Controller return response()->json($json); } + + /** + * Generate a pagination collection. + * + * @param array|Collection $items + * @param int $perPage + * @param int $page + * @param array $options + * + * @return LengthAwarePaginator + */ + public function paginate($items, $perPage = 15, $page = null, $options = []) + { + $page = $page ?: (Paginator::resolveCurrentPage() ?: 1); + + $items = $items instanceof Collection ? $items : Collection::make($items); + + return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options); + } } diff --git a/resources/views/expenses/vendors/index.blade.php b/resources/views/expenses/vendors/index.blade.php index 0a66e11ac..4f479f4a1 100644 --- a/resources/views/expenses/vendors/index.blade.php +++ b/resources/views/expenses/vendors/index.blade.php @@ -42,7 +42,7 @@ @foreach($vendors as $item) - {{ $item->name }} + {{ $item->name }} {{ !empty($item->email) ? $item->email : trans('general.na') }} {{ $item->phone }} @@ -58,6 +58,7 @@
    +
  • {{ trans('general.show') }}
  • {{ trans('general.edit') }}
  • @permission('create-expenses-vendors') diff --git a/resources/views/expenses/vendors/show.blade.php b/resources/views/expenses/vendors/show.blade.php new file mode 100644 index 000000000..635fd03b1 --- /dev/null +++ b/resources/views/expenses/vendors/show.blade.php @@ -0,0 +1,152 @@ +@extends('layouts.admin') + +@section('title', $vendor->name) + +@section('content') +
    +
    + +
    +
    + +
    + +
    + + +
    +
    +

    {{ trans('auth.profile') }}

    +
    +
    + +
    + +
    + + +
    +
    +

    {{ trans('general.address') }}

    +
    + +
    +

    + {{ $vendor->address }} +

    +
    + +
    + + + + +
    + + +
    +
    +
    +
    + + +
    + {{ trans('general.paid') }} + @money($amounts['paid'], setting('general.default_currency'), true) +
    + +
    + +
    + +
    +
    + + +
    + {{ trans('dashboard.open_bills') }} + @money($amounts['open'], setting('general.default_currency'), true) +
    + +
    + +
    + +
    +
    + + +
    + {{ trans('dashboard.overdue_bills') }} + @money($amounts['overdue'], setting('general.default_currency'), true) +
    + +
    + +
    + +
    + +
    +
    +

    {{ trans_choice('general.transactions', 2) }}

    +
    + +
    +
    + + + + + + + + + + + @foreach($transactions as $item) + + + + + + + @endforeach + +
    {{ trans('general.date') }}{{ trans('general.amount') }}
    {{ Date::parse($item->paid_at)->format($date_format) }}@money($item->amount, $item->currency_code, true)
    +
    +
    + + +
    + @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions']) +
    + +
    + +
    +
    +@endsection diff --git a/resources/views/incomes/customers/index.blade.php b/resources/views/incomes/customers/index.blade.php index 2d93a546a..f55cec5f0 100644 --- a/resources/views/incomes/customers/index.blade.php +++ b/resources/views/incomes/customers/index.blade.php @@ -42,7 +42,7 @@ @foreach($customers as $item) - {{ $item->name }} + {{ $item->name }} {{ !empty($item->email) ? $item->email : trans('general.na') }} {{ $item->phone }} @@ -58,6 +58,7 @@
      +
    • {{ trans('general.show') }}
    • {{ trans('general.edit') }}
    • @permission('create-incomes-customers') diff --git a/resources/views/incomes/customers/show.blade.php b/resources/views/incomes/customers/show.blade.php new file mode 100644 index 000000000..f4892fe6c --- /dev/null +++ b/resources/views/incomes/customers/show.blade.php @@ -0,0 +1,152 @@ +@extends('layouts.admin') + +@section('title', $customer->name) + +@section('content') +
      +
      + +
      +
      + +
      + +
      + + +
      +
      +

      {{ trans('auth.profile') }}

      +
      +
      + +
      + +
      + + +
      +
      +

      {{ trans('general.address') }}

      +
      + +
      +

      + {{ $customer->address }} +

      +
      + +
      + + + + +
      + + +
      +
      +
      +
      + + +
      + {{ trans('general.paid') }} + @money($amounts['paid'], setting('general.default_currency'), true) +
      + +
      + +
      + +
      +
      + + +
      + {{ trans('dashboard.open_invoices') }} + @money($amounts['open'], setting('general.default_currency'), true) +
      + +
      + +
      + +
      +
      + + +
      + {{ trans('dashboard.overdue_invoices') }} + @money($amounts['overdue'], setting('general.default_currency'), true) +
      + +
      + +
      + +
      + +
      +
      +

      {{ trans_choice('general.transactions', 2) }}

      +
      + +
      +
      + + + + + + + + + + + @foreach($transactions as $item) + + + + + + + @endforeach + +
      {{ trans('general.date') }}{{ trans('general.amount') }}
      {{ Date::parse($item->paid_at)->format($date_format) }}@money($item->amount, $item->currency_code, true)
      +
      +
      + + +
      + @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions']) +
      + +
      + +
      +
      +@endsection From 094e9d3002ce4ee728da7633934be1078d9525fa Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 10 Apr 2018 13:21:51 +0300 Subject: [PATCH 15/94] fixed #290 --- app/Http/Controllers/Settings/Categories.php | 4 +++- resources/views/settings/categories/edit.blade.php | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index a6d7f1bb2..5ab36a2ea 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -63,7 +63,9 @@ class Categories extends Controller */ public function edit(Category $category) { - return view('settings.categories.edit', compact('category')); + $transfer_id = Category::transfer(); + + return view('settings.categories.edit', compact('category', 'transfer_id')); } /** diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php index 12e0f1f26..4f993b9f1 100644 --- a/resources/views/settings/categories/edit.blade.php +++ b/resources/views/settings/categories/edit.blade.php @@ -14,7 +14,12 @@
      {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }} - {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', ['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'], config('general.types')) }} + @if ($category->id == $transfer_id) + {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', ['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'], null, ['required' => 'required', 'disabled' => 'disabled']) }} + + @else + {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', ['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other']) }} + @endif
      {!! Form::label('color', trans('general.color'), ['class' => 'control-label']) !!} From 98bcefc1b2015980f07446e6d021ce484a4a74e9 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 10 Apr 2018 17:36:48 +0300 Subject: [PATCH 16/94] item autocomplete by sku --- app/Http/Controllers/Api/Expenses/Bills.php | 2 ++ app/Http/Controllers/Api/Incomes/Invoices.php | 2 ++ app/Http/Controllers/Expenses/Bills.php | 2 ++ app/Http/Controllers/Incomes/Invoices.php | 2 ++ app/Http/Controllers/Items/Items.php | 7 ++++--- app/Models/Item/Item.php | 10 ++++++---- resources/views/expenses/bills/create.blade.php | 2 +- resources/views/expenses/bills/edit.blade.php | 2 +- resources/views/incomes/invoices/create.blade.php | 2 +- resources/views/incomes/invoices/edit.blade.php | 2 +- 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/Expenses/Bills.php b/app/Http/Controllers/Api/Expenses/Bills.php index 6a0077a29..06b4d3b6e 100644 --- a/app/Http/Controllers/Api/Expenses/Bills.php +++ b/app/Http/Controllers/Api/Expenses/Bills.php @@ -67,6 +67,7 @@ class Bills extends ApiController $item_id = $item['item_id']; + $item['name'] = $item_object->name; $item_sku = $item_object->sku; // Increase stock (item bought) @@ -143,6 +144,7 @@ class Bills extends ApiController $item_id = $item['item_id']; + $item['name'] = $item_object->name; $item_sku = $item_object->sku; } elseif (!empty($item['sku'])) { $item_sku = $item['sku']; diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php index fb78c9d46..bd923935d 100644 --- a/app/Http/Controllers/Api/Incomes/Invoices.php +++ b/app/Http/Controllers/Api/Incomes/Invoices.php @@ -83,6 +83,7 @@ class Invoices extends ApiController $item_id = $item['item_id']; + $item['name'] = $item_object->name; $item_sku = $item_object->sku; // Decrease stock (item sold) @@ -201,6 +202,7 @@ class Invoices extends ApiController $item_id = $item['item_id']; + $item['name'] = $item_object->name; $item_sku = $item_object->sku; } elseif (!empty($item['sku'])) { $item_sku = $item['sku']; diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index cde227a81..0915ab769 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -159,6 +159,7 @@ class Bills extends Controller if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item['name'] = $item_object->name; $item_sku = $item_object->sku; // Increase stock (item bought) @@ -348,6 +349,7 @@ class Bills extends Controller if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item['name'] = $item_object->name; $item_sku = $item_object->sku; } diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 7df620606..3611dee9f 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -163,6 +163,7 @@ class Invoices extends Controller if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item['name'] = $item_object->name; $item_sku = $item_object->sku; // Decrease stock (item sold) @@ -369,6 +370,7 @@ class Invoices extends Controller if (!empty($item['item_id'])) { $item_object = Item::find($item['item_id']); + $item['name'] = $item_object->name; $item_sku = $item_object->sku; } diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index e2bf8be39..b4aaec273 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -195,9 +195,10 @@ class Items extends Controller $currency = Currency::where('code', $currency_code)->first(); - $filter_data = array( - 'name' => $query - ); + $filter_data = [ + 'name' => $query, + 'sku' => $query, + ]; $items = Item::getItems($filter_data); diff --git a/app/Models/Item/Item.php b/app/Models/Item/Item.php index ab0104666..d1bda03f3 100644 --- a/app/Models/Item/Item.php +++ b/app/Models/Item/Item.php @@ -87,13 +87,15 @@ class Item extends Model return Item::all(); } - $query = Item::select('id as item_id', 'name', 'sale_price', 'purchase_price', 'tax_id'); + $query = Item::select('id as item_id', 'name', 'sku', 'sale_price', 'purchase_price', 'tax_id'); $query->where('quantity', '>', '0'); - foreach ($filter_data as $key => $value) { - $query->where($key, 'LIKE', "%" . $value . "%"); - } + $query->where(function ($query) use ($filter_data) { + foreach ($filter_data as $key => $value) { + $query->orWhere($key, 'LIKE', "%" . $value . "%"); + } + }); return $query->get(); } diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 12b9a7928..d40a13fd7 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -197,7 +197,7 @@ $(this).typeahead({ minLength: 3, displayText:function (data) { - return data.name; + return data.name + ' (' + data.sku + ')'; }, source: function (query, process) { $.ajax({ diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index 8c11bfa36..874017954 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -242,7 +242,7 @@ $(this).typeahead({ minLength: 3, displayText:function (data) { - return data.name; + return data.name + ' (' + data.sku + ')'; }, source: function (query, process) { $.ajax({ diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index dbb2db7dd..72469fef7 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -198,7 +198,7 @@ $(this).typeahead({ minLength: 3, displayText:function (data) { - return data.name; + return data.name + ' (' + data.sku + ')'; }, source: function (query, process) { $.ajax({ diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index aa2e8c37f..2e170a1ab 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -241,7 +241,7 @@ $(this).typeahead({ minLength: 3, displayText:function (data) { - return data.name; + return data.name + ' (' + data.sku + ')'; }, source: function (query, process) { $.ajax({ From eeb715f169aa2c949357ff920140db956dc11bf1 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 11 Apr 2018 17:52:41 +0300 Subject: [PATCH 17/94] skip transfers in reports --- app/Http/Controllers/Reports/ExpenseSummary.php | 2 +- app/Http/Controllers/Reports/IncomeExpenseSummary.php | 4 ++-- app/Http/Controllers/Reports/IncomeSummary.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index dbae1aea3..3f605c47e 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -87,7 +87,7 @@ class ExpenseSummary extends Controller // Payments if ($status != 'upcoming') { - $payments = Payment::monthsOfYear('paid_at')->get(); + $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($expenses_graph, $totals, $expenses, $payments, 'payment', 'paid_at'); } diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 86c7b138c..8aae900ee 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -115,7 +115,7 @@ class IncomeExpenseSummary extends Controller // Revenues if ($status != 'upcoming') { - $revenues = Revenue::monthsOfYear('paid_at')->get(); + $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($profit_graph, $totals, $compares, $revenues, 'revenue', 'paid_at'); } @@ -137,7 +137,7 @@ class IncomeExpenseSummary extends Controller // Payments if ($status != 'upcoming') { - $payments = Payment::monthsOfYear('paid_at')->get(); + $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($profit_graph, $totals, $compares, $payments, 'payment', 'paid_at'); } diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 338d677c1..896f568a5 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -87,7 +87,7 @@ class IncomeSummary extends Controller // Revenues if ($status != 'upcoming') { - $revenues = Revenue::monthsOfYear('paid_at')->get(); + $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get(); $this->setAmount($incomes_graph, $totals, $incomes, $revenues, 'revenue', 'paid_at'); } From a97772c3a0b4dc6a74ce03015daee692b8fc5378 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 11 Apr 2018 19:40:21 +0300 Subject: [PATCH 18/94] profit & loss --- .../Reports/IncomeExpenseSummary.php | 2 +- app/Http/Controllers/Reports/ProfitLoss.php | 232 ++++++++++++++++++ app/Http/Middleware/AdminMenu.php | 6 +- app/Listeners/Updates/Version120.php | 48 ++++ app/Providers/EventServiceProvider.php | 1 + resources/lang/en-GB/reports.php | 10 + .../views/reports/profit_loss/body.blade.php | 67 +++++ .../views/reports/profit_loss/index.blade.php | 28 +++ .../views/reports/profit_loss/print.blade.php | 7 + routes/web.php | 1 + 10 files changed, 400 insertions(+), 2 deletions(-) create mode 100644 app/Http/Controllers/Reports/ProfitLoss.php create mode 100644 app/Listeners/Updates/Version120.php create mode 100644 resources/views/reports/profit_loss/body.blade.php create mode 100644 resources/views/reports/profit_loss/index.blade.php create mode 100644 resources/views/reports/profit_loss/print.blade.php diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 8aae900ee..c29899be2 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -80,7 +80,7 @@ class IncomeExpenseSummary extends Controller $compares['expense'][0][$dates[$j]] = array( 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), + 'name' => trans_choice('general.bills', 1), 'amount' => 0, 'currency_code' => setting('general.default_currency'), 'currency_rate' => 1 diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php new file mode 100644 index 000000000..e6b0a10ff --- /dev/null +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -0,0 +1,232 @@ +type('income')->pluck('name', 'id')->toArray(); + + // Add invoice to income categories + $income_categories[0] = trans_choice('general.invoices', 2); + + $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); + + // Add bill to expense categories + $expense_categories[0] = trans_choice('general.bills', 2); + + // Get year + $year = request('year'); + if (empty($year)) { + $year = Date::now()->year; + } + + // Dates + for ($j = 1; $j <= 12; $j++) { + $dates[$j] = Date::parse($year . '-' . $j)->quarter; + + // Totals + $totals[$dates[$j]] = array( + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ); + + // Compares + $compares['income'][0][$dates[$j]] = [ + 'category_id' => 0, + 'name' => trans_choice('general.invoices', 1), + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + + foreach ($income_categories as $category_id => $category_name) { + $compares['income'][$category_id][$dates[$j]] = [ + 'category_id' => $category_id, + 'name' => $category_name, + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + } + + $compares['expense'][0][$dates[$j]] = [ + 'category_id' => 0, + 'name' => trans_choice('general.bills', 1), + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + + foreach ($expense_categories as $category_id => $category_name) { + $compares['expense'][$category_id][$dates[$j]] = [ + 'category_id' => $category_id, + 'name' => $category_name, + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + } + + $j += 2; + } + + $totals['total'] = [ + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + + $compares['income'][0]['total'] = [ + 'category_id' => 0, + 'name' => trans_choice('general.totals', 1), + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + + foreach ($income_categories as $category_id => $category_name) { + $compares['income'][$category_id]['total'] = [ + 'category_id' => $category_id, + 'name' => trans_choice('general.totals', 1), + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + } + + $compares['expense'][0]['total'] = [ + 'category_id' => 0, + 'name' => trans_choice('general.totals', 1), + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + + foreach ($expense_categories as $category_id => $category_name) { + $compares['expense'][$category_id]['total'] = [ + 'category_id' => $category_id, + 'name' => trans_choice('general.totals', 1), + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1 + ]; + } + + // Invoices + switch ($status) { + case 'paid': + $invoices = InvoicePayment::monthsOfYear('paid_at')->get(); + $this->setAmount($totals, $compares, $invoices, 'invoice', 'paid_at'); + break; + case 'upcoming': + $invoices = Invoice::accrued()->monthsOfYear('due_at')->get(); + $this->setAmount($totals, $compares, $invoices, 'invoice', 'due_at'); + break; + default: + $invoices = Invoice::accrued()->monthsOfYear('invoiced_at')->get(); + $this->setAmount($totals, $compares, $invoices, 'invoice', 'invoiced_at'); + break; + } + + // Revenues + if ($status != 'upcoming') { + $revenues = Revenue::monthsOfYear('paid_at')->isNotTransfer()->get(); + $this->setAmount($totals, $compares, $revenues, 'revenue', 'paid_at'); + } + + // Bills + switch ($status) { + case 'paid': + $bills = BillPayment::monthsOfYear('paid_at')->get(); + $this->setAmount($totals, $compares, $bills, 'bill', 'paid_at'); + break; + case 'upcoming': + $bills = Bill::accrued()->monthsOfYear('due_at')->get(); + $this->setAmount($totals, $compares, $bills, 'bill', 'due_at'); + break; + default: + $bills = Bill::accrued()->monthsOfYear('billed_at')->get(); + $this->setAmount($totals, $compares, $bills, 'bill', 'billed_at'); + break; + } + + // Payments + if ($status != 'upcoming') { + $payments = Payment::monthsOfYear('paid_at')->isNotTransfer()->get(); + $this->setAmount($totals, $compares, $payments, 'payment', 'paid_at'); + } + + // Check if it's a print or normal request + if (request('print')) { + $view_template = 'reports.profit_loss.print'; + } else { + $view_template = 'reports.profit_loss.index'; + } + + return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals')); + } + + private function setAmount(&$totals, &$compares, $items, $type, $date_field) + { + foreach ($items as $item) { + $date = Date::parse($item->$date_field)->quarter; + + if (($type == 'invoice') || ($type == 'bill')) { + $category_id = 0; + } else { + $category_id = $item->category_id; + } + + $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; + + if (!isset($compares[$group][$category_id])) { + continue; + } + + $amount = $item->getConvertedAmount(); + + // Forecasting + if ((($type == 'invoice') || ($type == 'bill')) && ($date_field == 'due_at')) { + foreach ($item->payments as $payment) { + $amount -= $payment->getConvertedAmount(); + } + } + + $compares[$group][$category_id][$date]['amount'] += $amount; + $compares[$group][$category_id][$date]['currency_code'] = $item->currency_code; + $compares[$group][$category_id][$date]['currency_rate'] = $item->currency_rate; + $compares[$group][$category_id]['total']['amount'] += $amount; + + if ($group == 'income') { + $totals[$date]['amount'] += $amount; + $totals['total']['amount'] += $amount; + } else { + $totals[$date]['amount'] -= $amount; + $totals['total']['amount'] -= $amount; + } + } + } +} diff --git a/app/Http/Middleware/AdminMenu.php b/app/Http/Middleware/AdminMenu.php index cfd01f644..3d58d2516 100644 --- a/app/Http/Middleware/AdminMenu.php +++ b/app/Http/Middleware/AdminMenu.php @@ -111,7 +111,7 @@ class AdminMenu } // Reports - if ($user->can(['read-reports-income-summary', 'read-reports-expense-summary', 'read-reports-income-expense-summary'])) { + if ($user->can(['read-reports-income-summary', 'read-reports-expense-summary', 'read-reports-income-expense-summary', 'read-reports-profit-loss'])) { $menu->dropdown(trans_choice('general.reports', 2), function ($sub) use($user, $attr) { if ($user->can('read-reports-income-summary')) { $sub->url('reports/income-summary', trans('reports.summary.income'), 1, $attr); @@ -124,6 +124,10 @@ class AdminMenu if ($user->can('read-reports-income-expense-summary')) { $sub->url('reports/income-expense-summary', trans('reports.summary.income_expense'), 3, $attr); } + + if ($user->can('read-reports-profit-loss')) { + $sub->url('reports/profit-loss', trans('reports.profit_loss'), 4, $attr); + } }, 6, [ 'title' => trans_choice('general.reports', 2), 'icon' => 'fa fa-bar-chart', diff --git a/app/Listeners/Updates/Version120.php b/app/Listeners/Updates/Version120.php new file mode 100644 index 000000000..0ef59c704 --- /dev/null +++ b/app/Listeners/Updates/Version120.php @@ -0,0 +1,48 @@ +check($event)) { + return; + } + + // Create permission + $permission = Permission::firstOrCreate([ + 'name' => 'read-reports-profit-loss', + 'display_name' => 'Read Reports Profit Loss', + 'description' => 'Read Reports Profit Loss', + ]); + + // Attach permission to roles + $roles = Role::all(); + + foreach ($roles as $role) { + $allowed = ['admin', 'manager']; + + if (!in_array($role->name, $allowed)) { + continue; + } + + $role->attachPermission($permission); + } + } +} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 002ecd50c..00ca6aaee 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -22,6 +22,7 @@ class EventServiceProvider extends ServiceProvider 'App\Listeners\Updates\Version112', 'App\Listeners\Updates\Version113', 'App\Listeners\Updates\Version119', + 'App\Listeners\Updates\Version120', ], 'Illuminate\Auth\Events\Login' => [ 'App\Listeners\Auth\Login', diff --git a/resources/lang/en-GB/reports.php b/resources/lang/en-GB/reports.php index 8589c7b9f..8b95b822d 100644 --- a/resources/lang/en-GB/reports.php +++ b/resources/lang/en-GB/reports.php @@ -7,6 +7,9 @@ return [ 'this_quarter' => 'This Quarter', 'previous_quarter' => 'Previous Quarter', 'last_12_months' => 'Last 12 Months', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', 'summary' => [ 'income' => 'Income Summary', @@ -14,4 +17,11 @@ return [ 'income_expense' => 'Income vs Expense', ], + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', + ], + ]; diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php new file mode 100644 index 000000000..2fbe6cb46 --- /dev/null +++ b/resources/views/reports/profit_loss/body.blade.php @@ -0,0 +1,67 @@ +
      +
      + + + + + @foreach($dates as $date) + + @endforeach + + + + + @if ($compares) +
       {{ trans('reports.quarter.' . $date) }}{{ trans_choice('general.totals', 1) }}
      + + + + + @foreach($compares['income'] as $category_id => $category) + + + + @foreach($category as $item) + + @endforeach + + @endforeach + +
      {{ trans_choice('general.incomes', 2) }}
      {{ $income_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      + + + + + + @foreach($compares['expense'] as $category_id => $category) + + + + @foreach($category as $item) + + @endforeach + + @endforeach + +
      {{ trans_choice('general.expenses', 2) }}
      {{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      + @else + + +
      {{ trans('general.no_records') }}
      + + + @endif + + + + + + @foreach($totals as $total) + + @endforeach + + +
      {{ trans('reports.net_profit') }}@money($total['amount'], $total['currency_code'], true)
      + +
      +
      diff --git a/resources/views/reports/profit_loss/index.blade.php b/resources/views/reports/profit_loss/index.blade.php new file mode 100644 index 000000000..0195b2cec --- /dev/null +++ b/resources/views/reports/profit_loss/index.blade.php @@ -0,0 +1,28 @@ +@extends('layouts.admin') + +@section('title', trans('reports.profit_loss')) + +@section('new_button') +  {{ trans('general.print') }} +@endsection + +@section('content') + +
      +
      +
      + {{ trans('general.all') }} + {{ trans('invoices.paid') }} + {{ trans('general.upcoming') }} +
      + {!! Form::open(['url' => 'reports/profit-loss', 'role' => 'form', 'method' => 'GET']) !!} +
      + {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} +
      + {!! Form::close() !!} +
      + + @include('reports.profit_loss.body') +
      + +@endsection diff --git a/resources/views/reports/profit_loss/print.blade.php b/resources/views/reports/profit_loss/print.blade.php new file mode 100644 index 000000000..9bc8a77ba --- /dev/null +++ b/resources/views/reports/profit_loss/print.blade.php @@ -0,0 +1,7 @@ +@extends('layouts.print') + +@section('title', trans('reports.profit_loss')) + +@section('content') + @include('reports.profit_loss.body') +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 570545e20..af481a340 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,6 +96,7 @@ Route::group(['middleware' => 'language'], function () { Route::resource('income-summary', 'Reports\IncomeSummary'); Route::resource('expense-summary', 'Reports\ExpenseSummary'); Route::resource('income-expense-summary', 'Reports\IncomeExpenseSummary'); + Route::resource('profit-loss', 'Reports\ProfitLoss'); }); Route::group(['prefix' => 'settings'], function () { From d97ec435158a41b5e27922813ae99fa0a84ca55f Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 12 Apr 2018 11:55:23 +0300 Subject: [PATCH 19/94] missing installation permission #293 --- database/seeds/Roles.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/seeds/Roles.php b/database/seeds/Roles.php index 736d6b682..e1553089f 100644 --- a/database/seeds/Roles.php +++ b/database/seeds/Roles.php @@ -61,6 +61,7 @@ class Roles extends Seeder 'reports-income-summary' => 'r', 'reports-expense-summary' => 'r', 'reports-income-expense-summary' => 'r', + 'reports-profit-loss' => 'r', ], 'manager' => [ 'admin-panel' => 'r', @@ -87,6 +88,7 @@ class Roles extends Seeder 'reports-income-summary' => 'r', 'reports-expense-summary' => 'r', 'reports-income-expense-summary' => 'r', + 'reports-profit-loss' => 'r', ], 'customer' => [ 'customer-panel' => 'r', From 8e87062e1a7395a724b226ddf655550cea61bff7 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 12 Apr 2018 11:59:12 +0300 Subject: [PATCH 20/94] styling --- resources/views/reports/expense_summary/index.blade.php | 2 +- resources/views/reports/income_expense_summary/index.blade.php | 2 +- resources/views/reports/income_summary/index.blade.php | 2 +- resources/views/reports/profit_loss/body.blade.php | 2 +- resources/views/reports/profit_loss/index.blade.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php index 1b2d0444b..49698b673 100644 --- a/resources/views/reports/expense_summary/index.blade.php +++ b/resources/views/reports/expense_summary/index.blade.php @@ -10,7 +10,7 @@
      -
      +
      {{ trans('general.all') }} {{ trans('bills.paid') }} {{ trans('dashboard.payables') }} diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php index e969e5598..cefbde5fb 100644 --- a/resources/views/reports/income_expense_summary/index.blade.php +++ b/resources/views/reports/income_expense_summary/index.blade.php @@ -10,7 +10,7 @@
      -
      +
      {{ trans('general.all') }} {{ trans('invoices.paid') }} {{ trans('general.upcoming') }} diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php index a3cb75b9c..bd8916313 100644 --- a/resources/views/reports/income_summary/index.blade.php +++ b/resources/views/reports/income_summary/index.blade.php @@ -10,7 +10,7 @@
      -
      +
      {{ trans('general.all') }} {{ trans('invoices.paid') }} {{ trans('dashboard.receivables') }} diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index 2fbe6cb46..aa2602e01 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -1,6 +1,6 @@
      - +
      diff --git a/resources/views/reports/profit_loss/index.blade.php b/resources/views/reports/profit_loss/index.blade.php index 0195b2cec..6d69154c1 100644 --- a/resources/views/reports/profit_loss/index.blade.php +++ b/resources/views/reports/profit_loss/index.blade.php @@ -10,7 +10,7 @@
      -
      +
      {{ trans('general.all') }} {{ trans('invoices.paid') }} {{ trans('general.upcoming') }} From 8ec2baced8097e3cb7832501db5a429ec31da54e Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 12 Apr 2018 18:20:07 +0300 Subject: [PATCH 21/94] added gross profit and total expenses #293 --- app/Http/Controllers/Reports/ProfitLoss.php | 4 +- resources/lang/en-GB/reports.php | 2 + .../views/reports/profit_loss/body.blade.php | 106 +++++++++--------- 3 files changed, 61 insertions(+), 51 deletions(-) diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index e6b0a10ff..53a201458 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -107,6 +107,8 @@ class ProfitLoss extends Controller 'currency_rate' => 1 ]; + $gross['income'] = $gross['expense'] = [1 => 0, 2 => 0, 3 => 0, 4 => 0, 'total' => 0]; + foreach ($income_categories as $category_id => $category_name) { $compares['income'][$category_id]['total'] = [ 'category_id' => $category_id, @@ -186,7 +188,7 @@ class ProfitLoss extends Controller $view_template = 'reports.profit_loss.index'; } - return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals')); + return view($view_template, compact('dates', 'income_categories', 'expense_categories', 'compares', 'totals', 'gross')); } private function setAmount(&$totals, &$compares, $items, $type, $date_field) diff --git a/resources/lang/en-GB/reports.php b/resources/lang/en-GB/reports.php index 8b95b822d..5f7139878 100644 --- a/resources/lang/en-GB/reports.php +++ b/resources/lang/en-GB/reports.php @@ -10,6 +10,8 @@ return [ 'profit_loss' => 'Profit & Loss', 'gross_profit' => 'Gross Profit', 'net_profit' => 'Net Profit', + 'less_expenses' => 'Less Expenses', + 'total_expenses' => 'Total Expenses', 'summary' => [ 'income' => 'Income Summary', diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index aa2602e01..13bde5318 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -1,6 +1,6 @@
      -
      -
       
      +
      +
      @@ -10,58 +10,64 @@ +
       {{ trans_choice('general.totals', 1) }}
      + + + + - @if ($compares) -
      {{ trans_choice('general.incomes', 1) }}
      - - - - - @foreach($compares['income'] as $category_id => $category) - - - - @foreach($category as $item) - - @endforeach - - @endforeach - -
      {{ trans_choice('general.incomes', 2) }}
      {{ $income_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      - - - - - - @foreach($compares['expense'] as $category_id => $category) - - - - @foreach($category as $item) - - @endforeach - - @endforeach - -
      {{ trans_choice('general.expenses', 2) }}
      {{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      - @else - - -
      {{ trans('general.no_records') }}
      - - - @endif - - - + @foreach($compares['income'] as $category_id => $category) - - @foreach($totals as $total) - + + + @foreach($category as $i => $item) + @php $gross['income'][$i] += $item['amount']; @endphp + @endforeach - -
      {{ trans('reports.net_profit') }}@money($total['amount'], $total['currency_code'], true){{ $income_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      + @endforeach + + {{ trans('reports.gross_profit') }} + + @foreach($gross['income'] as $item) + @money($item, setting('general.default_currency'), true) + @endforeach + + + + + + + + + @foreach($compares['expense'] as $category_id => $category) + + + + @foreach($category as $i => $item) + @php $gross['expense'][$i] += $item['amount']; @endphp + + @endforeach + + @endforeach + + + + @foreach($gross['expense'] as $item) + + @endforeach + + +
      {{ trans('reports.less_expenses') }}
      {{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      {{ trans('reports.total_expenses') }}@money($item, setting('general.default_currency'), true)
      + + + + + @foreach($totals as $total) + + @endforeach + +
      {{ trans('reports.net_profit') }}@money($total['amount'], $total['currency_code'], true)
      From 5506be336de57f9d438c1171bef9f620c377f18d Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 13 Apr 2018 17:05:35 +0300 Subject: [PATCH 22/94] styling #293 --- .../views/reports/profit_loss/body.blade.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index 13bde5318..5df908562 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -2,24 +2,25 @@
      - - - @foreach($dates as $date) - - @endforeach - - + + + @foreach($dates as $date) + + @endforeach + +
       {{ trans('reports.quarter.' . $date) }}{{ trans_choice('general.totals', 1) }}
       {{ trans('reports.quarter.' . $date) }}{{ trans_choice('general.totals', 1) }}
      - + + + @foreach($compares['income'] as $category_id => $category) - - + @foreach($category as $i => $item) @php $gross['income'][$i] += $item['amount']; @endphp @@ -27,8 +28,7 @@ @endforeach - - + @foreach($gross['income'] as $item) @endforeach @@ -37,13 +37,14 @@
      {{ trans_choice('general.incomes', 1) }}
      {{ trans_choice('general.incomes', 1) }}
      {{ $income_categories[$category_id] }}{{ $income_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      {{ trans('reports.gross_profit') }}{{ trans('reports.gross_profit') }}@money($item, setting('general.default_currency'), true)
      - + + + @foreach($compares['expense'] as $category_id => $category) - - + @foreach($category as $i => $item) @php $gross['expense'][$i] += $item['amount']; @endphp @@ -51,8 +52,7 @@ @endforeach - - + @foreach($gross['expense'] as $item) @endforeach From 6f035fd2b5cac0e1c15bcdd42a58597617d958fd Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 13 Apr 2018 18:04:24 +0300 Subject: [PATCH 23/94] added header to print layout #293 --- resources/views/reports/profit_loss/print.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/views/reports/profit_loss/print.blade.php b/resources/views/reports/profit_loss/print.blade.php index 9bc8a77ba..6c3154fb5 100644 --- a/resources/views/reports/profit_loss/print.blade.php +++ b/resources/views/reports/profit_loss/print.blade.php @@ -3,5 +3,13 @@ @section('title', trans('reports.profit_loss')) @section('content') +
      +

      {{ trans('reports.profit_loss') }}

      +
      + {{ setting('general.company_name') }} +
      + {{ Date::parse(request('year') . '-1-1')->format($date_format) }} - {{ Date::parse(request('year') . '-12-31')->format($date_format) }} +
      +
      @include('reports.profit_loss.body') @endsection \ No newline at end of file From 4db5592714101cada905aee2039159836ab79e38 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 14 Apr 2018 09:41:49 +0300 Subject: [PATCH 24/94] bg-BG translation --- composer.lock | 4923 --------------------------- config/language.php | 2 +- resources/lang/bg-BG/accounts.php | 14 + resources/lang/bg-BG/auth.php | 30 + resources/lang/bg-BG/bills.php | 41 + resources/lang/bg-BG/companies.php | 13 + resources/lang/bg-BG/currencies.php | 18 + resources/lang/bg-BG/customers.php | 11 + resources/lang/bg-BG/dashboard.php | 24 + resources/lang/bg-BG/demo.php | 17 + resources/lang/bg-BG/footer.php | 9 + resources/lang/bg-BG/general.php | 116 + resources/lang/bg-BG/header.php | 15 + resources/lang/bg-BG/import.php | 9 + resources/lang/bg-BG/install.php | 44 + resources/lang/bg-BG/invoices.php | 50 + resources/lang/bg-BG/items.php | 15 + resources/lang/bg-BG/messages.php | 23 + resources/lang/bg-BG/modules.php | 47 + resources/lang/bg-BG/pagination.php | 9 + resources/lang/bg-BG/passwords.php | 22 + resources/lang/bg-BG/reports.php | 17 + resources/lang/bg-BG/settings.php | 85 + resources/lang/bg-BG/taxes.php | 8 + resources/lang/bg-BG/transfers.php | 8 + resources/lang/bg-BG/updates.php | 15 + resources/lang/bg-BG/validation.php | 119 + 27 files changed, 780 insertions(+), 4924 deletions(-) delete mode 100644 composer.lock create mode 100644 resources/lang/bg-BG/accounts.php create mode 100644 resources/lang/bg-BG/auth.php create mode 100644 resources/lang/bg-BG/bills.php create mode 100644 resources/lang/bg-BG/companies.php create mode 100644 resources/lang/bg-BG/currencies.php create mode 100644 resources/lang/bg-BG/customers.php create mode 100644 resources/lang/bg-BG/dashboard.php create mode 100644 resources/lang/bg-BG/demo.php create mode 100644 resources/lang/bg-BG/footer.php create mode 100644 resources/lang/bg-BG/general.php create mode 100644 resources/lang/bg-BG/header.php create mode 100644 resources/lang/bg-BG/import.php create mode 100644 resources/lang/bg-BG/install.php create mode 100644 resources/lang/bg-BG/invoices.php create mode 100644 resources/lang/bg-BG/items.php create mode 100644 resources/lang/bg-BG/messages.php create mode 100644 resources/lang/bg-BG/modules.php create mode 100644 resources/lang/bg-BG/pagination.php create mode 100644 resources/lang/bg-BG/passwords.php create mode 100644 resources/lang/bg-BG/reports.php create mode 100644 resources/lang/bg-BG/settings.php create mode 100644 resources/lang/bg-BG/taxes.php create mode 100644 resources/lang/bg-BG/transfers.php create mode 100644 resources/lang/bg-BG/updates.php create mode 100644 resources/lang/bg-BG/validation.php diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 8f49b7427..000000000 --- a/composer.lock +++ /dev/null @@ -1,4923 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "content-hash": "ca86fd489e697ea3749648f338f9ba12", - "packages": [ - { - "name": "akaunting/language", - "version": "1.0.4", - "source": { - "type": "git", - "url": "https://github.com/akaunting/language.git", - "reference": "b260dc47e8e0b8cd3d02c829789ed6457267d2c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/akaunting/language/zipball/b260dc47e8e0b8cd3d02c829789ed6457267d2c4", - "reference": "b260dc47e8e0b8cd3d02c829789ed6457267d2c4", - "shasum": "" - }, - "require": { - "consoletvs/identify": "1.*", - "laravel/framework": ">=5.4.0", - "php": ">=5.6.4" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Akaunting\\Language\\Provider" - ], - "aliases": { - "Language": "Akaunting\\Language\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Akaunting\\Language\\": "./src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Denis Duliçi", - "email": "info@akaunting.com", - "homepage": "https://akaunting.com", - "role": "Developer" - } - ], - "description": "Language switcher package for Laravel.", - "keywords": [ - "language", - "laravel", - "switcher" - ], - "time": "2018-01-23T20:00:12+00:00" - }, - { - "name": "akaunting/money", - "version": "1.0.4", - "source": { - "type": "git", - "url": "https://github.com/akaunting/money.git", - "reference": "c8efd04929f753045f23c4610afd0d76bb1a5f0f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/akaunting/money/zipball/c8efd04929f753045f23c4610afd0d76bb1a5f0f", - "reference": "c8efd04929f753045f23c4610afd0d76bb1a5f0f", - "shasum": "" - }, - "require": { - "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*", - "illuminate/view": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.*", - "php": ">=5.5.9" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Akaunting\\Money\\Provider" - ] - } - }, - "autoload": { - "psr-4": { - "Akaunting\\Money\\": "./src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Denis Duliçi", - "email": "info@akaunting.com", - "homepage": "https://akaunting.com", - "role": "Developer" - } - ], - "description": "Currency formatting and conversion package for Laravel.", - "keywords": [ - "convert", - "currency", - "format", - "laravel", - "money" - ], - "time": "2018-02-06T14:08:45+00:00" - }, - { - "name": "akaunting/setting", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/akaunting/setting.git", - "reference": "da4fd8fe66e02bced13ef45cbfb28a94fb4eff49" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/akaunting/setting/zipball/da4fd8fe66e02bced13ef45cbfb28a94fb4eff49", - "reference": "da4fd8fe66e02bced13ef45cbfb28a94fb4eff49", - "shasum": "" - }, - "require": { - "laravel/framework": "5.2.* || 5.3.* || 5.4.* || 5.5.*", - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Akaunting\\Setting\\Provider" - ], - "aliases": { - "Setting": "Akaunting\\Setting\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Akaunting\\Setting\\": "./src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Denis Duliçi", - "email": "info@akaunting.com", - "homepage": "https://akaunting.com", - "role": "Developer" - } - ], - "description": "Persistent settings package for Laravel.", - "keywords": [ - "Settings", - "config", - "laravel", - "persistent" - ], - "time": "2018-01-10T21:57:10+00:00" - }, - { - "name": "akaunting/version", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/akaunting/version.git", - "reference": "43628c3f15ac9c546cc90f216f1f03446a4c0812" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/akaunting/version/zipball/43628c3f15ac9c546cc90f216f1f03446a4c0812", - "reference": "43628c3f15ac9c546cc90f216f1f03446a4c0812", - "shasum": "" - }, - "require": { - "laravel/framework": ">=5.2.0", - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Akaunting\\Version\\Provider" - ], - "aliases": { - "Version": "Akaunting\\Version\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Akaunting\\Version\\": "./src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Denis Duliçi", - "email": "info@akaunting.com", - "homepage": "https://akaunting.com", - "role": "Developer" - } - ], - "description": "Version management package for Laravel.", - "keywords": [ - "laravel", - "version" - ], - "time": "2017-08-24T08:04:43+00:00" - }, - { - "name": "almasaeed2010/adminlte", - "version": "v2.3.11", - "source": { - "type": "git", - "url": "https://github.com/almasaeed2010/AdminLTE.git", - "reference": "2be703222af2edcb87e562d3da2299e4352bff8a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/almasaeed2010/AdminLTE/zipball/2be703222af2edcb87e562d3da2299e4352bff8a", - "reference": "2be703222af2edcb87e562d3da2299e4352bff8a", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Abdullah Almsaeed", - "email": "abdullah@almsaeedstudio.com" - } - ], - "description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 3", - "homepage": "http://almsaeedstudio.com/", - "keywords": [ - "JS", - "admin", - "back-end", - "css", - "less", - "responsive", - "template", - "theme", - "web" - ], - "time": "2017-01-08T21:03:57+00:00" - }, - { - "name": "barryvdh/laravel-debugbar", - "version": "v2.3.2", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "24e4f0261e352d3fd86d0447791b56ae49398674" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/24e4f0261e352d3fd86d0447791b56ae49398674", - "reference": "24e4f0261e352d3fd86d0447791b56ae49398674", - "shasum": "" - }, - "require": { - "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*", - "maximebf/debugbar": "~1.13.0", - "php": ">=5.5.9", - "symfony/finder": "~2.7|~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Barryvdh\\Debugbar\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "PHP Debugbar integration for Laravel", - "keywords": [ - "debug", - "debugbar", - "laravel", - "profiler", - "webprofiler" - ], - "time": "2017-01-19T08:19:49+00:00" - }, - { - "name": "barryvdh/laravel-dompdf", - "version": "v0.8.2", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-dompdf.git", - "reference": "7dcdecfa125c174d0abe723603633dc2756ea3af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/7dcdecfa125c174d0abe723603633dc2756ea3af", - "reference": "7dcdecfa125c174d0abe723603633dc2756ea3af", - "shasum": "" - }, - "require": { - "dompdf/dompdf": "^0.8", - "illuminate/support": "5.1.x|5.2.x|5.3.x|5.4.x|5.5.x|5.6.x", - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.8-dev" - }, - "laravel": { - "providers": [ - "Barryvdh\\DomPDF\\ServiceProvider" - ], - "aliases": { - "PDF": "Barryvdh\\DomPDF\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Barryvdh\\DomPDF\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "A DOMPDF Wrapper for Laravel", - "keywords": [ - "dompdf", - "laravel", - "pdf" - ], - "time": "2018-02-07T17:43:25+00:00" - }, - { - "name": "barryvdh/laravel-ide-helper", - "version": "v2.3.2", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e82de98cef0d6597b1b686be0b5813a3a4bb53c5", - "reference": "e82de98cef0d6597b1b686be0b5813a3a4bb53c5", - "shasum": "" - }, - "require": { - "barryvdh/reflection-docblock": "^2.0.4", - "illuminate/console": "^5.0,<5.5", - "illuminate/filesystem": "^5.0,<5.5", - "illuminate/support": "^5.0,<5.5", - "php": ">=5.4.0", - "symfony/class-loader": "^2.3|^3.0" - }, - "require-dev": { - "doctrine/dbal": "~2.3", - "phpunit/phpunit": "4.*", - "scrutinizer/ocular": "~1.1", - "squizlabs/php_codesniffer": "~2.3" - }, - "suggest": { - "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Barryvdh\\LaravelIdeHelper\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.", - "keywords": [ - "autocomplete", - "codeintel", - "helper", - "ide", - "laravel", - "netbeans", - "phpdoc", - "phpstorm", - "sublime" - ], - "time": "2017-02-22T12:27:33+00:00" - }, - { - "name": "barryvdh/reflection-docblock", - "version": "v2.0.4", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0,<4.5" - }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Barryvdh": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" - } - ], - "time": "2016-06-13T19:28:20+00:00" - }, - { - "name": "bkwld/cloner", - "version": "3.2.2", - "source": { - "type": "git", - "url": "https://github.com/BKWLD/cloner.git", - "reference": "bc97049352ae94cf2ebbb78d644309fb6af7782e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/BKWLD/cloner/zipball/bc97049352ae94cf2ebbb78d644309fb6af7782e", - "reference": "bc97049352ae94cf2ebbb78d644309fb6af7782e", - "shasum": "" - }, - "require": { - "illuminate/support": "4 - 5", - "php": ">=5.5.0" - }, - "require-dev": { - "bkwld/upchuck": "^2.0@dev", - "illuminate/database": "4 - 5", - "league/flysystem-vfs": "^1.0", - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "~4.7", - "satooshi/php-coveralls": "^1.0" - }, - "suggest": { - "bkwld/upchuck": "Required for replicating of files." - }, - "type": "library", - "autoload": { - "psr-4": { - "Bkwld\\Cloner\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Robert Reinhard", - "email": "info@bkwld.com" - } - ], - "description": "A trait for Laravel Eloquent models that lets you clone of a model and it's relationships, including files.", - "time": "2017-03-27T22:38:12+00:00" - }, - { - "name": "consoletvs/charts", - "version": "4.6.0", - "source": { - "type": "git", - "url": "https://github.com/ConsoleTVs/Charts.git", - "reference": "5f31e72cf292c0042ff3eec68ad7a7fa36bdffc2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ConsoleTVs/Charts/zipball/5f31e72cf292c0042ff3eec68ad7a7fa36bdffc2", - "reference": "5f31e72cf292c0042ff3eec68ad7a7fa36bdffc2", - "shasum": "" - }, - "require": { - "illuminate/support": "5.*", - "jenssegers/date": "v3.*", - "jlawrence/eos": "3.*", - "php": ">=5.6.4" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "ConsoleTVs\\Charts\\ChartsServiceProvider" - ], - "aliases": { - "Charts": "ConsoleTVs\\Charts\\Facades\\Charts" - } - } - }, - "autoload": { - "psr-4": { - "ConsoleTVs\\Charts\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Erik Campobadal", - "email": "soc@erik.cat" - } - ], - "description": "Create charts for laravel using diferent charts libraries", - "time": "2017-06-07T20:23:50+00:00" - }, - { - "name": "consoletvs/identify", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/ConsoleTVs/Identify.git", - "reference": "21b8abb146b30a124df2737e46f217272d7039a4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ConsoleTVs/Identify/zipball/21b8abb146b30a124df2737e46f217272d7039a4", - "reference": "21b8abb146b30a124df2737e46f217272d7039a4", - "shasum": "" - }, - "require": { - "illuminate/support": "5.*", - "php": ">=5.5.9", - "sinergi/browser-detector": "6.0.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "Unicodeveloper\\Identify\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "unicodeveloper", - "email": "prosperotemuyiwa@gmail.com" - } - ], - "description": "A Laravel 5 Package Provider to Identify/detect a user's browser, device, operating system and Language", - "keywords": [ - "Evangelist", - "browser", - "detect", - "github", - "identify", - "language", - "laravel", - "open source", - "operating system" - ], - "time": "2017-04-24T17:27:25+00:00" - }, - { - "name": "dingo/api", - "version": "v1.0.0-beta8", - "source": { - "type": "git", - "url": "https://github.com/dingo/api.git", - "reference": "46cffad61942caa094dd876155e503b6819c5095" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dingo/api/zipball/46cffad61942caa094dd876155e503b6819c5095", - "reference": "46cffad61942caa094dd876155e503b6819c5095", - "shasum": "" - }, - "require": { - "dingo/blueprint": "0.2.*", - "illuminate/routing": "^5.1", - "illuminate/support": "^5.1", - "league/fractal": ">=0.12.0", - "php": "^5.5.9 || ^7.0" - }, - "require-dev": { - "illuminate/auth": "^5.1", - "illuminate/cache": "^5.1", - "illuminate/console": "^5.1", - "illuminate/database": "^5.1", - "illuminate/events": "^5.1", - "illuminate/filesystem": "^5.1", - "illuminate/log": "^5.1", - "illuminate/pagination": "^5.1", - "laravel/lumen-framework": "5.1.* || 5.2.*", - "lucadegasperi/oauth2-server-laravel": "5.0.*", - "mockery/mockery": "~0.9", - "phpunit/phpunit": "^4.8 || ^5.0", - "squizlabs/php_codesniffer": "~2.0", - "tymon/jwt-auth": "1.0.*" - }, - "suggest": { - "lucadegasperi/oauth2-server-laravel": "Protect your API with OAuth 2.0.", - "tymon/jwt-auth": "Protect your API with JSON Web Tokens." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Dingo\\Api\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jason Lewis", - "email": "jason.lewis1991@gmail.com" - } - ], - "description": "A RESTful API package for the Laravel and Lumen frameworks.", - "keywords": [ - "api", - "dingo", - "laravel", - "restful" - ], - "time": "2017-02-10T00:56:04+00:00" - }, - { - "name": "dingo/blueprint", - "version": "v0.2.4", - "source": { - "type": "git", - "url": "https://github.com/dingo/blueprint.git", - "reference": "1dc93b8ea443fbbdaaca0582572ee6ca53afccfd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dingo/blueprint/zipball/1dc93b8ea443fbbdaaca0582572ee6ca53afccfd", - "reference": "1dc93b8ea443fbbdaaca0582572ee6ca53afccfd", - "shasum": "" - }, - "require": { - "doctrine/annotations": "~1.2", - "illuminate/filesystem": "^5.1", - "illuminate/support": "^5.1", - "php": ">=5.5.9", - "phpdocumentor/reflection-docblock": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.2-dev" - } - }, - "autoload": { - "psr-4": { - "Dingo\\Blueprint\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jason Lewis", - "email": "jason.lewis1991@gmail.com" - } - ], - "description": "API Blueprint documentation generator.", - "keywords": [ - "api", - "blueprint", - "dingo", - "docs", - "laravel" - ], - "time": "2017-12-05T12:02:08+00:00" - }, - { - "name": "dnoegel/php-xdg-base-dir", - "version": "0.1", - "source": { - "type": "git", - "url": "https://github.com/dnoegel/php-xdg-base-dir.git", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/265b8593498b997dc2d31e75b89f053b5cc9621a", - "reference": "265b8593498b997dc2d31e75b89f053b5cc9621a", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "@stable" - }, - "type": "project", - "autoload": { - "psr-4": { - "XdgBaseDir\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24T07:27:01+00:00" - }, - { - "name": "doctrine/annotations", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", - "shasum": "" - }, - "require": { - "doctrine/lexer": "1.*", - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "time": "2017-02-24T16:22:25+00:00" - }, - { - "name": "doctrine/inflector", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", - "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "4.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Inflector\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "inflection", - "pluralize", - "singularize", - "string" - ], - "time": "2015-11-06T14:35:42+00:00" - }, - { - "name": "doctrine/lexer", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "lexer", - "parser" - ], - "time": "2014-09-09T13:34:57+00:00" - }, - { - "name": "dompdf/dompdf", - "version": "v0.8.2", - "source": { - "type": "git", - "url": "https://github.com/dompdf/dompdf.git", - "reference": "5113accd9ae5d466077cce5208dcf3fb871bf8f6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/5113accd9ae5d466077cce5208dcf3fb871bf8f6", - "reference": "5113accd9ae5d466077cce5208dcf3fb871bf8f6", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-gd": "*", - "ext-mbstring": "*", - "phenx/php-font-lib": "0.5.*", - "phenx/php-svg-lib": "0.3.*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "4.8.*", - "squizlabs/php_codesniffer": "2.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.7-dev" - } - }, - "autoload": { - "psr-4": { - "Dompdf\\": "src/" - }, - "classmap": [ - "lib/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - }, - { - "name": "Brian Sweeney", - "email": "eclecticgeek@gmail.com" - }, - { - "name": "Gabriel Bull", - "email": "me@gabrielbull.com" - } - ], - "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", - "homepage": "https://github.com/dompdf/dompdf", - "time": "2017-11-26T14:49:08+00:00" - }, - { - "name": "erusev/parsedown", - "version": "1.6.4", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ], - "time": "2017-11-14T20:44:03+00:00" - }, - { - "name": "fideloper/proxy", - "version": "3.3.4", - "source": { - "type": "git", - "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/9cdf6f118af58d89764249bbcc7bb260c132924f", - "reference": "9cdf6f118af58d89764249bbcc7bb260c132924f", - "shasum": "" - }, - "require": { - "illuminate/contracts": "~5.0", - "php": ">=5.4.0" - }, - "require-dev": { - "illuminate/http": "~5.0", - "mockery/mockery": "~0.9.3", - "phpunit/phpunit": "^5.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - }, - "laravel": { - "providers": [ - "Fideloper\\Proxy\\TrustedProxyServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Fideloper\\Proxy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Fidao", - "email": "fideloper@gmail.com" - } - ], - "description": "Set trusted proxies for Laravel", - "keywords": [ - "load balancing", - "proxy", - "trusted proxy" - ], - "time": "2017-06-15T17:19:42+00:00" - }, - { - "name": "guzzlehttp/guzzle", - "version": "6.3.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", - "shasum": "" - }, - "require": { - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", - "php": ">=5.5" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "^4.0 || ^5.0", - "psr/log": "^1.0" - }, - "suggest": { - "psr/log": "Required for using the Log middleware" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.2-dev" - } - }, - "autoload": { - "files": [ - "src/functions_include.php" - ], - "psr-4": { - "GuzzleHttp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "time": "2017-06-22T18:50:49+00:00" - }, - { - "name": "guzzlehttp/promises", - "version": "v1.3.1", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "shasum": "" - }, - "require": { - "php": ">=5.5.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Guzzle promises library", - "keywords": [ - "promise" - ], - "time": "2016-12-20T10:07:11+00:00" - }, - { - "name": "guzzlehttp/psr7", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "shasum": "" - }, - "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Tobias Schultze", - "homepage": "https://github.com/Tobion" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "request", - "response", - "stream", - "uri", - "url" - ], - "time": "2017-03-20T17:10:46+00:00" - }, - { - "name": "intervention/image", - "version": "2.3.14", - "source": { - "type": "git", - "url": "https://github.com/Intervention/image.git", - "reference": "dec642219be9a088fbbceb91cb5da23a0ee788f0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/dec642219be9a088fbbceb91cb5da23a0ee788f0", - "reference": "dec642219be9a088fbbceb91cb5da23a0ee788f0", - "shasum": "" - }, - "require": { - "ext-fileinfo": "*", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "~0.9.2", - "phpunit/phpunit": "^4.8 || ^5.7" - }, - "suggest": { - "ext-gd": "to use GD library based image processing.", - "ext-imagick": "to use Imagick based image processing.", - "intervention/imagecache": "Caching extension for the Intervention Image library" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - }, - "laravel": { - "providers": [ - "Intervention\\Image\\ImageServiceProvider" - ], - "aliases": { - "Image": "Intervention\\Image\\Facades\\Image" - } - } - }, - "autoload": { - "psr-4": { - "Intervention\\Image\\": "src/Intervention/Image" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Oliver Vogel", - "email": "oliver@olivervogel.com", - "homepage": "http://olivervogel.com/" - } - ], - "description": "Image handling and manipulation library with support for Laravel integration", - "homepage": "http://image.intervention.io/", - "keywords": [ - "gd", - "image", - "imagick", - "laravel", - "thumbnail", - "watermark" - ], - "time": "2017-07-03T10:53:01+00:00" - }, - { - "name": "jakub-onderka/php-console-color", - "version": "0.1", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "0.*", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "3.7.*", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleColor": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com", - "homepage": "http://www.acci.cz" - } - ], - "time": "2014-04-08T15:00:19+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.3.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "reference": "7daa75df45242c8d5b75a22c00a201e7954e4fb5", - "shasum": "" - }, - "require": { - "jakub-onderka/php-console-color": "~0.1", - "php": ">=5.3.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~0.5", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleHighlighter": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" - } - ], - "time": "2015-04-20T18:58:01+00:00" - }, - { - "name": "jenssegers/date", - "version": "v3.2.12", - "source": { - "type": "git", - "url": "https://github.com/jenssegers/date.git", - "reference": "1db4d580d1d45085a48fd4a332697619b9a3851c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jenssegers/date/zipball/1db4d580d1d45085a48fd4a332697619b9a3851c", - "reference": "1db4d580d1d45085a48fd4a332697619b9a3851c", - "shasum": "" - }, - "require": { - "nesbot/carbon": "^1.0", - "php": ">=5.4", - "symfony/translation": "^2.7|^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0|^6.0", - "satooshi/php-coveralls": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - }, - "laravel": { - "providers": [ - "Jenssegers\\Date\\DateServiceProvider" - ], - "aliases": { - "Date": "Jenssegers\\Date\\Date" - } - } - }, - "autoload": { - "psr-4": { - "Jenssegers\\Date\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jens Segers", - "homepage": "https://jenssegers.com" - } - ], - "description": "A date library to help you work with dates in different languages", - "homepage": "https://github.com/jenssegers/date", - "keywords": [ - "carbon", - "date", - "datetime", - "i18n", - "laravel", - "time", - "translation" - ], - "time": "2017-06-30T11:51:03+00:00" - }, - { - "name": "jeremeamia/SuperClosure", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/jeremeamia/super_closure.git", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db", - "reference": "443c3df3207f176a1b41576ee2a66968a507b3db", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.2|^2.0|^3.0", - "php": ">=5.4", - "symfony/polyfill-php56": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "SuperClosure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia", - "role": "Developer" - } - ], - "description": "Serialize Closure objects, including their context and binding", - "homepage": "https://github.com/jeremeamia/super_closure", - "keywords": [ - "closure", - "function", - "lambda", - "parser", - "serializable", - "serialize", - "tokenizer" - ], - "time": "2016-12-07T09:37:55+00:00" - }, - { - "name": "jlawrence/eos", - "version": "v3.2.2", - "source": { - "type": "git", - "url": "https://github.com/jlawrence11/eos.git", - "reference": "25e3d0f2316cb4636000f452a8e7dcc83725a32a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jlawrence11/eos/zipball/25e3d0f2316cb4636000f452a8e7dcc83725a32a", - "reference": "25e3d0f2316cb4636000f452a8e7dcc83725a32a", - "shasum": "" - }, - "require-dev": { - "codeclimate/php-test-reporter": "dev-master", - "phpunit/phpunit": "4.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "jlawrence\\eos\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1+" - ], - "authors": [ - { - "name": "Jon Lawrence", - "email": "jon@jon-lawrence.com" - } - ], - "description": "Parse and solve math equations without using 'eval()'.", - "keywords": [ - "eos", - "equations", - "math", - "solve" - ], - "time": "2016-03-02T22:35:41+00:00" - }, - { - "name": "kkszymanowski/traitor", - "version": "0.2.4", - "source": { - "type": "git", - "url": "https://github.com/KKSzymanowski/Traitor.git", - "reference": "05462468d0592545448f1a2877d045f5048abea1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/KKSzymanowski/Traitor/zipball/05462468d0592545448f1a2877d045f5048abea1", - "reference": "05462468d0592545448f1a2877d045f5048abea1", - "shasum": "" - }, - "require": { - "nikic/php-parser": "^1.0|^2.0|^3.0", - "php": ">=5.4" - }, - "require-dev": { - "phpunit/phpunit": "~4.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Traitor\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kuba Szymanowski", - "email": "kuba.szymanowski@inf24.pl" - } - ], - "description": "Add a trait use statement to existing PHP class", - "keywords": [ - "add", - "php", - "trait" - ], - "time": "2017-08-28T11:34:42+00:00" - }, - { - "name": "kyslik/column-sortable", - "version": "5.4.10", - "source": { - "type": "git", - "url": "https://github.com/Kyslik/column-sortable.git", - "reference": "fa7635d2ce28faf2599bf752428acc64437acf7c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/fa7635d2ce28faf2599bf752428acc64437acf7c", - "reference": "fa7635d2ce28faf2599bf752428acc64437acf7c", - "shasum": "" - }, - "require": { - "illuminate/database": "5.4.*", - "illuminate/support": "5.4.*", - "php": ">=5.6.4" - }, - "require-dev": { - "orchestra/testbench": "3.4.*", - "phpunit/phpunit": "~5.0" - }, - "type": "package", - "autoload": { - "psr-4": { - "Kyslik\\ColumnSortable\\": "src/ColumnSortable/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Martin Kiesel", - "email": "martin.kiesel@gmail.com", - "role": "Developer" - } - ], - "description": "Package for handling column sorting in Laravel 5.4", - "keywords": [ - "column", - "laravel", - "one-to-one", - "sort", - "sortable", - "sorting" - ], - "time": "2017-11-29T12:29:06+00:00" - }, - { - "name": "laracasts/flash", - "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/laracasts/flash.git", - "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laracasts/flash/zipball/10cd420ab63fd0796bf5e1e5b99f87636d2f4333", - "reference": "10cd420ab63fd0796bf5e1e5b99f87636d2f4333", - "shasum": "" - }, - "require": { - "illuminate/support": "~5.0", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "dev-master", - "phpunit/phpunit": "^6.1" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Laracasts\\Flash\\FlashServiceProvider" - ], - "aliases": { - "Flash": "Laracasts\\Flash\\Flash" - } - } - }, - "autoload": { - "psr-0": { - "Laracasts\\Flash": "src/" - }, - "files": [ - "src/Laracasts/Flash/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jeffrey Way", - "email": "jeffrey@laracasts.com" - } - ], - "description": "Easy flash notifications", - "time": "2017-06-22T19:01:19+00:00" - }, - { - "name": "laravel/framework", - "version": "v5.4.36", - "source": { - "type": "git", - "url": "https://github.com/laravel/framework.git", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", - "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", - "shasum": "" - }, - "require": { - "doctrine/inflector": "~1.1", - "erusev/parsedown": "~1.6", - "ext-mbstring": "*", - "ext-openssl": "*", - "league/flysystem": "~1.0", - "monolog/monolog": "~1.11", - "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.20", - "paragonie/random_compat": "~1.4|~2.0", - "php": ">=5.6.4", - "ramsey/uuid": "~3.0", - "swiftmailer/swiftmailer": "~5.4", - "symfony/console": "~3.2", - "symfony/debug": "~3.2", - "symfony/finder": "~3.2", - "symfony/http-foundation": "~3.2", - "symfony/http-kernel": "~3.2", - "symfony/process": "~3.2", - "symfony/routing": "~3.2", - "symfony/var-dumper": "~3.2", - "tijsverkoyen/css-to-inline-styles": "~2.2", - "vlucas/phpdotenv": "~2.2" - }, - "replace": { - "illuminate/auth": "self.version", - "illuminate/broadcasting": "self.version", - "illuminate/bus": "self.version", - "illuminate/cache": "self.version", - "illuminate/config": "self.version", - "illuminate/console": "self.version", - "illuminate/container": "self.version", - "illuminate/contracts": "self.version", - "illuminate/cookie": "self.version", - "illuminate/database": "self.version", - "illuminate/encryption": "self.version", - "illuminate/events": "self.version", - "illuminate/exception": "self.version", - "illuminate/filesystem": "self.version", - "illuminate/hashing": "self.version", - "illuminate/http": "self.version", - "illuminate/log": "self.version", - "illuminate/mail": "self.version", - "illuminate/notifications": "self.version", - "illuminate/pagination": "self.version", - "illuminate/pipeline": "self.version", - "illuminate/queue": "self.version", - "illuminate/redis": "self.version", - "illuminate/routing": "self.version", - "illuminate/session": "self.version", - "illuminate/support": "self.version", - "illuminate/translation": "self.version", - "illuminate/validation": "self.version", - "illuminate/view": "self.version", - "tightenco/collect": "self.version" - }, - "require-dev": { - "aws/aws-sdk-php": "~3.0", - "doctrine/dbal": "~2.5", - "mockery/mockery": "~0.9.4", - "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~5.7", - "predis/predis": "~1.0", - "symfony/css-selector": "~3.2", - "symfony/dom-crawler": "~3.2" - }, - "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).", - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).", - "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).", - "laravel/tinker": "Required to use the tinker console command (~1.0).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", - "nexmo/client": "Required to use the Nexmo transport (~1.0).", - "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).", - "predis/predis": "Required to use the redis cache and queue drivers (~1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.4-dev" - } - }, - "autoload": { - "files": [ - "src/Illuminate/Foundation/helpers.php", - "src/Illuminate/Support/helpers.php" - ], - "psr-4": { - "Illuminate\\": "src/Illuminate/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "The Laravel Framework.", - "homepage": "https://laravel.com", - "keywords": [ - "framework", - "laravel" - ], - "time": "2017-08-30T09:26:16+00:00" - }, - { - "name": "laravel/tinker", - "version": "v1.0.3", - "source": { - "type": "git", - "url": "https://github.com/laravel/tinker.git", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/852c2abe0b0991555a403f1c0583e64de6acb4a6", - "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6", - "shasum": "" - }, - "require": { - "illuminate/console": "~5.1", - "illuminate/contracts": "~5.1", - "illuminate/support": "~5.1", - "php": ">=5.5.9", - "psy/psysh": "0.7.*|0.8.*", - "symfony/var-dumper": "~3.0|~4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "suggest": { - "illuminate/database": "The Illuminate Database package (~5.1)." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Laravel\\Tinker\\TinkerServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Laravel\\Tinker\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Powerful REPL for the Laravel framework.", - "keywords": [ - "REPL", - "Tinker", - "laravel", - "psysh" - ], - "time": "2017-12-18T16:25:11+00:00" - }, - { - "name": "laravelcollective/html", - "version": "v5.4.9", - "source": { - "type": "git", - "url": "https://github.com/LaravelCollective/html.git", - "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/f04965dc688254f4c77f684ab0b42264f9eb9634", - "reference": "f04965dc688254f4c77f684ab0b42264f9eb9634", - "shasum": "" - }, - "require": { - "illuminate/http": "5.4.*", - "illuminate/routing": "5.4.*", - "illuminate/session": "5.4.*", - "illuminate/support": "5.4.*", - "illuminate/view": "5.4.*", - "php": ">=5.6.4" - }, - "require-dev": { - "illuminate/database": "5.4.*", - "mockery/mockery": "~0.9.4", - "phpunit/phpunit": "~5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Collective\\Html\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - }, - { - "name": "Adam Engebretson", - "email": "adam@laravelcollective.com" - } - ], - "description": "HTML and Form Builders for the Laravel Framework", - "homepage": "http://laravelcollective.com", - "time": "2017-08-12T15:52:38+00:00" - }, - { - "name": "league/flysystem", - "version": "1.0.42", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "09eabc54e199950041aef258a85847676496fe8e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/09eabc54e199950041aef258a85847676496fe8e", - "reference": "09eabc54e199950041aef258a85847676496fe8e", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "conflict": { - "league/flysystem-sftp": "<1.0.6" - }, - "require-dev": { - "ext-fileinfo": "*", - "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7" - }, - "suggest": { - "ext-fileinfo": "Required for MimeType", - "ext-ftp": "Allows you to use FTP server storage", - "ext-openssl": "Allows you to use FTPS server storage", - "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", - "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", - "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", - "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", - "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", - "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", - "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", - "league/flysystem-webdav": "Allows you to use WebDAV storage", - "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", - "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", - "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Flysystem\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Filesystem abstraction: Many filesystems, one API.", - "keywords": [ - "Cloud Files", - "WebDAV", - "abstraction", - "aws", - "cloud", - "copy.com", - "dropbox", - "file systems", - "files", - "filesystem", - "filesystems", - "ftp", - "rackspace", - "remote", - "s3", - "sftp", - "storage" - ], - "time": "2018-01-27T16:03:56+00:00" - }, - { - "name": "league/fractal", - "version": "0.17.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/fractal.git", - "reference": "a0b350824f22fc2fdde2500ce9d6851a3f275b0e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/fractal/zipball/a0b350824f22fc2fdde2500ce9d6851a3f275b0e", - "reference": "a0b350824f22fc2fdde2500ce9d6851a3f275b0e", - "shasum": "" - }, - "require": { - "php": ">=5.4" - }, - "require-dev": { - "doctrine/orm": "^2.5", - "illuminate/contracts": "~5.0", - "mockery/mockery": "~0.9", - "pagerfanta/pagerfanta": "~1.0.0", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5", - "zendframework/zend-paginator": "~2.3" - }, - "suggest": { - "illuminate/pagination": "The Illuminate Pagination component.", - "pagerfanta/pagerfanta": "Pagerfanta Paginator", - "zendframework/zend-paginator": "Zend Framework Paginator" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.13-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Fractal\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Phil Sturgeon", - "email": "me@philsturgeon.uk", - "homepage": "http://philsturgeon.uk/", - "role": "Developer" - } - ], - "description": "Handle the output of complex data structures ready for API output.", - "homepage": "http://fractal.thephpleague.com/", - "keywords": [ - "api", - "json", - "league", - "rest" - ], - "time": "2017-06-12T11:04:56+00:00" - }, - { - "name": "maatwebsite/excel", - "version": "2.1.25", - "source": { - "type": "git", - "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "5a8ac41af85cca4ca88971b2ab1a6ef674b1d82a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/5a8ac41af85cca4ca88971b2ab1a6ef674b1d82a", - "reference": "5a8ac41af85cca4ca88971b2ab1a6ef674b1d82a", - "shasum": "" - }, - "require": { - "illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "jeremeamia/superclosure": "^2.3", - "nesbot/carbon": "~1.0", - "php": ">=5.5", - "phpoffice/phpexcel": "^1.8.1", - "tijsverkoyen/css-to-inline-styles": "~2.0" - }, - "require-dev": { - "mockery/mockery": "~1.0", - "orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*|3.6.*", - "phpseclib/phpseclib": "~1.0", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*", - "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Maatwebsite\\Excel\\ExcelServiceProvider" - ], - "aliases": { - "Excel": "Maatwebsite\\Excel\\Facades\\Excel" - } - } - }, - "autoload": { - "classmap": [ - "src/Maatwebsite/Excel" - ], - "psr-0": { - "Maatwebsite\\Excel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maatwebsite.nl", - "email": "patrick@maatwebsite.nl" - } - ], - "description": "An eloquent way of importing and exporting Excel and CSV in Laravel 4 with the power of PHPExcel", - "keywords": [ - "PHPExcel", - "batch", - "csv", - "excel", - "export", - "import", - "laravel" - ], - "time": "2018-02-08T16:52:17+00:00" - }, - { - "name": "maximebf/debugbar", - "version": "1.13.1", - "source": { - "type": "git", - "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "afee79a236348e39a44cb837106b7c5b4897ac2a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/afee79a236348e39a44cb837106b7c5b4897ac2a", - "reference": "afee79a236348e39a44cb837106b7c5b4897ac2a", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "^1.0", - "symfony/var-dumper": "^2.6|^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "suggest": { - "kriswallsmith/assetic": "The best way to manage assets", - "monolog/monolog": "Log using Monolog", - "predis/predis": "Redis storage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.13-dev" - } - }, - "autoload": { - "psr-4": { - "DebugBar\\": "src/DebugBar/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maxime Bouroumeau-Fuseau", - "email": "maxime.bouroumeau@gmail.com", - "homepage": "http://maximebf.com" - }, - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Debug bar in the browser for php application", - "homepage": "https://github.com/maximebf/php-debugbar", - "keywords": [ - "debug", - "debugbar" - ], - "time": "2017-01-05T08:46:19+00:00" - }, - { - "name": "monolog/monolog", - "version": "1.23.0", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" - }, - "provide": { - "psr/log-implementation": "1.0.0" - }, - "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", - "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", - "php-amqplib/php-amqplib": "~2.4", - "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", - "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "^5.3|^6.0" - }, - "suggest": { - "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", - "doctrine/couchdb": "Allow sending log messages to a CouchDB server", - "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", - "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", - "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", - "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Monolog\\": "src/Monolog" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", - "keywords": [ - "log", - "logging", - "psr-3" - ], - "time": "2017-06-19T01:22:40+00:00" - }, - { - "name": "mtdowling/cron-expression", - "version": "v1.2.1", - "source": { - "type": "git", - "url": "https://github.com/mtdowling/cron-expression.git", - "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/9504fa9ea681b586028adaaa0877db4aecf32bad", - "reference": "9504fa9ea681b586028adaaa0877db4aecf32bad", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Cron\\": "src/Cron/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", - "keywords": [ - "cron", - "schedule" - ], - "time": "2017-01-23T04:29:33+00:00" - }, - { - "name": "nesbot/carbon", - "version": "1.22.1", - "source": { - "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "symfony/translation": "~2.6 || ~3.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "~4.0 || ~5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, - "autoload": { - "psr-4": { - "Carbon\\": "src/Carbon/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Nesbitt", - "email": "brian@nesbot.com", - "homepage": "http://nesbot.com" - } - ], - "description": "A simple API extension for DateTime.", - "homepage": "http://carbon.nesbot.com", - "keywords": [ - "date", - "datetime", - "time" - ], - "time": "2017-01-16T07:55:07+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v3.1.4", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "e57b3a09784f846411aa7ed664eedb73e3399078" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e57b3a09784f846411aa7ed664eedb73e3399078", - "reference": "e57b3a09784f846411aa7ed664eedb73e3399078", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2018-01-25T21:31:33+00:00" - }, - { - "name": "nwidart/laravel-menus", - "version": "0.5.0", - "source": { - "type": "git", - "url": "https://github.com/nWidart/laravel-menus.git", - "reference": "551e7049b4001a9d6dd95c37d3771a809df84126" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nWidart/laravel-menus/zipball/551e7049b4001a9d6dd95c37d3771a809df84126", - "reference": "551e7049b4001a9d6dd95c37d3771a809df84126", - "shasum": "" - }, - "require": { - "illuminate/config": "5.4.*", - "illuminate/support": "5.4.*", - "illuminate/view": "5.4.*", - "laravelcollective/html": "5.4.*", - "php": ">=5.6.4" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.4", - "mockery/mockery": "~0.9", - "orchestra/testbench": "3.4.*", - "phpro/grumphp": "^0.11", - "phpunit/phpunit": "~5.7" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Nwidart\\Menus\\MenusServiceProvider" - ], - "aliases": { - "Menu": "Nwidart\\Menus\\Facades\\Menu" - } - } - }, - "autoload": { - "psr-4": { - "Nwidart\\Menus\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Pingpong Labs", - "email": "pingpong.labs@gmail.com" - }, - { - "name": "Nicolas Widart", - "email": "n.widart@gmail.com" - } - ], - "description": "Laravel Menu management", - "keywords": [ - "bootstrap", - "laravel", - "menus", - "nav", - "navigation" - ], - "time": "2017-09-01T11:32:44+00:00" - }, - { - "name": "nwidart/laravel-modules", - "version": "1.27.2", - "source": { - "type": "git", - "url": "https://github.com/nWidart/laravel-modules.git", - "reference": "5f149198bd3d4cf9c9323a301d5b8b0aabc44591" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nWidart/laravel-modules/zipball/5f149198bd3d4cf9c9323a301d5b8b0aabc44591", - "reference": "5f149198bd3d4cf9c9323a301d5b8b0aabc44591", - "shasum": "" - }, - "require": { - "laravel/framework": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*", - "php": ">=5.5" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.4", - "mockery/mockery": "~0.9.3", - "orchestra/testbench": "^3.1|^3.2|^3.3|^3.4", - "phpro/grumphp": "^0.11", - "phpunit/phpunit": "~5.7" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Nwidart\\Modules\\LaravelModulesServiceProvider" - ], - "aliases": { - "Module": "Nwidart\\Modules\\Facades\\Module" - } - } - }, - "autoload": { - "psr-4": { - "Nwidart\\Modules\\": "src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Widart", - "email": "n.widart@gmail.com", - "homepage": "https://nicolaswidart.com", - "role": "Developer" - } - ], - "description": "Laravel Module management", - "keywords": [ - "laravel", - "module", - "modules", - "nwidart", - "rad" - ], - "time": "2017-08-31T16:09:16+00:00" - }, - { - "name": "paragonie/random_compat", - "version": "v2.0.11", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", - "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", - "shasum": "" - }, - "require": { - "php": ">=5.2.0" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "pseudorandom", - "random" - ], - "time": "2017-09-27T21:40:39+00:00" - }, - { - "name": "phenx/php-font-lib", - "version": "0.5.1", - "source": { - "type": "git", - "url": "https://github.com/PhenX/php-font-lib.git", - "reference": "760148820110a1ae0936e5cc35851e25a938bc97" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/760148820110a1ae0936e5cc35851e25a938bc97", - "reference": "760148820110a1ae0936e5cc35851e25a938bc97", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "^4.8" - }, - "type": "library", - "autoload": { - "psr-4": { - "FontLib\\": "src/FontLib" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - } - ], - "description": "A library to read, parse, export and make subsets of different types of font files.", - "homepage": "https://github.com/PhenX/php-font-lib", - "time": "2017-09-13T16:14:37+00:00" - }, - { - "name": "phenx/php-svg-lib", - "version": "v0.3", - "source": { - "type": "git", - "url": "https://github.com/PhenX/php-svg-lib.git", - "reference": "a85f7fe9fe08d093a4a8583cdd306b553ff918aa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/a85f7fe9fe08d093a4a8583cdd306b553ff918aa", - "reference": "a85f7fe9fe08d093a4a8583cdd306b553ff918aa", - "shasum": "" - }, - "require": { - "sabberworm/php-css-parser": "8.1.*" - }, - "require-dev": { - "phpunit/phpunit": "~5.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Svg\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Fabien Ménager", - "email": "fabien.menager@gmail.com" - } - ], - "description": "A library to read, parse and export to PDF SVG files.", - "homepage": "https://github.com/PhenX/php-svg-lib", - "time": "2017-05-24T10:07:27+00:00" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2017-09-11T18:02:19+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.3.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", - "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "phpdocumentor/reflection-common": "^1.0.0", - "phpdocumentor/type-resolver": "^0.4.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-10T14:09:06+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.4.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "time": "2017-07-14T14:27:02+00:00" - }, - { - "name": "phpoffice/phpexcel", - "version": "1.8.1", - "source": { - "type": "git", - "url": "https://github.com/PHPOffice/PHPExcel.git", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/372c7cbb695a6f6f1e62649381aeaa37e7e70b32", - "reference": "372c7cbb695a6f6f1e62649381aeaa37e7e70b32", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "ext-xmlwriter": "*", - "php": ">=5.2.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "PHPExcel": "Classes/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Maarten Balliauw", - "homepage": "http://blog.maartenballiauw.be" - }, - { - "name": "Mark Baker" - }, - { - "name": "Franck Lefevre", - "homepage": "http://blog.rootslabs.net" - }, - { - "name": "Erik Tilt" - } - ], - "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", - "homepage": "http://phpexcel.codeplex.com", - "keywords": [ - "OpenXML", - "excel", - "php", - "spreadsheet", - "xls", - "xlsx" - ], - "abandoned": "phpoffice/phpspreadsheet", - "time": "2015-05-01T07:00:55+00:00" - }, - { - "name": "plank/laravel-mediable", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/plank/laravel-mediable.git", - "reference": "41bd90fd714f453590830bc953c90946c4fec30b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/plank/laravel-mediable/zipball/41bd90fd714f453590830bc953c90946c4fec30b", - "reference": "41bd90fd714f453590830bc953c90946c4fec30b", - "shasum": "" - }, - "require": { - "illuminate/database": "^5.2.0", - "illuminate/filesystem": "^5.2.0", - "illuminate/support": "^5.2.0", - "league/flysystem": "^1.0.8", - "php": ">=5.4.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "league/flysystem-aws-s3-v3": "^1.0.8", - "orchestra/testbench": "^3.0", - "phpunit/phpunit": "^5.7", - "satooshi/php-coveralls": "^1.0.1", - "vlucas/phpdotenv": "^2.2" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Plank\\Mediable\\MediableServiceProvider" - ], - "aliases": { - "MediaUploader": "Plank\\Mediable\\MediaUploaderFacade" - } - } - }, - "autoload": { - "psr-4": { - "Plank\\Mediable\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Sean Fraser", - "email": "sean@plankdesign.com" - } - ], - "description": "A package for easily uploading and attaching media files to models with Laravel", - "keywords": [ - "eloquent", - "image", - "laravel", - "media", - "uploader" - ], - "time": "2017-08-30T12:54:56+00:00" - }, - { - "name": "psr/http-message", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2016-08-06T14:39:51+00:00" - }, - { - "name": "psr/log", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2016-10-10T12:19:37+00:00" - }, - { - "name": "psy/psysh", - "version": "v0.8.17", - "source": { - "type": "git", - "url": "https://github.com/bobthecow/psysh.git", - "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5069b70e8c4ea492c2b5939b6eddc78bfe41cfec", - "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec", - "shasum": "" - }, - "require": { - "dnoegel/php-xdg-base-dir": "0.1", - "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "~1.3|~2.0|~3.0", - "php": ">=5.3.9", - "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", - "symfony/var-dumper": "~2.7|~3.0|~4.0" - }, - "require-dev": { - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "^4.8.35|^5.4.3", - "symfony/finder": "~2.1|~3.0|~4.0" - }, - "suggest": { - "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", - "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", - "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." - }, - "bin": [ - "bin/psysh" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "0.8.x-dev" - } - }, - "autoload": { - "files": [ - "src/Psy/functions.php" - ], - "psr-4": { - "Psy\\": "src/Psy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Justin Hileman", - "email": "justin@justinhileman.info", - "homepage": "http://justinhileman.com" - } - ], - "description": "An interactive shell for modern PHP.", - "homepage": "http://psysh.org", - "keywords": [ - "REPL", - "console", - "interactive", - "shell" - ], - "time": "2017-12-28T16:14:16+00:00" - }, - { - "name": "ramsey/uuid", - "version": "3.7.3", - "source": { - "type": "git", - "url": "https://github.com/ramsey/uuid.git", - "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76", - "reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "^1.0|^2.0", - "php": "^5.4 || ^7.0" - }, - "replace": { - "rhumsaa/uuid": "self.version" - }, - "require-dev": { - "codeception/aspect-mock": "^1.0 | ~2.0.0", - "doctrine/annotations": "~1.2.0", - "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1", - "ircmaxell/random-lib": "^1.1", - "jakub-onderka/php-parallel-lint": "^0.9.0", - "mockery/mockery": "^0.9.9", - "moontoast/math": "^1.1", - "php-mock/php-mock-phpunit": "^0.3|^1.1", - "phpunit/phpunit": "^4.7|^5.0", - "squizlabs/php_codesniffer": "^2.3" - }, - "suggest": { - "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", - "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", - "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", - "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", - "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", - "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Ramsey\\Uuid\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marijn Huizendveld", - "email": "marijn.huizendveld@gmail.com" - }, - { - "name": "Thibaud Fabre", - "email": "thibaud@aztech.io" - }, - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" - } - ], - "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", - "homepage": "https://github.com/ramsey/uuid", - "keywords": [ - "guid", - "identifier", - "uuid" - ], - "time": "2018-01-20T00:28:24+00:00" - }, - { - "name": "sabberworm/php-css-parser", - "version": "8.1.0", - "source": { - "type": "git", - "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/850cbbcbe7fbb155387a151ea562897a67e242ef", - "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "type": "library", - "autoload": { - "psr-0": { - "Sabberworm\\CSS": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Raphael Schweikert" - } - ], - "description": "Parser for CSS Files written in PHP", - "homepage": "http://www.sabberworm.com/blog/2010/6/10/php-css-parser", - "keywords": [ - "css", - "parser", - "stylesheet" - ], - "time": "2016-07-19T19:14:21+00:00" - }, - { - "name": "santigarcor/laratrust", - "version": "4.0.5", - "source": { - "type": "git", - "url": "https://github.com/santigarcor/laratrust.git", - "reference": "b7ad126757c4e0542174c42b39094b4212a65d94" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/b7ad126757c4e0542174c42b39094b4212a65d94", - "reference": "b7ad126757c4e0542174c42b39094b4212a65d94", - "shasum": "" - }, - "require": { - "illuminate/cache": "~5.1", - "illuminate/console": "~5.1", - "illuminate/database": "~5.1", - "illuminate/support": "^5.1.40", - "kkszymanowski/traitor": "^0.2.0", - "php": ">=5.5.9" - }, - "require-dev": { - "mockery/mockery": "~0.9.2", - "phpunit/phpunit": "~4.1" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Laratrust\\LaratrustServiceProvider" - ], - "aliases": { - "Laratrust": "Laratrust\\LaratrustFacade" - } - } - }, - "autoload": { - "classmap": [ - "src/commands" - ], - "psr-4": { - "Laratrust\\": "src/Laratrust/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Santiago Garcia", - "homepage": "http://santigarcor.me" - } - ], - "description": "This package provides a flexible way to add Role-based Permissions to Laravel", - "keywords": [ - "acl", - "authorization", - "laratrust", - "laravel", - "permissions", - "php", - "rbac", - "roles" - ], - "time": "2017-09-29T19:54:05+00:00" - }, - { - "name": "sinergi/browser-detector", - "version": "6.0.5", - "source": { - "type": "git", - "url": "https://github.com/sinergi/php-browser-detector.git", - "reference": "7fcda47cf2690fb978c8cee3ba7304b7dca1bcc7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sinergi/php-browser-detector/zipball/7fcda47cf2690fb978c8cee3ba7304b7dca1bcc7", - "reference": "7fcda47cf2690fb978c8cee3ba7304b7dca1bcc7", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-develop": "6.1-dev" - } - }, - "autoload": { - "psr-4": { - "Sinergi\\BrowserDetector\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Schuld", - "email": "chris@chrisschuld.com", - "homepage": "http://chrisschuld.com" - }, - { - "name": "Gabriel Bull", - "email": "me@gabrielbull.com" - } - ], - "description": "Detecting the user's browser, operating system and language.", - "keywords": [ - "browser", - "detection", - "language", - "operating system", - "os" - ], - "time": "2016-07-28T15:35:24+00:00" - }, - { - "name": "sofa/eloquence", - "version": "5.4.1", - "source": { - "type": "git", - "url": "https://github.com/jarektkaczyk/eloquence.git", - "reference": "6f821bcf24950b58e633cb0cac7bbee6acb0f34a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jarektkaczyk/eloquence/zipball/6f821bcf24950b58e633cb0cac7bbee6acb0f34a", - "reference": "6f821bcf24950b58e633cb0cac7bbee6acb0f34a", - "shasum": "" - }, - "require": { - "illuminate/database": "5.4.*", - "php": ">=5.6.4", - "sofa/hookable": "5.4.*" - }, - "require-dev": { - "mockery/mockery": "0.9.4", - "phpunit/phpunit": "4.5.0", - "squizlabs/php_codesniffer": "2.3.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sofa\\Eloquence\\": "src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jarek Tkaczyk", - "email": "jarek@softonsofa.com", - "homepage": "http://softonsofa.com/", - "role": "Developer" - } - ], - "description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.", - "keywords": [ - "eloquent", - "laravel", - "mappable", - "metable", - "mutable", - "searchable" - ], - "time": "2017-04-22T14:38:11+00:00" - }, - { - "name": "sofa/hookable", - "version": "5.4.1", - "source": { - "type": "git", - "url": "https://github.com/jarektkaczyk/hookable.git", - "reference": "1791d001bdf483136a11b3ea600462f446b82401" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jarektkaczyk/hookable/zipball/1791d001bdf483136a11b3ea600462f446b82401", - "reference": "1791d001bdf483136a11b3ea600462f446b82401", - "shasum": "" - }, - "require": { - "illuminate/database": "5.3.*|5.4.*", - "php": ">=5.6.4" - }, - "require-dev": { - "crysalead/kahlan": "~1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sofa\\Hookable\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jarek Tkaczyk", - "email": "jarek@softonsofa.com", - "homepage": "http://softonsofa.com/", - "role": "Developer" - } - ], - "description": "Laravel Eloquent hooks system.", - "keywords": [ - "eloquent", - "laravel" - ], - "time": "2017-05-27T15:48:52+00:00" - }, - { - "name": "swiftmailer/swiftmailer", - "version": "v5.4.9", - "source": { - "type": "git", - "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7ffc1ea296ed14bf8260b6ef11b80208dbadba91", - "reference": "7ffc1ea296ed14bf8260b6ef11b80208dbadba91", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "~3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.4-dev" - } - }, - "autoload": { - "files": [ - "lib/swift_required.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Corbyn" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Swiftmailer, free feature-rich PHP mailer", - "homepage": "https://swiftmailer.symfony.com", - "keywords": [ - "email", - "mail", - "mailer" - ], - "time": "2018-01-23T07:37:21+00:00" - }, - { - "name": "symfony/class-loader", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/class-loader.git", - "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/e63c12699822bb3b667e7216ba07fbcc3a3e203e", - "reference": "e63c12699822bb3b667e7216ba07fbcc3a3e203e", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "require-dev": { - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/polyfill-apcu": "~1.1" - }, - "suggest": { - "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\ClassLoader\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony ClassLoader Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "symfony/console", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "26b6f419edda16c19775211987651cb27baea7f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/26b6f419edda16c19775211987651cb27baea7f1", - "reference": "26b6f419edda16c19775211987651cb27baea7f1", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/process": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T09:03:43+00:00" - }, - { - "name": "symfony/css-selector", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e66394bc7610e69279bfdb3ab11b4fe65403f556", - "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\CssSelector\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony CssSelector Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "symfony/debug", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "53f6af2805daf52a43b393b93d2f24925d35c937" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/53f6af2805daf52a43b393b93d2f24925d35c937", - "reference": "53f6af2805daf52a43b393b93d2f24925d35c937", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2018-01-18T22:16:57+00:00" - }, - { - "name": "symfony/event-dispatcher", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca", - "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "conflict": { - "symfony/dependency-injection": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "symfony/finder", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f", - "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" - }, - { - "name": "symfony/http-foundation", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30", - "reference": "8c39071ac9cc7e6d8dab1d556c990dc0d2cc3d30", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php70": "~1.6" - }, - "require-dev": { - "symfony/expression-language": "~2.8|~3.0|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony HttpFoundation Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T09:03:43+00:00" - }, - { - "name": "symfony/http-kernel", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-kernel.git", - "reference": "911d2e5dd4beb63caad9a72e43857de984301907" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/911d2e5dd4beb63caad9a72e43857de984301907", - "reference": "911d2e5dd4beb63caad9a72e43857de984301907", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/http-foundation": "^3.4.4|^4.0.4" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4", - "symfony/var-dumper": "<3.3", - "twig/twig": "<1.34|<2.4,>=2" - }, - "provide": { - "psr/log-implementation": "1.0" - }, - "require-dev": { - "psr/cache": "~1.0", - "symfony/browser-kit": "~2.8|~3.0|~4.0", - "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/console": "~2.8|~3.0|~4.0", - "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/dom-crawler": "~2.8|~3.0|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/process": "~2.8|~3.0|~4.0", - "symfony/routing": "~3.4|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0", - "symfony/templating": "~2.8|~3.0|~4.0", - "symfony/translation": "~2.8|~3.0|~4.0", - "symfony/var-dumper": "~3.3|~4.0" - }, - "suggest": { - "symfony/browser-kit": "", - "symfony/config": "", - "symfony/console": "", - "symfony/dependency-injection": "", - "symfony/finder": "", - "symfony/var-dumper": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpKernel\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony HttpKernel Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T12:29:46+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php56", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8", - "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-util": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php56\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f", - "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2018-01-30T19:27:44+00:00" - }, - { - "name": "symfony/polyfill-util", - "version": "v1.7.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-util.git", - "reference": "e17c808ec4228026d4f5a8832afa19be85979563" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563", - "reference": "e17c808ec4228026d4f5a8832afa19be85979563", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Util\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony utilities for portability of PHP codes", - "homepage": "https://symfony.com", - "keywords": [ - "compat", - "compatibility", - "polyfill", - "shim" - ], - "time": "2018-01-31T18:08:44+00:00" - }, - { - "name": "symfony/process", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "09a5172057be8fc677840e591b17f385e58c7c0d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/09a5172057be8fc677840e591b17f385e58c7c0d", - "reference": "09a5172057be8fc677840e591b17f385e58c7c0d", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Process Component", - "homepage": "https://symfony.com", - "time": "2018-01-29T09:03:43+00:00" - }, - { - "name": "symfony/routing", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "235d01730d553a97732990588407eaf6779bb4b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/235d01730d553a97732990588407eaf6779bb4b2", - "reference": "235d01730d553a97732990588407eaf6779bb4b2", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.3", - "symfony/yaml": "<3.4" - }, - "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/http-foundation": "~2.8|~3.0|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "doctrine/annotations": "For using the annotation loader", - "symfony/config": "For using the all-in-one router or any loader", - "symfony/dependency-injection": "For loading routes from a service", - "symfony/expression-language": "For using expression matching", - "symfony/http-foundation": "For using a Symfony Request object", - "symfony/yaml": "For using the YAML loader" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Routing\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Routing Component", - "homepage": "https://symfony.com", - "keywords": [ - "router", - "routing", - "uri", - "url" - ], - "time": "2018-01-16T18:03:57+00:00" - }, - { - "name": "symfony/translation", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/10b32cf0eae28b9b39fe26c456c42b19854c4b84", - "reference": "10b32cf0eae28b9b39fe26c456c42b19854c4b84", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", - "symfony/yaml": "~3.4|~4.0" - }, - "suggest": { - "psr/log": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Translation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Translation Component", - "homepage": "https://symfony.com", - "time": "2018-01-18T22:16:57+00:00" - }, - { - "name": "symfony/var-dumper", - "version": "v3.4.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/472a9849930cf21f73abdb02240f17cf5b5bd1a7", - "reference": "472a9849930cf21f73abdb02240f17cf5b5bd1a7", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" - }, - "require-dev": { - "ext-iconv": "*", - "twig/twig": "~1.34|~2.4" - }, - "suggest": { - "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump", - "ext-symfony_debug": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "files": [ - "Resources/functions/dump.php" - ], - "psr-4": { - "Symfony\\Component\\VarDumper\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony mechanism for exploring and dumping PHP variables", - "homepage": "https://symfony.com", - "keywords": [ - "debug", - "dump" - ], - "time": "2018-01-29T09:03:43+00:00" - }, - { - "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", - "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "TijsVerkoyen\\CssToInlineStyles\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Tijs Verkoyen", - "email": "css_to_inline_styles@verkoyen.eu", - "role": "Developer" - } - ], - "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", - "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2017-11-27T11:13:29+00:00" - }, - { - "name": "tucker-eric/eloquentfilter", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/Tucker-Eric/EloquentFilter.git", - "reference": "1e8d030da32eb7d319e1c68a76351c86a54396f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Tucker-Eric/EloquentFilter/zipball/1e8d030da32eb7d319e1c68a76351c86a54396f1", - "reference": "1e8d030da32eb7d319e1c68a76351c86a54396f1", - "shasum": "" - }, - "require": { - "illuminate/config": "~5.0", - "illuminate/console": "~5.0", - "illuminate/database": "~5.0", - "illuminate/filesystem": "~5.0", - "illuminate/support": "~5.0", - "php": ">=5.5.9" - }, - "require-dev": { - "mockery/mockery": "^0.9.5", - "phpunit/phpunit": "~5.4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "EloquentFilter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric Tucker", - "email": "tucker.ericm@gmail.com" - } - ], - "description": "An Eloquent way to filter Eloquent Models", - "keywords": [ - "eloquent", - "filter", - "laravel", - "model", - "query", - "search" - ], - "time": "2017-02-15T07:00:04+00:00" - }, - { - "name": "vlucas/phpdotenv", - "version": "v2.4.0", - "source": { - "type": "git", - "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", - "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "psr-4": { - "Dotenv\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause-Attribution" - ], - "authors": [ - { - "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com" - } - ], - "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", - "keywords": [ - "dotenv", - "env", - "environment" - ], - "time": "2016-09-01T10:05:43+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2018-01-29T19:49:41+00:00" - } - ], - "packages-dev": [ - { - "name": "fzaninotto/faker", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123", - "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123", - "shasum": "" - }, - "require": { - "php": "^5.3.3|^7.0" - }, - "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "extra": { - "branch-alias": [] - }, - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "time": "2016-04-29T12:21:54+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": { - "dingo/api": 10 - }, - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">=5.6.4" - }, - "platform-dev": [] -} diff --git a/config/language.php b/config/language.php index ce42dfbb5..b971ef4ce 100644 --- a/config/language.php +++ b/config/language.php @@ -115,7 +115,7 @@ return [ | */ - 'allowed' => ['en-GB', 'ar-SA', 'cs-CZ', 'de-DE', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], + 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'de-DE', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], /* |-------------------------------------------------------------------------- diff --git a/resources/lang/bg-BG/accounts.php b/resources/lang/bg-BG/accounts.php new file mode 100644 index 000000000..5c29d90d4 --- /dev/null +++ b/resources/lang/bg-BG/accounts.php @@ -0,0 +1,14 @@ + 'Oрганизация', + 'number' => 'Номер', + 'opening_balance' => 'Начално салдо', + 'current_balance' => 'Текущо салдо', + 'bank_name' => 'Име на банка', + 'bank_phone' => 'Телефон на банка', + 'bank_address' => 'Адрес на банката', + 'default_account' => 'Акаунт по подразбиране', + +]; diff --git a/resources/lang/bg-BG/auth.php b/resources/lang/bg-BG/auth.php new file mode 100644 index 000000000..df17efe14 --- /dev/null +++ b/resources/lang/bg-BG/auth.php @@ -0,0 +1,30 @@ + 'Профил', + 'logout' => 'Изход', + 'login' => 'Вход', + 'login_to' => 'Влезте, за да стартирате сесия', + 'remember_me' => 'Запомни ме', + 'forgot_password' => 'Забравих си паролата', + 'reset_password' => 'Възстановяване на парола', + 'enter_email' => 'Въведете е-мейл адрес', + 'current_email' => 'Текущ имейл адрес', + 'reset' => 'Възстановяване', + 'never' => 'никога', + 'password' => [ + 'current' => 'Парола', + 'current_confirm' => 'Потвърждение на паролата', + 'new' => 'Нова парола', + 'new_confirm' => 'Потвърждение на паролата', + ], + 'error' => [ + 'self_delete' => 'Грешка: Не може да изтриете себе си!' + ], + + 'failed' => 'Неуспешно удостоверяване на потребител.', + 'disabled' => 'Този акаунт е забранен. Моля обърнете се към системния администратор.', + 'throttle' => 'Твърде много опити за логин. Моля, опитайте отново след :seconds секунди.', + +]; diff --git a/resources/lang/bg-BG/bills.php b/resources/lang/bg-BG/bills.php new file mode 100644 index 000000000..373df65d2 --- /dev/null +++ b/resources/lang/bg-BG/bills.php @@ -0,0 +1,41 @@ + 'Фактура Номер', + 'bill_date' => 'Дата фактура', + 'total_price' => 'Обща цена', + 'due_date' => 'Падежна дата', + 'order_number' => 'Номер на поръчка', + 'bill_from' => 'Фактура от', + + 'quantity' => 'Количество', + 'price' => 'Цена', + 'sub_total' => 'Междинна сума', + 'tax_total' => 'Общо данък', + 'total' => 'Общо', + + 'item_name' => 'Име на артикул | Имена на артикули', + + 'payment_due' => 'Дължимото плащане', + 'amount_due' => 'Дължимата сума', + 'paid' => 'Платени', + 'histories' => 'История', + 'payments' => 'Плащания', + 'add_payment' => 'Добавяне на плащане', + 'mark_received' => 'Отбелязване като получено', + 'download_pdf' => 'Изтегляне на PDF', + 'send_mail' => 'Изпращане на имейл', + + 'status' => [ + 'draft' => 'Чернова', + 'received' => 'Получено', + 'partial' => 'Частичен', + 'paid' => 'Платен', + ], + + 'messages' => [ + 'received' => 'Фактура, отбелязана като платена!', + ], + +]; diff --git a/resources/lang/bg-BG/companies.php b/resources/lang/bg-BG/companies.php new file mode 100644 index 000000000..4b38f3b4a --- /dev/null +++ b/resources/lang/bg-BG/companies.php @@ -0,0 +1,13 @@ + 'Домейн', + 'logo' => 'Лого', + 'manage' => 'Управление на фирми', + 'all' => 'Всички фирми', + 'error' => [ + 'delete_active' => 'Грешка: Невъзможно изтриване на активна компания, моля, първо я променете!', + ], + +]; diff --git a/resources/lang/bg-BG/currencies.php b/resources/lang/bg-BG/currencies.php new file mode 100644 index 000000000..8272f9856 --- /dev/null +++ b/resources/lang/bg-BG/currencies.php @@ -0,0 +1,18 @@ + 'Код', + 'rate' => 'Курс', + 'default' => 'Валута по подразбиране', + 'decimal_mark' => 'Десетичен знак', + 'thousands_separator' => 'Разделител за хилядни', + 'precision' => 'Точност', + 'symbol' => [ + 'symbol' => 'Символ', + 'position' => 'Символ позиция', + 'before' => 'Преди сума', + 'after' => 'След сума', + ] + +]; diff --git a/resources/lang/bg-BG/customers.php b/resources/lang/bg-BG/customers.php new file mode 100644 index 000000000..e795ea981 --- /dev/null +++ b/resources/lang/bg-BG/customers.php @@ -0,0 +1,11 @@ + 'Разрешавате ли достъп?', + 'user_created' => 'Създаден потребител', + + 'error' => [ + 'email' => 'Този имейл вече е бил регистриран.' + ] +]; diff --git a/resources/lang/bg-BG/dashboard.php b/resources/lang/bg-BG/dashboard.php new file mode 100644 index 000000000..d0709bb6d --- /dev/null +++ b/resources/lang/bg-BG/dashboard.php @@ -0,0 +1,24 @@ + 'Общо приходи', + 'receivables' => 'Вземания', + 'open_invoices' => 'Отворени фактури', + 'overdue_invoices' => 'Просрочени фактури', + 'total_expenses' => 'Общо разходи', + 'payables' => 'Задължения', + 'open_bills' => 'Отворени задължения', + 'overdue_bills' => 'Просрочени задължения', + 'total_profit' => 'Обща печалба', + 'open_profit' => 'Отвори печалба', + 'overdue_profit' => 'Закъсняла печалба', + 'cash_flow' => 'Паричен поток', + 'no_profit_loss' => 'Няма печалба загуба', + 'incomes_by_category' => 'Приходи по категория', + 'expenses_by_category' => 'Разходи по категория', + 'account_balance' => 'Салдо', + 'latest_incomes' => 'Последни приходи', + 'latest_expenses' => 'Последни разходи', + +]; diff --git a/resources/lang/bg-BG/demo.php b/resources/lang/bg-BG/demo.php new file mode 100644 index 000000000..55a12f560 --- /dev/null +++ b/resources/lang/bg-BG/demo.php @@ -0,0 +1,17 @@ + 'В брой', + 'categories_uncat' => 'Некатегоризирани', + 'categories_deposit' => 'Депозит', + 'categories_sales' => 'Продажби', + 'currencies_usd' => 'Американски долар', + 'currencies_eur' => 'Евро', + 'currencies_gbp' => 'Британска лира', + 'currencies_try' => 'Турска лира', + 'taxes_exempt' => 'Освободени от данъци', + 'taxes_normal' => 'Нормален данък', + 'taxes_sales' => 'Данък продажби', + +]; diff --git a/resources/lang/bg-BG/footer.php b/resources/lang/bg-BG/footer.php new file mode 100644 index 000000000..8b50bb57b --- /dev/null +++ b/resources/lang/bg-BG/footer.php @@ -0,0 +1,9 @@ + 'Версия', + 'powered' => 'С подкрепата на Akaunting', + 'software' => 'Безплатен счетоводен софтуер', + +]; diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php new file mode 100644 index 000000000..02a3991a1 --- /dev/null +++ b/resources/lang/bg-BG/general.php @@ -0,0 +1,116 @@ + 'Стока | Стоки', + 'incomes' => 'Приход | Приходи', + 'invoices' => 'Фактура | Фактури', + 'revenues' => 'Приходи | Приходи', + 'customers' => 'Клиент | Клиенти', + 'expenses' => 'Разход| Разходи', + 'bills' => 'Сметка| Сметки', + 'payments' => 'Плащане | Плащания', + 'vendors' => 'Доставчик | Доставчици', + 'accounts' => 'Сметка | Сметки', + 'transfers' => 'Трансфер | Трансфери', + 'transactions' => 'Транзакция | Транзакции', + 'reports' => 'Доклад | Доклади', + 'settings' => 'Настройка | Настройки', + 'categories' => 'Категория | Категории', + 'currencies' => 'Валута | Валути', + 'tax_rates' => 'Данък | Данъци', + 'users' => 'Потребител | Потребители', + 'roles' => 'Роля | Роли', + 'permissions' => 'Позволение | Позволения', + 'modules' => 'Добавка | Добавки', + 'companies' => 'Компания | Компании', + 'profits' => 'Печалба | Печалби', + 'taxes' => 'Данък | Данъци', + 'logos' => 'Лого | Лога', + 'pictures' => 'Снимка | Снимки', + 'types' => 'Тип | Видове', + 'payment_methods' => 'Метод на плащане | Начини на плащане', + 'compares' => 'Приход срещу разход | Приходи срещу разходи', + 'notes' => 'Бележка | Бележки', + 'totals' => 'Общо | Общи суми', + 'languages' => 'Език | Езици', + 'updates' => 'Актуализация | Актуализации', + 'numbers' => 'Номер | Числа', + 'statuses' => 'Статус | Статуси', + + 'dashboard' => 'Табло', + 'banking' => 'Банкиране', + 'general' => 'Общи', + 'no_records' => 'Няма записи.', + 'date' => 'Дата', + 'amount' => 'Сума', + 'enabled' => 'Включен', + 'disabled' => 'Изключен', + 'yes' => 'Да', + 'no' => 'Не', + 'na' => 'Не е достъпно', + 'daily' => 'Дневно', + 'monthly' => 'Месечно', + 'quarterly' => 'На тримесечие', + 'yearly' => 'Годишно', + 'add' => 'Добави', + 'add_new' => 'Добави нов', + 'show' => 'Покажи', + 'edit' => 'Редактиране', + 'delete' => 'Изтрий', + 'send' => 'Изпрати', + 'download' => 'Изтегли', + 'delete_confirm' => 'Потвърждаване на изтриване :name :type?', + 'name' => 'Име', + 'email' => 'Имейл', + 'tax_number' => 'Данъчен номер', + 'phone' => 'Телефон', + 'address' => 'Адрес', + 'website' => 'Сайт', + 'actions' => 'Действия', + 'description' => 'Описание', + 'manage' => 'Управление', + 'code' => 'Код', + 'alias' => 'Псевдоним', + 'balance' => 'Баланс', + 'reference' => 'Референция', + 'attachment' => 'Прикачен файл', + 'change' => 'Промени', + 'switch' => 'Превключи', + 'color' => 'Цвят', + 'save' => 'Запиши', + 'cancel' => 'Отмени', + 'from' => 'От', + 'to' => 'До', + 'print' => 'Печат', + 'search' => 'Търси', + 'search_placeholder' => 'Пиши да търсиш..', + 'filter' => 'Филтър', + 'help' => 'Помощ', + 'all' => 'Всички', + 'all_type' => 'Всички :type', + 'upcoming' => 'Приближаващ', + 'created' => 'Създаден', + 'id' => 'ID', + 'more_actions' => 'Още действия', + 'duplicate' => 'Дублиране', + 'unpaid' => 'Неплатени', + 'paid' => 'Платени', + 'overdue' => 'Прослочени', + 'partially' => 'Частичен', + 'partially_paid' => 'Частично платено', + + 'title' => [ + 'new' => 'Нов :type', + 'edit' => 'Редактирай :type', + ], + 'form' => [ + 'enter' => 'Въведи :field', + 'select' => [ + 'field' => '- Избери :field -', + 'file' => 'Изберете файл', + ], + 'no_file_selected' => 'Не е избран файл...', + ], + +]; diff --git a/resources/lang/bg-BG/header.php b/resources/lang/bg-BG/header.php new file mode 100644 index 000000000..211b19582 --- /dev/null +++ b/resources/lang/bg-BG/header.php @@ -0,0 +1,15 @@ + 'Промяна на езика', + 'last_login' => 'Последно влизане :time', + 'notifications' => [ + 'counter' => '{0} Нямате известия|{1} Имате :count ново известие|[2,*] Имате :count нови известия', + 'overdue_invoices' => '{1} :count просрочено вземане|[2,*] :count просрочени вземания', + 'upcoming_bills' => '{1} :count наближаваща фактура|[2,*] :count наближаващи фактури', + 'items_stock' => '{1} :count стока без наличност|[2,*] :count стоки без наличност', + 'view_all' => 'Вижте всички' + ], + +]; diff --git a/resources/lang/bg-BG/import.php b/resources/lang/bg-BG/import.php new file mode 100644 index 000000000..9de2c28f3 --- /dev/null +++ b/resources/lang/bg-BG/import.php @@ -0,0 +1,9 @@ + 'Импортиране', + 'title' => 'Импортиране :type', + 'message' => 'Разрешени формати: CSV, XLS. Моля, изтегли примерен файл.', + +]; diff --git a/resources/lang/bg-BG/install.php b/resources/lang/bg-BG/install.php new file mode 100644 index 000000000..5ae035c95 --- /dev/null +++ b/resources/lang/bg-BG/install.php @@ -0,0 +1,44 @@ + 'Следващ', + 'refresh' => 'Обновяване', + + 'steps' => [ + 'requirements' => 'Моля, изпълнете следните изисквания!', + 'language' => 'Стъпка 1/3: Избор на език', + 'database' => 'Стъпка 2/3: Избор на база данни', + 'settings' => 'Стъпка 3/3: Детайли на компанията и администратора', + ], + + 'language' => [ + 'select' => 'Изберете език', + ], + + 'requirements' => [ + 'enabled' => ':feature трябва да бъде активирана!', + 'disabled' => ':feature трябва да бъде дезактивирана!', + 'extension' => ':extension разширението трябва да бъде заредено!', + 'directory' => ':directory директорията трябва да е с разрешение за промяна!', + ], + + 'database' => [ + 'hostname' => 'Име на хост', + 'username' => 'Потребителско име', + 'password' => 'Парола', + 'name' => 'База данни', + ], + + 'settings' => [ + 'company_name' => 'Име на компанията', + 'company_email' => 'Имейл на компанията', + 'admin_email' => 'Администраторски имейл', + 'admin_password' => 'Администраторска парола', + ], + + 'error' => [ + 'connection' => 'Грешка: Не можа да се свърже с базата данни! Моля, уверете се, че данните са правилни.', + ], + +]; diff --git a/resources/lang/bg-BG/invoices.php b/resources/lang/bg-BG/invoices.php new file mode 100644 index 000000000..eb128ec19 --- /dev/null +++ b/resources/lang/bg-BG/invoices.php @@ -0,0 +1,50 @@ + 'Номер на фактура', + 'invoice_date' => 'Дата на фактура', + 'total_price' => 'Обща цена', + 'due_date' => 'Падежна дата', + 'order_number' => 'Номер на поръчка', + 'bill_to' => 'Издадена на', + + 'quantity' => 'Количество', + 'price' => 'Цена', + 'sub_total' => 'Междинна сума', + 'tax_total' => 'Общо данък', + 'total' => 'Общо', + + 'item_name' => 'Име на артикул | Имена на артикули', + + 'payment_due' => 'Дължимото плащане', + 'paid' => 'Платен', + 'histories' => 'История', + 'payments' => 'Плащания', + 'add_payment' => 'Добавяне на плащане', + 'mark_paid' => 'Отбележи като платено', + 'mark_sent' => 'Маркирай като изпратено', + 'download_pdf' => 'Изтегляне на PDF', + 'send_mail' => 'Изпращане на имейл', + + 'status' => [ + 'draft' => 'Чернова', + 'sent' => 'Изпратено', + 'viewed' => 'Разгледани', + 'approved' => 'Одобрени', + 'partial' => 'Частичен', + 'paid' => 'Платен', + ], + + 'messages' => [ + 'email_sent' => 'И-мейла беше изпратен успешно!', + 'marked_sent' => 'Фактурата беше изпратена успешно!', + 'email_required' => 'Няма имейл адрес за този клиент!', + ], + + 'notification' => [ + 'message' => 'Вие получавате този имейл, защото имате предстояща фактура за плащане на стойност :amount на :customer.', + 'button' => 'Плати сега', + ], + +]; diff --git a/resources/lang/bg-BG/items.php b/resources/lang/bg-BG/items.php new file mode 100644 index 000000000..f5db258ae --- /dev/null +++ b/resources/lang/bg-BG/items.php @@ -0,0 +1,15 @@ + 'Количество | Количества', + 'sales_price' => 'Продажна цена', + 'purchase_price' => 'Покупна цена', + 'sku' => 'SKU', + + 'notification' => [ + 'message' => 'Вие получавате този имейл, защото :name е на изчерпване.', + 'button' => 'Покажи сега', + ], + +]; diff --git a/resources/lang/bg-BG/messages.php b/resources/lang/bg-BG/messages.php new file mode 100644 index 000000000..8ac1d5279 --- /dev/null +++ b/resources/lang/bg-BG/messages.php @@ -0,0 +1,23 @@ + [ + 'added' => ':type добавен!', + 'updated' => ':type променен!', + 'deleted' => ':type изтрит!', + 'duplicated' => ':type дублиран!', + 'imported' => ':type импортиран!', + ], + 'error' => [ + 'over_payment' => 'Грешка: Плащането не е добавено! Сумата преминава общата сума.', + 'not_user_company' => 'Грешка: Не ви е позволено да управлявате тази компания!', + 'customer' => 'Грешка: Потребителят не е създаден! :name вече използва този имейл адрес.', + 'no_file' => 'Грешка: Няма избран файл!', + ], + 'warning' => [ + 'deleted' => 'Предупреждение: Не ви е позволено да изтриете :name, защото има :text свързан.', + 'disabled' => 'Предупреждение: Не ви е позволено да деактивирате :name, защото има :text свързан.', + ], + +]; diff --git a/resources/lang/bg-BG/modules.php b/resources/lang/bg-BG/modules.php new file mode 100644 index 000000000..f5604040c --- /dev/null +++ b/resources/lang/bg-BG/modules.php @@ -0,0 +1,47 @@ + 'API Token', + 'api_token' => 'Token', + 'top_paid' => 'Топ платени', + 'new' => 'Нов', + 'top_free' => 'Топ безплатни', + 'free' => 'БЕЗПЛАТНО', + 'install' => 'Инсталирай', + 'buy_now' => 'Купете сега', + 'token_link' => 'Натиснете тук за да получите Вашия API token.', + 'no_apps' => 'Все още няма приложения в тази категория.', + 'developer' => 'Вие сте разработчик? Тук можете да научите как да създадете приложение и да започнете да продавате днес!', + + 'about' => 'Относно', + + 'added' => 'Добавено', + 'updated' => 'Обновено', + 'compatibility' => 'Съвместимост', + + 'installed' => ':module инсталиран', + 'uninstalled' => ':module деинсталиран', + //'updated' => ':module updated', + 'enabled' => ':module включен', + 'disabled' => ':module изключен', + + 'tab' => [ + 'installation' => 'Инсталация', + 'faq' => 'ЧЗВ', + 'changelog' => 'Списък на промените', + ], + + 'installation' => [ + 'header' => 'Инсталиране на приложение', + 'download' => 'Изтегляне :module файл.', + 'unzip' => 'Извличане :module файлове.', + 'install' => 'Инсталиране :module файлове.', + ], + + 'button' => [ + 'uninstall' => 'Деинсталирай', + 'disable' => 'Изключи', + 'enable' => 'Активирай', + ], +]; diff --git a/resources/lang/bg-BG/pagination.php b/resources/lang/bg-BG/pagination.php new file mode 100644 index 000000000..5c22e0fe4 --- /dev/null +++ b/resources/lang/bg-BG/pagination.php @@ -0,0 +1,9 @@ + '« Предишна', + 'next' => 'Следваща »', + 'showing' => 'Показване на :first до :last от общо :total :type', + +]; diff --git a/resources/lang/bg-BG/passwords.php b/resources/lang/bg-BG/passwords.php new file mode 100644 index 000000000..bc8de2969 --- /dev/null +++ b/resources/lang/bg-BG/passwords.php @@ -0,0 +1,22 @@ + 'Паролата трябва да бъде поне шест знака и да съвпада.', + 'reset' => 'Паролата е ресетната!', + 'sent' => 'Изпратено е напомняне за вашата парола!', + 'token' => 'Този токен за ресет на парола е невалиден.', + 'user' => "Потребител с такъв e-mail адрес не може да бъде открит.", + +]; diff --git a/resources/lang/bg-BG/reports.php b/resources/lang/bg-BG/reports.php new file mode 100644 index 000000000..2babe504d --- /dev/null +++ b/resources/lang/bg-BG/reports.php @@ -0,0 +1,17 @@ + 'Текущата година', + 'previous_year' => 'Миналата година', + 'this_quarter' => 'Текущото тримесечие', + 'previous_quarter' => 'Предходното тримесечие', + 'last_12_months' => 'Последните 12 месеца', + + 'summary' => [ + 'income' => 'Приходи', + 'expense' => 'Разходи', + 'income_expense' => 'Приходи срещу разходи', + ], + +]; diff --git a/resources/lang/bg-BG/settings.php b/resources/lang/bg-BG/settings.php new file mode 100644 index 000000000..904bf0781 --- /dev/null +++ b/resources/lang/bg-BG/settings.php @@ -0,0 +1,85 @@ + [ + 'name' => 'Име', + 'email' => 'Имейл', + 'phone' => 'Телефон', + 'address' => 'Адрес', + 'logo' => 'Лого', + ], + 'localisation' => [ + 'tab' => 'Локализиране', + 'date' => [ + 'format' => 'Формат на датата', + 'separator' => 'Разделител за дата', + 'dash' => 'Тире (-)', + 'dot' => 'Точка (.)', + 'comma' => 'Запетая (,)', + 'slash' => 'Наклонена черта (/)', + 'space' => 'Празно място ( )', + ], + 'timezone' => 'Часова зона', + ], + 'invoice' => [ + 'tab' => 'Фактура', + 'prefix' => 'Префикс', + 'digit' => 'Брой цифри', + 'next' => 'Следващия номер', + 'logo' => 'Лого', + ], + 'default' => [ + 'tab' => 'По подразбиране', + 'account' => 'Акаунт по подразбиране', + 'currency' => 'Валута по подразбиране', + 'tax' => 'Данъчна ставка по подразбиране', + 'payment' => 'Начин на плащане по подразбиране', + 'language' => 'Език по подразбиране', + ], + 'email' => [ + 'protocol' => 'Протокол', + 'php' => 'PHP Mail', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'SMTP хост', + 'port' => 'SMTP порт', + 'username' => 'SMTP потребител', + 'password' => 'SMTP парола', + 'encryption' => 'SMTP сигурност', + 'none' => 'Няма', + ], + 'sendmail' => 'Sendmail', + 'sendmail_path' => 'Път към Sendmail', + 'log' => 'Лог имейли', + ], + 'scheduling' => [ + 'tab' => 'График на дейностите', + 'send_invoice' => 'Изпрати напомняне за фактура', + 'invoice_days' => 'Изпрати след забавени дни', + 'send_bill' => 'Изпрати напомняне за фактура', + 'bill_days' => 'Изпрати преди забавени дни', + 'cron_command' => 'Грешна команда', + 'schedule_time' => 'Час за стартиране', + ], + 'appearance' => [ + 'tab' => 'Външен вид', + 'theme' => 'Тема', + 'light' => 'Светла', + 'dark' => 'Тъмна', + 'list_limit' => 'Резултати на страница', + 'use_gravatar' => 'Използвай Gravatar', + ], + 'system' => [ + 'tab' => 'Система', + 'session' => [ + 'lifetime' => 'Сесия живот (минути)', + 'handler' => 'Управление на сесиите', + 'file' => 'Файл', + 'database' => 'База данни', + ], + 'file_size' => 'Макс размер на файл (МБ)', + 'file_types' => 'Разрешени типове файлове', + ], + +]; diff --git a/resources/lang/bg-BG/taxes.php b/resources/lang/bg-BG/taxes.php new file mode 100644 index 000000000..1552e6e5a --- /dev/null +++ b/resources/lang/bg-BG/taxes.php @@ -0,0 +1,8 @@ + 'Данък', + 'rate_percent' => 'Ставка (%)', + +]; diff --git a/resources/lang/bg-BG/transfers.php b/resources/lang/bg-BG/transfers.php new file mode 100644 index 000000000..0d35b2c7c --- /dev/null +++ b/resources/lang/bg-BG/transfers.php @@ -0,0 +1,8 @@ + 'От сметка', + 'to_account' => 'Към сметка', + +]; diff --git a/resources/lang/bg-BG/updates.php b/resources/lang/bg-BG/updates.php new file mode 100644 index 000000000..a8e567c46 --- /dev/null +++ b/resources/lang/bg-BG/updates.php @@ -0,0 +1,15 @@ + 'Инсталирана версия', + 'latest_version' => 'Последна версия', + 'update' => 'Актуализиране на Akaunting до :version версия', + 'changelog' => 'Списък на промените', + 'check' => 'Проверете', + 'new_core' => 'Актуализирана версия на Akaunting е налична.', + 'latest_core' => 'Поздравления! Вие имате последната версия на Akaunting. Бъдещите актуализации ще се прилагат автоматично.', + 'success' => 'Процес на актуализиране е завършен успешно.', + 'error' => 'Процес на актуализиране беше прекъснат, моля, опитайте отново.', + +]; diff --git a/resources/lang/bg-BG/validation.php b/resources/lang/bg-BG/validation.php new file mode 100644 index 000000000..e33c14037 --- /dev/null +++ b/resources/lang/bg-BG/validation.php @@ -0,0 +1,119 @@ + 'Трябва да приемете :attribute.', + 'active_url' => 'Полето :attribute не е валиден URL адрес.', + 'after' => 'Полето :attribute трябва да бъде дата след :date.', + 'after_or_equal' => 'Полето :attribute трябва да бъде дата след или равна на :date.', + 'alpha' => 'Полето :attribute трябва да съдържа само букви.', + 'alpha_dash' => 'Полето :attribute трябва да съдържа само букви, цифри, долна черта и тире.', + 'alpha_num' => 'Полето :attribute трябва да съдържа само букви и цифри.', + 'array' => 'Полето :attribute трябва да бъде масив.', + 'before' => 'Полето :attribute трябва да бъде дата преди :date.', + 'before_or_equal' => 'Полето :attribute трябва да бъде дата преди или равна на :date.', + 'between' => [ + 'numeric' => 'Полето :attribute трябва да бъде между :min и :max.', + 'file' => 'Полето :attribute трябва да бъде между :min и :max килобайта.', + 'string' => 'Полето :attribute трябва да бъде между :min и :max знака.', + 'array' => 'Полето :attribute трябва да има между :min - :max елемента.', + ], + 'boolean' => 'Полето :attribute трябва да съдържа Да или Не', + 'confirmed' => 'Полето :attribute не е потвърдено.', + 'date' => 'Полето :attribute не е валидна дата.', + 'date_format' => 'Полето :attribute не е във формат :format.', + 'different' => 'Полетата :attribute и :other трябва да са различни.', + 'digits' => 'Полето :attribute трябва да има :digits цифри.', + 'digits_between' => 'Полето :attribute трябва да има между :min и :max цифри.', + 'dimensions' => 'Невалидни размери за снимка :attribute.', + 'distinct' => 'Данните в полето :attribute се дублират.', + 'email' => 'Полето :attribute е в невалиден формат.', + 'exists' => 'Избранато поле :attribute вече съществува.', + 'file' => ':attribute трябва да е файл.', + 'filled' => 'Полето :attribute е задължително.', + 'image' => 'Полето :attribute трябва да бъде изображение.', + 'in' => 'Избраното поле :attribute е невалидно.', + 'in_array' => 'Полето :attribute не съществува в :other.', + 'integer' => 'Полето :attribute трябва да бъде цяло число.', + 'ip' => 'Полето :attribute трябва да бъде IP адрес.', + 'json' => 'Полето :attribute трябва да бъде JSON низ.', + 'max' => [ + 'numeric' => 'Полето :attribute трябва да бъде по-малко от :max.', + 'file' => 'Полето :attribute трябва да бъде по-малко от :max килобайта.', + 'string' => 'Полето :attribute трябва да бъде по-малко от :max знака.', + 'array' => 'Полето :attribute трябва да има по-малко от :max елемента.', + ], + 'mimes' => 'Полето :attribute трябва да бъде файл от тип: :values.', + 'mimetypes' => 'Полето :attribute трябва да бъде файл от тип: :values.', + 'min' => [ + 'numeric' => 'Полето :attribute трябва да бъде минимум :min.', + 'file' => 'Полето :attribute трябва да бъде минимум :min килобайта.', + 'string' => 'Полето :attribute трябва да бъде минимум :min знака.', + 'array' => 'Полето :attribute трябва има минимум :min елемента.', + ], + 'not_in' => 'Избраното поле :attribute е невалидно.', + 'numeric' => 'Полето :attribute трябва да бъде число.', + 'present' => 'Полето :attribute трябва да съествува.', + 'regex' => 'Полето :attribute е в невалиден формат.', + 'required' => 'Полето :attribute е задължително.', + 'required_if' => 'Полето :attribute се изисква, когато :other е :value.', + 'required_unless' => 'Полето :attribute е задължително освен ако :other е в :values.', + 'required_with' => 'Полето :attribute се изисква, когато :values има стойност.', + 'required_with_all' => 'Полето :attribute е задължително, когато :values имат стойност.', + 'required_without' => 'Полето :attribute се изисква, когато :values няма стойност.', + 'required_without_all' => 'Полето :attribute се изисква, когато никое от полетата :values няма стойност.', + 'same' => 'Полетата :attribute и :other трябва да съвпадат.', + 'size' => [ + 'numeric' => 'Полето :attribute трябва да бъде :size.', + 'file' => 'Полето :attribute трябва да бъде :size килобайта.', + 'string' => 'Полето :attribute трябва да бъде :size знака.', + 'array' => 'Полето :attribute трябва да има :size елемента.', + ], + 'string' => 'Полето :attribute трябва да бъде знаков низ.', + 'timezone' => 'Полето :attribute трябва да съдържа валидна часова зона.', + 'unique' => 'Полето :attribute вече съществува.', + 'uploaded' => 'Неуспешно качване на :attribute.', + 'url' => 'Полето :attribute е в невалиден формат.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'custom-message', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + +]; From c6df7e68454f3ea221cf6562a882d2b84c97b80b Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 14 Apr 2018 10:36:26 +0300 Subject: [PATCH 25/94] fixed bootstrap 3 print issue #293 --- public/css/bootstrap3-print-fix.css | 193 ++++++++++++++++++ resources/lang/en-GB/reports.php | 1 - resources/views/layouts/print.blade.php | 5 + .../views/reports/profit_loss/body.blade.php | 30 +-- 4 files changed, 213 insertions(+), 16 deletions(-) create mode 100644 public/css/bootstrap3-print-fix.css diff --git a/public/css/bootstrap3-print-fix.css b/public/css/bootstrap3-print-fix.css new file mode 100644 index 000000000..ecc5a59f9 --- /dev/null +++ b/public/css/bootstrap3-print-fix.css @@ -0,0 +1,193 @@ +@media print { + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + float: left; + } + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666667%; + } + .col-sm-10 { + width: 83.33333333%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666667%; + } + .col-sm-7 { + width: 58.33333333%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666667%; + } + .col-sm-4 { + width: 33.33333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.66666667%; + } + .col-sm-1 { + width: 8.33333333%; + } + .col-sm-pull-12 { + right: 100%; + } + .col-sm-pull-11 { + right: 91.66666667%; + } + .col-sm-pull-10 { + right: 83.33333333%; + } + .col-sm-pull-9 { + right: 75%; + } + .col-sm-pull-8 { + right: 66.66666667%; + } + .col-sm-pull-7 { + right: 58.33333333%; + } + .col-sm-pull-6 { + right: 50%; + } + .col-sm-pull-5 { + right: 41.66666667%; + } + .col-sm-pull-4 { + right: 33.33333333%; + } + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-2 { + right: 16.66666667%; + } + .col-sm-pull-1 { + right: 8.33333333%; + } + .col-sm-pull-0 { + right: auto; + } + .col-sm-push-12 { + left: 100%; + } + .col-sm-push-11 { + left: 91.66666667%; + } + .col-sm-push-10 { + left: 83.33333333%; + } + .col-sm-push-9 { + left: 75%; + } + .col-sm-push-8 { + left: 66.66666667%; + } + .col-sm-push-7 { + left: 58.33333333%; + } + .col-sm-push-6 { + left: 50%; + } + .col-sm-push-5 { + left: 41.66666667%; + } + .col-sm-push-4 { + left: 33.33333333%; + } + .col-sm-push-3 { + left: 25%; + } + .col-sm-push-2 { + left: 16.66666667%; + } + .col-sm-push-1 { + left: 8.33333333%; + } + .col-sm-push-0 { + left: auto; + } + .col-sm-offset-12 { + margin-left: 100%; + } + .col-sm-offset-11 { + margin-left: 91.66666667%; + } + .col-sm-offset-10 { + margin-left: 83.33333333%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-8 { + margin-left: 66.66666667%; + } + .col-sm-offset-7 { + margin-left: 58.33333333%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-5 { + margin-left: 41.66666667%; + } + .col-sm-offset-4 { + margin-left: 33.33333333%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-2 { + margin-left: 16.66666667%; + } + .col-sm-offset-1 { + margin-left: 8.33333333%; + } + .col-sm-offset-0 { + margin-left: 0%; + } + .visible-xs { + display: none !important; + } + .hidden-xs { + display: block !important; + } + table.hidden-xs { + display: table; + } + tr.hidden-xs { + display: table-row !important; + } + th.hidden-xs, + td.hidden-xs { + display: table-cell !important; + } + .hidden-xs.hidden-print { + display: none !important; + } + .hidden-sm { + display: none !important; + } + .visible-sm { + display: block !important; + } + table.visible-sm { + display: table; + } + tr.visible-sm { + display: table-row !important; + } + th.visible-sm, + td.visible-sm { + display: table-cell !important; + } +} \ No newline at end of file diff --git a/resources/lang/en-GB/reports.php b/resources/lang/en-GB/reports.php index 5f7139878..a0e8c53e0 100644 --- a/resources/lang/en-GB/reports.php +++ b/resources/lang/en-GB/reports.php @@ -10,7 +10,6 @@ return [ 'profit_loss' => 'Profit & Loss', 'gross_profit' => 'Gross Profit', 'net_profit' => 'Net Profit', - 'less_expenses' => 'Less Expenses', 'total_expenses' => 'Total Expenses', 'summary' => [ diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index 6b213602e..9530c04ac 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -1,6 +1,11 @@ @include('partials.admin.head') + @push('css') + + + @endpush + @yield('content') diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index 5df908562..6e76cc33b 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -3,34 +3,34 @@
      {{ trans('reports.less_expenses') }}
      {{ trans('reports.less_expenses') }}
      {{ $expense_categories[$category_id] }}{{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)
      {{ trans('reports.total_expenses') }}{{ trans('reports.total_expenses') }}@money($item, setting('general.default_currency'), true)
      - + @foreach($dates as $date) - + @endforeach - +
        {{ trans('reports.quarter.' . $date) }}{{ trans('reports.quarter.' . $date) }}{{ trans_choice('general.totals', 1) }}{{ trans_choice('general.totals', 1) }}
      - + @foreach($compares['income'] as $category_id => $category) - + @foreach($category as $i => $item) @php $gross['income'][$i] += $item['amount']; @endphp - + @endforeach @endforeach - + @foreach($gross['income'] as $item) - + @endforeach @@ -38,23 +38,23 @@
      {{ trans_choice('general.incomes', 1) }}{{ trans_choice('general.incomes', 1) }}
      {{ $income_categories[$category_id] }}{{ $income_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)@money($item['amount'], $item['currency_code'], true)
      {{ trans('reports.gross_profit') }}{{ trans('reports.gross_profit') }}@money($item, setting('general.default_currency'), true)@money($item, setting('general.default_currency'), true)
      - + @foreach($compares['expense'] as $category_id => $category) - + @foreach($category as $i => $item) @php $gross['expense'][$i] += $item['amount']; @endphp - + @endforeach @endforeach - + @foreach($gross['expense'] as $item) - + @endforeach @@ -62,9 +62,9 @@
      {{ trans('reports.less_expenses') }}{{ trans_choice('general.expenses', 2) }}
      {{ $expense_categories[$category_id] }}{{ $expense_categories[$category_id] }}@money($item['amount'], $item['currency_code'], true)@money($item['amount'], $item['currency_code'], true)
      {{ trans('reports.total_expenses') }}{{ trans('reports.total_expenses') }}@money($item, setting('general.default_currency'), true)@money($item, setting('general.default_currency'), true)
      - + @foreach($totals as $total) - + @endforeach From 47826e15f4d11282ddb6400885d6fbdfbc82b42f Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 14 Apr 2018 12:26:50 +0300 Subject: [PATCH 26/94] fixed language override --- app/Overrides/Illuminate/MessageSelector.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/Overrides/Illuminate/MessageSelector.php b/app/Overrides/Illuminate/MessageSelector.php index d6a91c463..31cbc1f65 100644 --- a/app/Overrides/Illuminate/MessageSelector.php +++ b/app/Overrides/Illuminate/MessageSelector.php @@ -116,6 +116,7 @@ class MessageSelector case 'bo': case 'dz': case 'id': + case 'id-ID': case 'ja': case 'jv': case 'ka': @@ -126,14 +127,18 @@ class MessageSelector case 'th': case 'tr': case 'vi': + case 'vi-VN': case 'zh': + case 'zh-TW': return 0; break; case 'af': case 'bn': case 'bg': + case 'bg-BG': case 'ca': case 'da': + case 'da-DK': case 'de': case 'de-DE': case 'el': @@ -145,6 +150,7 @@ class MessageSelector case 'eo': case 'es': case 'es-ES': + case 'es-MX': case 'et': case 'eu': case 'fa': @@ -167,8 +173,10 @@ class MessageSelector case 'mr': case 'nah': case 'nb': + case 'nb-NO': case 'ne': case 'nl': + case 'nl-NL': case 'nn': case 'no': case 'om': @@ -179,7 +187,9 @@ class MessageSelector case 'pt': case 'so': case 'sq': + case 'sq-AL': case 'sv': + case 'sv-SE': case 'sw': case 'ta': case 'te': @@ -207,11 +217,14 @@ class MessageSelector case 'be': case 'bs': case 'hr': + case 'hr-HR': case 'ru': + case 'ru-RU': case 'sr': case 'uk': return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2); case 'cs': + case 'cs-CZ': case 'sk': return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2); case 'ga': @@ -233,6 +246,7 @@ class MessageSelector case 'ro': return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2); case 'ar': + case 'ar-SA': return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5)))); default: return 0; From 2baed1e322234feaae106b9a4032ee433cd197ba Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 14 Apr 2018 14:16:03 +0300 Subject: [PATCH 27/94] da-DK translation --- config/language.php | 2 +- resources/lang/da-DK/accounts.php | 14 ++++ resources/lang/da-DK/auth.php | 30 +++++++ resources/lang/da-DK/bills.php | 41 ++++++++++ resources/lang/da-DK/companies.php | 13 +++ resources/lang/da-DK/currencies.php | 18 +++++ resources/lang/da-DK/customers.php | 11 +++ resources/lang/da-DK/dashboard.php | 24 ++++++ resources/lang/da-DK/demo.php | 17 ++++ resources/lang/da-DK/footer.php | 9 +++ resources/lang/da-DK/general.php | 116 +++++++++++++++++++++++++++ resources/lang/da-DK/header.php | 15 ++++ resources/lang/da-DK/import.php | 9 +++ resources/lang/da-DK/install.php | 44 ++++++++++ resources/lang/da-DK/invoices.php | 50 ++++++++++++ resources/lang/da-DK/items.php | 15 ++++ resources/lang/da-DK/messages.php | 23 ++++++ resources/lang/da-DK/modules.php | 47 +++++++++++ resources/lang/da-DK/pagination.php | 9 +++ resources/lang/da-DK/passwords.php | 22 +++++ resources/lang/da-DK/reports.php | 17 ++++ resources/lang/da-DK/settings.php | 85 ++++++++++++++++++++ resources/lang/da-DK/taxes.php | 8 ++ resources/lang/da-DK/transfers.php | 8 ++ resources/lang/da-DK/updates.php | 15 ++++ resources/lang/da-DK/validation.php | 119 ++++++++++++++++++++++++++++ 26 files changed, 780 insertions(+), 1 deletion(-) create mode 100644 resources/lang/da-DK/accounts.php create mode 100644 resources/lang/da-DK/auth.php create mode 100644 resources/lang/da-DK/bills.php create mode 100644 resources/lang/da-DK/companies.php create mode 100644 resources/lang/da-DK/currencies.php create mode 100644 resources/lang/da-DK/customers.php create mode 100644 resources/lang/da-DK/dashboard.php create mode 100644 resources/lang/da-DK/demo.php create mode 100644 resources/lang/da-DK/footer.php create mode 100644 resources/lang/da-DK/general.php create mode 100644 resources/lang/da-DK/header.php create mode 100644 resources/lang/da-DK/import.php create mode 100644 resources/lang/da-DK/install.php create mode 100644 resources/lang/da-DK/invoices.php create mode 100644 resources/lang/da-DK/items.php create mode 100644 resources/lang/da-DK/messages.php create mode 100644 resources/lang/da-DK/modules.php create mode 100644 resources/lang/da-DK/pagination.php create mode 100644 resources/lang/da-DK/passwords.php create mode 100644 resources/lang/da-DK/reports.php create mode 100644 resources/lang/da-DK/settings.php create mode 100644 resources/lang/da-DK/taxes.php create mode 100644 resources/lang/da-DK/transfers.php create mode 100644 resources/lang/da-DK/updates.php create mode 100644 resources/lang/da-DK/validation.php diff --git a/config/language.php b/config/language.php index b971ef4ce..37db73ace 100644 --- a/config/language.php +++ b/config/language.php @@ -115,7 +115,7 @@ return [ | */ - 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'de-DE', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], + 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], /* |-------------------------------------------------------------------------- diff --git a/resources/lang/da-DK/accounts.php b/resources/lang/da-DK/accounts.php new file mode 100644 index 000000000..afe6adc5d --- /dev/null +++ b/resources/lang/da-DK/accounts.php @@ -0,0 +1,14 @@ + 'Kontonavn', + 'number' => 'Nummer', + 'opening_balance' => 'Åbningsbalancen', + 'current_balance' => 'Nuværende saldo', + 'bank_name' => 'Banknavn', + 'bank_phone' => 'Telefon nr. til bank', + 'bank_address' => 'Bank adresse', + 'default_account' => 'Standard konto', + +]; diff --git a/resources/lang/da-DK/auth.php b/resources/lang/da-DK/auth.php new file mode 100644 index 000000000..f6745d3ee --- /dev/null +++ b/resources/lang/da-DK/auth.php @@ -0,0 +1,30 @@ + 'Profil', + 'logout' => 'Log ud', + 'login' => 'Log ind', + 'login_to' => 'Log ind for at starte din session', + 'remember_me' => 'Husk mig', + 'forgot_password' => 'Jeg har glemt min adgangskode', + 'reset_password' => 'Nulstil adgangskode', + 'enter_email' => 'Indtast din mailadresse', + 'current_email' => 'Nuværende E-mail', + 'reset' => 'Nulstil', + 'never' => 'aldrig', + 'password' => [ + 'current' => 'Adgangskode', + 'current_confirm' => 'Bekræft adgangskode', + 'new' => 'Ny adgangskode', + 'new_confirm' => 'Bekræftelse af ny adgangskode', + ], + 'error' => [ + 'self_delete' => 'Fejl: du Kan ikke slette dig selv!' + ], + + 'failed' => 'Disse legitimationsoplysninger passer ikke i vores database.', + 'disabled' => 'Denne konto er deaktiveret. Kontakt systemadministratoren.', + 'throttle' => 'For mange login forsøg. Prøv igen i :seconds sekunder.', + +]; diff --git a/resources/lang/da-DK/bills.php b/resources/lang/da-DK/bills.php new file mode 100644 index 000000000..cfa9b84c2 --- /dev/null +++ b/resources/lang/da-DK/bills.php @@ -0,0 +1,41 @@ + 'Faktura nummer', + 'bill_date' => 'Faktura dato', + 'total_price' => 'Total pris', + 'due_date' => 'Forfaldsdato', + 'order_number' => 'Ordrenummer', + 'bill_from' => 'Faktura fra', + + 'quantity' => 'Antal', + 'price' => 'Pris', + 'sub_total' => 'Subtotal', + 'tax_total' => 'Moms i alt', + 'total' => 'I alt', + + 'item_name' => 'Punkt navn | Varenavne', + + 'payment_due' => 'Betalingsfrist', + 'amount_due' => 'Forfaldent beløb', + 'paid' => 'Betalt', + 'histories' => 'Historik', + 'payments' => 'Betalinger', + 'add_payment' => 'Tilføj betaling', + 'mark_received' => 'Modtagelse godkendt', + 'download_pdf' => 'Download som PDF', + 'send_mail' => 'Send e-mail', + + 'status' => [ + 'draft' => 'Udkast', + 'received' => 'Modtaget', + 'partial' => 'Delvis', + 'paid' => 'Betalt', + ], + + 'messages' => [ + 'received' => 'Regning registreret som modtaget!', + ], + +]; diff --git a/resources/lang/da-DK/companies.php b/resources/lang/da-DK/companies.php new file mode 100644 index 000000000..7128209b2 --- /dev/null +++ b/resources/lang/da-DK/companies.php @@ -0,0 +1,13 @@ + 'Domæne', + 'logo' => 'Logo', + 'manage' => 'Administrer virksomheder', + 'all' => 'Alle virksomheder', + 'error' => [ + 'delete_active' => 'Fejl: Kan ikke slette aktiv virksomhed! ændre dette først!', + ], + +]; diff --git a/resources/lang/da-DK/currencies.php b/resources/lang/da-DK/currencies.php new file mode 100644 index 000000000..20e6d4616 --- /dev/null +++ b/resources/lang/da-DK/currencies.php @@ -0,0 +1,18 @@ + 'Kode', + 'rate' => 'Sats', + 'default' => 'Standardvaluta', + 'decimal_mark' => 'Decimalseparator', + 'thousands_separator' => 'Tusinder Separator', + 'precision' => 'Præcision', + 'symbol' => [ + 'symbol' => 'Symbol', + 'position' => 'Symbol Position', + 'before' => 'Før beløbet', + 'after' => 'Efter beløb', + ] + +]; diff --git a/resources/lang/da-DK/customers.php b/resources/lang/da-DK/customers.php new file mode 100644 index 000000000..17c37f67f --- /dev/null +++ b/resources/lang/da-DK/customers.php @@ -0,0 +1,11 @@ + 'Tillad login?', + 'user_created' => 'Bruger oprettet', + + 'error' => [ + 'email' => 'Denne mail er allerede registreret.' + ] +]; diff --git a/resources/lang/da-DK/dashboard.php b/resources/lang/da-DK/dashboard.php new file mode 100644 index 000000000..ced8365bb --- /dev/null +++ b/resources/lang/da-DK/dashboard.php @@ -0,0 +1,24 @@ + 'Samlede indkomster', + 'receivables' => 'Tilgodehavender', + 'open_invoices' => 'Åbne fakturaer', + 'overdue_invoices' => 'Forfaldne fakturaer', + 'total_expenses' => 'Udgifter i alt', + 'payables' => 'Kreditorstyring', + 'open_bills' => 'Åben regninger', + 'overdue_bills' => 'Forfaldne regninger', + 'total_profit' => 'Samlet overskud', + 'open_profit' => 'Kommende overskud', + 'overdue_profit' => 'Forfalden overskud', + 'cash_flow' => 'Pengestrøm', + 'no_profit_loss' => 'Ingen fortjeneste eller tab', + 'incomes_by_category' => 'Indkomst efter kategori', + 'expenses_by_category' => 'Udgifter efter kategori', + 'account_balance' => 'Saldo', + 'latest_incomes' => 'Seneste indkomster', + 'latest_expenses' => 'Seneste udgifter', + +]; diff --git a/resources/lang/da-DK/demo.php b/resources/lang/da-DK/demo.php new file mode 100644 index 000000000..fc76d6bea --- /dev/null +++ b/resources/lang/da-DK/demo.php @@ -0,0 +1,17 @@ + 'Kontant', + 'categories_uncat' => 'Ikke kategoriseret', + 'categories_deposit' => 'Indsæt', + 'categories_sales' => 'Salg', + 'currencies_usd' => 'Amerikanske Dollar', + 'currencies_eur' => 'Euro', + 'currencies_gbp' => 'Britiske pund', + 'currencies_try' => 'Tyrkiske Lira', + 'taxes_exempt' => 'Fritaget for moms', + 'taxes_normal' => 'Normal moms', + 'taxes_sales' => 'Salgs moms', + +]; diff --git a/resources/lang/da-DK/footer.php b/resources/lang/da-DK/footer.php new file mode 100644 index 000000000..e0d7d48c2 --- /dev/null +++ b/resources/lang/da-DK/footer.php @@ -0,0 +1,9 @@ + 'Version', + 'powered' => 'Drevet af Akaunting', + 'software' => 'Gratis regnskabs Software', + +]; diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php new file mode 100644 index 000000000..c1897c46d --- /dev/null +++ b/resources/lang/da-DK/general.php @@ -0,0 +1,116 @@ + 'Vare|Elementer', + 'incomes' => 'Indkomst|Indkomster', + 'invoices' => 'Faktura|Fakturaer', + 'revenues' => 'Indtægt|Indtægter', + 'customers' => 'Kunde|Kunder', + 'expenses' => 'Udgift|Udgifter', + 'bills' => 'Regning|Regninger', + 'payments' => 'Betaling|Betalinger', + 'vendors' => 'Kreditor|Kreditorer', + 'accounts' => 'Konto|Konti', + 'transfers' => 'Overføre|Overførsler', + 'transactions' => 'Transaktion|Transaktioner', + 'reports' => 'Rapport|Rapporter', + 'settings' => 'Indstilling|Indstillinger', + 'categories' => 'Kategori|Kategorier', + 'currencies' => 'Valuta|Valutaer', + 'tax_rates' => 'Momssats|Momssatser', + 'users' => 'Bruger|Brugere', + 'roles' => 'Rolle|Roller', + 'permissions' => 'Tilladelse|Tilladelser', + 'modules' => 'App|Apps', + 'companies' => 'Virksomhed|Virksomheder', + 'profits' => 'Overskud|Overskud', + 'taxes' => 'Moms|Moms', + 'logos' => 'Logo|Logoer', + 'pictures' => 'Billede|Billeder', + 'types' => 'Type|Typer', + 'payment_methods' => 'Betalingsmetode|Betalingsmetoder', + 'compares' => 'Indkomst vs Udgifter|Indkomster vs Udgifter', + 'notes' => 'Note|Noter', + 'totals' => 'Total|Totaler', + 'languages' => 'Sprog|Sprog', + 'updates' => 'Opdatering|Opdateringer', + 'numbers' => 'Nummer|Numre', + 'statuses' => 'Status|Statusser', + + 'dashboard' => 'Oversigt', + 'banking' => 'Bank', + 'general' => 'Generelt', + 'no_records' => 'Ingen poster', + 'date' => 'Dato', + 'amount' => 'Beløb', + 'enabled' => 'Aktiveret', + 'disabled' => 'Deaktiveret', + 'yes' => 'Ja', + 'no' => 'Nej', + 'na' => 'Ikke tilgængeligt', + 'daily' => 'Dagligt', + 'monthly' => 'Månedlig', + 'quarterly' => 'Kvartalsvis', + 'yearly' => 'Årlig', + 'add' => 'Tilføj', + 'add_new' => 'Tilføj ny', + 'show' => 'Vis', + 'edit' => 'Rediger', + 'delete' => 'Slet', + 'send' => 'Send', + 'download' => 'Download', + 'delete_confirm' => 'Bekræft sletning :name :type?', + 'name' => 'Navn', + 'email' => 'E-mail', + 'tax_number' => 'Moms nummer', + 'phone' => 'Telefon', + 'address' => 'Adresse', + 'website' => 'Hjemmeside', + 'actions' => 'Handlinger:', + 'description' => 'Beskrivelse', + 'manage' => 'Administrér', + 'code' => 'Kode', + 'alias' => 'Alias', + 'balance' => 'Balance', + 'reference' => 'Reference', + 'attachment' => 'Bilag', + 'change' => 'Ændre', + 'switch' => 'Skift', + 'color' => 'Farve', + 'save' => 'Gem', + 'cancel' => 'Annullér', + 'from' => 'Fra:', + 'to' => 'Til', + 'print' => 'Udskriv', + 'search' => 'Søg', + 'search_placeholder' => 'Skriv for at søge..', + 'filter' => 'Filter', + 'help' => 'Hjælp!', + 'all' => 'Alt', + 'all_type' => 'Alle :type', + 'upcoming' => 'Kommende', + 'created' => 'Oprettet', + 'id' => 'ID', + 'more_actions' => 'Flere handlinger', + 'duplicate' => 'Dublet', + 'unpaid' => 'Ikke betalt', + 'paid' => 'Betalt', + 'overdue' => 'Forfalden', + 'partially' => 'Delvist', + 'partially_paid' => 'Delvist betalt', + + 'title' => [ + 'new' => 'Ny :type', + 'edit' => 'Rediger :type', + ], + 'form' => [ + 'enter' => 'Indtast: :field', + 'select' => [ + 'field' => '- Vælg :field -', + 'file' => 'Vælg fil', + ], + 'no_file_selected' => 'Ingen fil valgt...', + ], + +]; diff --git a/resources/lang/da-DK/header.php b/resources/lang/da-DK/header.php new file mode 100644 index 000000000..16cd4bc74 --- /dev/null +++ b/resources/lang/da-DK/header.php @@ -0,0 +1,15 @@ + 'Skift sprog', + 'last_login' => 'Sidste login :time', + 'notifications' => [ + 'counter' => '{0} du har ingen notifikationer|{1} du har :count notifikationer|[2, *] Du har :count notifikationer', + 'overdue_invoices' => '{1} :count forfalden regning|[2,*] :count forfaldne regninger', + 'upcoming_bills' => '{1} :count kommende regning|[2,*] :count kommende regninger', + 'items_stock' => '{1} :count vare ikke på lager|[2,*] :count varer ikke på lager', + 'view_all' => 'Vis alle' + ], + +]; diff --git a/resources/lang/da-DK/import.php b/resources/lang/da-DK/import.php new file mode 100644 index 000000000..4762e2e1c --- /dev/null +++ b/resources/lang/da-DK/import.php @@ -0,0 +1,9 @@ + 'Importer', + 'title' => 'Import :type', + 'message' => 'Tilladte filtyper: CSV, XLS. Venligst, download eksempelfilen.', + +]; diff --git a/resources/lang/da-DK/install.php b/resources/lang/da-DK/install.php new file mode 100644 index 000000000..7451d1978 --- /dev/null +++ b/resources/lang/da-DK/install.php @@ -0,0 +1,44 @@ + 'Næste', + 'refresh' => 'Opdatér', + + 'steps' => [ + 'requirements' => 'Venligst, opfyld følgende krav!', + 'language' => 'Trin 1/3: Valg af sprog', + 'database' => 'Trin 2/3: Database opsætning', + 'settings' => 'Trin 3/3: Virksomhed og Admin detaljer', + ], + + 'language' => [ + 'select' => 'Vælg sprog', + ], + + 'requirements' => [ + 'enabled' => ':feature skal være aktiveret!', + 'disabled' => ':feature skal være deaktiveret!', + 'extension' => ':extension udvidelse skal være indlæst!', + 'directory' => ':directory folderen skal være skrivbar!', + ], + + 'database' => [ + 'hostname' => 'Hostnavn', + 'username' => 'Brugernavn', + 'password' => 'Adgangskode', + 'name' => 'Database', + ], + + 'settings' => [ + 'company_name' => 'Firmanavn', + 'company_email' => 'Firma E-mail', + 'admin_email' => 'Administrator e-mail', + 'admin_password' => 'Admin Password', + ], + + 'error' => [ + 'connection' => 'Error: Kunne ikke forbinde til databasen! Kontroller, at oplysningerne er korrekte.', + ], + +]; diff --git a/resources/lang/da-DK/invoices.php b/resources/lang/da-DK/invoices.php new file mode 100644 index 000000000..ecb3e2701 --- /dev/null +++ b/resources/lang/da-DK/invoices.php @@ -0,0 +1,50 @@ + 'Faktura nummer', + 'invoice_date' => 'Faktura dato', + 'total_price' => 'Total pris', + 'due_date' => 'Forfaldsdato', + 'order_number' => 'Ordrenummer', + 'bill_to' => 'Faktura til', + + 'quantity' => 'Antal', + 'price' => 'Pris', + 'sub_total' => 'Subtotal', + 'tax_total' => 'Moms i alt', + 'total' => 'I alt', + + 'item_name' => 'Vare navn|Vare navne', + + 'payment_due' => 'Betalingsfrist', + 'paid' => 'Betalt', + 'histories' => 'Historik', + 'payments' => 'Betalinger', + 'add_payment' => 'Tilføj betaling', + 'mark_paid' => 'Marker som betalt', + 'mark_sent' => 'Marker som sendt', + 'download_pdf' => 'Download som PDF', + 'send_mail' => 'Send e-mail', + + 'status' => [ + 'draft' => 'Kladde', + 'sent' => 'Sendt', + 'viewed' => 'Vist', + 'approved' => 'Godkendt', + 'partial' => 'Delvist', + 'paid' => 'Betalt', + ], + + 'messages' => [ + 'email_sent' => 'E-maiil med faktura er afsendt!', + 'marked_sent' => 'Faktura markeret som sendt!', + 'email_required' => 'Ingen e-mail-adresse for denne kunde!', + ], + + 'notification' => [ + 'message' => 'Du modtager denne e-mail, fordi du har en faktura på :amount til :customer kunde.', + 'button' => 'Betal nu', + ], + +]; diff --git a/resources/lang/da-DK/items.php b/resources/lang/da-DK/items.php new file mode 100644 index 000000000..612773e62 --- /dev/null +++ b/resources/lang/da-DK/items.php @@ -0,0 +1,15 @@ + 'Mængde|Mængder', + 'sales_price' => 'Salgspris', + 'purchase_price' => 'Købspris', + 'sku' => 'Varenummer', + + 'notification' => [ + 'message' => 'Du modtager denne e-mail, fordi følgende vare snart ikke er på lager længere. :name.', + 'button' => 'Vis nu', + ], + +]; diff --git a/resources/lang/da-DK/messages.php b/resources/lang/da-DK/messages.php new file mode 100644 index 000000000..723f869eb --- /dev/null +++ b/resources/lang/da-DK/messages.php @@ -0,0 +1,23 @@ + [ + 'added' => ':type tilføjet!', + 'updated' => ':type opdateret!', + 'deleted' => ':type slettet!', + 'duplicated' => ':type duplikeret!', + 'imported' => ':type importeret!', + ], + 'error' => [ + 'over_payment' => 'Fejl: Betaling ikke tilføjet! Beløbet overskrider total porisen.', + 'not_user_company' => 'Fejl: Du har ikke tilladelse til at kontrollere denne virksomhed!', + 'customer' => 'Fejl: Brugeren ikke oprettet! :name bruger allerede denne e-mail.', + 'no_file' => 'Fejl: Ingen fil valgt!', + ], + 'warning' => [ + 'deleted' => 'Advarsel: Du har ikke tilladelse tiil at slette :name fordi den er :text relateret.', + 'disabled' => 'Advarsel: Du har ikke tilladelse tiil at deaktivere :name fordi den er :text relateret.', + ], + +]; diff --git a/resources/lang/da-DK/modules.php b/resources/lang/da-DK/modules.php new file mode 100644 index 000000000..2119497e5 --- /dev/null +++ b/resources/lang/da-DK/modules.php @@ -0,0 +1,47 @@ + 'API Token', + 'api_token' => 'Token', + 'top_paid' => 'Top betalt', + 'new' => 'Ny', + 'top_free' => 'Top gratis', + 'free' => 'GRATIS', + 'install' => 'Installer', + 'buy_now' => 'Køb nu', + 'token_link' => 'Klik her for at få din API-token.', + 'no_apps' => 'Der er ingen apps i denne kategori endnu.', + 'developer' => 'Er du udvikler? her kan du lære hvordan du opretter en app og begynde at sælge i dag!', + + 'about' => 'Om', + + 'added' => 'Tilføjet', + 'updated' => 'Opdateret', + 'compatibility' => 'Kompatibilitet', + + 'installed' => ':module installeret', + 'uninstalled' => ':module afinstalleret', + //'updated' => ':module updated', + 'enabled' => ':module aktiveret', + 'disabled' => ':module deaktiveret', + + 'tab' => [ + 'installation' => 'Installation', + 'faq' => 'FAQ', + 'changelog' => 'Ændringslog', + ], + + 'installation' => [ + 'header' => 'App installation', + 'download' => 'Downloading :modul filen.', + 'unzip' => 'Udpakker :module filer.', + 'install' => 'Installere :module filer.', + ], + + 'button' => [ + 'uninstall' => 'Afinstaller', + 'disable' => 'Deaktiver', + 'enable' => 'Aktivér', + ], +]; diff --git a/resources/lang/da-DK/pagination.php b/resources/lang/da-DK/pagination.php new file mode 100644 index 000000000..bae42ea25 --- /dev/null +++ b/resources/lang/da-DK/pagination.php @@ -0,0 +1,9 @@ + '« Forrige', + 'next' => 'Næste »', + 'showing' => 'Viser :first til :last af :total :type', + +]; diff --git a/resources/lang/da-DK/passwords.php b/resources/lang/da-DK/passwords.php new file mode 100644 index 000000000..91a810f26 --- /dev/null +++ b/resources/lang/da-DK/passwords.php @@ -0,0 +1,22 @@ + 'Adgangskoder skal være mindst 6 tegn og matche.', + 'reset' => 'Din adgangskode er blevet nulstillet!', + 'sent' => 'Vi har sendt dig en e-mail med reset password link!', + 'token' => 'Denne adgangskodes nulstillings token er ugyldig.', + 'user' => "Vi kan ikke finde en bruger med den e-mail adresse.", + +]; diff --git a/resources/lang/da-DK/reports.php b/resources/lang/da-DK/reports.php new file mode 100644 index 000000000..930b6eaf3 --- /dev/null +++ b/resources/lang/da-DK/reports.php @@ -0,0 +1,17 @@ + 'Dette år', + 'previous_year' => 'Forrige år', + 'this_quarter' => 'Dette kvartal', + 'previous_quarter' => 'Foregående kvartal', + 'last_12_months' => 'Seneste 12 måneder', + + 'summary' => [ + 'income' => 'Indkomst Resumé', + 'expense' => 'Udgift Resumé', + 'income_expense' => 'Indkomst vs udgift', + ], + +]; diff --git a/resources/lang/da-DK/settings.php b/resources/lang/da-DK/settings.php new file mode 100644 index 000000000..ba3a42878 --- /dev/null +++ b/resources/lang/da-DK/settings.php @@ -0,0 +1,85 @@ + [ + 'name' => 'Navn', + 'email' => 'E-mail', + 'phone' => 'Telefon', + 'address' => 'Adresse', + 'logo' => 'Logo', + ], + 'localisation' => [ + 'tab' => 'Lokalisering', + 'date' => [ + 'format' => 'Datoformat', + 'separator' => 'Datoseparator', + 'dash' => 'Bindestreg (-)', + 'dot' => 'Punktum (.)', + 'comma' => 'Komma (,)', + 'slash' => 'Skråstreg (/)', + 'space' => 'Mellemrum ( )', + ], + 'timezone' => 'Tidszone', + ], + 'invoice' => [ + 'tab' => 'Faktura', + 'prefix' => 'Nummerpræfiks', + 'digit' => 'Antal cifre', + 'next' => 'Næste nummer', + 'logo' => 'Logo', + ], + 'default' => [ + 'tab' => 'Standarder', + 'account' => 'Standard konto', + 'currency' => 'Standardvaluta', + 'tax' => 'Standard moms procent', + 'payment' => 'Standardbetalingsmetode', + 'language' => 'Standardsprog', + ], + 'email' => [ + 'protocol' => 'Protokol', + 'php' => 'PHP mail', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'SMTP Host', + 'port' => 'SMTP Port', + 'username' => 'SMTP Brugernavn', + 'password' => 'SMTP adgangskode', + 'encryption' => 'SMTP sikkerhed', + 'none' => 'Ingen', + ], + 'sendmail' => 'Sendmail', + 'sendmail_path' => 'Sendmail sti', + 'log' => 'Log E-mails', + ], + 'scheduling' => [ + 'tab' => 'Planlægger', + 'send_invoice' => 'Send faktura påmindelse', + 'invoice_days' => 'Send efter forfalds dato', + 'send_bill' => 'Send regningens påmindelse', + 'bill_days' => 'Send før forfalds dage', + 'cron_command' => 'Cron kommando', + 'schedule_time' => 'Timer at køre', + ], + 'appearance' => [ + 'tab' => 'Udseende', + 'theme' => 'Theme', + 'light' => 'Lys', + 'dark' => 'Mørk', + 'list_limit' => 'Poster pr. side', + 'use_gravatar' => 'Bruge Gravatar', + ], + 'system' => [ + 'tab' => 'System', + 'session' => [ + 'lifetime' => 'Session levetid (minutter)', + 'handler' => 'Sessionsbehandler', + 'file' => 'Fil', + 'database' => 'Database', + ], + 'file_size' => 'Maximum filstørrelse (MB)', + 'file_types' => 'Tilladte filtyper', + ], + +]; diff --git a/resources/lang/da-DK/taxes.php b/resources/lang/da-DK/taxes.php new file mode 100644 index 000000000..0ff1ac99f --- /dev/null +++ b/resources/lang/da-DK/taxes.php @@ -0,0 +1,8 @@ + 'Sats', + 'rate_percent' => 'Sats (%)', + +]; diff --git a/resources/lang/da-DK/transfers.php b/resources/lang/da-DK/transfers.php new file mode 100644 index 000000000..5de0931a4 --- /dev/null +++ b/resources/lang/da-DK/transfers.php @@ -0,0 +1,8 @@ + 'Fra konto', + 'to_account' => 'Til konto', + +]; diff --git a/resources/lang/da-DK/updates.php b/resources/lang/da-DK/updates.php new file mode 100644 index 000000000..d8b0f33b5 --- /dev/null +++ b/resources/lang/da-DK/updates.php @@ -0,0 +1,15 @@ + 'Installeret version', + 'latest_version' => 'Seneste version', + 'update' => 'Opdatere Akaunting til :version version', + 'changelog' => 'Ændringslog', + 'check' => 'Kontrollér', + 'new_core' => 'Der findes en opdateret version af Akaunting.', + 'latest_core' => 'Tillykke! Du har nu den nyeste version af Akaunting. Fremtidige sikkerhedsopdateringer installeres automatisk.', + 'success' => 'Opdateringen er gennemført.', + 'error' => 'Opdateringen er fejlet, prøv igen.', + +]; diff --git a/resources/lang/da-DK/validation.php b/resources/lang/da-DK/validation.php new file mode 100644 index 000000000..c851a4afc --- /dev/null +++ b/resources/lang/da-DK/validation.php @@ -0,0 +1,119 @@ + ':attribute skal være accepteret.', + 'active_url' => ':attribute er ikke en gyldig URL.', + 'after' => ':attribute skal være en dato efter :date.', + 'after_or_equal' => ':attribute skal være en dato før eller lig med :date.', + 'alpha' => ':attribute må kun indeholde bogstaver.', + 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal eller bindestreger.', + 'alpha_num' => ':attribute må kun indeholde bogstaver eller tal.', + 'array' => ':attribute skal være en matrix.', + 'before' => ':attribute skal være en dato før :date.', + 'before_or_equal' => ':attribute skal være en dato før eller lig med :date.', + 'between' => [ + 'numeric' => ':attribute skal være imellem :min og :max.', + 'file' => ':attribute skal være imellem :min - :max kilobytes.', + 'string' => ':attribute skal være imellem :min - :max tegn.', + 'array' => ':attribute skal have mellem: min og: maks. Emner.', + ], + 'boolean' => ':attribute skal være enabled eller disabled.', + 'confirmed' => ':attribute valget stemmer ikke overens.', + 'date' => ':attribute er ikke en gyldig dato.', + 'date_format' => ':attribute svarer ikke til formatet :format.', + 'different' => ':attribute og :other skal være forskellige.', + 'digits' => ':attribute skal være :digits cifre.', + 'digits_between' => ':attribute skal være imellem :min og :max cifre.', + 'dimensions' => ':attribute har ugyldige billeddimensioner.', + 'distinct' => ':attribute har en duplikatværdi.', + 'email' => ':attribute skal være en gyldig email adresse.', + 'exists' => 'Det valgte :attribute er ugyldigt.', + 'file' => ':attribute skal være en fil.', + 'filled' => ':attribute skal have en værdi.', + 'image' => ':attribute skal være et billede.', + 'in' => 'Det valgte :attribute er ugyldigt.', + 'in_array' => ':attribute findes ikke i :other.', + 'integer' => ':attribute skal være et heltal.', + 'ip' => ':attribute skal være en gyldig IP adresse.', + 'json' => ':attribute skal være en gyldig JSON-streng.', + 'max' => [ + 'numeric' => ':attribute må ikke overstige :max.', + 'file' => ':attribute må ikke overstige :max. kilobytes.', + 'string' => ':attribute må ikke overstige :max. tegn.', + 'array' => ':attribute må ikke overstige :max. antal.', + ], + 'mimes' => ':attribute skal være en fil af typen: :values.', + 'mimetypes' => ':attribute skal være en fil af typen: :values.', + 'min' => [ + 'numeric' => ':attribute skal mindst være :min.', + 'file' => ':attribute skal mindst være :min kilobytes.', + 'string' => ':attribute skal mindst være :min tegn.', + 'array' => ':attribute skal have mindst :min styk.', + ], + 'not_in' => 'Det valgte :attribute er ugyldigt.', + 'numeric' => ':attribute skal være et tal.', + 'present' => ':attribute feltet er krævet.', + 'regex' => ':attribute formatet er ugylidgt.', + 'required' => ':attribute feltet er påkrævet.', + 'required_if' => ':attribute feltet er krævet når :other er :value.', + 'required_unless' => ':attribute feltet er påkrævet, med mindre :other er :value.', + 'required_with' => ':attribute er påkrævet, når :values er til stede.', + 'required_with_all' => ':attribute er påkrævet, når :values er til stede.', + 'required_without' => ':attribute er påkrævet, når :values ikke er tilstede.', + 'required_without_all' => ':attribute er påkrævet, når ingen af :values er tilstede.', + 'same' => ':attribute og :other skal være ens.', + 'size' => [ + 'numeric' => ':attribute skal være :size.', + 'file' => ':attribute skal være :size kilobytes.', + 'string' => ':attribute skal være :size tegn.', + 'array' => ':attribute skal indeholde :size antal.', + ], + 'string' => ':attribute skal være en streng.', + 'timezone' => ':attribute skal være en gyldig zone.', + 'unique' => ':attribute er allerede taget.', + 'uploaded' => ':attribute kunne ikke uploades.', + 'url' => ':attribute formatet er ugylidgt.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'brugerdefineret besked', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + +]; From 1baee603a71e73c2611623431a3d3641914a5741 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 16 Apr 2018 12:15:51 +0300 Subject: [PATCH 28/94] tax summary --- app/Http/Controllers/Reports/TaxSummary.php | 139 ++++++++++++++++++ app/Http/Middleware/AdminMenu.php | 14 +- app/Listeners/Updates/Version120.php | 17 ++- database/seeds/Roles.php | 2 + resources/lang/en-GB/reports.php | 2 + .../views/reports/tax_summary/body.blade.php | 57 +++++++ .../views/reports/tax_summary/index.blade.php | 28 ++++ .../views/reports/tax_summary/print.blade.php | 15 ++ routes/web.php | 1 + 9 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 app/Http/Controllers/Reports/TaxSummary.php create mode 100644 resources/views/reports/tax_summary/body.blade.php create mode 100644 resources/views/reports/tax_summary/index.blade.php create mode 100644 resources/views/reports/tax_summary/print.blade.php diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php new file mode 100644 index 000000000..ac81ec6e6 --- /dev/null +++ b/app/Http/Controllers/Reports/TaxSummary.php @@ -0,0 +1,139 @@ +where('rate', '<>', '0')->pluck('name')->toArray(); + + $taxes = array_combine($t, $t); + + // Get year + $year = request('year'); + if (empty($year)) { + $year = Date::now()->year; + } + + // Dates + for ($j = 1; $j <= 12; $j++) { + $dates[$j] = Date::parse($year . '-' . $j)->format('M'); + + foreach ($taxes as $tax_name) { + $incomes[$tax_name][$dates[$j]] = [ + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1, + ]; + + $expenses[$tax_name][$dates[$j]] = [ + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1, + ]; + + $totals[$tax_name][$dates[$j]] = [ + 'amount' => 0, + 'currency_code' => setting('general.default_currency'), + 'currency_rate' => 1, + ]; + } + } + + switch ($status) { + case 'paid': + // Invoices + $invoices = InvoicePayment::monthsOfYear('paid_at')->get(); + $this->setAmount($incomes, $totals, $invoices, 'invoice', 'paid_at'); + // Bills + $bills = BillPayment::monthsOfYear('paid_at')->get(); + $this->setAmount($expenses, $totals, $bills, 'bill', 'paid_at'); + break; + case 'upcoming': + // Invoices + $invoices = Invoice::accrued()->monthsOfYear('due_at')->get(); + $this->setAmount($incomes, $totals, $invoices, 'invoice', 'due_at'); + // Bills + $bills = Bill::accrued()->monthsOfYear('due_at')->get(); + $this->setAmount($expenses, $totals, $bills, 'bill', 'due_at'); + break; + default: + // Invoices + $invoices = Invoice::accrued()->monthsOfYear('invoiced_at')->get(); + $this->setAmount($incomes, $totals, $invoices, 'invoice', 'invoiced_at'); + // Bills + $bills = Bill::accrued()->monthsOfYear('billed_at')->get(); + $this->setAmount($expenses, $totals, $bills, 'bill', 'billed_at'); + break; + } + + // Check if it's a print or normal request + if (request('print')) { + $view_template = 'reports.tax_summary.print'; + } else { + $view_template = 'reports.tax_summary.index'; + } + + return view($view_template, compact('dates', 'taxes', 'incomes', 'expenses', 'totals')); + } + + private function setAmount(&$items, &$totals, $rows, $type, $date_field) + { + foreach ($rows as $row) { + $date = Date::parse($row->$date_field)->format('M'); + + if ($date_field == 'paid_at') { + if (!$row->invoice instanceof Invoice) { + continue; + } + + $row_totals = $row->invoice->totals; + } else { + $row_totals = $row->totals; + } + + foreach ($row_totals as $row_total) { + if ($row_total->code != 'tax') { + continue; + } + + if (!isset($items[$row_total->name])) { + continue; + } + + $amount = $this->convert($row_total->amount, $row->currency_code, $row->currency_rate); + + $items[$row_total->name][$date]['amount'] += $amount; + + if ($type == 'invoice') { + $totals[$row_total->name][$date]['amount'] += $amount; + } else { + $totals[$row_total->name][$date]['amount'] -= $amount; + } + } + } + } +} diff --git a/app/Http/Middleware/AdminMenu.php b/app/Http/Middleware/AdminMenu.php index 3d58d2516..c16c1ed19 100644 --- a/app/Http/Middleware/AdminMenu.php +++ b/app/Http/Middleware/AdminMenu.php @@ -111,7 +111,13 @@ class AdminMenu } // Reports - if ($user->can(['read-reports-income-summary', 'read-reports-expense-summary', 'read-reports-income-expense-summary', 'read-reports-profit-loss'])) { + if ($user->can([ + 'read-reports-income-summary', + 'read-reports-expense-summary', + 'read-reports-income-expense-summary', + 'read-reports-tax-summary', + 'read-reports-profit-loss', + ])) { $menu->dropdown(trans_choice('general.reports', 2), function ($sub) use($user, $attr) { if ($user->can('read-reports-income-summary')) { $sub->url('reports/income-summary', trans('reports.summary.income'), 1, $attr); @@ -125,8 +131,12 @@ class AdminMenu $sub->url('reports/income-expense-summary', trans('reports.summary.income_expense'), 3, $attr); } + if ($user->can('read-reports-tax-summary')) { + $sub->url('reports/tax-summary', trans('reports.summary.tax'), 4, $attr); + } + if ($user->can('read-reports-profit-loss')) { - $sub->url('reports/profit-loss', trans('reports.profit_loss'), 4, $attr); + $sub->url('reports/profit-loss', trans('reports.profit_loss'), 5, $attr); } }, 6, [ 'title' => trans_choice('general.reports', 2), diff --git a/app/Listeners/Updates/Version120.php b/app/Listeners/Updates/Version120.php index 0ef59c704..41ea4942c 100644 --- a/app/Listeners/Updates/Version120.php +++ b/app/Listeners/Updates/Version120.php @@ -25,8 +25,17 @@ class Version120 extends Listener return; } - // Create permission - $permission = Permission::firstOrCreate([ + $permissions = []; + + // Create tax summary permission + $permissions[] = Permission::firstOrCreate([ + 'name' => 'read-reports-tax-summary', + 'display_name' => 'Read Reports Tax Summary', + 'description' => 'Read Reports Tax Summary', + ]); + + // Create profit loss permission + $permissions[] = Permission::firstOrCreate([ 'name' => 'read-reports-profit-loss', 'display_name' => 'Read Reports Profit Loss', 'description' => 'Read Reports Profit Loss', @@ -42,7 +51,9 @@ class Version120 extends Listener continue; } - $role->attachPermission($permission); + foreach ($permissions as $permission) { + $role->attachPermission($permission); + } } } } diff --git a/database/seeds/Roles.php b/database/seeds/Roles.php index e1553089f..3e0932bab 100644 --- a/database/seeds/Roles.php +++ b/database/seeds/Roles.php @@ -62,6 +62,7 @@ class Roles extends Seeder 'reports-expense-summary' => 'r', 'reports-income-expense-summary' => 'r', 'reports-profit-loss' => 'r', + 'reports-tax-summary' => 'r', ], 'manager' => [ 'admin-panel' => 'r', @@ -89,6 +90,7 @@ class Roles extends Seeder 'reports-expense-summary' => 'r', 'reports-income-expense-summary' => 'r', 'reports-profit-loss' => 'r', + 'reports-tax-summary' => 'r', ], 'customer' => [ 'customer-panel' => 'r', diff --git a/resources/lang/en-GB/reports.php b/resources/lang/en-GB/reports.php index a0e8c53e0..a0e1f3a5b 100644 --- a/resources/lang/en-GB/reports.php +++ b/resources/lang/en-GB/reports.php @@ -11,11 +11,13 @@ return [ 'gross_profit' => 'Gross Profit', 'net_profit' => 'Net Profit', 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Income Summary', 'expense' => 'Expense Summary', 'income_expense' => 'Income vs Expense', + 'tax' => 'Tax Summary', ], 'quarter' => [ diff --git a/resources/views/reports/tax_summary/body.blade.php b/resources/views/reports/tax_summary/body.blade.php new file mode 100644 index 000000000..59695a1e2 --- /dev/null +++ b/resources/views/reports/tax_summary/body.blade.php @@ -0,0 +1,57 @@ +
      +
      +
      {{ trans('reports.net_profit') }}{{ trans('reports.net_profit') }}@money($total['amount'], $total['currency_code'], true)@money($total['amount'], $total['currency_code'], true)
      + + + + @foreach($dates as $date) + + @endforeach + + +
       {{ $date }}
      + @if ($taxes) + @foreach($taxes as $tax_name) + + + + + + + + + + @foreach($incomes[$tax_name] as $tax_date) + + @endforeach + + + + @foreach($expenses[$tax_name] as $tax_date) + + @endforeach + + + + + + @foreach($totals[$tax_name] as $tax_date) + + @endforeach + + +
      {{ $tax_name }}
      {{ trans_choice('general.incomes', 2) }}@money($tax_date['amount'], $tax_date['currency_code'], true)
      {{ trans_choice('general.expenses', 2) }}@money($tax_date['amount'], $tax_date['currency_code'], true)
      {{ trans('reports.net') }}@money($tax_date['amount'], $tax_date['currency_code'], true)
      + @endforeach + @else + + + + + + +
      +
      {{ trans('general.no_records') }}
      +
      + @endif +
      +
      \ No newline at end of file diff --git a/resources/views/reports/tax_summary/index.blade.php b/resources/views/reports/tax_summary/index.blade.php new file mode 100644 index 000000000..1cfbbcc09 --- /dev/null +++ b/resources/views/reports/tax_summary/index.blade.php @@ -0,0 +1,28 @@ +@extends('layouts.admin') + +@section('title', trans('reports.summary.tax')) + +@section('new_button') +  {{ trans('general.print') }} +@endsection + +@section('content') + +
      +
      +
      + {{ trans('general.all') }} + {{ trans('invoices.paid') }} + {{ trans('dashboard.receivables') }} +
      + {!! Form::open(['url' => 'reports/tax-summary', 'role' => 'form', 'method' => 'GET']) !!} +
      + {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} +
      + {!! Form::close() !!} +
      + + @include('reports.tax_summary.body') +
      + +@endsection diff --git a/resources/views/reports/tax_summary/print.blade.php b/resources/views/reports/tax_summary/print.blade.php new file mode 100644 index 000000000..4fc18a5f8 --- /dev/null +++ b/resources/views/reports/tax_summary/print.blade.php @@ -0,0 +1,15 @@ +@extends('layouts.print') + +@section('title', trans('reports.summary.tax')) + +@section('content') +
      +

      {{ trans('reports.summary.tax') }}

      +
      + {{ setting('general.company_name') }} +
      + {{ Date::parse(request('year') . '-1-1')->format($date_format) }} - {{ Date::parse(request('year') . '-12-31')->format($date_format) }} +
      +
      + @include('reports.tax_summary.body') +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index af481a340..8d3d90320 100644 --- a/routes/web.php +++ b/routes/web.php @@ -96,6 +96,7 @@ Route::group(['middleware' => 'language'], function () { Route::resource('income-summary', 'Reports\IncomeSummary'); Route::resource('expense-summary', 'Reports\ExpenseSummary'); Route::resource('income-expense-summary', 'Reports\IncomeExpenseSummary'); + Route::resource('tax-summary', 'Reports\TaxSummary'); Route::resource('profit-loss', 'Reports\ProfitLoss'); }); From 5dc4ca6d0df421a58179ff6f348595cc97b56186 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 16 Apr 2018 13:59:53 +0300 Subject: [PATCH 29/94] added temp show method --- app/Http/Controllers/Banking/Accounts.php | 10 ++++++++++ app/Http/Controllers/Banking/Transfers.php | 10 ++++++++++ app/Http/Controllers/Companies/Companies.php | 11 +++++++++++ app/Http/Controllers/Expenses/Payments.php | 10 ++++++++++ app/Http/Controllers/Incomes/Revenues.php | 10 ++++++++++ app/Http/Controllers/Items/Items.php | 10 ++++++++++ app/Http/Controllers/Settings/Categories.php | 10 ++++++++++ app/Http/Controllers/Settings/Currencies.php | 10 ++++++++++ app/Http/Controllers/Settings/Taxes.php | 10 ++++++++++ 9 files changed, 91 insertions(+) diff --git a/app/Http/Controllers/Banking/Accounts.php b/app/Http/Controllers/Banking/Accounts.php index 4e43d9bd2..1ab4a6cf3 100644 --- a/app/Http/Controllers/Banking/Accounts.php +++ b/app/Http/Controllers/Banking/Accounts.php @@ -22,6 +22,16 @@ class Accounts extends Controller return view('banking.accounts.index', compact('accounts')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('banking/accounts'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index b1f5ccf7a..dedbe5c7c 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -72,6 +72,16 @@ class Transfers extends Controller return view('banking.transfers.index', compact('transfers', 'items', 'accounts')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('banking/transfers'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Companies/Companies.php b/app/Http/Controllers/Companies/Companies.php index 908937fa0..d29003d5e 100644 --- a/app/Http/Controllers/Companies/Companies.php +++ b/app/Http/Controllers/Companies/Companies.php @@ -28,6 +28,17 @@ class Companies extends Controller return view('companies.companies.index', compact('companies')); } + + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('companies/companies'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index 11d777408..67419e951 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -40,6 +40,16 @@ class Payments extends Controller return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('expenses/payments'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php index 8a4d8d736..e617f8cd0 100644 --- a/app/Http/Controllers/Incomes/Revenues.php +++ b/app/Http/Controllers/Incomes/Revenues.php @@ -42,6 +42,16 @@ class Revenues extends Controller return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('incomes/revenues'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index b4aaec273..2ab8d42bd 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -30,6 +30,16 @@ class Items extends Controller return view('items.items.index', compact('items', 'categories')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('items/items'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index 5ab36a2ea..380f75452 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -26,6 +26,16 @@ class Categories extends Controller return view('settings.categories.index', compact('categories', 'types', 'transfer_id')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('settings/categories'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Settings/Currencies.php b/app/Http/Controllers/Settings/Currencies.php index 79e675606..54c44c748 100644 --- a/app/Http/Controllers/Settings/Currencies.php +++ b/app/Http/Controllers/Settings/Currencies.php @@ -22,6 +22,16 @@ class Currencies extends Controller return view('settings.currencies.index', compact('currencies')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('settings/currencies'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Settings/Taxes.php b/app/Http/Controllers/Settings/Taxes.php index 1600cf0b5..c5220c29a 100644 --- a/app/Http/Controllers/Settings/Taxes.php +++ b/app/Http/Controllers/Settings/Taxes.php @@ -21,6 +21,16 @@ class Taxes extends Controller return view('settings.taxes.index', compact('taxes', 'rates')); } + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function show() + { + return redirect('settings/taxes'); + } + /** * Show the form for creating a new resource. * From 0d4f3e9daeb99c2661f5fffc3ee15568374e1e3c Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 16 Apr 2018 14:37:19 +0300 Subject: [PATCH 30/94] missing bills in paid view #296 --- app/Http/Controllers/Reports/TaxSummary.php | 18 +++++++----------- .../views/reports/tax_summary/index.blade.php | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php index ac81ec6e6..45e74ab60 100644 --- a/app/Http/Controllers/Reports/TaxSummary.php +++ b/app/Http/Controllers/Reports/TaxSummary.php @@ -66,26 +66,26 @@ class TaxSummary extends Controller switch ($status) { case 'paid': // Invoices - $invoices = InvoicePayment::monthsOfYear('paid_at')->get(); + $invoices = InvoicePayment::with(['invoice', 'invoice.totals'])->monthsOfYear('paid_at')->get(); $this->setAmount($incomes, $totals, $invoices, 'invoice', 'paid_at'); // Bills - $bills = BillPayment::monthsOfYear('paid_at')->get(); + $bills = BillPayment::with(['bill', 'bill.totals'])->monthsOfYear('paid_at')->get(); $this->setAmount($expenses, $totals, $bills, 'bill', 'paid_at'); break; case 'upcoming': // Invoices - $invoices = Invoice::accrued()->monthsOfYear('due_at')->get(); + $invoices = Invoice::with(['totals'])->accrued()->monthsOfYear('due_at')->get(); $this->setAmount($incomes, $totals, $invoices, 'invoice', 'due_at'); // Bills - $bills = Bill::accrued()->monthsOfYear('due_at')->get(); + $bills = Bill::with(['totals'])->accrued()->monthsOfYear('due_at')->get(); $this->setAmount($expenses, $totals, $bills, 'bill', 'due_at'); break; default: // Invoices - $invoices = Invoice::accrued()->monthsOfYear('invoiced_at')->get(); + $invoices = Invoice::with(['totals'])->accrued()->monthsOfYear('invoiced_at')->get(); $this->setAmount($incomes, $totals, $invoices, 'invoice', 'invoiced_at'); // Bills - $bills = Bill::accrued()->monthsOfYear('billed_at')->get(); + $bills = Bill::with(['totals'])->accrued()->monthsOfYear('billed_at')->get(); $this->setAmount($expenses, $totals, $bills, 'bill', 'billed_at'); break; } @@ -106,11 +106,7 @@ class TaxSummary extends Controller $date = Date::parse($row->$date_field)->format('M'); if ($date_field == 'paid_at') { - if (!$row->invoice instanceof Invoice) { - continue; - } - - $row_totals = $row->invoice->totals; + $row_totals = $row->$type->totals; } else { $row_totals = $row->totals; } diff --git a/resources/views/reports/tax_summary/index.blade.php b/resources/views/reports/tax_summary/index.blade.php index 1cfbbcc09..ce1f2554c 100644 --- a/resources/views/reports/tax_summary/index.blade.php +++ b/resources/views/reports/tax_summary/index.blade.php @@ -13,7 +13,7 @@
      {{ trans('general.all') }} {{ trans('invoices.paid') }} - {{ trans('dashboard.receivables') }} + {{ trans('general.upcoming') }}
      {!! Form::open(['url' => 'reports/tax-summary', 'role' => 'form', 'method' => 'GET']) !!}
      From 7897300cb86024b43a16c7021c46e14052d71488 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 16 Apr 2018 15:45:00 +0300 Subject: [PATCH 31/94] styling #293 --- resources/views/reports/profit_loss/body.blade.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/views/reports/profit_loss/body.blade.php b/resources/views/reports/profit_loss/body.blade.php index 6e76cc33b..c3682ec3d 100644 --- a/resources/views/reports/profit_loss/body.blade.php +++ b/resources/views/reports/profit_loss/body.blade.php @@ -11,7 +11,7 @@ - +
      @@ -27,15 +27,17 @@ @endforeach @endforeach + + @foreach($gross['income'] as $item) @endforeach - +
      {{ trans_choice('general.incomes', 1) }}
      {{ trans('reports.gross_profit') }}@money($item, setting('general.default_currency'), true)
      - +
      @@ -51,13 +53,15 @@ @endforeach @endforeach + + @foreach($gross['expense'] as $item) @endforeach - +
      {{ trans_choice('general.expenses', 2) }}
      {{ trans('reports.total_expenses') }}@money($item, setting('general.default_currency'), true)
      From d2b0a816e3c3b7f7b97f669c6a812a3b2fda9d80 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 16 Apr 2018 19:01:29 +0300 Subject: [PATCH 32/94] closes #281 --- app/Http/Controllers/Expenses/Bills.php | 16 +++++++---- app/Http/Controllers/Incomes/Invoices.php | 22 ++++++++++----- app/Http/Controllers/Items/Items.php | 4 +-- app/Http/Controllers/Settings/Settings.php | 14 +++++++--- app/Models/Setting/Tax.php | 27 +++++++++++++++++++ database/seeds/Settings.php | 1 + resources/lang/en-GB/settings.php | 5 ++++ resources/views/expenses/bills/bill.blade.php | 15 ++++++++--- resources/views/expenses/bills/show.blade.php | 19 ++++++++----- .../views/incomes/invoices/invoice.blade.php | 21 ++++++++++----- .../views/incomes/invoices/show.blade.php | 21 ++++++++++----- .../views/settings/settings/edit.blade.php | 6 +++++ 12 files changed, 130 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 0915ab769..2360783fc 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -84,7 +84,9 @@ class Bills extends Controller $payment_methods = Modules::getPaymentMethods(); - return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods')); + $taxes = Tax::enabled()->get()->pluck('title', 'name'); + + return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'taxes')); } /** @@ -100,7 +102,7 @@ class Bills extends Controller $items = Item::enabled()->pluck('name', 'id'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes')); } @@ -301,7 +303,7 @@ class Bills extends Controller $items = Item::enabled()->pluck('name', 'id'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes')); } @@ -476,7 +478,9 @@ class Bills extends Controller $logo = $this->getLogo($bill); - return view($bill->template_path, compact('bill', 'logo')); + $taxes = Tax::enabled()->get()->pluck('title', 'name'); + + return view($bill->template_path, compact('bill', 'logo', 'taxes')); } /** @@ -492,7 +496,9 @@ class Bills extends Controller $logo = $this->getLogo($bill); - $html = view($bill->template_path, compact('bill', 'logo'))->render(); + $taxes = Tax::enabled()->get()->pluck('title', 'name'); + + $html = view($bill->template_path, compact('bill', 'logo', 'taxes'))->render(); $pdf = \App::make('dompdf.wrapper'); $pdf->loadHTML($html); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 3611dee9f..8e0917d2c 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -87,7 +87,9 @@ class Invoices extends Controller $payment_methods = Modules::getPaymentMethods(); - return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods')); + $taxes = Tax::enabled()->get()->pluck('title', 'name'); + + return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'taxes')); } /** @@ -103,7 +105,7 @@ class Invoices extends Controller $items = Item::enabled()->pluck('name', 'id'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); $number = $this->getNextInvoiceNumber(); @@ -322,7 +324,7 @@ class Invoices extends Controller $items = Item::enabled()->pluck('name', 'id'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes')); } @@ -511,7 +513,11 @@ class Invoices extends Controller $logo = $this->getLogo(); - $html = view($invoice->template_path, compact('invoice', 'logo'))->render(); + $taxes = collect(Tax::enabled()->get())->each(function ($item) { + $item->title = $item->name . ' (' . $item->rate . '%)'; + })->pluck('title', 'name'); + + $html = view($invoice->template_path, compact('invoice', 'logo', 'taxes'))->render(); $pdf = \App::make('dompdf.wrapper'); $pdf->loadHTML($html); @@ -567,7 +573,9 @@ class Invoices extends Controller $logo = $this->getLogo(); - return view($invoice->template_path, compact('invoice', 'logo')); + $taxes = Tax::enabled()->get()->pluck('title', 'name'); + + return view($invoice->template_path, compact('invoice', 'logo', 'taxes')); } /** @@ -583,7 +591,9 @@ class Invoices extends Controller $logo = $this->getLogo(); - $html = view($invoice->template_path, compact('invoice', 'logo'))->render(); + $taxes = Tax::enabled()->get()->pluck('title', 'name'); + + $html = view($invoice->template_path, compact('invoice', 'logo', 'taxes'))->render(); $pdf = \App::make('dompdf.wrapper'); $pdf->loadHTML($html); diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index 2ab8d42bd..96b27f396 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -49,7 +49,7 @@ class Items extends Controller { $categories = Category::enabled()->type('item')->pluck('name', 'id'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); return view('items.items.create', compact('categories', 'taxes')); } @@ -133,7 +133,7 @@ class Items extends Controller { $categories = Category::enabled()->type('item')->pluck('name', 'id'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); return view('items.items.edit', compact('item', 'categories', 'taxes')); } diff --git a/app/Http/Controllers/Settings/Settings.php b/app/Http/Controllers/Settings/Settings.php index 5b2f15658..919cebeb1 100644 --- a/app/Http/Controllers/Settings/Settings.php +++ b/app/Http/Controllers/Settings/Settings.php @@ -47,7 +47,7 @@ class Settings extends Controller $currencies = Currency::enabled()->pluck('name', 'code'); - $taxes = Tax::enabled()->pluck('name', 'id'); + $taxes = Tax::enabled()->get()->pluck('title', 'id'); $payment_methods = Modules::getPaymentMethods(); @@ -56,7 +56,7 @@ class Settings extends Controller 'd F Y' => '31 December 2017', 'd m Y' => '31 12 2017', 'm d Y' => '12 31 2017', - 'Y m d' => '2017 12 31' + 'Y m d' => '2017 12 31', ]; $date_separators = [ @@ -71,7 +71,12 @@ class Settings extends Controller 'mail' => trans('settings.email.php'), 'smtp' => trans('settings.email.smtp.name'), 'sendmail' => trans('settings.email.sendmail'), - 'log' => trans('settings.email.log') + 'log' => trans('settings.email.log'), + ]; + + $percent_positions = [ + 'before' => trans('settings.localisation.percent.before'), + 'after' => trans('settings.localisation.percent.after'), ]; return view('settings.settings.edit', compact( @@ -83,7 +88,8 @@ class Settings extends Controller 'payment_methods', 'date_formats', 'date_separators', - 'email_protocols' + 'email_protocols', + 'percent_positions' )); } diff --git a/app/Models/Setting/Tax.php b/app/Models/Setting/Tax.php index e3d71f6f8..30dd5b67b 100644 --- a/app/Models/Setting/Tax.php +++ b/app/Models/Setting/Tax.php @@ -9,6 +9,13 @@ class Tax extends Model protected $table = 'taxes'; + /** + * The accessors to append to the model's array form. + * + * @var array + */ + protected $appends = ['title']; + /** * Attributes that should be mass-assignable. * @@ -48,4 +55,24 @@ class Tax extends Model { $this->attributes['rate'] = (double) $value; } + + /** + * Get the name including rate. + * + * @return string + */ + public function getTitleAttribute() + { + $title = $this->name . ' ('; + + if (setting('general.percent_position', 'after') == 'after') { + $title .= $this->rate . '%'; + } else { + $title .= '%' . $this->rate; + } + + $title .= ')'; + + return $title; + } } diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php index 2f9f9129e..5c27b9392 100644 --- a/database/seeds/Settings.php +++ b/database/seeds/Settings.php @@ -30,6 +30,7 @@ class Settings extends Seeder 'general.date_format' => 'd M Y', 'general.date_separator' => 'space', 'general.timezone' => 'Europe/London', + 'general.percent_position' => 'after', 'general.invoice_number_prefix' => 'INV-', 'general.invoice_number_digit' => '5', 'general.invoice_number_next' => '1', diff --git a/resources/lang/en-GB/settings.php b/resources/lang/en-GB/settings.php index 83c1308f3..20e7cc22b 100644 --- a/resources/lang/en-GB/settings.php +++ b/resources/lang/en-GB/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Space ( )', ], 'timezone' => 'Time Zone', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Invoice', diff --git a/resources/views/expenses/bills/bill.blade.php b/resources/views/expenses/bills/bill.blade.php index 8fa3bc9cb..d36efcb0a 100644 --- a/resources/views/expenses/bills/bill.blade.php +++ b/resources/views/expenses/bills/bill.blade.php @@ -114,10 +114,17 @@ @foreach($bill->totals as $total) @if ($total->code != 'total') - - - - + @if (($total->code == 'tax') && isset($taxes[$total->name])) + + + + + @else + + + + + @endif @else @if ($bill->paid) diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index adffc2fc4..ecbc1d84e 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -117,12 +117,19 @@
      {{ trans($total['name']) }}:@money($total->amount, $bill->currency_code, true)
      {{ $taxes[$total->name] }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $bill->currency_code, true)
      - @foreach($bill->totals as $total) + @foreach ($bill->totals as $total) @if ($total->code != 'total') - - - - + @if (($total->code == 'tax') && isset($taxes[$total->name])) + + + + + @else + + + + + @endif @else @if ($bill->paid) @@ -131,7 +138,7 @@ @endif - + @endif diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/invoice.blade.php index e80137f2d..4cef5201b 100644 --- a/resources/views/incomes/invoices/invoice.blade.php +++ b/resources/views/incomes/invoices/invoice.blade.php @@ -112,12 +112,19 @@
      {{ trans($total['name']) }}:@money($total->amount, $bill->currency_code, true)
      {{ $taxes[$total->name] }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total['name']) }}:{{ trans($total->name) }}: @money($total->amount - $bill->paid, $bill->currency_code, true)
      - @foreach($invoice->totals as $total) - @if($total->code != 'total') - - - - + @foreach ($invoice->totals as $total) + @if ($total->code != 'total') + @if (($total->code == 'tax') && isset($taxes[$total->name])) + + + + + @else + + + + + @endif @else @if ($invoice->paid) @@ -126,7 +133,7 @@ @endif - + @endif diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 9cef3d092..052a34fc4 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -119,12 +119,19 @@
      {{ trans($total['name']) }}:@money($total->amount, $invoice->currency_code, true)
      {{ $taxes[$total->name] }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total['name']) }}:{{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true)
      - @foreach($invoice->totals as $total) - @if($total->code != 'total') - - - - + @foreach ($invoice->totals as $total) + @if ($total->code != 'total') + @if (($total->code == 'tax') && isset($taxes[$total->name])) + + + + + @else + + + + + @endif @else @if ($invoice->paid) @@ -133,7 +140,7 @@ @endif - + @endif diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php index 3b078fcdc..9cda125e6 100644 --- a/resources/views/settings/settings/edit.blade.php +++ b/resources/views/settings/settings/edit.blade.php @@ -47,6 +47,8 @@ {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, null, []) }} {{ Form::selectGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, null, []) }} + + {{ Form::selectGroup('percent_position', trans('settings.localisation.percent.title'), 'percent', $percent_positions, null, []) }}
      @@ -164,6 +166,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans('settings.localisation.timezone')]) }}" }); + $("#percent_position").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans('settings.localisation.percent.title')]) }}" + }); + $("#default_account").select2({ placeholder: "{{ trans('general.form.select.field', ['field' => trans('settings.default.account')]) }}" }); From cfda5585a4872d12c15a5acf3120b9118e7bd126 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 17 Apr 2018 00:34:02 +0300 Subject: [PATCH 33/94] fixed #280 --- app/Providers/FormServiceProvider.php | 4 ++++ resources/views/banking/accounts/create.blade.php | 2 +- resources/views/banking/accounts/edit.blade.php | 2 +- resources/views/banking/transfers/create.blade.php | 2 +- resources/views/banking/transfers/edit.blade.php | 2 +- resources/views/expenses/bills/create.blade.php | 10 +++++----- resources/views/expenses/bills/edit.blade.php | 14 +++++++------- resources/views/expenses/payments/create.blade.php | 2 +- resources/views/expenses/payments/edit.blade.php | 2 +- resources/views/incomes/invoices/create.blade.php | 10 +++++----- resources/views/incomes/invoices/edit.blade.php | 14 +++++++------- resources/views/incomes/revenues/create.blade.php | 2 +- resources/views/incomes/revenues/edit.blade.php | 2 +- resources/views/items/items/create.blade.php | 4 ++-- resources/views/items/items/edit.blade.php | 4 ++-- .../views/settings/currencies/create.blade.php | 4 ++-- resources/views/settings/currencies/edit.blade.php | 4 ++-- resources/views/settings/taxes/create.blade.php | 2 +- resources/views/settings/taxes/edit.blade.php | 2 +- 19 files changed, 46 insertions(+), 42 deletions(-) diff --git a/app/Providers/FormServiceProvider.php b/app/Providers/FormServiceProvider.php index 680e9c7e6..b4d9daf88 100644 --- a/app/Providers/FormServiceProvider.php +++ b/app/Providers/FormServiceProvider.php @@ -27,6 +27,10 @@ class FormServiceProvider extends ServiceProvider 'name', 'text', 'icon', 'attributes' => ['required' => 'required'], 'value' => null, 'col' => 'col-md-6', ]); + Form::component('numberGroup', 'partials.form.number_group', [ + 'name', 'text', 'icon', 'attributes' => ['required' => 'required'], 'value' => null, 'col' => 'col-md-6', + ]); + Form::component('selectGroup', 'partials.form.select_group', [ 'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', ]); diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php index b39a015f2..ff9a3b264 100644 --- a/resources/views/banking/accounts/create.blade.php +++ b/resources/views/banking/accounts/create.blade.php @@ -14,7 +14,7 @@ {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }} - {{ Form::textGroup('opening_balance', trans('accounts.opening_balance'), 'money', ['required' => 'required'], 0) }} + {{ Form::numberGroup('opening_balance', trans('accounts.opening_balance'), 'money', ['required' => 'required'], 0) }} {{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }} diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php index 5033d6a3f..83b2ede15 100644 --- a/resources/views/banking/accounts/edit.blade.php +++ b/resources/views/banking/accounts/edit.blade.php @@ -18,7 +18,7 @@ {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies) }} - {{ Form::textGroup('opening_balance', trans('accounts.opening_balance'), 'money') }} + {{ Form::numberGroup('opening_balance', trans('accounts.opening_balance'), 'money') }} {{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }} diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index 4fe79d8f8..86eb4b963 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -12,7 +12,7 @@ {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts) }} - {{ Form::textGroup('amount', trans('general.amount'), 'money') }} + {{ Form::numberGroup('amount', trans('general.amount'), 'money') }} {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }} diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index f4dbdd93a..c5a3974b8 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -16,7 +16,7 @@ {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts) }} - {{ Form::textGroup('amount', trans('general.amount'), 'money') }} + {{ Form::numberGroup('amount', trans('general.amount'), 'money') }} {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }} diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index d40a13fd7..d2e51de41 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -55,10 +55,10 @@
      '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' '; html += ' @foreach($bill->totals as $total) @if ($total->code != 'total') - @if (($total->code == 'tax') && isset($taxes[$total->name])) - - - - - @else - - - - - @endif + + + + @else @if ($bill->paid) diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index d2e51de41..fb7de3f00 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -76,6 +76,15 @@ + + + + @@ -255,7 +264,7 @@ url: '{{ url("items/items/totalItem") }}', type: 'POST', dataType: 'JSON', - data: $('#currency_code, #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), + data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, success: function(data) { if (data) { diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index 5af16682b..a1d7bcc0a 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -92,6 +92,15 @@ + + + + @@ -300,7 +309,7 @@ url: '{{ url("items/items/totalItem") }}', type: 'POST', dataType: 'JSON', - data: $('#currency_code, #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), + data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, success: function(data) { if (data) { diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index ecbc1d84e..a2e028f00 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -119,17 +119,10 @@ @foreach ($bill->totals as $total) @if ($total->code != 'total') - @if (($total->code == 'tax') && isset($taxes[$total->name])) - - - - - @else - - - - - @endif + + + + @else @if ($bill->paid) diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 45cdfad4a..0e0a9f46a 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -76,6 +76,15 @@ + + + + @@ -256,7 +265,7 @@ url: '{{ url("items/items/totalItem") }}', type: 'POST', dataType: 'JSON', - data: $('#currency_code, #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), + data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, success: function(data) { if (data) { diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index 01c28854c..3abdb1f72 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -91,6 +91,15 @@ + + + + @@ -299,7 +308,7 @@ url: '{{ url("items/items/totalItem") }}', type: 'POST', dataType: 'JSON', - data: $('#currency_code, #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), + data: $('#currency_code, #discount input[type=\'number\'], #items input[type=\'text\'],#items input[type=\'number\'],#items input[type=\'hidden\'], #items textarea, #items select'), headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}' }, success: function(data) { if (data) { diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/invoice.blade.php index 4cef5201b..91860a10a 100644 --- a/resources/views/incomes/invoices/invoice.blade.php +++ b/resources/views/incomes/invoices/invoice.blade.php @@ -114,17 +114,10 @@ @foreach ($invoice->totals as $total) @if ($total->code != 'total') - @if (($total->code == 'tax') && isset($taxes[$total->name])) - - - - - @else - - - - - @endif + + + + @else @if ($invoice->paid) diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 052a34fc4..39104d4fe 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -121,17 +121,10 @@ @foreach ($invoice->totals as $total) @if ($total->code != 'total') - @if (($total->code == 'tax') && isset($taxes[$total->name])) - - - - - @else - - - - - @endif + + + + @else @if ($invoice->paid) diff --git a/resources/views/partials/form/number_group.blade.php b/resources/views/partials/form/number_group.blade.php new file mode 100644 index 000000000..de65ab61e --- /dev/null +++ b/resources/views/partials/form/number_group.blade.php @@ -0,0 +1,8 @@ +
      + {!! Form::label($name, $text, ['class' => 'control-label']) !!} +
      +
      + {!! Form::number($name, $value, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.enter', ['field' => $text])], $attributes)) !!} +
      + {!! $errors->first($name, '

      :message

      ') !!} +
      From df3a15f7bd91c113f8921824d9e50c55d5615434 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 17 Apr 2018 17:05:44 +0300 Subject: [PATCH 35/94] removed tax from item total --- app/Http/Controllers/Items/Items.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index 63aa35074..e9f16cc4a 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -282,9 +282,7 @@ class Items extends Controller $tax_total += $item_tax_total; - $total = $item_sub_total + $item_tax_total; - - $items[$key] = money($total, $currency_code, true)->format(); + $items[$key] = money($item_sub_total, $currency_code, true)->format(); } } From a44026704eee2fc20cba2e56c816326111e0ab26 Mon Sep 17 00:00:00 2001 From: Victualia // Loquere Date: Wed, 18 Apr 2018 00:46:06 +0200 Subject: [PATCH 36/94] Updated rules so rate must be between 0 and 100 --- app/Http/Requests/Setting/Tax.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/Setting/Tax.php b/app/Http/Requests/Setting/Tax.php index 157936d4b..15645d2bc 100644 --- a/app/Http/Requests/Setting/Tax.php +++ b/app/Http/Requests/Setting/Tax.php @@ -25,7 +25,7 @@ class Tax extends Request { return [ 'name' => 'required|string', - 'rate' => 'required', + 'rate' => 'required|min:0|max:100', ]; } } From c37203076c2e31cfec51fcfc31a657fc35c8f833 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 18 Apr 2018 14:34:33 +0300 Subject: [PATCH 37/94] fixed discount percentage #297 --- app/Models/Expense/Bill.php | 14 ++++++-------- app/Models/Income/Invoice.php | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index 832c59ba1..655712881 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -170,18 +170,16 @@ class Bill extends Model */ public function getDiscountAttribute() { - $discount = 0; + $percent = 0; - foreach ($this->totals as $total) { - if ($total->code != 'discount') { - continue; - } + $discount = $this->totals()->where('code', 'discount')->value('amount'); - $discount = number_format((($total->amount * 100) / $this->amount), 0); + if ($discount) { + $sub_total = $this->totals()->where('code', 'sub_total')->value('amount'); - break; + $percent = number_format((($discount * 100) / $sub_total), 0); } - return $discount; + return $percent; } } diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 9554fb7a6..16e5cfa9f 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -172,18 +172,16 @@ class Invoice extends Model */ public function getDiscountAttribute() { - $discount = 0; + $percent = 0; - foreach ($this->totals as $total) { - if ($total->code != 'discount') { - continue; - } + $discount = $this->totals()->where('code', 'discount')->value('amount'); - $discount = number_format((($total->amount * 100) / $this->amount), 0); + if ($discount) { + $sub_total = $this->totals()->where('code', 'sub_total')->value('amount'); - break; + $percent = number_format((($discount * 100) / $sub_total), 0); } - return $discount; + return $percent; } } From 61d326d76af5f640ac5c7c17d267abec70561f3e Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 18 Apr 2018 16:12:46 +0300 Subject: [PATCH 38/94] check if date is available in totals --- app/Http/Controllers/Dashboard/Dashboard.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/Dashboard/Dashboard.php b/app/Http/Controllers/Dashboard/Dashboard.php index 3c0bafac0..7c9f5cf2c 100644 --- a/app/Http/Controllers/Dashboard/Dashboard.php +++ b/app/Http/Controllers/Dashboard/Dashboard.php @@ -359,6 +359,10 @@ class Dashboard extends Controller $i = Date::parse($item->paid_at)->quarter; } + if (!isset($totals[$i])) { + continue; + } + $totals[$i] += $item->getConvertedAmount(); } } From 62560782c56f8ac8ef9516318fbb7688ba5dbd95 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 23 Apr 2018 10:06:55 +0300 Subject: [PATCH 39/94] el-GR translation --- config/language.php | 2 +- resources/lang/el-GR/accounts.php | 14 ++++ resources/lang/el-GR/auth.php | 30 +++++++ resources/lang/el-GR/bills.php | 41 ++++++++++ resources/lang/el-GR/companies.php | 13 +++ resources/lang/el-GR/currencies.php | 18 +++++ resources/lang/el-GR/customers.php | 11 +++ resources/lang/el-GR/dashboard.php | 24 ++++++ resources/lang/el-GR/demo.php | 17 ++++ resources/lang/el-GR/footer.php | 9 +++ resources/lang/el-GR/general.php | 116 +++++++++++++++++++++++++++ resources/lang/el-GR/header.php | 15 ++++ resources/lang/el-GR/import.php | 9 +++ resources/lang/el-GR/install.php | 44 ++++++++++ resources/lang/el-GR/invoices.php | 50 ++++++++++++ resources/lang/el-GR/items.php | 15 ++++ resources/lang/el-GR/messages.php | 23 ++++++ resources/lang/el-GR/modules.php | 47 +++++++++++ resources/lang/el-GR/pagination.php | 9 +++ resources/lang/el-GR/passwords.php | 22 +++++ resources/lang/el-GR/reports.php | 17 ++++ resources/lang/el-GR/settings.php | 85 ++++++++++++++++++++ resources/lang/el-GR/taxes.php | 8 ++ resources/lang/el-GR/transfers.php | 8 ++ resources/lang/el-GR/updates.php | 15 ++++ resources/lang/el-GR/validation.php | 119 ++++++++++++++++++++++++++++ 26 files changed, 780 insertions(+), 1 deletion(-) create mode 100644 resources/lang/el-GR/accounts.php create mode 100644 resources/lang/el-GR/auth.php create mode 100644 resources/lang/el-GR/bills.php create mode 100644 resources/lang/el-GR/companies.php create mode 100644 resources/lang/el-GR/currencies.php create mode 100644 resources/lang/el-GR/customers.php create mode 100644 resources/lang/el-GR/dashboard.php create mode 100644 resources/lang/el-GR/demo.php create mode 100644 resources/lang/el-GR/footer.php create mode 100644 resources/lang/el-GR/general.php create mode 100644 resources/lang/el-GR/header.php create mode 100644 resources/lang/el-GR/import.php create mode 100644 resources/lang/el-GR/install.php create mode 100644 resources/lang/el-GR/invoices.php create mode 100644 resources/lang/el-GR/items.php create mode 100644 resources/lang/el-GR/messages.php create mode 100644 resources/lang/el-GR/modules.php create mode 100644 resources/lang/el-GR/pagination.php create mode 100644 resources/lang/el-GR/passwords.php create mode 100644 resources/lang/el-GR/reports.php create mode 100644 resources/lang/el-GR/settings.php create mode 100644 resources/lang/el-GR/taxes.php create mode 100644 resources/lang/el-GR/transfers.php create mode 100644 resources/lang/el-GR/updates.php create mode 100644 resources/lang/el-GR/validation.php diff --git a/config/language.php b/config/language.php index 37db73ace..217de7e96 100644 --- a/config/language.php +++ b/config/language.php @@ -115,7 +115,7 @@ return [ | */ - 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], + 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], /* |-------------------------------------------------------------------------- diff --git a/resources/lang/el-GR/accounts.php b/resources/lang/el-GR/accounts.php new file mode 100644 index 000000000..aefe53ae0 --- /dev/null +++ b/resources/lang/el-GR/accounts.php @@ -0,0 +1,14 @@ + 'Όνομα Λογαριασμού', + 'number' => 'Αριθμός', + 'opening_balance' => 'Εναρκτήριο υπόλοιπο', + 'current_balance' => 'Τρέχον υπόλοιπο', + 'bank_name' => 'Όνομα τράπεζας', + 'bank_phone' => 'Τηλέφωνο τράπεζας', + 'bank_address' => 'Διεύθυνση τράπεζας', + 'default_account' => 'Προεπιλεγμένος λογαριασμός', + +]; diff --git a/resources/lang/el-GR/auth.php b/resources/lang/el-GR/auth.php new file mode 100644 index 000000000..412f5dcfe --- /dev/null +++ b/resources/lang/el-GR/auth.php @@ -0,0 +1,30 @@ + 'Προφίλ', + 'logout' => 'Αποσύνδεση', + 'login' => 'Σύνδεση', + 'login_to' => 'Συνδεθείτε για να ξεκινήσετε την περίοδο λειτουργίας σας', + 'remember_me' => 'Να με θυμάσαι', + 'forgot_password' => 'Ξέχασα τον κωδικό μου', + 'reset_password' => 'Επαναφορά κωδικού πρόσβασης', + 'enter_email' => 'Εισάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας', + 'current_email' => 'Τρέχον ηλεκτρονικό ταχυδρομείο', + 'reset' => 'Επαναφορά', + 'never' => 'ποτέ', + 'password' => [ + 'current' => 'Κωδικός πρόσβασης', + 'current_confirm' => 'Επιβεβαίωση κωδικού', + 'new' => 'Νέος κωδικός πρόσβασης', + 'new_confirm' => 'Επιβεβαίωση νέου κωδικού', + ], + 'error' => [ + 'self_delete' => 'Σφάλμα: Δεν μπορείτε να διαγράψετε τον εαυτό σας!' + ], + + 'failed' => 'Αυτά τα στοιχεία εισόδου επαληθεύονται από τις εγγραφές μας.', + 'disabled' => 'Αυτός ο λογαριασμός είναι απενεργοποιημένος. Παρακαλώ, επικοινωνήστε με το διαχειριστή του συστήματος.', + 'throttle' => 'Υπερβολικές προσπάθειες σύνδεσης. Παρακαλώ δοκιμάστε ξανά σε :seconds δευτερόλεπτα.', + +]; diff --git a/resources/lang/el-GR/bills.php b/resources/lang/el-GR/bills.php new file mode 100644 index 000000000..f7aea13bd --- /dev/null +++ b/resources/lang/el-GR/bills.php @@ -0,0 +1,41 @@ + 'Αριθμό λογαριασμού', + 'bill_date' => 'Ημερομηνία Λογαριασμού', + 'total_price' => 'Συνολική Τιμή', + 'due_date' => 'Προθεσμία εξόφλησης', + 'order_number' => 'Αριθμός παραγγελίας', + 'bill_from' => 'Λογαριασμός από', + + 'quantity' => 'Ποσότητα', + 'price' => 'Τιμή', + 'sub_total' => 'Μερικό Σύνολο', + 'tax_total' => 'Συνολικό ΦΠΑ', + 'total' => 'Σύνολο', + + 'item_name' => 'Όνομα/ονόματα Αντικειμένου', + + 'payment_due' => 'Πληρωτέο ποσό', + 'amount_due' => 'Οφειλόμενο ποσό', + 'paid' => 'Πληρωτέο', + 'histories' => 'Ιστορικό', + 'payments' => 'Πληρωμές', + 'add_payment' => 'Προσθήκη πληρωμής', + 'mark_received' => 'Ειλημμένη σημείωση', + 'download_pdf' => 'Λήψη PDF', + 'send_mail' => 'Αποστολή Email', + + 'status' => [ + 'draft' => 'Προσχέδιο', + 'received' => 'Ληφθέντα', + 'partial' => 'Μερική', + 'paid' => 'Πληρωμένο', + ], + + 'messages' => [ + 'received' => 'Λογαριασμός που σημειώθηκε ότι ελήφθη επιτυχώς!', + ], + +]; diff --git a/resources/lang/el-GR/companies.php b/resources/lang/el-GR/companies.php new file mode 100644 index 000000000..c2e2db365 --- /dev/null +++ b/resources/lang/el-GR/companies.php @@ -0,0 +1,13 @@ + 'Ιστοσελίδα', + 'logo' => 'Λογότυπο', + 'manage' => 'Διαχείριση εταιρειών', + 'all' => 'Όλες οι εταιρείες', + 'error' => [ + 'delete_active' => 'Σφάλμα: Δεν μπορείτε να διαγράψετε μια ενεργή εταιρεία, παρακαλώ πρέπει πρώτα να την τροποποιήσετε!', + ], + +]; diff --git a/resources/lang/el-GR/currencies.php b/resources/lang/el-GR/currencies.php new file mode 100644 index 000000000..13b388512 --- /dev/null +++ b/resources/lang/el-GR/currencies.php @@ -0,0 +1,18 @@ + 'Κωδικός', + 'rate' => 'Ποσοστό', + 'default' => 'Προεπιλεγμένο νόμισμα', + 'decimal_mark' => 'Σύμβολο διαχωρισμού δεκαδικών', + 'thousands_separator' => 'Σύμβολο διαχωρισμού χιλιάδων', + 'precision' => 'Ακρίβεια', + 'symbol' => [ + 'symbol' => 'Σύμβολο', + 'position' => 'Θέση συμβόλου', + 'before' => 'Πριν από το ποσό', + 'after' => 'Μετά από το ποσό', + ] + +]; diff --git a/resources/lang/el-GR/customers.php b/resources/lang/el-GR/customers.php new file mode 100644 index 000000000..05842329d --- /dev/null +++ b/resources/lang/el-GR/customers.php @@ -0,0 +1,11 @@ + 'Να επιτρέπεται η είσοδος;', + 'user_created' => 'Ο χρήστης δημιουργήθηκε', + + 'error' => [ + 'email' => 'Το email αυτό χρησιμοποιείται ήδη.' + ] +]; diff --git a/resources/lang/el-GR/dashboard.php b/resources/lang/el-GR/dashboard.php new file mode 100644 index 000000000..1ef356083 --- /dev/null +++ b/resources/lang/el-GR/dashboard.php @@ -0,0 +1,24 @@ + 'Συνολικά έσοδα', + 'receivables' => 'Εισπρακτέα', + 'open_invoices' => 'Εκρεμή τιμολόγια', + 'overdue_invoices' => 'Ανεξόφλητα τιμολόγια', + 'total_expenses' => 'Συνολικές δαπάνες', + 'payables' => 'Πληρωτέα', + 'open_bills' => 'Ανοιχτοί λογαριασμοί', + 'overdue_bills' => 'Ανεξόφλητοι λογαριασμοί', + 'total_profit' => 'Συνολικό κέρδος', + 'open_profit' => 'Ανοιχτό κέρδος', + 'overdue_profit' => 'Εκπρόθεσμο κέρδος', + 'cash_flow' => 'Ταμειακή ροή', + 'no_profit_loss' => 'Καμία απώλεια κέρδους', + 'incomes_by_category' => 'Έσοδα κατά κατηγορία', + 'expenses_by_category' => 'Έξοδα ανά κατηγορία', + 'account_balance' => 'Υπόλοιπο λογαριασμού', + 'latest_incomes' => 'Τελευταία έσοδα', + 'latest_expenses' => 'Τελευταία έξοδα', + +]; diff --git a/resources/lang/el-GR/demo.php b/resources/lang/el-GR/demo.php new file mode 100644 index 000000000..28abab310 --- /dev/null +++ b/resources/lang/el-GR/demo.php @@ -0,0 +1,17 @@ + 'Μετρητά', + 'categories_uncat' => 'Χωρίς κατηγοριοποίηση', + 'categories_deposit' => 'Κατάθεση', + 'categories_sales' => 'Πωλήσεις', + 'currencies_usd' => 'Δολάριο ΗΠΑ', + 'currencies_eur' => 'Ευρώ', + 'currencies_gbp' => 'Βρετανική Λίρα', + 'currencies_try' => 'Τουρκική Λίρα', + 'taxes_exempt' => 'Φοροαπαλλαγή', + 'taxes_normal' => 'Κανονικό ΦΠΑ', + 'taxes_sales' => 'ΦΠΑ πωλήσεων', + +]; diff --git a/resources/lang/el-GR/footer.php b/resources/lang/el-GR/footer.php new file mode 100644 index 000000000..94192e9d1 --- /dev/null +++ b/resources/lang/el-GR/footer.php @@ -0,0 +1,9 @@ + 'Έκδοση', + 'powered' => 'Powered By Akaunting', + 'software' => 'Δωρεάν λογισμικό λογιστικής', + +]; diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php new file mode 100644 index 000000000..85c027044 --- /dev/null +++ b/resources/lang/el-GR/general.php @@ -0,0 +1,116 @@ + 'Στοιχείο | Στοιχεία', + 'incomes' => 'Έσοδα | Εισοδήματα', + 'invoices' => 'Τιμολόγιο | Τιμολόγια', + 'revenues' => 'Έσοδα | Έσοδα', + 'customers' => 'Πελάτης | Πελάτες', + 'expenses' => 'Έξοδα | Έξοδα', + 'bills' => 'Λογαριασμός | Λογαριασμοί', + 'payments' => 'Πληρωμής | Πληρωμές', + 'vendors' => 'Προμηθευτής | Προμηθευτές', + 'accounts' => 'Λογαριασμός | Λογαριασμοί', + 'transfers' => 'Μεταφορά | Μεταφορές', + 'transactions' => 'Συναλλαγής | Συναλλαγές', + 'reports' => 'Αναφορά | Αναφορές', + 'settings' => 'Ρύθμιση | Ρυθμίσεις', + 'categories' => 'Κατηγορία | Κατηγορίες', + 'currencies' => 'Νόμισμα | Νομίσματα', + 'tax_rates' => 'Φορολογικός συντελεστής | Φορολογικοί συντελεστές', + 'users' => 'Χρήστη | Χρήστες', + 'roles' => 'Ρόλος | Ρόλοι', + 'permissions' => 'Δικαίωμα | Δικαιώματα', + 'modules' => 'Εφαρμογή | Εφαρμογές', + 'companies' => 'Εταιρεία | Εταιρείες', + 'profits' => 'Κέρδος | Κέρδη', + 'taxes' => 'Φόρος | Φόροι', + 'logos' => 'Λογότυπο | Λογότυπα', + 'pictures' => 'Εικόνα | Εικόνες', + 'types' => 'Τύπος | Τύποι', + 'payment_methods' => 'Μέθοδος πληρωμής | Μέθοδοι πληρωμής', + 'compares' => 'Έσοδο προς Έξοδο | Έσοδα προς Έξοδα', + 'notes' => 'Σημείωση | Σημειώσεις', + 'totals' => 'Σύνολο | Σύνολα', + 'languages' => 'Γλώσσα | Γλώσσες', + 'updates' => 'Ενημέρωση | Ενημερώσεις', + 'numbers' => 'Αριθμός | Αριθμοί', + 'statuses' => 'Κατάσταση | Καταστάσεις', + + 'dashboard' => 'Πίνακας ελέγχου', + 'banking' => 'Τραπεζική', + 'general' => 'Γενικά', + 'no_records' => 'Καμία εγγραφή.', + 'date' => 'Ημερομηνία', + 'amount' => 'Ποσό', + 'enabled' => 'Ενεργοποιημένο', + 'disabled' => 'Απενεργοποιημένο', + 'yes' => 'Ναι', + 'no' => 'Όχι', + 'na' => 'Μη Διαθέσιμο', + 'daily' => 'Ημερήσια', + 'monthly' => 'Μηνιαία', + 'quarterly' => 'Τριμηνιαία', + 'yearly' => 'Ετήσια', + 'add' => 'Προσθήκη', + 'add_new' => 'Προσθήκη νέου', + 'show' => 'Εμφάνιση', + 'edit' => 'Επεξεργασία', + 'delete' => 'Διαγραφή', + 'send' => 'Αποστολή', + 'download' => 'Λήψη', + 'delete_confirm' => 'Επιβεβαίωση διαγραφής :name :type;', + 'name' => 'Όνομα', + 'email' => 'Email', + 'tax_number' => 'Ονομασία ΦΠΑ', + 'phone' => 'Τηλέφωνο', + 'address' => 'Διεύθυνση', + 'website' => 'Ιστοσελίδα', + 'actions' => 'Ενέργειες', + 'description' => 'Περιγραφή', + 'manage' => 'Διαχείριση', + 'code' => 'Κωδικός', + 'alias' => 'Ψευδώνυμο', + 'balance' => 'Υπόλοιπο', + 'reference' => 'Αναφορά', + 'attachment' => 'Συνημμένο', + 'change' => 'Αλλαγή', + 'switch' => 'Αλλαγή', + 'color' => 'Χρώμα', + 'save' => 'Αποθήκευση', + 'cancel' => 'Ακύρωση', + 'from' => 'Από', + 'to' => 'Προς', + 'print' => 'Εκτύπωση', + 'search' => 'Αναζήτηση', + 'search_placeholder' => 'Αναζήτηση..', + 'filter' => 'Φίλτρο', + 'help' => 'Βοήθεια', + 'all' => 'Όλα', + 'all_type' => 'Όλα :type', + 'upcoming' => 'Επερχόμενα', + 'created' => 'Δημιουργήθηκε', + 'id' => 'ID', + 'more_actions' => 'Περίσσότερες ενέργειες', + 'duplicate' => 'Αντιγραφή', + 'unpaid' => 'Ανεξόφλητο', + 'paid' => 'Εξοφλημένα', + 'overdue' => 'Εκπρόθεσμο', + 'partially' => 'Μερικό', + 'partially_paid' => 'Μερικώς εξοφλημένα', + + 'title' => [ + 'new' => 'Νέο :type', + 'edit' => 'Επεξεργασία :type', + ], + 'form' => [ + 'enter' => 'Πληκτρολογήστε :field', + 'select' => [ + 'field' => 'Επίλέξτε :field', + 'file' => 'Επιλογή αρχείου', + ], + 'no_file_selected' => 'Δεν έχει επιλεχθεί αρχείο...', + ], + +]; diff --git a/resources/lang/el-GR/header.php b/resources/lang/el-GR/header.php new file mode 100644 index 000000000..9898f1a7e --- /dev/null +++ b/resources/lang/el-GR/header.php @@ -0,0 +1,15 @@ + 'Αλλαγή γλώσσας', + 'last_login' => 'Τελευταία είσοδος :time', + 'notifications' => [ + 'counter' => '{0} Δεν έχετε καμία ειδοποίηση |{1} Έχετε :count ειδοποίηση| [2 *] Έχετε :count ειδοποιήσεις', + 'overdue_invoices' => '{1} :count εκπρόθεσμο τιμολόγιο | [2 *] :count εκπρόθεσμα τιμολόγια', + 'upcoming_bills' => '{1} :count επερχόμενος λογαριασμός | [2 *] :count επερχόμενοι λογαριασμοί', + 'items_stock' => '{1} :count απόθεμα σε έλλειψη | {2,*} :count αποθέματα σε έλλειψη', + 'view_all' => 'Προβολή Όλων' + ], + +]; diff --git a/resources/lang/el-GR/import.php b/resources/lang/el-GR/import.php new file mode 100644 index 000000000..74db40660 --- /dev/null +++ b/resources/lang/el-GR/import.php @@ -0,0 +1,9 @@ + 'Εισαγωγή', + 'title' => 'Εισαγωγή :type', + 'message' => 'Επιτρεπόμενοι τύποοι αρχείων: CSV, XLS. Παρακαλούμε, Κατεβάστε το δείγμα του αρχείου.', + +]; diff --git a/resources/lang/el-GR/install.php b/resources/lang/el-GR/install.php new file mode 100644 index 000000000..490433ed5 --- /dev/null +++ b/resources/lang/el-GR/install.php @@ -0,0 +1,44 @@ + 'Επόμενο', + 'refresh' => 'Ανανέωση', + + 'steps' => [ + 'requirements' => 'Παρακαλώ, να πληρούνται οι ακόλουθες προϋποθέσεις!', + 'language' => 'Βήμα 1 από 3: Επιλογή Γλώσσας', + 'database' => 'Βήμα 2 από 3: Εγκατάσταση Βάσης Δεδομένων', + 'settings' => 'Βήμα 3 από 3: Στοιχεία Εταιρείας και Διαχειριστή', + ], + + 'language' => [ + 'select' => 'Επιλέξτε γλώσσα', + ], + + 'requirements' => [ + 'enabled' => ':feature πρέπει να ενεργοποιηθεί!', + 'disabled' => ':feature πρέπει να απενεργοποιηθεί!', + 'extension' => ':extension η επέκταση πρέπει να φορτωθεί!', + 'directory' => ':directory ο καταλόγος πρέπει να είναι εγγράψιμος!', + ], + + 'database' => [ + 'hostname' => 'Όνομα κεντρικού υπολογιστή', + 'username' => 'Όνομα χρήστη', + 'password' => 'Κωδικός πρόσβασης', + 'name' => 'Βάση δεδομένων', + ], + + 'settings' => [ + 'company_name' => 'Επωνυμία εταιρείας', + 'company_email' => 'Εταιρικό ηλεκτρονικό ταχυδρομείο', + 'admin_email' => 'Ηλεκτρονικού ταχυδρομείου Διαχειριστή', + 'admin_password' => 'Κωδικός Πρόσβασης Διαχειριστή', + ], + + 'error' => [ + 'connection' => 'Σφάλμα: Η σύνδεση με τη βάση δεδομένων ήταν αδύνατη! Παρακαλούμε, βεβαιωθείτε ότι τα στοιχεία είναι σωστά.', + ], + +]; diff --git a/resources/lang/el-GR/invoices.php b/resources/lang/el-GR/invoices.php new file mode 100644 index 000000000..c1848ed77 --- /dev/null +++ b/resources/lang/el-GR/invoices.php @@ -0,0 +1,50 @@ + 'Αριθμός Τιμολογίου', + 'invoice_date' => 'Ημερομηνία Τιμολογίου', + 'total_price' => 'Συνολική Τιμή', + 'due_date' => 'Ημ/νία Προθεσμίας Πληρωμής', + 'order_number' => 'Αριθμός παραγγελίας', + 'bill_to' => 'Πληρωτέες σε', + + 'quantity' => 'Ποσότητα', + 'price' => 'Τιμή', + 'sub_total' => 'Μερικό Σύνολο', + 'tax_total' => 'Σύνολο φόρου', + 'total' => 'Σύνολο', + + 'item_name' => 'Όνομα Αντικειμένου | Ονόματα Αντικειμένων', + + 'payment_due' => 'Οφειλόμενη Πληρωμή', + 'paid' => 'Εξοφλημένο', + 'histories' => 'Ιστορικό', + 'payments' => 'Πληρωμές', + 'add_payment' => 'Προσθήκη πληρωμής', + 'mark_paid' => 'Σημείωσε ως Εξοφλημένο', + 'mark_sent' => 'Σημείωσε ως Απεσταλμένο', + 'download_pdf' => 'Λήψη PDF', + 'send_mail' => 'Αποστολή email Μηνύματος', + + 'status' => [ + 'draft' => 'Προσχέδιο', + 'sent' => 'Απεσταλμένο', + 'viewed' => 'Έχει ανοιχτεί', + 'approved' => 'Έχει εγκριθεί', + 'partial' => 'Μερικός', + 'paid' => 'Πληρωμένο', + ], + + 'messages' => [ + 'email_sent' => 'Τιμολόγιο email έχει σταλεί με επιτυχία!', + 'marked_sent' => 'Τιμολόγιο σημασμένο ως σταλμένο με επιτυχία!', + 'email_required' => 'Δεν υπάρχει διεύθυνση email για αυτόν τον πελάτη!', + ], + + 'notification' => [ + 'message' => 'Λαμβάνετε αυτό το μήνυμα επειδή έχετε ένα επερχόμενο: ποσό τιμολογίου σε : πελάτη πελάτη.', + 'button' => 'Εξόφληση τώρα', + ], + +]; diff --git a/resources/lang/el-GR/items.php b/resources/lang/el-GR/items.php new file mode 100644 index 000000000..be5522e5d --- /dev/null +++ b/resources/lang/el-GR/items.php @@ -0,0 +1,15 @@ + 'Ποσότητα | Ποσότητες', + 'sales_price' => 'Τιμή Πώλησης', + 'purchase_price' => 'Τιμή αγοράς', + 'sku' => 'Μονάδες Προϊόντος σε Απόθεμα', + + 'notification' => [ + 'message' => 'Λαμβάνετε αυτό το μήνυμα επειδή το : υπ\' αριθμ. προϊόν εξαντλείται.', + 'button' => 'Δείτε τώρα', + ], + +]; diff --git a/resources/lang/el-GR/messages.php b/resources/lang/el-GR/messages.php new file mode 100644 index 000000000..8421b4dfd --- /dev/null +++ b/resources/lang/el-GR/messages.php @@ -0,0 +1,23 @@ + [ + 'added' => ':type προστέθηκε!', + 'updated' => ':type ενημερώθηκε!', + 'deleted' => ':type διεγράφη!', + 'duplicated' => ':type αντιγράφηκε!', + 'imported' => ':type εισήχθη!', + ], + 'error' => [ + 'over_payment' => 'Σφάλμα: Η πληρωμή δεν προστέθηκε! Το ποσό ξεπερνάει το σύνολο.', + 'not_user_company' => 'Σφάλμα: Δεν επιτρέπεται να διαχειριστείτε αυτή την εταιρεία!', + 'customer' => 'Σφάλμα: Ο χρήστης δεν δημιουργήθηκε! Ο/Η :name χρησιμοποιεί ήδη αυτό το email.', + 'no_file' => 'Σφάλμα: Δεν έχετε επιλέξει αρχείο!', + ], + 'warning' => [ + 'deleted' => 'Προειδοποίηση: Δεν επιτρέπεται να διαγράψετε το :name επειδή έχει :text που σχετίζονται.', + 'disabled' => 'Προειδοποίηση: Δεν επιτρέπεται να διαγράψετε το : name επειδή έχει :text που σχετίζονται.', + ], + +]; diff --git a/resources/lang/el-GR/modules.php b/resources/lang/el-GR/modules.php new file mode 100644 index 000000000..45931ae68 --- /dev/null +++ b/resources/lang/el-GR/modules.php @@ -0,0 +1,47 @@ + 'Προσωπικό API token', + 'api_token' => 'Token', + 'top_paid' => 'Κορυφαία επί πληρωμή Προϊόντα', + 'new' => 'Νέο', + 'top_free' => 'Κορυφαία δωρεάν Προϊόντα', + 'free' => 'ΔΩΡΕΑΝ', + 'install' => 'Εγκατάσταση', + 'buy_now' => 'Αγοράστε τώρα', + 'token_link' => ' κάντε κλικ εδώ για να λάβετε το προσωπικό σας Token API.', + 'no_apps' => 'Δεν υπάρχουν εφαρμογές σε αυτή την κατηγορία, ακόμα.', + 'developer' => 'Είστε προγραμματιστής; εδώ μπορείτε να μάθετε πώς μπορείτε να δημιουργήσετε μια εφαρμογή και να αρχίσετε να την πουλάτε σήμερα κιόλας!', + + 'about' => 'Σχετικά με', + + 'added' => 'Έχει προστεθεί', + 'updated' => 'Ενημερώθηκε', + 'compatibility' => 'Συμβατότητα', + + 'installed' => ':κομμάτι που έχει εγκατασταθεί', + 'uninstalled' => ':κομμάτι που έχει απεγκατασταθεί', + //'updated' => ':module updated', + 'enabled' => ': κομμάτι που έχει ενεργοποιηθεί', + 'disabled' => ':κομμάτι που έχει απενεργοποιηθεί', + + 'tab' => [ + 'installation' => 'Εγκατάσταση', + 'faq' => 'Συχνές ερωτήσεις (FAQ)', + 'changelog' => 'Αρχείο καταγραφής αλλαγών', + ], + + 'installation' => [ + 'header' => 'Εγκατάσταση εφαρμογής', + 'download' => 'Λήψη :όνομα αρχείου.', + 'unzip' => 'Εξαγωγή :όνομα αρχείου.', + 'install' => 'Εγκατάσταση :όνομα αρχείου.', + ], + + 'button' => [ + 'uninstall' => 'Απεγκατάσταση', + 'disable' => 'Απενεργοποίηση', + 'enable' => 'Ενεργοποίηση', + ], +]; diff --git a/resources/lang/el-GR/pagination.php b/resources/lang/el-GR/pagination.php new file mode 100644 index 000000000..e19f51a87 --- /dev/null +++ b/resources/lang/el-GR/pagination.php @@ -0,0 +1,9 @@ + '« Προηγούμενο', + 'next' => 'Επόμενη »', + 'showing' => 'Απεικόνιση :πρώτο σε :τελευταίο από :συνολικό :είδος', + +]; diff --git a/resources/lang/el-GR/passwords.php b/resources/lang/el-GR/passwords.php new file mode 100644 index 000000000..6bd075e7b --- /dev/null +++ b/resources/lang/el-GR/passwords.php @@ -0,0 +1,22 @@ + 'Το συνθηματικό πρέπει να έχει τουλάχιστον έξι χαρακτήρες και να ταιριάζει με την επαλήθευση.', + 'reset' => 'Έχει γίνει επαναφορά του συνθηματικού!', + 'sent' => 'Η υπενθύμιση του συνθηματικού εστάλη!', + 'token' => 'Το κλειδί αρχικοποίησης του συνθηματικού δεν είναι έγκυρο.', + 'user' => "Δεν βρέθηκε χρήστης με το συγκεκριμένο email.", + +]; diff --git a/resources/lang/el-GR/reports.php b/resources/lang/el-GR/reports.php new file mode 100644 index 000000000..a03b80b78 --- /dev/null +++ b/resources/lang/el-GR/reports.php @@ -0,0 +1,17 @@ + 'Φέτος', + 'previous_year' => 'Προηγούμενο έτος', + 'this_quarter' => 'Αυτό το τρίμηνο', + 'previous_quarter' => 'Προηγούμενο τρίμηνο', + 'last_12_months' => 'Τελευταίοι 12 μήνες', + + 'summary' => [ + 'income' => 'Σύνοψη εσόδων', + 'expense' => 'Σύνοψη εξόδων', + 'income_expense' => 'Έσοδα με έξοδα', + ], + +]; diff --git a/resources/lang/el-GR/settings.php b/resources/lang/el-GR/settings.php new file mode 100644 index 000000000..90a9973a2 --- /dev/null +++ b/resources/lang/el-GR/settings.php @@ -0,0 +1,85 @@ + [ + 'name' => 'Όνομα', + 'email' => 'Διεύθυνση ηλ. ταχυδρομείου', + 'phone' => 'Τηλέφωνο', + 'address' => 'Διεύθυνση', + 'logo' => 'Λογότυπο', + ], + 'localisation' => [ + 'tab' => 'Τοπική προσαρμογή', + 'date' => [ + 'format' => 'Μορφοποίηση Ημερομηνίας', + 'separator' => 'Διαχωριστικό ημερομηνίας', + 'dash' => 'Παύλα (-)', + 'dot' => 'Τελεία (.)', + 'comma' => 'Κόμμα (,)', + 'slash' => 'Πλαγιοκάθετος (/)', + 'space' => 'Κενό ( )', + ], + 'timezone' => 'Ζώνη ώρας', + ], + 'invoice' => [ + 'tab' => 'Τιμολόγιο', + 'prefix' => 'Πρόθεμα αριθμού', + 'digit' => 'Αριθμός ψηφίων', + 'next' => 'Επόμενος αριθμός', + 'logo' => 'Λογότυπο', + ], + 'default' => [ + 'tab' => 'Προεπιλογές', + 'account' => 'Προεπιλεγμένος λογαριασμός', + 'currency' => 'Προεπιλεγμένο νόμισμα', + 'tax' => 'Προεπιλεγμένη φορολογικός συντελεστής', + 'payment' => 'Προεπιλεγμένη μέθοδος πληρωμής', + 'language' => 'Προεπιλεγμένη Γλώσσα', + ], + 'email' => [ + 'protocol' => 'Πρωτόκολλο', + 'php' => 'PHP Mail', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'Διακομιστής SMTP', + 'port' => 'Θύρα SMTP', + 'username' => 'Όνομα Χρήστη SMTP', + 'password' => 'Κωδικός πρόσβασης SMTP', + 'encryption' => 'Ασφάλεια SMTP', + 'none' => 'Κανένα', + ], + 'sendmail' => 'Απεσταλμένα μηνύματα', + 'sendmail_path' => 'Διαδρομή προς Απεσταλμένα Μηνύματα', + 'log' => 'Αρχείο καταγραφής ηλεκτρονικών μηνυμάτων', + ], + 'scheduling' => [ + 'tab' => 'Χρονοδιαγραμα', + 'send_invoice' => 'Υπενθύμιση αποστολής τιμολογίου', + 'invoice_days' => 'Αποστολή μετά από πόσες μέρες πρέπει να εξοφληθεί', + 'send_bill' => 'Αποστολή υπενθύμισης Λογαριασμού', + 'bill_days' => 'Αποστολή πριν από πόσες μέρες θα έπρεπε να είχε εξοφληθεί', + 'cron_command' => 'Προγραμματισμένη Εντολή', + 'schedule_time' => 'Ώρα εκτέλεσης', + ], + 'appearance' => [ + 'tab' => 'Εμφάνιση', + 'theme' => 'Θέμα', + 'light' => 'Φωτεινό', + 'dark' => 'Σκοτεινό', + 'list_limit' => 'Εγγραφές ανά σελίδα', + 'use_gravatar' => 'Χρήση gravatar', + ], + 'system' => [ + 'tab' => 'Σύστημα', + 'session' => [ + 'lifetime' => 'Διάρκεια συνεδρίας (λεπτά)', + 'handler' => 'Διαχειριστής συνεδρίας', + 'file' => 'Αρχείο', + 'database' => 'Βάση δεδομένων', + ], + 'file_size' => 'Μέγιστο μέγεθος αρχείου (MB)', + 'file_types' => 'Επιτρεπόμενα αρχεία', + ], + +]; diff --git a/resources/lang/el-GR/taxes.php b/resources/lang/el-GR/taxes.php new file mode 100644 index 000000000..2597fffdb --- /dev/null +++ b/resources/lang/el-GR/taxes.php @@ -0,0 +1,8 @@ + 'Ποσοστό', + 'rate_percent' => 'Ποσοστό (%)', + +]; diff --git a/resources/lang/el-GR/transfers.php b/resources/lang/el-GR/transfers.php new file mode 100644 index 000000000..a8136c0c8 --- /dev/null +++ b/resources/lang/el-GR/transfers.php @@ -0,0 +1,8 @@ + 'Από λογαριασμό', + 'to_account' => 'Προς λογαριασμό', + +]; diff --git a/resources/lang/el-GR/updates.php b/resources/lang/el-GR/updates.php new file mode 100644 index 000000000..3e477b16c --- /dev/null +++ b/resources/lang/el-GR/updates.php @@ -0,0 +1,15 @@ + 'Εγκατεστημένη έκδοση', + 'latest_version' => 'Τελευταία έκδοση', + 'update' => 'Ενημέρωση Akaunting στην έκδοση :version', + 'changelog' => 'Αρχείο καταγραφής αλλαγών', + 'check' => 'Έλεγχος', + 'new_core' => 'Διατίθεται μια ενημερωμένη έκδοση του Akaunting.', + 'latest_core' => 'Συγχαρητήρια! Έχετε την τελευταία έκδοση του Akaunting. Μελλοντικές ενημερωμένες εκδόσεις θα εφαρμοστούν αυτόματα.', + 'success' => 'Η ενημέρωση έχει ολοκληρωθεί επιτυχώς.', + 'error' => 'Η ενημέρωση απέτυχε. Παρακαλώ προσπαθήστε ξανά.', + +]; diff --git a/resources/lang/el-GR/validation.php b/resources/lang/el-GR/validation.php new file mode 100644 index 000000000..7b3f49335 --- /dev/null +++ b/resources/lang/el-GR/validation.php @@ -0,0 +1,119 @@ + 'Το πεδίο :attribute πρέπει να γίνει αποδεκτό.', + 'active_url' => 'Το πεδίο :attribute δεν είναι αποδεκτή διεύθυνση URL.', + 'after' => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία μετά από :date.', + 'after_or_equal' => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία ίδια ή μετά από :date.', + 'alpha' => 'Το πεδίο :attribute μπορεί να περιέχει μόνο γράμματα.', + 'alpha_dash' => 'Το πεδίο :attribute μπορεί να περιέχει μόνο γράμματα, αριθμούς, και παύλες.', + 'alpha_num' => 'Το πεδίο :attribute μπορεί να περιέχει μόνο γράμματα και αριθμούς.', + 'array' => 'Το πεδίο :attribute πρέπει να είναι ένας πίνακας.', + 'before' => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία πριν από :date.', + 'before_or_equal' => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία ίδια ή πριν από :date.', + 'between' => [ + 'numeric' => 'Το πεδίο :attribute πρέπει να είναι μεταξύ :min - :max.', + 'file' => 'Το πεδίο :attribute πρέπει να είναι μεταξύ :min - :max kilobytes.', + 'string' => 'Το πεδίο :attribute πρέπει να είναι μεταξύ :min - :max χαρακτήρες.', + 'array' => 'Το πεδίο :attribute πρέπει να έχει μεταξύ :min - :max αντικείμενα.', + ], + 'boolean' => 'Το πεδίο :attribute πρέπει να είναι true ή false.', + 'confirmed' => 'Η επιβεβαίωση του :attribute δεν ταιριάζει.', + 'date' => 'Το πεδίο :attribute δεν είναι έγκυρη ημερομηνία.', + 'date_format' => 'Το πεδίο :attribute δεν είναι της μορφής :format.', + 'different' => 'Το πεδίο :attribute και :other πρέπει να είναι διαφορετικά.', + 'digits' => 'Το πεδίο :attribute πρέπει να είναι :digits ψηφία.', + 'digits_between' => 'Το πεδίο :attribute πρέπει να είναι μεταξύ :min και :max ψηφία.', + 'dimensions' => 'Το πεδίο :attribute περιέχει μη έγκυρες διαστάσεις εικόνας.', + 'distinct' => 'Το πεδίο :attribute περιέχει δύο φορές την ίδια τιμή.', + 'email' => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση email.', + 'exists' => 'Το επιλεγμένο :attribute δεν είναι έγκυρο.', + 'file' => 'Το πεδίο :attribute πρέπει να είναι αρχείο.', + 'filled' => 'To πεδίο :attribute είναι απαραίτητο.', + 'image' => 'Το πεδίο :attribute πρέπει να είναι εικόνα.', + 'in' => 'Το επιλεγμένο :attribute δεν είναι έγκυρο.', + 'in_array' => 'Το πεδίο :attribute δεν υπάρχει σε :other.', + 'integer' => 'Το πεδίο :attribute πρέπει να είναι ακέραιος.', + 'ip' => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση IP.', + 'json' => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη συμβολοσειρά JSON.', + 'max' => [ + 'numeric' => 'Το πεδίο :attribute δεν μπορεί να είναι μεγαλύτερο από :max.', + 'file' => 'Το πεδίο :attribute δεν μπορεί να είναι μεγαλύτερό :max kilobytes.', + 'string' => 'Το πεδίο :attribute δεν μπορεί να έχει περισσότερους από :max χαρακτήρες.', + 'array' => 'Το πεδίο :attribute δεν μπορεί να έχει περισσότερα από :max αντικείμενα.', + ], + 'mimes' => 'Το πεδίο :attribute πρέπει να είναι αρχείο τύπου: :values.', + 'mimetypes' => 'Το πεδίο :attribute πρέπει να είναι αρχείο τύπου: :values.', + 'min' => [ + 'numeric' => 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min.', + 'file' => 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min kilobytes.', + 'string' => 'Το πεδίο :attribute πρέπει να έχει τουλάχιστον :min χαρακτήρες.', + 'array' => 'Το πεδίο :attribute πρέπει να έχει τουλάχιστον :min αντικείμενα.', + ], + 'not_in' => 'Το επιλεγμένο :attribute δεν είναι αποδεκτό.', + 'numeric' => 'Το πεδίο :attribute πρέπει να είναι αριθμός.', + 'present' => 'Το πεδίο :attribute πρέπει να υπάρχει.', + 'regex' => 'Η μορφή του :attribute δεν είναι αποδεκτή.', + 'required' => 'Το πεδίο :attribute είναι απαραίτητο.', + 'required_if' => 'Το πεδίο :attribute είναι απαραίτητο όταν το πεδίο :other είναι :value.', + 'required_unless' => 'Το πεδίο :attribute είναι απαραίτητο εκτός αν το πεδίο :other εμπεριέχει :values.', + 'required_with' => 'Το πεδίο :attribute είναι απαραίτητο όταν υπάρχει :values.', + 'required_with_all' => 'Το πεδίο :attribute είναι απαραίτητο όταν υπάρχουν :values.', + 'required_without' => 'Το πεδίο :attribute είναι απαραίτητο όταν δεν υπάρχει :values.', + 'required_without_all' => 'Το πεδίο :attribute είναι απαραίτητο όταν δεν υπάρχει κανένα από :values.', + 'same' => 'Τα πεδία :attribute και :other πρέπει να είναι ίδια.', + 'size' => [ + 'numeric' => 'Το πεδίο :attribute πρέπει να είναι :size.', + 'file' => 'Το πεδίο :attribute πρέπει να είναι :size kilobytes.', + 'string' => 'Το πεδίο :attribute πρέπει να είναι :size χαρακτήρες.', + 'array' => 'Το πεδίο :attribute πρέπει να περιέχει :size αντικείμενα.', + ], + 'string' => 'Το πεδίο :attribute πρέπει να είναι αλφαριθμητικό.', + 'timezone' => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη ζώνη ώρας.', + 'unique' => 'Το πεδίο :attribute έχει ήδη εκχωρηθεί.', + 'uploaded' => 'Η μεταφόρτωση του πεδίου :attribute απέτυχε.', + 'url' => 'Το πεδίο :attribute δεν είναι έγκυρη διεύθυνση URL.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'προσαρμοσμένο-μήνυμα', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + +]; From 1af5720915810390d73e1847b04ab0c36f37e134 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 23 Apr 2018 22:17:20 +0300 Subject: [PATCH 40/94] categories for invoices/bills --- app/Http/Controllers/Dashboard/Dashboard.php | 70 +++++++++++-------- app/Http/Controllers/Expenses/Bills.php | 8 ++- app/Http/Controllers/Incomes/Invoices.php | 8 ++- .../Controllers/Reports/ExpenseSummary.php | 33 ++------- .../Reports/IncomeExpenseSummary.php | 47 ++----------- .../Controllers/Reports/IncomeSummary.php | 30 ++------ app/Http/Controllers/Reports/ProfitLoss.php | 55 ++------------- app/Http/Requests/Expense/Bill.php | 1 + app/Http/Requests/Income/Invoice.php | 1 + app/Listeners/Updates/Version120.php | 50 +++++++++++++ app/Models/Expense/Bill.php | 5 ++ app/Models/Income/Invoice.php | 5 ++ app/Models/Setting/Category.php | 18 +++-- ...000_add_category_column_invoices_bills.php | 38 ++++++++++ .../views/expenses/bills/create.blade.php | 7 ++ resources/views/expenses/bills/edit.blade.php | 7 ++ .../views/incomes/invoices/create.blade.php | 7 ++ .../views/incomes/invoices/edit.blade.php | 7 ++ 18 files changed, 215 insertions(+), 182 deletions(-) create mode 100644 database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php diff --git a/app/Http/Controllers/Dashboard/Dashboard.php b/app/Http/Controllers/Dashboard/Dashboard.php index 7c9f5cf2c..9616926f7 100644 --- a/app/Http/Controllers/Dashboard/Dashboard.php +++ b/app/Http/Controllers/Dashboard/Dashboard.php @@ -243,52 +243,63 @@ class Dashboard extends Controller private function calculateAmounts() { - $incomes_amount = $expenses_amount = 0; + $incomes_amount = $open_invoice = $overdue_invoice = 0; + $expenses_amount = $open_bill = $overdue_bill = 0; - // Invoices - $invoices = Invoice::with('payments')->accrued()->get(); - list($invoice_paid_amount, $open_invoice, $overdue_invoice) = $this->calculateTotals($invoices, 'invoice'); - - $incomes_amount += $invoice_paid_amount; - - // Add to Incomes By Category - $this->addToIncomeDonut('#00c0ef', $invoice_paid_amount, trans_choice('general.invoices', 2)); - - // Bills - $bills = Bill::with('payments')->accrued()->get(); - list($bill_paid_amount, $open_bill, $overdue_bill) = $this->calculateTotals($bills, 'bill'); - - $expenses_amount += $bill_paid_amount; - - // Add to Expenses By Category - $this->addToExpenseDonut('#dd4b39', $bill_paid_amount, trans_choice('general.bills', 2)); - - // Revenues & Payments - $categories = Category::orWhere('type', 'income')->orWhere('type', 'expense')->enabled()->get(); + // Get categories + $categories = Category::with(['bills', 'invoices', 'payments', 'revenues'])->orWhere('type', 'income')->orWhere('type', 'expense')->enabled()->get(); foreach ($categories as $category) { switch ($category->type) { case 'income': $amount = 0; + // Revenues foreach ($category->revenues as $revenue) { $amount += $revenue->getConvertedAmount(); } + $incomes_amount += $amount; + + // Invoices + $invoices = $category->invoices()->accrued()->get(); + foreach ($invoices as $invoice) { + list($paid, $open, $overdue) = $this->calculateInvoiceBillTotals($invoice, 'invoice'); + + $incomes_amount += $paid; + $open_invoice += $open; + $overdue_invoice += $overdue; + + $amount += $paid; + } + $this->addToIncomeDonut($category->color, $amount, $category->name); - $incomes_amount += $amount; break; case 'expense': $amount = 0; + // Payments foreach ($category->payments as $payment) { $amount += $payment->getConvertedAmount(); } + $expenses_amount += $amount; + + // Bills + $bills = $category->bills()->accrued()->get(); + foreach ($bills as $bill) { + list($paid, $open, $overdue) = $this->calculateInvoiceBillTotals($bill, 'bill'); + + $expenses_amount += $paid; + $open_bill += $open; + $overdue_bill += $overdue; + + $amount += $paid; + } + $this->addToExpenseDonut($category->color, $amount, $category->name); - $expenses_amount += $amount; break; } } @@ -382,22 +393,19 @@ class Dashboard extends Controller return $profit; } - private function calculateTotals($items, $type) + private function calculateInvoiceBillTotals($item, $type) { $paid = $open = $overdue = 0; $today = $this->today->toDateString(); - foreach ($items as $item) { - $paid += $item->getConvertedAmount(); + $paid += $item->getConvertedAmount(); - $code_field = $type . '_status_code'; - - if ($item->$code_field == 'paid') { - continue; - } + $code_field = $type . '_status_code'; + if ($item->$code_field != 'paid') { $payments = 0; + if ($item->$code_field == 'partial') { foreach ($item->payments as $payment) { $payments += $payment->getConvertedAmount(); diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 130ae0420..5330d572e 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -102,7 +102,9 @@ class Bills extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); - return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes')); + $categories = Category::enabled()->type('expense')->pluck('name', 'id'); + + return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes', 'categories')); } /** @@ -319,7 +321,9 @@ class Bills extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); - return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes')); + $categories = Category::enabled()->type('expense')->pluck('name', 'id'); + + return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes', 'categories')); } /** diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index c222f7eed..6dc279ff2 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -105,9 +105,11 @@ class Invoices extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); + $categories = Category::enabled()->type('income')->pluck('name', 'id'); + $number = $this->getNextInvoiceNumber(); - return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'number')); + return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'categories', 'number')); } /** @@ -340,7 +342,9 @@ class Invoices extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); - return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes')); + $categories = Category::enabled()->type('income')->pluck('name', 'id'); + + return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes', 'categories')); } /** diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 3f605c47e..a72c03ee1 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -23,12 +23,7 @@ class ExpenseSummary extends Controller $status = request('status'); - //if ($filter != 'upcoming') { - $categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); - //} - - // Add Bill in Categories - $categories[0] = trans_choice('general.bills', 2); + $categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); // Get year $year = request('year'); @@ -49,15 +44,6 @@ class ExpenseSummary extends Controller 'currency_rate' => 1 ); - // Bill - $expenses[0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.bills', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($categories as $category_id => $category_name) { $expenses[$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -109,9 +95,6 @@ class ExpenseSummary extends Controller ->credits(false) ->view($chart_template); - // Expenses Graph - $expenses_graph = json_encode($expenses_graph); - return view($view_template, compact('chart', 'dates', 'categories', 'expenses', 'totals')); } @@ -120,13 +103,7 @@ class ExpenseSummary extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->format('F'); - if ($type == 'bill') { - $category_id = 0; - } else { - $category_id = $item->category_id; - } - - if (!isset($expenses[$category_id])) { + if (!isset($expenses[$item->category_id])) { continue; } @@ -139,9 +116,9 @@ class ExpenseSummary extends Controller } } - $expenses[$category_id][$date]['amount'] += $amount; - $expenses[$category_id][$date]['currency_code'] = $item->currency_code; - $expenses[$category_id][$date]['currency_rate'] = $item->currency_rate; + $expenses[$item->category_id][$date]['amount'] += $amount; + $expenses[$item->category_id][$date]['currency_code'] = $item->currency_code; + $expenses[$item->category_id][$date]['currency_rate'] = $item->currency_rate; $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index c29899be2..c8a65b73e 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -26,19 +26,9 @@ class IncomeExpenseSummary extends Controller $status = request('status'); - //if ($filter != 'upcoming') { - $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - //} + $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - // Add Invoice in Categories - $income_categories[0] = trans_choice('general.invoices', 2); - - //if ($filter != 'upcoming') { - $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); - //} - - // Add Bill in Categories - $expense_categories[0] = trans_choice('general.bills', 2); + $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); // Get year $year = request('year'); @@ -59,15 +49,6 @@ class IncomeExpenseSummary extends Controller 'currency_rate' => 1 ); - // Compares - $compares['income'][0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($income_categories as $category_id => $category_name) { $compares['income'][$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -78,14 +59,6 @@ class IncomeExpenseSummary extends Controller ); } - $compares['expense'][0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.bills', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($expense_categories as $category_id => $category_name) { $compares['expense'][$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -167,15 +140,9 @@ class IncomeExpenseSummary extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->format('F'); - if (($type == 'invoice') || ($type == 'bill')) { - $category_id = 0; - } else { - $category_id = $item->category_id; - } + $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - - if (!isset($compares[$group][$category_id])) { + if (!isset($compares[$group][$item->category_id])) { continue; } @@ -188,9 +155,9 @@ class IncomeExpenseSummary extends Controller } } - $compares[$group][$category_id][$date]['amount'] += $amount; - $compares[$group][$category_id][$date]['currency_code'] = $item->currency_code; - $compares[$group][$category_id][$date]['currency_rate'] = $item->currency_rate; + $compares[$group][$item->category_id][$date]['amount'] += $amount; + $compares[$group][$item->category_id][$date]['currency_code'] = $item->currency_code; + $compares[$group][$item->category_id][$date]['currency_rate'] = $item->currency_rate; if ($group == 'income') { $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 896f568a5..16f05aa73 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -23,12 +23,7 @@ class IncomeSummary extends Controller $status = request('status'); - //if ($filter != 'upcoming') { - $categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - //} - - // Add Invoice in Categories - $categories[0] = trans_choice('general.invoices', 2); + $categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); // Get year $year = request('year'); @@ -49,15 +44,6 @@ class IncomeSummary extends Controller 'currency_rate' => 1 ); - // Invoice - $incomes[0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($categories as $category_id => $category_name) { $incomes[$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -117,13 +103,7 @@ class IncomeSummary extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->format('F'); - if ($type == 'invoice') { - $category_id = 0; - } else { - $category_id = $item->category_id; - } - - if (!isset($incomes[$category_id])) { + if (!isset($incomes[$item->category_id])) { continue; } @@ -136,9 +116,9 @@ class IncomeSummary extends Controller } } - $incomes[$category_id][$date]['amount'] += $amount; - $incomes[$category_id][$date]['currency_code'] = $item->currency_code; - $incomes[$category_id][$date]['currency_rate'] = $item->currency_rate; + $incomes[$item->category_id][$date]['amount'] += $amount; + $incomes[$item->category_id][$date]['currency_code'] = $item->currency_code; + $incomes[$item->category_id][$date]['currency_rate'] = $item->currency_rate; $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index 53a201458..1726aeb18 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -28,14 +28,8 @@ class ProfitLoss extends Controller $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - // Add invoice to income categories - $income_categories[0] = trans_choice('general.invoices', 2); - $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); - // Add bill to expense categories - $expense_categories[0] = trans_choice('general.bills', 2); - // Get year $year = request('year'); if (empty($year)) { @@ -53,15 +47,6 @@ class ProfitLoss extends Controller 'currency_rate' => 1 ); - // Compares - $compares['income'][0][$dates[$j]] = [ - 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - foreach ($income_categories as $category_id => $category_name) { $compares['income'][$category_id][$dates[$j]] = [ 'category_id' => $category_id, @@ -72,14 +57,6 @@ class ProfitLoss extends Controller ]; } - $compares['expense'][0][$dates[$j]] = [ - 'category_id' => 0, - 'name' => trans_choice('general.bills', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - foreach ($expense_categories as $category_id => $category_name) { $compares['expense'][$category_id][$dates[$j]] = [ 'category_id' => $category_id, @@ -99,14 +76,6 @@ class ProfitLoss extends Controller 'currency_rate' => 1 ]; - $compares['income'][0]['total'] = [ - 'category_id' => 0, - 'name' => trans_choice('general.totals', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - $gross['income'] = $gross['expense'] = [1 => 0, 2 => 0, 3 => 0, 4 => 0, 'total' => 0]; foreach ($income_categories as $category_id => $category_name) { @@ -119,14 +88,6 @@ class ProfitLoss extends Controller ]; } - $compares['expense'][0]['total'] = [ - 'category_id' => 0, - 'name' => trans_choice('general.totals', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - foreach ($expense_categories as $category_id => $category_name) { $compares['expense'][$category_id]['total'] = [ 'category_id' => $category_id, @@ -196,15 +157,9 @@ class ProfitLoss extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->quarter; - if (($type == 'invoice') || ($type == 'bill')) { - $category_id = 0; - } else { - $category_id = $item->category_id; - } - $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - if (!isset($compares[$group][$category_id])) { + if (!isset($compares[$group][$item->category_id])) { continue; } @@ -217,10 +172,10 @@ class ProfitLoss extends Controller } } - $compares[$group][$category_id][$date]['amount'] += $amount; - $compares[$group][$category_id][$date]['currency_code'] = $item->currency_code; - $compares[$group][$category_id][$date]['currency_rate'] = $item->currency_rate; - $compares[$group][$category_id]['total']['amount'] += $amount; + $compares[$group][$item->category_id][$date]['amount'] += $amount; + $compares[$group][$item->category_id][$date]['currency_code'] = $item->currency_code; + $compares[$group][$item->category_id][$date]['currency_rate'] = $item->currency_rate; + $compares[$group][$item->category_id]['total']['amount'] += $amount; if ($group == 'income') { $totals[$date]['amount'] += $amount; diff --git a/app/Http/Requests/Expense/Bill.php b/app/Http/Requests/Expense/Bill.php index ffdcef1b1..8bd84e01c 100644 --- a/app/Http/Requests/Expense/Bill.php +++ b/app/Http/Requests/Expense/Bill.php @@ -39,6 +39,7 @@ class Bill extends Request 'billed_at' => 'required|date', 'due_at' => 'required|date', 'currency_code' => 'required|string', + 'category_id' => 'required|integer', 'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, ]; } diff --git a/app/Http/Requests/Income/Invoice.php b/app/Http/Requests/Income/Invoice.php index a0ddcdb24..ed35db28c 100644 --- a/app/Http/Requests/Income/Invoice.php +++ b/app/Http/Requests/Income/Invoice.php @@ -39,6 +39,7 @@ class Invoice extends Request 'invoiced_at' => 'required|date', 'due_at' => 'required|date', 'currency_code' => 'required|string', + 'category_id' => 'required|integer', 'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, ]; } diff --git a/app/Listeners/Updates/Version120.php b/app/Listeners/Updates/Version120.php index 41ea4942c..3ee1329a1 100644 --- a/app/Listeners/Updates/Version120.php +++ b/app/Listeners/Updates/Version120.php @@ -5,6 +5,11 @@ namespace App\Listeners\Updates; use App\Events\UpdateFinished; use App\Models\Auth\Role; use App\Models\Auth\Permission; +use App\Models\Company\Company; +use App\Models\Expense\Bill; +use App\Models\Income\Invoice; +use App\Models\Setting\Category; +use Artisan; class Version120 extends Listener { @@ -25,6 +30,16 @@ class Version120 extends Listener return; } + $this->updatePermissions(); + + // Update database + Artisan::call('migrate', ['--force' => true]); + + $this->updateInvoicesAndBills(); + } + + protected function updatePermissions() + { $permissions = []; // Create tax summary permission @@ -56,4 +71,39 @@ class Version120 extends Listener } } } + + protected function updateInvoicesAndBills() + { + $companies = Company::all(); + + foreach ($companies as $company) { + // Invoices + $invoice_category = Category::create([ + 'company_id' => $company->id, + 'name' => trans_choice('general.invoices', 2), + 'type' => 'income', + 'color' => '#00c0ef', + 'enabled' => '1' + ]); + + foreach ($company->invoices as $invoice) { + $invoice->category_id = $invoice_category->id; + $invoice->save(); + } + + // Bills + $bill_category = Category::create([ + 'company_id' => $company->id, + 'name' => trans_choice('general.bills', 2), + 'type' => 'expense', + 'color' => '#dd4b39', + 'enabled' => '1' + ]); + + foreach ($company->bills as $bill) { + $bill->category_id = $bill_category->id; + $bill->save(); + } + } + } } diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index 655712881..e278a2c8f 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -60,6 +60,11 @@ class Bill extends Model */ protected $cloneable_relations = ['items', 'totals']; + public function category() + { + return $this->belongsTo('App\Models\Setting\Category'); + } + public function vendor() { return $this->belongsTo('App\Models\Expense\Vendor'); diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 16e5cfa9f..dece8caaf 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -61,6 +61,11 @@ class Invoice extends Model */ protected $cloneable_relations = ['items', 'totals']; + public function category() + { + return $this->belongsTo('App\Models\Setting\Category'); + } + public function customer() { return $this->belongsTo('App\Models\Income\Customer'); diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php index 4fd9b40b1..5aa3f418f 100644 --- a/app/Models/Setting/Category.php +++ b/app/Models/Setting/Category.php @@ -22,9 +22,19 @@ class Category extends Model */ public $sortable = ['name', 'type', 'enabled']; - public function revenues() + public function bills() { - return $this->hasMany('App\Models\Income\Revenue'); + return $this->hasMany('App\Models\Expense\Bill'); + } + + public function invoices() + { + return $this->hasMany('App\Models\Income\Invoice'); + } + + public function items() + { + return $this->hasMany('App\Models\Item\Item'); } public function payments() @@ -32,9 +42,9 @@ class Category extends Model return $this->hasMany('App\Models\Expense\Payment'); } - public function items() + public function revenues() { - return $this->hasMany('App\Models\Item\Item'); + return $this->hasMany('App\Models\Income\Revenue'); } /** diff --git a/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php new file mode 100644 index 000000000..d32668d85 --- /dev/null +++ b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php @@ -0,0 +1,38 @@ +integer('category_id'); + }); + + Schema::table('bills', function ($table) { + $table->integer('category_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('invoices', function ($table) { + $table->dropColumn('category_id'); + }); + + Schema::table('bills', function ($table) { + $table->dropColumn('category_id'); + }); + } +} diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index fb7de3f00..1fe8904c5 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -97,6 +97,9 @@
      {{ trans($total['name']) }}:@money($total->amount, $invoice->currency_code, true)
      {{ $taxes[$total->name] }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total['name']) }}:{{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true)
      - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -127,10 +127,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -70,10 +70,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -145,10 +145,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -128,10 +128,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -69,10 +69,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -144,10 +144,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += '
      {{ $taxes[$total->name] }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $bill->currency_code, true)
      {{ trans('bills.sub_total') }} 0
      {{ trans('bills.discount') }} +
      +
      + {!! Form::number('discount', null, ['class' => 'form-control text-right']) !!} +
      +
      {{ trans_choice('general.taxes', 1) }} 0{{ trans('bills.sub_total') }} 0
      {{ trans('bills.discount') }} +
      +
      + {!! Form::number('discount', $bill->discount, ['class' => 'form-control text-right']) !!} +
      +
      {{ trans_choice('general.taxes', 1) }} 0
      {{ $taxes[$total->name] }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $bill->currency_code, true)
      {{ trans('invoices.sub_total') }} 0
      {{ trans('invoices.discount') }} +
      +
      + {!! Form::number('discount', null, ['class' => 'form-control text-right']) !!} +
      +
      {{ trans_choice('general.taxes', 1) }} 0{{ trans('invoices.sub_total') }} 0
      {{ trans('invoices.discount') }} +
      +
      + {!! Form::number('discount', $invoice->discount, ['class' => 'form-control text-right']) !!} +
      +
      {{ trans_choice('general.taxes', 1) }} 0
      {{ $taxes[$total->name] }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $invoice->currency_code, true)
      {{ $taxes[$total->name] }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:@money($total->amount, $invoice->currency_code, true)
      + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment'),[]) }} @@ -190,6 +193,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index a1d7bcc0a..2409cd649 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -113,6 +113,9 @@
      + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment'),[]) }} @@ -210,6 +213,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 0e0a9f46a..e777bb087 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -97,6 +97,9 @@
      + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment')) }} @@ -191,6 +194,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index 3abdb1f72..a159593c8 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -112,6 +112,9 @@
      + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment')) }} @@ -209,6 +212,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', From 15e0662b761df6deaada3950be89697c178d11d7 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 23 Apr 2018 22:28:43 +0300 Subject: [PATCH 41/94] prevent deletion of invoice/bill category #304 --- app/Http/Controllers/Settings/Categories.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index 380f75452..ebead8492 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -90,7 +90,9 @@ class Categories extends Controller { $relationships = $this->countRelationships($category, [ 'items' => 'items', + 'invoices' => 'invoices', 'revenues' => 'revenues', + 'bills' => 'bills', 'payments' => 'payments', ]); @@ -122,7 +124,9 @@ class Categories extends Controller { $relationships = $this->countRelationships($category, [ 'items' => 'items', + 'invoices' => 'invoices', 'revenues' => 'revenues', + 'bills' => 'bills', 'payments' => 'payments', ]); From 483ffa396e7e409832e2d5262d3e6a42611bd0d8 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 24 Apr 2018 01:03:01 +0300 Subject: [PATCH 42/94] prevent deletion of last category by type #304 --- app/Http/Controllers/Settings/Categories.php | 42 ++++++++++++++----- resources/lang/en-GB/general.php | 1 + resources/lang/en-GB/messages.php | 1 + .../settings/categories/create.blade.php | 2 +- .../views/settings/categories/edit.blade.php | 8 ++-- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index ebead8492..4bbad1a59 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -20,8 +20,12 @@ class Categories extends Controller $transfer_id = Category::transfer(); - $types = collect(['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other']) - ->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), ''); + $types = collect([ + 'expense' => trans_choice('general.expenses', 1), + 'income' => trans_choice('general.incomes', 1), + 'item' => trans_choice('general.items', 1), + 'other' => trans_choice('general.others', 1), + ])->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), ''); return view('settings.categories.index', compact('categories', 'types', 'transfer_id')); } @@ -43,7 +47,14 @@ class Categories extends Controller */ public function create() { - return view('settings.categories.create'); + $types = [ + 'expense' => trans_choice('general.expenses', 1), + 'income' => trans_choice('general.incomes', 1), + 'item' => trans_choice('general.items', 1), + 'other' => trans_choice('general.others', 1), + ]; + + return view('settings.categories.create', compact('types')); } /** @@ -73,9 +84,16 @@ class Categories extends Controller */ public function edit(Category $category) { - $transfer_id = Category::transfer(); + $types = [ + 'expense' => trans_choice('general.expenses', 1), + 'income' => trans_choice('general.incomes', 1), + 'item' => trans_choice('general.items', 1), + 'other' => trans_choice('general.others', 1), + ]; - return view('settings.categories.edit', compact('category', 'transfer_id')); + $type_disabled = (Category::where('type', $category->type)->count() == 1) ?: false; + + return view('settings.categories.edit', compact('category', 'types', 'type_disabled')); } /** @@ -122,6 +140,15 @@ class Categories extends Controller */ public function destroy(Category $category) { + // Can not delete the last category by type + if (Category::where('type', $category->type)->count() == 1) { + $message = trans('messages.error.last_category', ['type' => strtolower(trans_choice('general.' . $category->type . 's', 1))]); + + flash($message)->warning(); + + return redirect('settings/categories'); + } + $relationships = $this->countRelationships($category, [ 'items' => 'items', 'invoices' => 'invoices', @@ -130,11 +157,6 @@ class Categories extends Controller 'payments' => 'payments', ]); - // Can't delete transfer category - if ($category->id == Category::transfer()) { - return redirect('settings/categories'); - } - if (empty($relationships)) { $category->delete(); diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 627a417e7..530c03a9e 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -37,6 +37,7 @@ return [ 'updates' => 'Update|Updates', 'numbers' => 'Number|Numbers', 'statuses' => 'Status|Statuses', + 'others' => 'Other|Others', 'dashboard' => 'Dashboard', 'banking' => 'Banking', diff --git a/resources/lang/en-GB/messages.php b/resources/lang/en-GB/messages.php index 491beb1c2..63825167f 100644 --- a/resources/lang/en-GB/messages.php +++ b/resources/lang/en-GB/messages.php @@ -14,6 +14,7 @@ return [ 'not_user_company' => 'Error: You are not allowed to manage this company!', 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: No file selected!', + 'last_category' => 'Error: Can not delete the last :type category!', ], 'warning' => [ 'deleted' => 'Warning: You are not allowed to delete :name because it has :text related.', diff --git a/resources/views/settings/categories/create.blade.php b/resources/views/settings/categories/create.blade.php index ab398ae85..c0f3fdab3 100644 --- a/resources/views/settings/categories/create.blade.php +++ b/resources/views/settings/categories/create.blade.php @@ -10,7 +10,7 @@
      {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }} - {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', ['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'], config('general.types')) }} + {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, config('general.types')) }}
      {!! Form::label('color', trans('general.color'), ['class' => 'control-label']) !!} diff --git a/resources/views/settings/categories/edit.blade.php b/resources/views/settings/categories/edit.blade.php index 4f993b9f1..cb47eee2f 100644 --- a/resources/views/settings/categories/edit.blade.php +++ b/resources/views/settings/categories/edit.blade.php @@ -14,11 +14,11 @@
      {{ Form::textGroup('name', trans('general.name'), 'id-card-o') }} - @if ($category->id == $transfer_id) - {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', ['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'], null, ['required' => 'required', 'disabled' => 'disabled']) }} - + @if ($type_disabled) + {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, null, ['required' => 'required', 'disabled' => 'disabled']) }} + @else - {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', ['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other']) }} + {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types) }} @endif
      From 754a15cb42bc828a3e489e8938deafa733b21e6d Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 24 Apr 2018 15:33:58 +0300 Subject: [PATCH 43/94] styling new button --- public/css/app.css | 4 ++++ resources/views/expenses/bills/create.blade.php | 2 +- resources/views/expenses/payments/create.blade.php | 2 +- resources/views/incomes/invoices/create.blade.php | 6 +++--- resources/views/incomes/revenues/create.blade.php | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 966652125..ae5031122 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -569,4 +569,8 @@ input::-webkit-inner-spin-button { /* display: none; <- Crashes Chrome on hover */ -webkit-appearance: none; margin: 0; /* <-- Apparently some margin are still there even though it's hidden */ +} + +.btn-icon { + height: 34px; } \ No newline at end of file diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 1fe8904c5..09a589c69 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -14,7 +14,7 @@
      {!! Form::select('vendor_id', $vendors, null, array_merge(['id' => 'vendor_id', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.vendors', 1)])])) !!} - +
      {!! $errors->first('vendor_id', '

      :message

      ') !!} diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index d9754fd98..df8704f4d 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -34,7 +34,7 @@
      {!! Form::select('vendor_id', $vendors, null, array_merge(['id' => 'vendor_id', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.vendors', 1)])])) !!} - +
      diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index e777bb087..15d0afb86 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -13,9 +13,9 @@
      {!! Form::select('customer_id', $customers, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.customers', 1)])])) !!} - - - +
      + +
      {!! $errors->first('customer_id', '

      :message

      ') !!}
      diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index f26f760a2..953ef1799 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -34,7 +34,7 @@
      {!! Form::select('customer_id', $customers, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.customers', 1)])])) !!} - +
      From 04cf93e98ee2a3d123f9ab53389a2aaa5a8390e6 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 24 Apr 2018 15:56:21 +0300 Subject: [PATCH 44/94] number type input style --- public/css/app.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index ae5031122..462744820 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -564,11 +564,13 @@ span.picture, span.attachment { min-width: 150px; } -input::-webkit-outer-spin-button, -input::-webkit-inner-spin-button { - /* display: none; <- Crashes Chrome on hover */ +input[type="number"]::-webkit-outer-spin-button, +input[type="number"]::-webkit-inner-spin-button { -webkit-appearance: none; - margin: 0; /* <-- Apparently some margin are still there even though it's hidden */ + margin: 0; +} +input[type="number"] { + -moz-appearance: textfield; } .btn-icon { From bfc4a70ec9a8621af02be3705d6c21434ba900c2 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Tue, 24 Apr 2018 17:26:05 +0300 Subject: [PATCH 45/94] Bill, Revenue, Bill, Payment create page add new category button --- app/Http/Controllers/Settings/Categories.php | 7 ++ .../views/expenses/bills/create.blade.php | 98 ++++++++++++++++++- .../views/expenses/payments/create.blade.php | 98 ++++++++++++++++++- .../views/incomes/invoices/create.blade.php | 98 ++++++++++++++++++- .../views/incomes/revenues/create.blade.php | 98 ++++++++++++++++++- routes/web.php | 1 + 6 files changed, 396 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Settings/Categories.php b/app/Http/Controllers/Settings/Categories.php index 4bbad1a59..b0a6d85e9 100644 --- a/app/Http/Controllers/Settings/Categories.php +++ b/app/Http/Controllers/Settings/Categories.php @@ -171,4 +171,11 @@ class Categories extends Controller return redirect('settings/categories'); } + + public function category(Request $request) + { + $category = Category::create($request->all()); + + return response()->json($category); + } } diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 09a589c69..e340e50db 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -98,7 +98,17 @@
      - {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} +
      + {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!} +
      + +
      +
      + {!! $errors->first('category_id', '

      :message

      ') !!} +
      {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} @@ -118,11 +128,13 @@ + @endpush @push('css') + @endpush @push('scripts') @@ -401,5 +413,89 @@ } }); }); + + function createCategory() { + $('#modal-create-category').remove(); + + modal = ''; + + $('body').append(modal); + + $('#category-color-picker').colorpicker(); + + $('#modal-create-category').modal('show'); + } + + $(document).on('click', '#button-create-category', function (e) { + $('#modal-create-category .modal-header').before(''); + + $.ajax({ + url: '{{ url("settings/categories/category") }}', + type: 'POST', + dataType: 'JSON', + data: $("#form-create-category").serialize(), + beforeSend: function () { + $(".form-group").removeClass("has-error"); + $(".help-block").remove(); + }, + success: function(data) { + $('#span-loading').remove(); + + $('#modal-create-category').modal('hide'); + + $("#category_id").append(''); + $("#category_id").select2('refresh'); + }, + error: function(error, textStatus, errorThrown) { + $('#span-loading').remove(); + + if (error.responseJSON.name) { + $("input[name='name']").parent().parent().addClass('has-error'); + $("input[name='name']").parent().after('

      ' + error.responseJSON.name + '

      '); + } + + if (error.responseJSON.color) { + $("input[name='color']").parent().parent().addClass('has-error'); + $("input[name='color']").parent().after('

      ' + error.responseJSON.color + '

      '); + } + } + }); + }); @endpush diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index df8704f4d..b61be999c 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -26,7 +26,17 @@ {{ Form::textareaGroup('description', trans('general.description')) }} - {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} +
      + {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!} +
      + +
      +
      + {!! $errors->first('category_id', '

      :message

      ') !!} +
      {!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!} @@ -59,11 +69,13 @@ @push('js') + @endpush @push('css') + @endpush @push('scripts') @@ -223,5 +235,89 @@ } }); }); + + function createCategory() { + $('#modal-create-category').remove(); + + modal = ''; + + $('body').append(modal); + + $('#category-color-picker').colorpicker(); + + $('#modal-create-category').modal('show'); + } + + $(document).on('click', '#button-create-category', function (e) { + $('#modal-create-category .modal-header').before(''); + + $.ajax({ + url: '{{ url("settings/categories/category") }}', + type: 'POST', + dataType: 'JSON', + data: $("#form-create-category").serialize(), + beforeSend: function () { + $(".form-group").removeClass("has-error"); + $(".help-block").remove(); + }, + success: function(data) { + $('#span-loading').remove(); + + $('#modal-create-category').modal('hide'); + + $("#category_id").append(''); + $("#category_id").select2('refresh'); + }, + error: function(error, textStatus, errorThrown) { + $('#span-loading').remove(); + + if (error.responseJSON.name) { + $("input[name='name']").parent().parent().addClass('has-error'); + $("input[name='name']").parent().after('

      ' + error.responseJSON.name + '

      '); + } + + if (error.responseJSON.color) { + $("input[name='color']").parent().parent().addClass('has-error'); + $("input[name='color']").parent().after('

      ' + error.responseJSON.color + '

      '); + } + } + }); + }); @endpush diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 15d0afb86..7b6a78787 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -98,7 +98,17 @@
      - {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} +
      + {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!} +
      + +
      +
      + {!! $errors->first('category_id', '

      :message

      ') !!} +
      {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} @@ -119,11 +129,13 @@ + @endpush @push('css') + @endpush @push('scripts') @@ -400,5 +412,89 @@ } }); }); + + function createCategory() { + $('#modal-create-category').remove(); + + modal = ''; + + $('body').append(modal); + + $('#category-color-picker').colorpicker(); + + $('#modal-create-category').modal('show'); + } + + $(document).on('click', '#button-create-category', function (e) { + $('#modal-create-category .modal-header').before(''); + + $.ajax({ + url: '{{ url("settings/categories/category") }}', + type: 'POST', + dataType: 'JSON', + data: $("#form-create-category").serialize(), + beforeSend: function () { + $(".form-group").removeClass("has-error"); + $(".help-block").remove(); + }, + success: function(data) { + $('#span-loading').remove(); + + $('#modal-create-category').modal('hide'); + + $("#category_id").append(''); + $("#category_id").select2('refresh'); + }, + error: function(error, textStatus, errorThrown) { + $('#span-loading').remove(); + + if (error.responseJSON.name) { + $("input[name='name']").parent().parent().addClass('has-error'); + $("input[name='name']").parent().after('

      ' + error.responseJSON.name + '

      '); + } + + if (error.responseJSON.color) { + $("input[name='color']").parent().parent().addClass('has-error'); + $("input[name='color']").parent().after('

      ' + error.responseJSON.color + '

      '); + } + } + }); + }); @endpush diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index 953ef1799..7dbf7c996 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -26,7 +26,17 @@ {{ Form::textareaGroup('description', trans('general.description')) }} - {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} +
      + {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!} +
      + +
      +
      + {!! $errors->first('category_id', '

      :message

      ') !!} +
      {!! Form::label('customer_id', trans_choice('general.customers', 1), ['class' => 'control-label']) !!} @@ -59,11 +69,13 @@ @push('js') + @endpush @push('css') + @endpush @push('scripts') @@ -223,5 +235,89 @@ } }); }); + + function createCategory() { + $('#modal-create-category').remove(); + + modal = ''; + + $('body').append(modal); + + $('#category-color-picker').colorpicker(); + + $('#modal-create-category').modal('show'); + } + + $(document).on('click', '#button-create-category', function (e) { + $('#modal-create-category .modal-header').before(''); + + $.ajax({ + url: '{{ url("settings/categories/category") }}', + type: 'POST', + dataType: 'JSON', + data: $("#form-create-category").serialize(), + beforeSend: function () { + $(".form-group").removeClass("has-error"); + $(".help-block").remove(); + }, + success: function(data) { + $('#span-loading').remove(); + + $('#modal-create-category').modal('hide'); + + $("#category_id").append(''); + $("#category_id").select2('refresh'); + }, + error: function(error, textStatus, errorThrown) { + $('#span-loading').remove(); + + if (error.responseJSON.name) { + $("input[name='name']").parent().parent().addClass('has-error'); + $("input[name='name']").parent().after('

      ' + error.responseJSON.name + '

      '); + } + + if (error.responseJSON.color) { + $("input[name='color']").parent().parent().addClass('has-error'); + $("input[name='color']").parent().after('

      ' + error.responseJSON.color + '

      '); + } + } + }); + }); @endpush diff --git a/routes/web.php b/routes/web.php index 8d3d90320..38937987f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -101,6 +101,7 @@ Route::group(['middleware' => 'language'], function () { }); Route::group(['prefix' => 'settings'], function () { + Route::post('categories/category', 'Settings\Categories@category'); Route::resource('categories', 'Settings\Categories'); Route::get('currencies/currency', 'Settings\Currencies@currency'); Route::get('currencies/config', 'Settings\Currencies@config'); From 683c3bbfd8b7b090805be91fec1b947d84de37da Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 25 Apr 2018 10:34:04 +0300 Subject: [PATCH 46/94] Category list page type get language text --- resources/views/settings/categories/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/categories/index.blade.php b/resources/views/settings/categories/index.blade.php index 722255c45..2aa986649 100644 --- a/resources/views/settings/categories/index.blade.php +++ b/resources/views/settings/categories/index.blade.php @@ -43,7 +43,7 @@ @foreach($categories as $item) {{ $item->name }} - {{ $item->type }} + {{ $types[$item->type] }} @if ($item->enabled) From 2969bf6e48c3a0a142ab93903ec03533020c689c Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 25 Apr 2018 11:31:49 +0300 Subject: [PATCH 47/94] change api token --- resources/views/modules/home/index.blade.php | 4 ++++ resources/views/modules/item/show.blade.php | 4 ++++ resources/views/modules/tiles/index.blade.php | 4 ++++ resources/views/modules/token/create.blade.php | 4 ++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php index c650a3cda..258448efb 100644 --- a/resources/views/modules/home/index.blade.php +++ b/resources/views/modules/home/index.blade.php @@ -2,6 +2,10 @@ @section('title', trans_choice('general.modules', 2)) +@section('new_button') +  {{ trans('modules.api_token') }} +@endsection + @section('content') @include('partials.modules.bar') diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 0b7e98605..c4a59a6a8 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -2,6 +2,10 @@ @section('title', trans_choice('general.modules', 2)) +@section('new_button') +  {{ trans('modules.api_token') }} +@endsection + @section('content') @include('partials.modules.bar') diff --git a/resources/views/modules/tiles/index.blade.php b/resources/views/modules/tiles/index.blade.php index 498410f27..f59d2c238 100644 --- a/resources/views/modules/tiles/index.blade.php +++ b/resources/views/modules/tiles/index.blade.php @@ -2,6 +2,10 @@ @section('title', trans_choice('general.modules', 2)) +@section('new_button') +  {{ trans('modules.api_token') }} +@endsection + @section('content') @include('partials.modules.bar') diff --git a/resources/views/modules/token/create.blade.php b/resources/views/modules/token/create.blade.php index dee72feb0..61faa3bbe 100644 --- a/resources/views/modules/token/create.blade.php +++ b/resources/views/modules/token/create.blade.php @@ -12,7 +12,7 @@ {!! Form::label('sale_price', trans('modules.api_token'), ['class' => 'control-label']) !!}
      - {!! Form::text('api_token', null, ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!} + {!! Form::text('api_token', setting('general.api_token', null), ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!}
      {!! $errors->first('api_token', '

      :message

      ') !!}
      @@ -24,7 +24,7 @@
      - {{ Form::saveButtons('apps/token') }} + {{ Form::saveButtons('apps/home') }}
      {!! Form::close() !!} From 5b5ce93e29589e2ea1cc5c35f19324e59c0260b6 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 25 Apr 2018 11:45:34 +0300 Subject: [PATCH 48/94] added category id to fillable fields #304 --- app/Models/Expense/Bill.php | 2 +- app/Models/Income/Invoice.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index e278a2c8f..4d060814f 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -29,7 +29,7 @@ class Bill extends Model * * @var array */ - protected $fillable = ['company_id', 'bill_number', 'order_number', 'bill_status_code', 'billed_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'vendor_id', 'vendor_name', 'vendor_email', 'vendor_tax_number', 'vendor_phone', 'vendor_address', 'notes']; + protected $fillable = ['company_id', 'bill_number', 'order_number', 'bill_status_code', 'billed_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'vendor_id', 'vendor_name', 'vendor_email', 'vendor_tax_number', 'vendor_phone', 'vendor_address', 'notes', 'category_id']; /** * Sortable columns. diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index dece8caaf..6f4cd5b21 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -30,7 +30,7 @@ class Invoice extends Model * * @var array */ - protected $fillable = ['company_id', 'invoice_number', 'order_number', 'invoice_status_code', 'invoiced_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'customer_id', 'customer_name', 'customer_email', 'customer_tax_number', 'customer_phone', 'customer_address', 'notes']; + protected $fillable = ['company_id', 'invoice_number', 'order_number', 'invoice_status_code', 'invoiced_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'customer_id', 'customer_name', 'customer_email', 'customer_tax_number', 'customer_phone', 'customer_address', 'notes', 'category_id']; /** * Sortable columns. From 244b5aabbe500d0ca7e6a77144422302a7e9b307 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 25 Apr 2018 16:56:01 +0300 Subject: [PATCH 49/94] App store token verify --- app/Http/Requests/Module/Module.php | 19 ++++++++++++++++++- app/Traits/Modules.php | 19 +++++++++++++++++++ resources/lang/en-GB/modules.php | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/Module/Module.php b/app/Http/Requests/Module/Module.php index 436ce99f3..29807c34e 100644 --- a/app/Http/Requests/Module/Module.php +++ b/app/Http/Requests/Module/Module.php @@ -3,9 +3,26 @@ namespace App\Http\Requests\Module; use App\Http\Requests\Request; +use Illuminate\Validation\Factory as ValidationFactory; +use App\Traits\Modules; class Module extends Request { + use Modules; + + public function __construct(ValidationFactory $validationFactory) + { + + $validationFactory->extend( + 'check', + function ($attribute, $value, $parameters) { + return $this->checkToken($value); + }, + trans('modules.invalid_token') + ); + + } + /** * Determine if the user is authorized to make this request. * @@ -24,7 +41,7 @@ class Module extends Request public function rules() { return [ - 'api_token' => 'required|string', + 'api_token' => 'required|string|check', ]; } } diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index fa82c221d..224507538 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -12,6 +12,25 @@ use ZipArchive; trait Modules { + public function checkToken($token) + { + $data = [ + 'form_params' => [ + 'token' => $token, + ] + ]; + + $response = $this->getRemote('token/check', 'POST', $data); + + if ($response->getStatusCode() == 200) { + $result = json_decode($response->getBody()); + + return ($result->success) ? true : false; + } + + return false; + } + public function getModules() { $response = $this->getRemote('apps/items'); diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php index 3520c9c9b..7d89c2681 100644 --- a/resources/lang/en-GB/modules.php +++ b/resources/lang/en-GB/modules.php @@ -4,6 +4,7 @@ return [ 'title' => 'API Token', 'api_token' => 'Token', + 'invalid_token' => 'Sorry, it invalid token validation!', 'top_paid' => 'Top Paid', 'new' => 'New', 'top_free' => 'Top Free', From 50b3ff78446a11ca6d8ffcce2c85beeba3d6a4f7 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 25 Apr 2018 17:39:32 +0300 Subject: [PATCH 50/94] token message --- app/Http/Requests/Module/Module.php | 8 ++++---- resources/lang/en-GB/messages.php | 1 + resources/lang/en-GB/modules.php | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Requests/Module/Module.php b/app/Http/Requests/Module/Module.php index 29807c34e..d1492911e 100644 --- a/app/Http/Requests/Module/Module.php +++ b/app/Http/Requests/Module/Module.php @@ -3,22 +3,22 @@ namespace App\Http\Requests\Module; use App\Http\Requests\Request; -use Illuminate\Validation\Factory as ValidationFactory; use App\Traits\Modules; +use Illuminate\Validation\Factory as ValidationFactory; class Module extends Request { use Modules; - public function __construct(ValidationFactory $validationFactory) + public function __construct(ValidationFactory $validation) { - $validationFactory->extend( + $validation->extend( 'check', function ($attribute, $value, $parameters) { return $this->checkToken($value); }, - trans('modules.invalid_token') + trans('messages.error.invalid_token') ); } diff --git a/resources/lang/en-GB/messages.php b/resources/lang/en-GB/messages.php index 63825167f..fee6c43ff 100644 --- a/resources/lang/en-GB/messages.php +++ b/resources/lang/en-GB/messages.php @@ -15,6 +15,7 @@ return [ 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: No file selected!', 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Warning: You are not allowed to delete :name because it has :text related.', diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php index 7d89c2681..3520c9c9b 100644 --- a/resources/lang/en-GB/modules.php +++ b/resources/lang/en-GB/modules.php @@ -4,7 +4,6 @@ return [ 'title' => 'API Token', 'api_token' => 'Token', - 'invalid_token' => 'Sorry, it invalid token validation!', 'top_paid' => 'Top Paid', 'new' => 'New', 'top_free' => 'Top Free', From 1294ab3f8b4b8cadeb426fdaac2e82a3de8fd63e Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Wed, 25 Apr 2018 19:28:10 +0300 Subject: [PATCH 51/94] App Store search issue solved --- app/Http/Controllers/Modules/Tiles.php | 24 +++++++++++++++++++ app/Traits/Modules.php | 11 +++++++++ resources/lang/en-GB/modules.php | 1 + .../views/partials/modules/bar.blade.php | 10 ++++---- routes/web.php | 1 + 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Modules/Tiles.php b/app/Http/Controllers/Modules/Tiles.php index 849ae2ee3..8f8af734e 100644 --- a/app/Http/Controllers/Modules/Tiles.php +++ b/app/Http/Controllers/Modules/Tiles.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Modules; use App\Http\Controllers\Controller; use App\Traits\Modules; use Illuminate\Routing\Route; +use Illuminate\Http\Request; class Tiles extends Controller { @@ -73,4 +74,27 @@ class Tiles extends Controller return view('modules.tiles.index', compact('title', 'modules')); } + + /** + * Show the form for viewing the specified resource. + * + * @return Response + */ + public function searchModules(Request $request) + { + $this->checkApiToken(); + + $keyword = $request['keyword']; + + $data = [ + 'query' => [ + 'keyword' => $keyword, + ] + ]; + + $title = trans('modules.search'); + $modules = $this->getSearchModules($data); + + return view('modules.tiles.index', compact('title', 'modules', 'keyword')); + } } diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 224507538..e309c0574 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -108,6 +108,17 @@ trait Modules return []; } + public function getSearchModules($data = []) + { + $response = $this->getRemote('apps/search', 'GET', $data); + + if ($response->getStatusCode() == 200) { + return json_decode($response->getBody())->data; + } + + return []; + } + public function getCoreVersion() { $data['query'] = Info::all(); diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php index 7d89c2681..42b485077 100644 --- a/resources/lang/en-GB/modules.php +++ b/resources/lang/en-GB/modules.php @@ -9,6 +9,7 @@ return [ 'new' => 'New', 'top_free' => 'Top Free', 'free' => 'FREE', + 'search' => 'Search', 'install' => 'Install', 'buy_now' => 'Buy Now', 'token_link' => 'Click here to get your API token.', diff --git a/resources/views/partials/modules/bar.blade.php b/resources/views/partials/modules/bar.blade.php index 7773f35cf..a8c6eceb1 100644 --- a/resources/views/partials/modules/bar.blade.php +++ b/resources/views/partials/modules/bar.blade.php @@ -4,15 +4,15 @@
      {!! Form::select('category', $categories, request('category'), ['class' => 'form-control input-sm', 'style' => 'display:inline;width:inherit;']) !!} - Top Paid - New - Top Free + {{ trans('modules.top_paid') }} + {{ trans('modules.new') }} + {{ trans('modules.top_free') }}
      - {!! Form::open(['url' => 'apps/search', 'role' => 'form']) !!} - + {!! Form::open(['url' => 'apps/search', 'role' => 'form', 'method' => 'GET']) !!} + {!! Form::close() !!}
      diff --git a/routes/web.php b/routes/web.php index 38937987f..16abc173e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -120,6 +120,7 @@ Route::group(['middleware' => 'language'], function () { Route::get('paid', 'Modules\Tiles@paidModules'); Route::get('new', 'Modules\Tiles@newModules'); Route::get('free', 'Modules\Tiles@freeModules'); + Route::get('search', 'Modules\Tiles@searchModules'); Route::post('steps', 'Modules\Item@steps'); Route::post('download', 'Modules\Item@download'); Route::post('unzip', 'Modules\Item@unzip'); From ad202645b84096b66c2147f3c8951034819b5f69 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 26 Apr 2018 02:17:55 +0300 Subject: [PATCH 52/94] started recurring --- app/Http/Controllers/Incomes/Invoices.php | 10 ++++- app/Models/Common/Recurring.php | 17 +++++++++ app/Models/Income/Invoice.php | 27 ++++++++------ ...8_04_26_000000_create_recurrings_table.php | 37 +++++++++++++++++++ resources/lang/en-GB/recurring.php | 11 ++++++ .../views/incomes/invoices/create.blade.php | 6 +++ 6 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 app/Models/Common/Recurring.php create mode 100644 database/migrations/2018_04_26_000000_create_recurrings_table.php create mode 100644 resources/lang/en-GB/recurring.php diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 6dc279ff2..0be49efa2 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -107,9 +107,17 @@ class Invoices extends Controller $categories = Category::enabled()->type('income')->pluck('name', 'id'); + $recurrings = [ + '0' => trans('general.no'), + '1' => trans('recurring.weekly'), + '2' => trans('recurring.monthly'), + '3' => trans('recurring.yearly'), + '4' => trans('recurring.custom'), + ]; + $number = $this->getNextInvoiceNumber(); - return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'categories', 'number')); + return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'categories', 'recurrings', 'number')); } /** diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php new file mode 100644 index 000000000..feb8af816 --- /dev/null +++ b/app/Models/Common/Recurring.php @@ -0,0 +1,17 @@ +morphTo(); + } +} diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 6f4cd5b21..139323f98 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -66,19 +66,14 @@ class Invoice extends Model return $this->belongsTo('App\Models\Setting\Category'); } - public function customer() - { - return $this->belongsTo('App\Models\Income\Customer'); - } - public function currency() { return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code'); } - public function status() + public function customer() { - return $this->belongsTo('App\Models\Income\InvoiceStatus', 'invoice_status_code', 'code'); + return $this->belongsTo('App\Models\Income\Customer'); } public function items() @@ -86,9 +81,9 @@ class Invoice extends Model return $this->hasMany('App\Models\Income\InvoiceItem'); } - public function totals() + public function histories() { - return $this->hasMany('App\Models\Income\InvoiceTotal'); + return $this->hasMany('App\Models\Income\InvoiceHistory'); } public function payments() @@ -96,9 +91,19 @@ class Invoice extends Model return $this->hasMany('App\Models\Income\InvoicePayment'); } - public function histories() + public function recurrings() { - return $this->hasMany('App\Models\Income\InvoiceHistory'); + return $this->morphMany('App\Models\Common\Recurring', 'recurrable'); + } + + public function status() + { + return $this->belongsTo('App\Models\Income\InvoiceStatus', 'invoice_status_code', 'code'); + } + + public function totals() + { + return $this->hasMany('App\Models\Income\InvoiceTotal'); } public function scopeDue($query, $date) diff --git a/database/migrations/2018_04_26_000000_create_recurrings_table.php b/database/migrations/2018_04_26_000000_create_recurrings_table.php new file mode 100644 index 000000000..518e921ff --- /dev/null +++ b/database/migrations/2018_04_26_000000_create_recurrings_table.php @@ -0,0 +1,37 @@ +increments('id'); + $table->integer('company_id'); + $table->morphs('recurrable'); + $table->string('frequency'); + $table->integer('interval')->default(1); + $table->date('started_at'); + $table->integer('count')->default(1); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('recurrings'); + } +} diff --git a/resources/lang/en-GB/recurring.php b/resources/lang/en-GB/recurring.php new file mode 100644 index 000000000..5b97bdeed --- /dev/null +++ b/resources/lang/en-GB/recurring.php @@ -0,0 +1,11 @@ + 'Recurring', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + +]; diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 7b6a78787..7233a6114 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -110,6 +110,8 @@ {!! $errors->first('category_id', '

      :message

      ') !!}
      + {{ Form::selectGroup('recurring_id', trans('recurring.recurring'), 'refresh', $recurrings, 0, []) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment')) }} @@ -210,6 +212,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" }); + $("#recurring_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans('recurring.recurring')]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', From 9b120b7510cac708fe8cab21fb5b2048dcc5e799 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 26 Apr 2018 12:50:20 +0300 Subject: [PATCH 53/94] fixed #305 --- app/Overrides/Illuminate/MessageSelector.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Overrides/Illuminate/MessageSelector.php b/app/Overrides/Illuminate/MessageSelector.php index 31cbc1f65..66d177b91 100644 --- a/app/Overrides/Illuminate/MessageSelector.php +++ b/app/Overrides/Illuminate/MessageSelector.php @@ -246,7 +246,6 @@ class MessageSelector case 'ro': return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2); case 'ar': - case 'ar-SA': return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number % 100 >= 3) && ($number % 100 <= 10)) ? 3 : ((($number % 100 >= 11) && ($number % 100 <= 99)) ? 4 : 5)))); default: return 0; From c118b806e52aa6d339ba064bdae4b3be79bf069a Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Thu, 26 Apr 2018 13:21:43 +0300 Subject: [PATCH 54/94] App store price style change --- app/Traits/Modules.php | 1 + resources/views/modules/item/show.blade.php | 23 ++++++++----------- .../views/partials/modules/item.blade.php | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index e309c0574..3be0078d5 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -320,6 +320,7 @@ trait Modules 'Authorization' => 'Bearer ' . setting('general.api_token'), 'Accept' => 'application/json', 'Referer' => env('APP_URL'), + 'Akaunting' => version('short'), ]; $data['http_errors'] = false; diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index c4a59a6a8..81e032071 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -59,20 +59,15 @@
      - - - - - - - -
      Price - @if ($module->price == '0.0000') - {{ trans('modules.free') }} - @else - {{ $module->price . ' / month' }} - @endif -
      +
      +
      + @if ($module->price == '0.0000') + {{ trans('modules.free') }} + @else + {{ $module->price }} + @endif +
      +
      diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php index 0a7ba743f..3a8decd6f 100644 --- a/resources/views/partials/modules/item.blade.php +++ b/resources/views/partials/modules/item.blade.php @@ -25,7 +25,7 @@ @if ($module->price == '0.0000') {{ trans('modules.free') }} @else - {{ $module->price . ' / month' }} + {{ $module->price }} @endif
      From 3daf5f00622f75d93237a5b43400a468c63b4233 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Thu, 26 Apr 2018 15:31:26 +0300 Subject: [PATCH 55/94] Payment, Revenue account and currency input combination --- public/css/app.css | 11 ++++++++++- .../views/expenses/payments/create.blade.php | 16 ++++++++-------- resources/views/expenses/payments/edit.blade.php | 16 ++++++++-------- .../views/incomes/revenues/create.blade.php | 16 ++++++++-------- resources/views/incomes/revenues/edit.blade.php | 16 ++++++++-------- 5 files changed, 42 insertions(+), 33 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 462744820..05b332e1c 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -575,4 +575,13 @@ input[type="number"] { .btn-icon { height: 34px; -} \ No newline at end of file +} + +.form-small #account_id, .form-small .select2.select2-container { + width: 70% !important; + float: left; +} + +.form-small #currency { + width: 30%; +} diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index b61be999c..bd2b2509e 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -12,16 +12,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('general.default_account')) }} - -
      - {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
      + {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
      -
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      + {!! Form::select('account_id', $accounts, setting('general.default_account'), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
      + {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      - {!! $errors->first('currency_code', '

      :message

      ') !!}
      {{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index f1428957d..ab0cdfc75 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -17,16 +17,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts) }} - -
      - {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
      + {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
      -
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      + {!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
      + {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      - {!! $errors->first('currency_code', '

      :message

      ') !!}
      {{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index 7dbf7c996..913baf489 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -12,16 +12,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('general.accounts', 1)) }} - -
      - {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
      + {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
      -
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      + {!! Form::select('account_id', $accounts, setting('general.accounts', 1), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
      + {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      - {!! $errors->first('currency_code', '

      :message

      ') !!}
      {{ Form::textareaGroup('description', trans('general.description')) }} diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index c9327cb9d..f457786b6 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -17,16 +17,16 @@ {{ Form::numberGroup('amount', trans('general.amount'), 'money', ['required' => 'required', 'autofocus' => 'autofocus']) }} - {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts) }} - -
      - {!! Form::label('currency_code', trans_choice('general.currencies', 1), ['class' => 'control-label']) !!} +
      + {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
      -
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} - {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      + {!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!} +
      + {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} +
      - {!! $errors->first('currency_code', '

      :message

      ') !!}
      {{ Form::textareaGroup('description', trans('general.description')) }} From 706f4e8d779cff3fa785b932b547d5553fd907e4 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Thu, 26 Apr 2018 15:42:46 +0300 Subject: [PATCH 56/94] refs payment, revenue style --- public/css/app.css | 4 ++-- resources/views/expenses/payments/create.blade.php | 2 +- resources/views/expenses/payments/edit.blade.php | 2 +- resources/views/incomes/revenues/create.blade.php | 2 +- resources/views/incomes/revenues/edit.blade.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 05b332e1c..2bbb850af 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -578,10 +578,10 @@ input[type="number"] { } .form-small #account_id, .form-small .select2.select2-container { - width: 70% !important; + width: 90% !important; float: left; } .form-small #currency { - width: 30%; + width: 10%; } diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index bd2b2509e..b5872207b 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -18,7 +18,7 @@
      {!! Form::select('account_id', $accounts, setting('general.default_account'), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
      diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index ab0cdfc75..988cc14b7 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -23,7 +23,7 @@
      {!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
      diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index 913baf489..bf5c211b4 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -18,7 +18,7 @@
      {!! Form::select('account_id', $accounts, setting('general.accounts', 1), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
      diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index f457786b6..c893b856c 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -23,7 +23,7 @@
      {!! Form::select('account_id', $accounts, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
      - {!! Form::text('currency', $currencies[$account_currency_code], ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} + {!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!} {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
      From ba544ffae8085ea133ebc32c915f47909d64c742 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Thu, 26 Apr 2018 15:48:13 +0300 Subject: [PATCH 57/94] missing js action --- resources/views/expenses/payments/create.blade.php | 2 +- resources/views/expenses/payments/edit.blade.php | 2 +- resources/views/incomes/revenues/create.blade.php | 2 +- resources/views/incomes/revenues/edit.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index b5872207b..11536a1e2 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -116,7 +116,7 @@ dataType: 'JSON', data: 'account_id=' + $(this).val(), success: function(data) { - $('#currency').val(data.currency_name); + $('#currency').val(data.currency_code); $('#currency_code').val(data.currency_code); } }); diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index 988cc14b7..c7b82ffc2 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -127,7 +127,7 @@ dataType: 'JSON', data: 'account_id=' + $(this).val(), success: function(data) { - $('#currency').val(data.currency_name); + $('#currency').val(data.currency_code); $('#currency_code').val(data.currency_code); } }); diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index bf5c211b4..d1b11eb1a 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -116,7 +116,7 @@ dataType: 'JSON', data: 'account_id=' + $(this).val(), success: function(data) { - $('#currency').val(data.currency_name); + $('#currency').val(data.currency_code); $('#currency_code').val(data.currency_code); } }); diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index c893b856c..633cd6c59 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -127,7 +127,7 @@ dataType: 'JSON', data: 'account_id=' + $(this).val(), success: function(data) { - $('#currency').val(data.currency_name); + $('#currency').val(data.currency_code); $('#currency_code').val(data.currency_code); } }); From c283796fe1e3ff636b32f307559e46fa18e73a84 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 26 Apr 2018 16:04:27 +0300 Subject: [PATCH 58/94] moved logo method to view composer --- app/Http/Controllers/Expenses/Bills.php | 43 +------------- app/Http/Controllers/Incomes/Invoices.php | 57 ++----------------- app/Http/ViewComposers/Logo.php | 54 ++++++++++++++++++ app/Providers/ViewComposerServiceProvider.php | 5 ++ 4 files changed, 65 insertions(+), 94 deletions(-) create mode 100644 app/Http/ViewComposers/Logo.php diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 5330d572e..f938875a4 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -511,9 +511,7 @@ class Bills extends Controller { $bill = $this->prepareBill($bill); - $logo = $this->getLogo($bill); - - return view($bill->template_path, compact('bill', 'logo')); + return view($bill->template_path, compact('bill')); } /** @@ -527,9 +525,7 @@ class Bills extends Controller { $bill = $this->prepareBill($bill); - $logo = $this->getLogo($bill); - - $html = view($bill->template_path, compact('bill', 'logo'))->render(); + $html = view($bill->template_path, compact('bill'))->render(); $pdf = \App::make('dompdf.wrapper'); $pdf->loadHTML($html); @@ -736,39 +732,4 @@ class Bills extends Controller 'sort_order' => $sort_order, ]); } - - protected function getLogo($bill) - { - $logo = ''; - - $media_id = setting('general.company_logo'); - - if (isset($bill->vendor->logo) && !empty($bill->vendor->logo->id)) { - $media_id = $bill->vendor->logo->id; - } - - $media = Media::find($media_id); - - if (!empty($media)) { - $path = Storage::path($media->getDiskPath()); - - if (!is_file($path)) { - return $logo; - } - } else { - $path = asset('public/img/company.png'); - } - - $image = Image::make($path)->encode()->getEncoded(); - - if (empty($image)) { - return $logo; - } - - $extension = File::extension($path); - - $logo = 'data:image/' . $extension . ';base64,' . base64_encode($image); - - return $logo; - } } diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 0be49efa2..6837ba86a 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -107,17 +107,9 @@ class Invoices extends Controller $categories = Category::enabled()->type('income')->pluck('name', 'id'); - $recurrings = [ - '0' => trans('general.no'), - '1' => trans('recurring.weekly'), - '2' => trans('recurring.monthly'), - '3' => trans('recurring.yearly'), - '4' => trans('recurring.custom'), - ]; - $number = $this->getNextInvoiceNumber(); - return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'categories', 'recurrings', 'number')); + return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'categories', 'number')); } /** @@ -554,9 +546,7 @@ class Invoices extends Controller $invoice = $this->prepareInvoice($invoice); - $logo = $this->getLogo(); - - $html = view($invoice->template_path, compact('invoice', 'logo'))->render(); + $html = view($invoice->template_path, compact('invoice'))->render(); $pdf = \App::make('dompdf.wrapper'); $pdf->loadHTML($html); @@ -610,9 +600,7 @@ class Invoices extends Controller { $invoice = $this->prepareInvoice($invoice); - $logo = $this->getLogo(); - - return view($invoice->template_path, compact('invoice', 'logo')); + return view($invoice->template_path, compact('invoice')); } /** @@ -626,9 +614,7 @@ class Invoices extends Controller { $invoice = $this->prepareInvoice($invoice); - $logo = $this->getLogo(); - - $html = view($invoice->template_path, compact('invoice', 'logo'))->render(); + $html = view($invoice->template_path, compact('invoice'))->render(); $pdf = \App::make('dompdf.wrapper'); $pdf->loadHTML($html); @@ -877,39 +863,4 @@ class Invoices extends Controller 'sort_order' => $sort_order, ]); } - - protected function getLogo() - { - $logo = ''; - - $media_id = setting('general.company_logo'); - - if (setting('general.invoice_logo')) { - $media_id = setting('general.invoice_logo'); - } - - $media = Media::find($media_id); - - if (!empty($media)) { - $path = Storage::path($media->getDiskPath()); - - if (!is_file($path)) { - return $logo; - } - } else { - $path = asset('public/img/company.png'); - } - - $image = Image::make($path)->encode()->getEncoded(); - - if (empty($image)) { - return $logo; - } - - $extension = File::extension($path); - - $logo = 'data:image/' . $extension . ';base64,' . base64_encode($image); - - return $logo; - } } diff --git a/app/Http/ViewComposers/Logo.php b/app/Http/ViewComposers/Logo.php new file mode 100644 index 000000000..8d3b7f681 --- /dev/null +++ b/app/Http/ViewComposers/Logo.php @@ -0,0 +1,54 @@ +getDiskPath()); + + if (!is_file($path)) { + return $logo; + } + } else { + $path = asset('public/img/company.png'); + } + + $image = Image::make($path)->encode()->getEncoded(); + + if (empty($image)) { + return $logo; + } + + $extension = File::extension($path); + + $logo = 'data:image/' . $extension . ';base64,' . base64_encode($image); + + $view->with(['logo' => $logo]); + } +} diff --git a/app/Providers/ViewComposerServiceProvider.php b/app/Providers/ViewComposerServiceProvider.php index fc9574a5e..97e01dc2e 100644 --- a/app/Providers/ViewComposerServiceProvider.php +++ b/app/Providers/ViewComposerServiceProvider.php @@ -38,6 +38,11 @@ class ViewComposerServiceProvider extends ServiceProvider View::composer( 'modules.*', 'App\Http\ViewComposers\Modules' ); + + // Add logo + View::composer( + ['incomes.invoices.invoice', 'expenses.bills.bill'], 'App\Http\ViewComposers\Logo' + ); } /** From b5e937b58d42ccc0e667e5437cfddaa9b06a3d4b Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 26 Apr 2018 18:40:04 +0300 Subject: [PATCH 59/94] form stuff done --- app/Http/Controllers/Expenses/Bills.php | 36 ++++++++++++++++ app/Http/Controllers/Expenses/Payments.php | 36 ++++++++++++++++ app/Http/Controllers/Incomes/Invoices.php | 36 ++++++++++++++++ app/Http/Controllers/Incomes/Revenues.php | 36 ++++++++++++++++ app/Http/ViewComposers/Recurring.php | 36 ++++++++++++++++ app/Models/Common/Recurring.php | 10 +++++ app/Models/Expense/Bill.php | 35 ++++++++------- app/Models/Expense/Payment.php | 26 ++++++++--- app/Models/Income/Invoice.php | 6 +-- app/Models/Income/Revenue.php | 12 ++++++ app/Providers/FormServiceProvider.php | 4 ++ app/Providers/ViewComposerServiceProvider.php | 5 +++ ...8_04_26_000000_create_recurrings_table.php | 2 +- resources/lang/en-GB/recurring.php | 8 ++++ .../views/expenses/bills/create.blade.php | 4 +- resources/views/expenses/bills/edit.blade.php | 4 +- .../views/expenses/payments/create.blade.php | 22 +++++----- .../views/expenses/payments/edit.blade.php | 4 +- .../views/incomes/invoices/create.blade.php | 10 ++--- .../views/incomes/invoices/edit.blade.php | 4 +- .../views/incomes/revenues/create.blade.php | 22 +++++----- .../views/incomes/revenues/edit.blade.php | 4 +- .../views/partials/form/recurring.blade.php | 43 +++++++++++++++++++ 23 files changed, 347 insertions(+), 58 deletions(-) create mode 100644 app/Http/ViewComposers/Recurring.php create mode 100644 resources/views/partials/form/recurring.blade.php diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index f938875a4..e2064a511 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -242,6 +242,20 @@ class Bills extends Controller 'description' => trans('messages.success.added', ['type' => $bill->bill_number]), ]); + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + $bill->recurring()->create([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['billed_at'], + 'count' => (int) $request['recurring_count'], + ]); + } + // Fire the event to make it extendible event(new BillCreated($bill)); @@ -444,6 +458,28 @@ class Bills extends Controller $bill->totals()->delete(); $this->addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total); + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + if ($bill->has('recurring')->count()) { + $function = 'update'; + } else { + $function = 'create'; + } + + $bill->recurring()->$function([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['billed_at'], + 'count' => (int) $request['recurring_count'], + ]); + } else { + $bill->recurring()->delete(); + } + // Fire the event to make it extendible event(new BillUpdated($bill)); diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index 67419e951..1317ed992 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -96,6 +96,20 @@ class Payments extends Controller $payment->attachMedia($media, 'attachment'); } + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + $payment->recurring()->create([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['paid_at'], + 'count' => (int) $request['recurring_count'], + ]); + } + $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]); flash($message)->success(); @@ -195,6 +209,28 @@ class Payments extends Controller $payment->attachMedia($media, 'attachment'); } + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + if ($payment->has('recurring')->count()) { + $function = 'update'; + } else { + $function = 'create'; + } + + $payment->recurring()->$function([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['paid_at'], + 'count' => (int) $request['recurring_count'], + ]); + } else { + $payment->recurring()->delete(); + } + $message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]); flash($message)->success(); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 6837ba86a..7d23019ab 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -260,6 +260,20 @@ class Invoices extends Controller // Update next invoice number $this->increaseNextInvoiceNumber(); + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + $invoice->recurring()->create([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['invoiced_at'], + 'count' => (int) $request['recurring_count'], + ]); + } + // Fire the event to make it extendible event(new InvoiceCreated($invoice)); @@ -465,6 +479,28 @@ class Invoices extends Controller $invoice->totals()->delete(); $this->addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total); + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + if ($invoice->has('recurring')->count()) { + $function = 'update'; + } else { + $function = 'create'; + } + + $invoice->recurring()->$function([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['invoiced_at'], + 'count' => (int) $request['recurring_count'], + ]); + } else { + $invoice->recurring()->delete(); + } + // Fire the event to make it extendible event(new InvoiceUpdated($invoice)); diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php index e617f8cd0..5e4d347e4 100644 --- a/app/Http/Controllers/Incomes/Revenues.php +++ b/app/Http/Controllers/Incomes/Revenues.php @@ -98,6 +98,20 @@ class Revenues extends Controller $revenue->attachMedia($media, 'attachment'); } + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + $revenue->recurring()->create([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['paid_at'], + 'count' => (int) $request['recurring_count'], + ]); + } + $message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]); flash($message)->success(); @@ -197,6 +211,28 @@ class Revenues extends Controller $revenue->attachMedia($media, 'attachment'); } + // Recurring + if ($request->get('recurring_frequency') != 'no') { + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + + if ($revenue->has('recurring')->count()) { + $function = 'update'; + } else { + $function = 'create'; + } + + $revenue->recurring()->$function([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $request['paid_at'], + 'count' => (int) $request['recurring_count'], + ]); + } else { + $revenue->recurring()->delete(); + } + $message = trans('messages.success.updated', ['type' => trans_choice('general.revenues', 1)]); flash($message)->success(); diff --git a/app/Http/ViewComposers/Recurring.php b/app/Http/ViewComposers/Recurring.php new file mode 100644 index 000000000..81063b117 --- /dev/null +++ b/app/Http/ViewComposers/Recurring.php @@ -0,0 +1,36 @@ + trans('general.no'), + 'daily' => trans('recurring.daily'), + 'weekly' => trans('recurring.weekly'), + 'monthly' => trans('recurring.monthly'), + 'yearly' => trans('recurring.yearly'), + 'custom' => trans('recurring.custom'), + ]; + + $recurring_custom_frequencies = [ + 'daily' => trans('recurring.days'), + 'weekly' => trans('recurring.weeks'), + 'monthly' => trans('recurring.months'), + 'yearly' => trans('recurring.years'), + ]; + + $view->with(['recurring_frequencies' => $recurring_frequencies, 'recurring_custom_frequencies' => $recurring_custom_frequencies]); + } +} diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php index feb8af816..0640d04e6 100644 --- a/app/Models/Common/Recurring.php +++ b/app/Models/Common/Recurring.php @@ -7,6 +7,16 @@ use App\Models\Model; class Recurring extends Model { + protected $table = 'recurrings'; + + /** + * Attributes that should be mass-assignable. + * + * @var array + */ + protected $fillable = ['company_id', 'recurrable_id', 'recurrable_type', 'frequency', 'interval', 'started_at', 'count']; + + /** * Get all of the owning recurrable models. */ diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index 4d060814f..1ac8ed36d 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -58,26 +58,21 @@ class Bill extends Model * * @var array */ - protected $cloneable_relations = ['items', 'totals']; + protected $cloneable_relations = ['items', 'recurring', 'totals']; public function category() { return $this->belongsTo('App\Models\Setting\Category'); } - public function vendor() - { - return $this->belongsTo('App\Models\Expense\Vendor'); - } - public function currency() { return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code'); } - public function status() + public function histories() { - return $this->belongsTo('App\Models\Expense\BillStatus', 'bill_status_code', 'code'); + return $this->hasMany('App\Models\Expense\BillHistory'); } public function items() @@ -85,19 +80,29 @@ class Bill extends Model return $this->hasMany('App\Models\Expense\BillItem'); } - public function totals() - { - return $this->hasMany('App\Models\Expense\BillTotal'); - } - public function payments() { return $this->hasMany('App\Models\Expense\BillPayment'); } - public function histories() + public function recurring() { - return $this->hasMany('App\Models\Expense\BillHistory'); + return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); + } + + public function status() + { + return $this->belongsTo('App\Models\Expense\BillStatus', 'bill_status_code', 'code'); + } + + public function totals() + { + return $this->hasMany('App\Models\Expense\BillTotal'); + } + + public function vendor() + { + return $this->belongsTo('App\Models\Expense\Vendor'); } public function scopeDue($query, $date) diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php index 36e7e5074..46d1ed8f2 100644 --- a/app/Models/Expense/Payment.php +++ b/app/Models/Expense/Payment.php @@ -44,24 +44,31 @@ class Payment extends Model 'description' , ]; + /** + * Clonable relationships. + * + * @var array + */ + protected $cloneable_relations = ['recurring']; + public function account() { return $this->belongsTo('App\Models\Banking\Account'); } - public function currency() - { - return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code'); - } - public function category() { return $this->belongsTo('App\Models\Setting\Category'); } - public function vendor() + public function currency() { - return $this->belongsTo('App\Models\Expense\Vendor'); + return $this->belongsTo('App\Models\Setting\Currency', 'currency_code', 'code'); + } + + public function recurring() + { + return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); } public function transfers() @@ -69,6 +76,11 @@ class Payment extends Model return $this->hasMany('App\Models\Banking\Transfer'); } + public function vendor() + { + return $this->belongsTo('App\Models\Expense\Vendor'); + } + /** * Get only transfers. * diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 139323f98..f1b149872 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -59,7 +59,7 @@ class Invoice extends Model * * @var array */ - protected $cloneable_relations = ['items', 'totals']; + protected $cloneable_relations = ['items', 'recurring', 'totals']; public function category() { @@ -91,9 +91,9 @@ class Invoice extends Model return $this->hasMany('App\Models\Income\InvoicePayment'); } - public function recurrings() + public function recurring() { - return $this->morphMany('App\Models\Common\Recurring', 'recurrable'); + return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); } public function status() diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php index 5ee965c0b..0a61a25f5 100644 --- a/app/Models/Income/Revenue.php +++ b/app/Models/Income/Revenue.php @@ -45,6 +45,13 @@ class Revenue extends Model 'notes' => 2, ]; + /** + * Clonable relationships. + * + * @var array + */ + protected $cloneable_relations = ['recurring']; + public function user() { return $this->belongsTo('App\Models\Auth\User', 'customer_id', 'id'); @@ -70,6 +77,11 @@ class Revenue extends Model return $this->belongsTo('App\Models\Income\Customer'); } + public function recurring() + { + return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); + } + public function transfers() { return $this->hasMany('App\Models\Banking\Transfer'); diff --git a/app/Providers/FormServiceProvider.php b/app/Providers/FormServiceProvider.php index b4d9daf88..39e66eb40 100644 --- a/app/Providers/FormServiceProvider.php +++ b/app/Providers/FormServiceProvider.php @@ -62,6 +62,10 @@ class FormServiceProvider extends ServiceProvider Form::component('saveButtons', 'partials.form.save_buttons', [ 'cancel', 'col' => 'col-md-12', ]); + + Form::component('recurring', 'partials.form.recurring', [ + 'page', 'model' => null, + ]); } /** diff --git a/app/Providers/ViewComposerServiceProvider.php b/app/Providers/ViewComposerServiceProvider.php index 97e01dc2e..18609e7a7 100644 --- a/app/Providers/ViewComposerServiceProvider.php +++ b/app/Providers/ViewComposerServiceProvider.php @@ -39,6 +39,11 @@ class ViewComposerServiceProvider extends ServiceProvider 'modules.*', 'App\Http\ViewComposers\Modules' ); + // Add recurring + View::composer( + ['partials.form.recurring',], 'App\Http\ViewComposers\Recurring' + ); + // Add logo View::composer( ['incomes.invoices.invoice', 'expenses.bills.bill'], 'App\Http\ViewComposers\Logo' diff --git a/database/migrations/2018_04_26_000000_create_recurrings_table.php b/database/migrations/2018_04_26_000000_create_recurrings_table.php index 518e921ff..1d50638d2 100644 --- a/database/migrations/2018_04_26_000000_create_recurrings_table.php +++ b/database/migrations/2018_04_26_000000_create_recurrings_table.php @@ -19,7 +19,7 @@ class CreateRecurringsTable extends Migration $table->string('frequency'); $table->integer('interval')->default(1); $table->date('started_at'); - $table->integer('count')->default(1); + $table->integer('count')->default(0); $table->timestamps(); $table->softDeletes(); }); diff --git a/resources/lang/en-GB/recurring.php b/resources/lang/en-GB/recurring.php index 5b97bdeed..52f9afada 100644 --- a/resources/lang/en-GB/recurring.php +++ b/resources/lang/en-GB/recurring.php @@ -3,9 +3,17 @@ return [ 'recurring' => 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', 'weekly' => 'Weekly', 'monthly' => 'Monthly', 'yearly' => 'Yearly', 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', ]; diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index e340e50db..9890f8a09 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -98,6 +98,8 @@ + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} +
      {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
      @@ -110,7 +112,7 @@ {!! $errors->first('category_id', '

      :message

      ') !!}
      - {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} + {{ Form::recurring('create') }} {{ Form::fileGroup('attachment', trans('general.attachment'),[]) }}
      diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index 2409cd649..3f9f57f73 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -114,9 +114,11 @@ + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} - {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} + {{ Form::recurring('edit', $bill) }} {{ Form::fileGroup('attachment', trans('general.attachment'),[]) }} diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php index 11536a1e2..46eccb0ea 100644 --- a/resources/views/expenses/payments/create.blade.php +++ b/resources/views/expenses/payments/create.blade.php @@ -24,6 +24,17 @@ +
      + {!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('vendor_id', $vendors, null, array_merge(['id' => 'vendor_id', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.vendors', 1)])])) !!} + + + +
      +
      + {{ Form::textareaGroup('description', trans('general.description')) }}
      @@ -38,16 +49,7 @@ {!! $errors->first('category_id', '

      :message

      ') !!}
      -
      - {!! Form::label('vendor_id', trans_choice('general.vendors', 1), ['class' => 'control-label']) !!} -
      -
      - {!! Form::select('vendor_id', $vendors, null, array_merge(['id' => 'vendor_id', 'class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.vendors', 1)])])) !!} - - - -
      -
      + {{ Form::recurring('create') }} {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('general.default_payment_method')) }} diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index c7b82ffc2..ba25a42c0 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -29,11 +29,13 @@ + {{ Form::selectGroup('vendor_id', trans_choice('general.vendors', 1), 'user', $vendors, null, []) }} + {{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} - {{ Form::selectGroup('vendor_id', trans_choice('general.vendors', 1), 'user', $vendors, null, []) }} + {{ Form::recurring('edit', $payment) }} {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods) }} diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 7233a6114..0bc6f6323 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -98,6 +98,8 @@ + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} +
      {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!}
      @@ -110,9 +112,7 @@ {!! $errors->first('category_id', '

      :message

      ') !!}
      - {{ Form::selectGroup('recurring_id', trans('recurring.recurring'), 'refresh', $recurrings, 0, []) }} - - {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} + {{ Form::recurring('create') }} {{ Form::fileGroup('attachment', trans('general.attachment')) }}
      @@ -212,10 +212,6 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" }); - $("#recurring_id").select2({ - placeholder: "{{ trans('general.form.select.field', ['field' => trans('recurring.recurring')]) }}" - }); - $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index a159593c8..0f778a659 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -113,9 +113,11 @@ + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} - {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} + {{ Form::recurring('edit', $invoice) }} {{ Form::fileGroup('attachment', trans('general.attachment')) }} diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php index d1b11eb1a..70e3c1b4c 100644 --- a/resources/views/incomes/revenues/create.blade.php +++ b/resources/views/incomes/revenues/create.blade.php @@ -24,6 +24,17 @@ +
      + {!! Form::label('customer_id', trans_choice('general.customers', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('customer_id', $customers, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.customers', 1)])])) !!} + + + +
      +
      + {{ Form::textareaGroup('description', trans('general.description')) }}
      @@ -38,16 +49,7 @@ {!! $errors->first('category_id', '

      :message

      ') !!}
      -
      - {!! Form::label('customer_id', trans_choice('general.customers', 1), ['class' => 'control-label']) !!} -
      -
      - {!! Form::select('customer_id', $customers, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.customers', 1)])])) !!} - - - -
      -
      + {{ Form::recurring('create') }} {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('general.default_payment_method')) }} diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index 633cd6c59..40e18bbba 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -29,11 +29,13 @@ + {{ Form::selectGroup('customer_id', trans_choice('general.customers', 1), 'user', $customers, null, []) }} + {{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} - {{ Form::selectGroup('customer_id', trans_choice('general.customers', 1), 'user', $customers, null, []) }} + {{ Form::recurring('edit', $revenue) }} {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods) }} diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php new file mode 100644 index 000000000..ed39abd4e --- /dev/null +++ b/resources/views/partials/form/recurring.blade.php @@ -0,0 +1,43 @@ +@php + if (($page == 'create') || !$model->has('recurring')->count()) { + $frequency = 'no'; + $interval = 1; + $custom_frequency = 'monthly'; + $count = 0; + } else { + $r = $model->recurring; + $frequency = $r->frequency; + $interval = $r->interval; + $custom_frequency = $r->frequency; + $count = $r->count; + } +@endphp + +
      +
      + {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('recurring_frequency', $recurring_frequencies, $frequency, ['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans('recurring.recurring')])]) !!} +
      + {!! $errors->first('recurring_frequency', '

      :message

      ') !!} +
      + + + + + + +
      \ No newline at end of file From 581d9d7cfcaeff235f7e6823da2836b3f68f634c Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Fri, 27 Apr 2018 12:03:29 +0300 Subject: [PATCH 60/94] recurring select add change event action --- public/js/app.js | 33 +++++++++++++++++++ .../views/expenses/bills/create.blade.php | 4 +-- resources/views/expenses/bills/edit.blade.php | 4 +-- .../views/incomes/invoices/create.blade.php | 4 +-- .../views/incomes/invoices/edit.blade.php | 4 +-- .../views/partials/form/recurring.blade.php | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index bd76950f5..04a720722 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -186,6 +186,39 @@ $(document).ready(function () { disable_input.trigger('change'); } }); + + $("#recurring_frequency").select2(); + + $(document).on('change', '.input-group-recurring #recurring_frequency', function (e) { + var value = $(this).val(); + + var recurring_frequency = $('#recurring_frequency').parent().parent(); + var recurring_interval = $('#recurring_interval').parent(); + var recurring_custom_frequency = $('#recurring_custom_frequency').parent(); + var recurring_count = $('#recurring_count').parent(); + + if (value == 'custom') { + recurring_frequency.removeClass('col-md-12').removeClass('col-md-12').addClass('col-md-4'); + + recurring_interval.removeClass('hidden'); + recurring_custom_frequency.removeClass('hidden'); + recurring_count.removeClass('hidden'); + + $("#recurring_custom_frequency").select2(); + } else if(value == 'no' || value == '') { + recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12'); + + recurring_interval.addClass('hidden'); + recurring_custom_frequency.addClass('hidden'); + recurring_count.addClass('hidden'); + } else { + recurring_frequency.removeClass('col-md-12').removeClass('col-md-4').addClass('col-md-10'); + + recurring_interval.addClass('hidden'); + recurring_custom_frequency.addClass('hidden'); + recurring_count.removeClass('hidden'); + } + }); }); function confirmDelete(form_id, title, message, button_cancel, button_delete) { diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 9890f8a09..462721caa 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -61,7 +61,7 @@ - {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} 0 @@ -195,7 +195,7 @@ autoclose: true }); - $(".select2").select2({ + $(".tax-select2").select2({ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" }); diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index 3f9f57f73..05d996868 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -76,7 +76,7 @@ - {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} 0 @@ -203,7 +203,7 @@ autoclose: true }); - $(".select2").select2({ + $(".tax-select2").select2({ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" }); diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 0bc6f6323..a4b1ccbe5 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -61,7 +61,7 @@ - {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} 0 @@ -196,7 +196,7 @@ autoclose: true }); - $(".select2").select2({ + $(".tax-select2").select2({ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" }); diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index 0f778a659..98fb6f761 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -51,7 +51,7 @@ - {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @money($item->total, $invoice->currency_code, true) @@ -202,7 +202,7 @@ autoclose: true }); - $(".select2").select2({ + $(".tax-select2").select2({ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}" }); diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php index ed39abd4e..23bffbcfb 100644 --- a/resources/views/partials/form/recurring.blade.php +++ b/resources/views/partials/form/recurring.blade.php @@ -13,7 +13,7 @@ } @endphp -
      +
      {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!}
      From c3e2050c72036bf8fcabfd6b46fd0a4a7eb1bf89 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 12:39:07 +0300 Subject: [PATCH 61/94] removed placeholder --- resources/views/partials/form/recurring.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php index 23bffbcfb..1b48f18be 100644 --- a/resources/views/partials/form/recurring.blade.php +++ b/resources/views/partials/form/recurring.blade.php @@ -18,7 +18,7 @@ {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!}
      - {!! Form::select('recurring_frequency', $recurring_frequencies, $frequency, ['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans('recurring.recurring')])]) !!} + {!! Form::select('recurring_frequency', $recurring_frequencies, $frequency, ['class' => 'form-control']) !!}
      {!! $errors->first('recurring_frequency', '

      :message

      ') !!}
      @@ -31,7 +31,7 @@ From 70d3fa4ef5cf052a0e5a9b42a2514a22b8d51e06 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Fri, 27 Apr 2018 15:03:01 +0300 Subject: [PATCH 62/94] refs app.js --- public/js/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/js/app.js b/public/js/app.js index 04a720722..d8703a0ab 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -187,7 +187,10 @@ $(document).ready(function () { } }); - $("#recurring_frequency").select2(); + if ($('#recurring_frequency').length == 0) { + $("#recurring_frequency").select2(); + $('#recurring_frequency').trigger('change'); + } $(document).on('change', '.input-group-recurring #recurring_frequency', function (e) { var value = $(this).val(); From d8515ecd78a98b9341e6f4bb39934071e5493e57 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Fri, 27 Apr 2018 15:04:09 +0300 Subject: [PATCH 63/94] refs app.js --- public/js/app.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index d8703a0ab..4b67c3f32 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -187,9 +187,9 @@ $(document).ready(function () { } }); - if ($('#recurring_frequency').length == 0) { - $("#recurring_frequency").select2(); - $('#recurring_frequency').trigger('change'); + if ($('.input-group-recurring #recurring_frequency').length == 0) { + $(".input-group-recurring #recurring_frequency").select2(); + $('.input-group-recurring #recurring_frequency').trigger('change'); } $(document).on('change', '.input-group-recurring #recurring_frequency', function (e) { @@ -208,7 +208,7 @@ $(document).ready(function () { recurring_count.removeClass('hidden'); $("#recurring_custom_frequency").select2(); - } else if(value == 'no' || value == '') { + } else if (value == 'no' || value == '') { recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12'); recurring_interval.addClass('hidden'); From f9bd64fd05e2e469b58ac061358a4fae5a81bdec Mon Sep 17 00:00:00 2001 From: Kostas Dizas Date: Fri, 27 Apr 2018 13:39:17 +0100 Subject: [PATCH 64/94] Added lang attribute to layout views using the default localisation --- resources/views/layouts/admin.blade.php | 2 +- resources/views/layouts/auth.blade.php | 2 +- resources/views/layouts/bill.blade.php | 2 +- resources/views/layouts/customer.blade.php | 2 +- resources/views/layouts/install.blade.php | 2 +- resources/views/layouts/invoice.blade.php | 2 +- resources/views/layouts/modules.blade.php | 2 +- resources/views/layouts/print.blade.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index c819fb3e1..779612ccc 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -1,4 +1,4 @@ - + @include('partials.admin.head') diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php index 1990d30c2..fd5cb23e0 100644 --- a/resources/views/layouts/auth.blade.php +++ b/resources/views/layouts/auth.blade.php @@ -1,4 +1,4 @@ - + @include('partials.auth.head') diff --git a/resources/views/layouts/bill.blade.php b/resources/views/layouts/bill.blade.php index 78bdff652..8494bab3e 100644 --- a/resources/views/layouts/bill.blade.php +++ b/resources/views/layouts/bill.blade.php @@ -1,4 +1,4 @@ - + @include('partials.bill.head') diff --git a/resources/views/layouts/customer.blade.php b/resources/views/layouts/customer.blade.php index 95d6c4e9c..e6b9843fd 100644 --- a/resources/views/layouts/customer.blade.php +++ b/resources/views/layouts/customer.blade.php @@ -1,4 +1,4 @@ - + @include('partials.customer.head') diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php index e60f1eb96..ee39a4b8b 100644 --- a/resources/views/layouts/install.blade.php +++ b/resources/views/layouts/install.blade.php @@ -1,4 +1,4 @@ - + @include('partials.install.head') diff --git a/resources/views/layouts/invoice.blade.php b/resources/views/layouts/invoice.blade.php index 954aa55f4..df937596d 100644 --- a/resources/views/layouts/invoice.blade.php +++ b/resources/views/layouts/invoice.blade.php @@ -1,4 +1,4 @@ - + @include('partials.invoice.head') diff --git a/resources/views/layouts/modules.blade.php b/resources/views/layouts/modules.blade.php index 28f97970a..31399c961 100644 --- a/resources/views/layouts/modules.blade.php +++ b/resources/views/layouts/modules.blade.php @@ -1,4 +1,4 @@ - + @include('partials.modules.head') diff --git a/resources/views/layouts/print.blade.php b/resources/views/layouts/print.blade.php index 9530c04ac..c3f3ac095 100644 --- a/resources/views/layouts/print.blade.php +++ b/resources/views/layouts/print.blade.php @@ -1,4 +1,4 @@ - + @include('partials.admin.head') @push('css') From da4307eaf9b114ad1287194fc86e9764f344ae99 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Fri, 27 Apr 2018 15:48:06 +0300 Subject: [PATCH 65/94] refs app.js --- public/js/app.js | 64 ++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index 4b67c3f32..cd85df6ac 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -187,41 +187,10 @@ $(document).ready(function () { } }); - if ($('.input-group-recurring #recurring_frequency').length == 0) { + if (document.getElementById('recurring_frequency')) { $(".input-group-recurring #recurring_frequency").select2(); $('.input-group-recurring #recurring_frequency').trigger('change'); } - - $(document).on('change', '.input-group-recurring #recurring_frequency', function (e) { - var value = $(this).val(); - - var recurring_frequency = $('#recurring_frequency').parent().parent(); - var recurring_interval = $('#recurring_interval').parent(); - var recurring_custom_frequency = $('#recurring_custom_frequency').parent(); - var recurring_count = $('#recurring_count').parent(); - - if (value == 'custom') { - recurring_frequency.removeClass('col-md-12').removeClass('col-md-12').addClass('col-md-4'); - - recurring_interval.removeClass('hidden'); - recurring_custom_frequency.removeClass('hidden'); - recurring_count.removeClass('hidden'); - - $("#recurring_custom_frequency").select2(); - } else if (value == 'no' || value == '') { - recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12'); - - recurring_interval.addClass('hidden'); - recurring_custom_frequency.addClass('hidden'); - recurring_count.addClass('hidden'); - } else { - recurring_frequency.removeClass('col-md-12').removeClass('col-md-4').addClass('col-md-10'); - - recurring_interval.addClass('hidden'); - recurring_custom_frequency.addClass('hidden'); - recurring_count.removeClass('hidden'); - } - }); }); function confirmDelete(form_id, title, message, button_cancel, button_delete) { @@ -285,3 +254,34 @@ $(document).on('click', '.popup', function(e) { } }); }); + +$(document).on('change', '.input-group-recurring #recurring_frequency', function (e) { + var value = $(this).val(); + + var recurring_frequency = $('#recurring_frequency').parent().parent(); + var recurring_interval = $('#recurring_interval').parent(); + var recurring_custom_frequency = $('#recurring_custom_frequency').parent(); + var recurring_count = $('#recurring_count').parent(); + + if (value == 'custom') { + recurring_frequency.removeClass('col-md-12').removeClass('col-md-12').addClass('col-md-4'); + + recurring_interval.removeClass('hidden'); + recurring_custom_frequency.removeClass('hidden'); + recurring_count.removeClass('hidden'); + + $("#recurring_custom_frequency").select2(); + } else if (value == 'no' || value == '') { + recurring_frequency.removeClass('col-md-10').removeClass('col-md-4').addClass('col-md-12'); + + recurring_interval.addClass('hidden'); + recurring_custom_frequency.addClass('hidden'); + recurring_count.addClass('hidden'); + } else { + recurring_frequency.removeClass('col-md-12').removeClass('col-md-4').addClass('col-md-10'); + + recurring_interval.addClass('hidden'); + recurring_custom_frequency.addClass('hidden'); + recurring_count.removeClass('hidden'); + } +}); From b0e9de6347546c263f29ba7beb2528831989fc0a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 16:01:31 +0300 Subject: [PATCH 66/94] recurring trait --- app/Http/Controllers/Expenses/Bills.php | 34 +---------- app/Http/Controllers/Expenses/Payments.php | 34 +---------- app/Http/Controllers/Incomes/Invoices.php | 34 +---------- app/Http/Controllers/Incomes/Revenues.php | 34 +---------- app/Models/Expense/Bill.php | 5 +- app/Models/Expense/Payment.php | 5 +- app/Models/Income/Invoice.php | 5 +- app/Models/Income/Revenue.php | 5 +- app/Traits/Recurring.php | 56 +++++++++++++++++++ .../views/partials/form/recurring.blade.php | 6 +- 10 files changed, 79 insertions(+), 139 deletions(-) create mode 100644 app/Traits/Recurring.php diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index e2064a511..b4483352b 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -243,18 +243,7 @@ class Bills extends Controller ]); // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - $bill->recurring()->create([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['billed_at'], - 'count' => (int) $request['recurring_count'], - ]); - } + $bill->createRecurring(); // Fire the event to make it extendible event(new BillCreated($bill)); @@ -459,26 +448,7 @@ class Bills extends Controller $this->addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total); // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - if ($bill->has('recurring')->count()) { - $function = 'update'; - } else { - $function = 'create'; - } - - $bill->recurring()->$function([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['billed_at'], - 'count' => (int) $request['recurring_count'], - ]); - } else { - $bill->recurring()->delete(); - } + $bill->updateRecurring(); // Fire the event to make it extendible event(new BillUpdated($bill)); diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index 1317ed992..fcb6ac7ed 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -97,18 +97,7 @@ class Payments extends Controller } // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - $payment->recurring()->create([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['paid_at'], - 'count' => (int) $request['recurring_count'], - ]); - } + $payment->createRecurring(); $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]); @@ -210,26 +199,7 @@ class Payments extends Controller } // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - if ($payment->has('recurring')->count()) { - $function = 'update'; - } else { - $function = 'create'; - } - - $payment->recurring()->$function([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['paid_at'], - 'count' => (int) $request['recurring_count'], - ]); - } else { - $payment->recurring()->delete(); - } + $payment->updateRecurring(); $message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 7d23019ab..4166520a0 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -261,18 +261,7 @@ class Invoices extends Controller $this->increaseNextInvoiceNumber(); // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - $invoice->recurring()->create([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['invoiced_at'], - 'count' => (int) $request['recurring_count'], - ]); - } + $invoice->createRecurring(); // Fire the event to make it extendible event(new InvoiceCreated($invoice)); @@ -480,26 +469,7 @@ class Invoices extends Controller $this->addTotals($invoice, $request, $taxes, $sub_total, $discount_total, $tax_total); // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - if ($invoice->has('recurring')->count()) { - $function = 'update'; - } else { - $function = 'create'; - } - - $invoice->recurring()->$function([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['invoiced_at'], - 'count' => (int) $request['recurring_count'], - ]); - } else { - $invoice->recurring()->delete(); - } + $invoice->updateRecurring(); // Fire the event to make it extendible event(new InvoiceUpdated($invoice)); diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php index 5e4d347e4..835968775 100644 --- a/app/Http/Controllers/Incomes/Revenues.php +++ b/app/Http/Controllers/Incomes/Revenues.php @@ -99,18 +99,7 @@ class Revenues extends Controller } // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - $revenue->recurring()->create([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['paid_at'], - 'count' => (int) $request['recurring_count'], - ]); - } + $revenue->createRecurring(); $message = trans('messages.success.added', ['type' => trans_choice('general.revenues', 1)]); @@ -212,26 +201,7 @@ class Revenues extends Controller } // Recurring - if ($request->get('recurring_frequency') != 'no') { - $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; - $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; - - if ($revenue->has('recurring')->count()) { - $function = 'update'; - } else { - $function = 'create'; - } - - $revenue->recurring()->$function([ - 'company_id' => session('company_id'), - 'frequency' => $frequency, - 'interval' => $interval, - 'started_at' => $request['paid_at'], - 'count' => (int) $request['recurring_count'], - ]); - } else { - $revenue->recurring()->delete(); - } + $revenue->updateRecurring(); $message = trans('messages.success.updated', ['type' => trans_choice('general.revenues', 1)]); diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index 1ac8ed36d..b46bdcb07 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -5,13 +5,14 @@ namespace App\Models\Expense; use App\Models\Model; use App\Traits\Currencies; use App\Traits\DateTime; +use App\Traits\Media; +use App\Traits\Recurring; use Bkwld\Cloner\Cloneable; use Sofa\Eloquence\Eloquence; -use App\Traits\Media; class Bill extends Model { - use Cloneable, Currencies, DateTime, Eloquence, Media; + use Cloneable, Currencies, DateTime, Eloquence, Media, Recurring; protected $table = 'bills'; diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php index 46d1ed8f2..56a85d43e 100644 --- a/app/Models/Expense/Payment.php +++ b/app/Models/Expense/Payment.php @@ -6,13 +6,14 @@ use App\Models\Model; use App\Models\Setting\Category; use App\Traits\Currencies; use App\Traits\DateTime; +use App\Traits\Media; +use App\Traits\Recurring; use Bkwld\Cloner\Cloneable; use Sofa\Eloquence\Eloquence; -use App\Traits\Media; class Payment extends Model { - use Cloneable, Currencies, DateTime, Eloquence, Media; + use Cloneable, Currencies, DateTime, Eloquence, Media, Recurring; protected $table = 'payments'; diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index f1b149872..04b5b7f98 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -6,13 +6,14 @@ use App\Models\Model; use App\Traits\Currencies; use App\Traits\DateTime; use App\Traits\Incomes; +use App\Traits\Media; +use App\Traits\Recurring; use Bkwld\Cloner\Cloneable; use Sofa\Eloquence\Eloquence; -use App\Traits\Media; class Invoice extends Model { - use Cloneable, Currencies, DateTime, Eloquence, Incomes, Media; + use Cloneable, Currencies, DateTime, Eloquence, Incomes, Media, Recurring; protected $table = 'invoices'; diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php index 0a61a25f5..87a794f42 100644 --- a/app/Models/Income/Revenue.php +++ b/app/Models/Income/Revenue.php @@ -6,13 +6,14 @@ use App\Models\Model; use App\Models\Setting\Category; use App\Traits\Currencies; use App\Traits\DateTime; +use App\Traits\Media; +use App\Traits\Recurring; use Bkwld\Cloner\Cloneable; use Sofa\Eloquence\Eloquence; -use App\Traits\Media; class Revenue extends Model { - use Cloneable, Currencies, DateTime, Eloquence, Media; + use Cloneable, Currencies, DateTime, Eloquence, Media, Recurring; protected $table = 'revenues'; diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php new file mode 100644 index 000000000..3b4b6594f --- /dev/null +++ b/app/Traits/Recurring.php @@ -0,0 +1,56 @@ +get('recurring_frequency') == 'no') { + return; + } + + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at')); + + $this->recurring()->create([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $started_at, + 'count' => (int) $request['recurring_count'], + ]); + } + + public function updateRecurring() + { + $request = request(); + + if ($request->get('recurring_frequency') == 'no') { + $this->recurring()->delete(); + return; + } + + $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency']; + $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; + $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at')); + + if ($this->has('recurring')->count()) { + $function = 'update'; + } else { + $function = 'create'; + } + + $this->recurring()->$function([ + 'company_id' => session('company_id'), + 'frequency' => $frequency, + 'interval' => $interval, + 'started_at' => $started_at, + 'count' => (int) $request['recurring_count'], + ]); + } +} \ No newline at end of file diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php index 1b48f18be..3ed0607b4 100644 --- a/resources/views/partials/form/recurring.blade.php +++ b/resources/views/partials/form/recurring.blade.php @@ -1,12 +1,12 @@ @php - if (($page == 'create') || !$model->has('recurring')->count()) { + if (($page == 'create') || ($model->has('recurring')->count() > 0)) { $frequency = 'no'; $interval = 1; $custom_frequency = 'monthly'; $count = 0; } else { $r = $model->recurring; - $frequency = $r->frequency; + $frequency = ($r->interval != 1) ? 'custom' : $r->frequency; $interval = $r->interval; $custom_frequency = $r->frequency; $count = $r->count; @@ -40,4 +40,4 @@ {!! Form::number('recurring_count', $count, ['class' => 'form-control']) !!} {!! $errors->first('recurring_count', '

      :message

      ') !!}
      -
      \ No newline at end of file +
      From 4b56001806ba72898a10c52b50152af44e0d8f01 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 16:48:59 +0300 Subject: [PATCH 67/94] fixed counter --- app/Traits/Recurring.php | 6 ++++-- public/css/app.css | 5 +++++ resources/views/partials/form/recurring.blade.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php index 3b4b6594f..ac693787a 100644 --- a/app/Traits/Recurring.php +++ b/app/Traits/Recurring.php @@ -39,13 +39,15 @@ trait Recurring $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval']; $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at')); - if ($this->has('recurring')->count()) { + $recurring = $this->recurring(); + + if ($recurring->count()) { $function = 'update'; } else { $function = 'create'; } - $this->recurring()->$function([ + $recurring->$function([ 'company_id' => session('company_id'), 'frequency' => $frequency, 'interval' => $interval, diff --git a/public/css/app.css b/public/css/app.css index 2bbb850af..841126099 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -585,3 +585,8 @@ input[type="number"] { .form-small #currency { width: 10%; } + +.input-group-recurring { + padding-left: 0; + padding-right: 0; +} diff --git a/resources/views/partials/form/recurring.blade.php b/resources/views/partials/form/recurring.blade.php index 3ed0607b4..ba37d81e3 100644 --- a/resources/views/partials/form/recurring.blade.php +++ b/resources/views/partials/form/recurring.blade.php @@ -1,5 +1,5 @@ @php - if (($page == 'create') || ($model->has('recurring')->count() > 0)) { + if (($page == 'create') || !$model->recurring()->count()) { $frequency = 'no'; $interval = 1; $custom_frequency = 'monthly'; @@ -13,7 +13,7 @@ } @endphp -
      +
      {!! Form::label('recurring_frequency', trans('recurring.recurring'), ['class' => 'control-label']) !!}
      From 7a595608d525217b34ca8e1b0e8bf32476dc5d59 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 17:42:45 +0300 Subject: [PATCH 68/94] renaming --- app/Models/Common/Recurring.php | 6 +++--- app/Models/Expense/Bill.php | 2 +- app/Models/Expense/Payment.php | 2 +- app/Models/Income/Invoice.php | 2 +- app/Models/Income/Revenue.php | 2 +- ...e.php => 2018_04_26_000000_create_recurring_table.php} | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename database/migrations/{2018_04_26_000000_create_recurrings_table.php => 2018_04_26_000000_create_recurring_table.php} (77%) diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php index 0640d04e6..bb308c77a 100644 --- a/app/Models/Common/Recurring.php +++ b/app/Models/Common/Recurring.php @@ -7,20 +7,20 @@ use App\Models\Model; class Recurring extends Model { - protected $table = 'recurrings'; + protected $table = 'recurring'; /** * Attributes that should be mass-assignable. * * @var array */ - protected $fillable = ['company_id', 'recurrable_id', 'recurrable_type', 'frequency', 'interval', 'started_at', 'count']; + protected $fillable = ['company_id', 'recurable_id', 'recurable_type', 'frequency', 'interval', 'started_at', 'count']; /** * Get all of the owning recurrable models. */ - public function recurrable() + public function recurable() { return $this->morphTo(); } diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index b46bdcb07..dba2b8044 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -88,7 +88,7 @@ class Bill extends Model public function recurring() { - return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); + return $this->morphOne('App\Models\Common\Recurring', 'recurable'); } public function status() diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php index 56a85d43e..d179d5854 100644 --- a/app/Models/Expense/Payment.php +++ b/app/Models/Expense/Payment.php @@ -69,7 +69,7 @@ class Payment extends Model public function recurring() { - return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); + return $this->morphOne('App\Models\Common\Recurring', 'recurable'); } public function transfers() diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 04b5b7f98..cbbe8a094 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -94,7 +94,7 @@ class Invoice extends Model public function recurring() { - return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); + return $this->morphOne('App\Models\Common\Recurring', 'recurable'); } public function status() diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php index 87a794f42..95c3d008b 100644 --- a/app/Models/Income/Revenue.php +++ b/app/Models/Income/Revenue.php @@ -80,7 +80,7 @@ class Revenue extends Model public function recurring() { - return $this->morphOne('App\Models\Common\Recurring', 'recurrable'); + return $this->morphOne('App\Models\Common\Recurring', 'recurable'); } public function transfers() diff --git a/database/migrations/2018_04_26_000000_create_recurrings_table.php b/database/migrations/2018_04_26_000000_create_recurring_table.php similarity index 77% rename from database/migrations/2018_04_26_000000_create_recurrings_table.php rename to database/migrations/2018_04_26_000000_create_recurring_table.php index 1d50638d2..0057ca08d 100644 --- a/database/migrations/2018_04_26_000000_create_recurrings_table.php +++ b/database/migrations/2018_04_26_000000_create_recurring_table.php @@ -3,7 +3,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -class CreateRecurringsTable extends Migration +class CreateRecurringTable extends Migration { /** * Run the migrations. @@ -12,10 +12,10 @@ class CreateRecurringsTable extends Migration */ public function up() { - Schema::create('recurrings', function (Blueprint $table) { + Schema::create('recurring', function (Blueprint $table) { $table->increments('id'); $table->integer('company_id'); - $table->morphs('recurrable'); + $table->morphs('recurable'); $table->string('frequency'); $table->integer('interval')->default(1); $table->date('started_at'); @@ -32,6 +32,6 @@ class CreateRecurringsTable extends Migration */ public function down() { - Schema::drop('recurrings'); + Schema::drop('recurring'); } } From 715587d36a68a9bd7726c9771b67db67ca5459bc Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 17:48:21 +0300 Subject: [PATCH 69/94] uk-UA translation --- config/language.php | 2 +- resources/lang/uk-UA/accounts.php | 14 ++++ resources/lang/uk-UA/auth.php | 30 +++++++ resources/lang/uk-UA/bills.php | 41 ++++++++++ resources/lang/uk-UA/companies.php | 13 +++ resources/lang/uk-UA/currencies.php | 18 +++++ resources/lang/uk-UA/customers.php | 11 +++ resources/lang/uk-UA/dashboard.php | 24 ++++++ resources/lang/uk-UA/demo.php | 17 ++++ resources/lang/uk-UA/footer.php | 9 +++ resources/lang/uk-UA/general.php | 116 +++++++++++++++++++++++++++ resources/lang/uk-UA/header.php | 15 ++++ resources/lang/uk-UA/import.php | 9 +++ resources/lang/uk-UA/install.php | 44 ++++++++++ resources/lang/uk-UA/invoices.php | 50 ++++++++++++ resources/lang/uk-UA/items.php | 15 ++++ resources/lang/uk-UA/messages.php | 23 ++++++ resources/lang/uk-UA/modules.php | 47 +++++++++++ resources/lang/uk-UA/pagination.php | 9 +++ resources/lang/uk-UA/passwords.php | 22 +++++ resources/lang/uk-UA/reports.php | 17 ++++ resources/lang/uk-UA/settings.php | 85 ++++++++++++++++++++ resources/lang/uk-UA/taxes.php | 8 ++ resources/lang/uk-UA/transfers.php | 8 ++ resources/lang/uk-UA/updates.php | 15 ++++ resources/lang/uk-UA/validation.php | 119 ++++++++++++++++++++++++++++ 26 files changed, 780 insertions(+), 1 deletion(-) create mode 100644 resources/lang/uk-UA/accounts.php create mode 100644 resources/lang/uk-UA/auth.php create mode 100644 resources/lang/uk-UA/bills.php create mode 100644 resources/lang/uk-UA/companies.php create mode 100644 resources/lang/uk-UA/currencies.php create mode 100644 resources/lang/uk-UA/customers.php create mode 100644 resources/lang/uk-UA/dashboard.php create mode 100644 resources/lang/uk-UA/demo.php create mode 100644 resources/lang/uk-UA/footer.php create mode 100644 resources/lang/uk-UA/general.php create mode 100644 resources/lang/uk-UA/header.php create mode 100644 resources/lang/uk-UA/import.php create mode 100644 resources/lang/uk-UA/install.php create mode 100644 resources/lang/uk-UA/invoices.php create mode 100644 resources/lang/uk-UA/items.php create mode 100644 resources/lang/uk-UA/messages.php create mode 100644 resources/lang/uk-UA/modules.php create mode 100644 resources/lang/uk-UA/pagination.php create mode 100644 resources/lang/uk-UA/passwords.php create mode 100644 resources/lang/uk-UA/reports.php create mode 100644 resources/lang/uk-UA/settings.php create mode 100644 resources/lang/uk-UA/taxes.php create mode 100644 resources/lang/uk-UA/transfers.php create mode 100644 resources/lang/uk-UA/updates.php create mode 100644 resources/lang/uk-UA/validation.php diff --git a/config/language.php b/config/language.php index 217de7e96..b17a3c65d 100644 --- a/config/language.php +++ b/config/language.php @@ -115,7 +115,7 @@ return [ | */ - 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'vi-VN', 'zh-TW'], + 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-TW'], /* |-------------------------------------------------------------------------- diff --git a/resources/lang/uk-UA/accounts.php b/resources/lang/uk-UA/accounts.php new file mode 100644 index 000000000..dbacda196 --- /dev/null +++ b/resources/lang/uk-UA/accounts.php @@ -0,0 +1,14 @@ + 'Ім\'я облікового запису', + 'number' => 'Номер', + 'opening_balance' => 'Відкриття балансу', + 'current_balance' => 'Поточний баланс', + 'bank_name' => 'Назва банку', + 'bank_phone' => 'Телефон банку', + 'bank_address' => 'Адреса банку', + 'default_account' => 'Обліковий запис за замовчуванням', + +]; diff --git a/resources/lang/uk-UA/auth.php b/resources/lang/uk-UA/auth.php new file mode 100644 index 000000000..a04ccbfe0 --- /dev/null +++ b/resources/lang/uk-UA/auth.php @@ -0,0 +1,30 @@ + 'Профіль', + 'logout' => 'Вийти', + 'login' => 'Логін', + 'login_to' => 'Увійдіть щоб розпочати сеанс', + 'remember_me' => 'Запам\'ятати мене', + 'forgot_password' => 'Я забув свій пароль', + 'reset_password' => 'Змінити пароль', + 'enter_email' => 'Введіть адресу електронної пошти', + 'current_email' => 'Поточна електронна пошта', + 'reset' => 'Скинути', + 'never' => 'Ніколи', + 'password' => [ + 'current' => 'Пароль', + 'current_confirm' => 'Підтвердіть пароль', + 'new' => 'Новий пароль', + 'new_confirm' => 'Підтвердити новий пароль', + ], + 'error' => [ + 'self_delete' => 'Помилка: неможливо видалити!' + ], + + 'failed' => 'Ці облікові дані не збігаються з нашими записами.', + 'disabled' => 'Цей обліковий запис вимкнено. Будь-ласка, зверніться до адміністратора.', + 'throttle' => 'Занадто багато спроб входу. Будь ласка, спробуйте ще раз, через :seconds секунд.', + +]; diff --git a/resources/lang/uk-UA/bills.php b/resources/lang/uk-UA/bills.php new file mode 100644 index 000000000..81b530c79 --- /dev/null +++ b/resources/lang/uk-UA/bills.php @@ -0,0 +1,41 @@ + 'Номер рахунку', + 'bill_date' => 'Дата', + 'total_price' => 'Загальна сума', + 'due_date' => 'Термін дії', + 'order_number' => 'Номер замовлення', + 'bill_from' => 'Рахунок від', + + 'quantity' => 'Кількість', + 'price' => 'Ціна', + 'sub_total' => 'Всього', + 'tax_total' => 'Всього пдв', + 'total' => 'Всього', + + 'item_name' => 'Назва товару', + + 'payment_due' => 'Очікуваний платіж', + 'amount_due' => 'Сума боргу', + 'paid' => 'Оплачений', + 'histories' => 'Історії', + 'payments' => 'Платежі', + 'add_payment' => 'Додати платіж', + 'mark_received' => 'Відмітка отримана', + 'download_pdf' => 'Завантажити PDF', + 'send_mail' => 'Надіслати листа', + + 'status' => [ + 'draft' => 'Чернетка', + 'received' => 'Отримано', + 'partial' => 'Частково', + 'paid' => 'Оплачений', + ], + + 'messages' => [ + 'received' => 'Рахунок позначено як успішно отриманий!', + ], + +]; diff --git a/resources/lang/uk-UA/companies.php b/resources/lang/uk-UA/companies.php new file mode 100644 index 000000000..0e8ed77d0 --- /dev/null +++ b/resources/lang/uk-UA/companies.php @@ -0,0 +1,13 @@ + 'Домен', + 'logo' => 'Логотип', + 'manage' => 'Управління компаніями', + 'all' => 'Всі компанії', + 'error' => [ + 'delete_active' => 'Помилка: Не можна видалити активну компанію, будь ласка, спочатку змініть її!', + ], + +]; diff --git a/resources/lang/uk-UA/currencies.php b/resources/lang/uk-UA/currencies.php new file mode 100644 index 000000000..d37ba7cfa --- /dev/null +++ b/resources/lang/uk-UA/currencies.php @@ -0,0 +1,18 @@ + 'Код', + 'rate' => 'Оцінити', + 'default' => 'Валюта за замовчуванням', + 'decimal_mark' => 'Десятковий знак', + 'thousands_separator' => 'Тисячі сепаратор', + 'precision' => 'Точність', + 'symbol' => [ + 'symbol' => 'Символ', + 'position' => 'Позиція символу', + 'before' => 'Перед сумою', + 'after' => 'Після суми', + ] + +]; diff --git a/resources/lang/uk-UA/customers.php b/resources/lang/uk-UA/customers.php new file mode 100644 index 000000000..8b8e82497 --- /dev/null +++ b/resources/lang/uk-UA/customers.php @@ -0,0 +1,11 @@ + 'Дозволити вхід?', + 'user_created' => 'Користувача створено', + + 'error' => [ + 'email' => 'Ця електронна пошта вже використовується.' + ] +]; diff --git a/resources/lang/uk-UA/dashboard.php b/resources/lang/uk-UA/dashboard.php new file mode 100644 index 000000000..16797f932 --- /dev/null +++ b/resources/lang/uk-UA/dashboard.php @@ -0,0 +1,24 @@ + 'Загальний дохід', + 'receivables' => 'Дебіторська заборгованість', + 'open_invoices' => 'Виставлені рахунки', + 'overdue_invoices' => 'Протерміновані рахунки', + 'total_expenses' => 'Загальні витрати', + 'payables' => 'Кредиторська заборгованість', + 'open_bills' => 'Відкриті рахунки', + 'overdue_bills' => 'Протерміновані рахунки', + 'total_profit' => 'Загальний прибуток', + 'open_profit' => 'Очікуваний Прибуток', + 'overdue_profit' => 'Протермінований прибуток', + 'cash_flow' => 'Грошовий потік', + 'no_profit_loss' => 'Без втрати прибутку', + 'incomes_by_category' => 'Доходи за категоріями', + 'expenses_by_category' => 'Витрати за категоріями', + 'account_balance' => 'Залишок на рахунку', + 'latest_incomes' => 'Останні доходи', + 'latest_expenses' => 'Останні витрати', + +]; diff --git a/resources/lang/uk-UA/demo.php b/resources/lang/uk-UA/demo.php new file mode 100644 index 000000000..607d0cd85 --- /dev/null +++ b/resources/lang/uk-UA/demo.php @@ -0,0 +1,17 @@ + 'Готівка', + 'categories_uncat' => 'Без категорії', + 'categories_deposit' => 'Депозит', + 'categories_sales' => 'Продажі', + 'currencies_usd' => 'Долар США', + 'currencies_eur' => 'Євро', + 'currencies_gbp' => 'Британський фунт', + 'currencies_try' => 'Турецька ліра', + 'taxes_exempt' => 'Без податку', + 'taxes_normal' => 'Звичайний Податок', + 'taxes_sales' => 'Податок з продажу', + +]; diff --git a/resources/lang/uk-UA/footer.php b/resources/lang/uk-UA/footer.php new file mode 100644 index 000000000..0de829c6b --- /dev/null +++ b/resources/lang/uk-UA/footer.php @@ -0,0 +1,9 @@ + 'Версія', + 'powered' => 'Зроблено в Akaunting', + 'software' => 'Безкоштовна Бухгалтерська Програма', + +]; diff --git a/resources/lang/uk-UA/general.php b/resources/lang/uk-UA/general.php new file mode 100644 index 000000000..18812be13 --- /dev/null +++ b/resources/lang/uk-UA/general.php @@ -0,0 +1,116 @@ + 'Позиція | Позиції', + 'incomes' => 'Прибуток | Прибутки', + 'invoices' => 'Рахунок | Рахунки', + 'revenues' => 'Дохід | Доходи', + 'customers' => 'Клієнт | Клієнти', + 'expenses' => 'Витрати | Витрати', + 'bills' => 'Рахунок | Рахунки', + 'payments' => 'Платіж | Платежі', + 'vendors' => 'Постачальник | Постачальники', + 'accounts' => 'Обліковий запис | Облікові записи', + 'transfers' => 'Переказ | Перекази', + 'transactions' => 'Операція | Операції', + 'reports' => 'Звіт | Звіти', + 'settings' => 'Налаштування | Налаштування', + 'categories' => 'Категорія | Категорії', + 'currencies' => 'Валюта | Валюти', + 'tax_rates' => 'Податкова ставка | Податкові ставки', + 'users' => 'Користувач | Користувачі', + 'roles' => 'Роль | Ролі', + 'permissions' => 'Дозвіл | Дозволи', + 'modules' => 'Додаток | Додатки', + 'companies' => 'Компанія | Компанії', + 'profits' => 'Прибуток | Прибутки', + 'taxes' => 'Податок | Податки', + 'logos' => 'Логотип | Логотипи', + 'pictures' => 'Зображення | Зображення', + 'types' => 'Тип | Типи', + 'payment_methods' => 'Метод оплати | Метод оплат', + 'compares' => 'Дохід vs витрати | Доходи vs витрати', + 'notes' => 'Примітка | Примітки', + 'totals' => 'Всього | Разом', + 'languages' => 'Мова | Мови', + 'updates' => 'Оновлення | Оновлення', + 'numbers' => 'Номер | Номери', + 'statuses' => 'Статус | Статуси', + + 'dashboard' => 'Панель інструментів', + 'banking' => 'Банківська справа', + 'general' => 'Головний', + 'no_records' => 'Немає записів.', + 'date' => 'Дата', + 'amount' => 'Сума', + 'enabled' => 'Увімкнено', + 'disabled' => 'Вимкнено', + 'yes' => 'Так', + 'no' => 'Ні', + 'na' => 'Н/Д', + 'daily' => 'Щоденно', + 'monthly' => 'Щомісяця', + 'quarterly' => 'Щоквартально', + 'yearly' => 'Щорічно', + 'add' => 'Додати', + 'add_new' => 'Добавити нове', + 'show' => 'Показати', + 'edit' => 'Редагувати', + 'delete' => 'Видалити', + 'send' => 'Надіслати', + 'download' => 'Завантажити', + 'delete_confirm' => 'Підтвердити видалення: ім\'я: тип?', + 'name' => 'Ім’я', + 'email' => 'E-mail', + 'tax_number' => 'Податковий номер', + 'phone' => 'Телефон', + 'address' => 'Адреса', + 'website' => 'Сайт', + 'actions' => 'Дії', + 'description' => 'Опис', + 'manage' => 'Управління', + 'code' => 'Код', + 'alias' => 'Псевдонім', + 'balance' => 'Баланс', + 'reference' => 'Посилання', + 'attachment' => 'Вкладення', + 'change' => 'Редагувати', + 'switch' => 'Перемкнути', + 'color' => 'Колір', + 'save' => 'Зберегти', + 'cancel' => 'Відміна', + 'from' => 'Від', + 'to' => 'До', + 'print' => 'Друк', + 'search' => 'Пошук', + 'search_placeholder' => 'Введіть текст для пошуку..', + 'filter' => 'Фільтр', + 'help' => 'Допомога', + 'all' => 'Всі', + 'all_type' => 'Всі: тип', + 'upcoming' => 'Майбутні', + 'created' => 'Створено', + 'id' => 'Ідентифікатор', + 'more_actions' => 'Додаткові дії', + 'duplicate' => 'Дублювати', + 'unpaid' => 'Неоплачено', + 'paid' => 'Оплачено', + 'overdue' => 'Протерміновано', + 'partially' => 'Частково', + 'partially_paid' => 'Частково Оплачено', + + 'title' => [ + 'new' => 'Нове: тип', + 'edit' => 'Редагування: тип', + ], + 'form' => [ + 'enter' => 'Введіть: поля', + 'select' => [ + 'field' => '-Вкажiть: поля -', + 'file' => 'Вибрати файл', + ], + 'no_file_selected' => 'Файл не вибрано...', + ], + +]; diff --git a/resources/lang/uk-UA/header.php b/resources/lang/uk-UA/header.php new file mode 100644 index 000000000..5f3693996 --- /dev/null +++ b/resources/lang/uk-UA/header.php @@ -0,0 +1,15 @@ + 'Змінити мову', + 'last_login' => 'Останній вхід :час', + 'notifications' => [ + 'counter' => '{0} немає сповіщення |{1} , у вас є: розраховувати сповіщення | [2, *] У вас є: розраховувати сповіщення', + 'overdue_invoices' => '{1} : враховувати прострочені рахунки | [2, *]: враховувати прострочені рахунки', + 'upcoming_bills' => '{1} : враховувати майбутній рахунок | [2, *]: враховувати майбутні рахунки', + 'items_stock' => '{1} :враховувати позицію немає в наявності|[2,*] :враховувати позиції немає в наявності', + 'view_all' => 'Переглянути всі' + ], + +]; diff --git a/resources/lang/uk-UA/import.php b/resources/lang/uk-UA/import.php new file mode 100644 index 000000000..16428a9c0 --- /dev/null +++ b/resources/lang/uk-UA/import.php @@ -0,0 +1,9 @@ + 'Імпорт', + 'title' => 'Імпорт: тип', + 'message' => 'Допускається типи файлів: CSV, XLS. Будь-ласказавантажте зразок файлу.', + +]; diff --git a/resources/lang/uk-UA/install.php b/resources/lang/uk-UA/install.php new file mode 100644 index 000000000..288ea66cd --- /dev/null +++ b/resources/lang/uk-UA/install.php @@ -0,0 +1,44 @@ + 'Наступний', + 'refresh' => 'Перезавантажити', + + 'steps' => [ + 'requirements' => 'Будь ласка, відповідайте наступним вимогам!', + 'language' => 'Крок 1/3: Вибір мови', + 'database' => 'Крок 2/3: Налаштування бази даних', + 'settings' => 'Крок 3/3: Деталі компанії та адміністратора', + ], + + 'language' => [ + 'select' => 'Виберіть мову', + ], + + 'requirements' => [ + 'enabled' => ': функцію потрібно ввімкнути!', + 'disabled' => ': функцію потрібно вимкнути!', + 'extension' => ': розширення розширення повинно бути завантаженим!', + 'directory' => ': директорія каталогу повинна бути доступною для запису!', + ], + + 'database' => [ + 'hostname' => 'Ім\'я хосту', + 'username' => 'Ім\'я користувача', + 'password' => 'Пароль', + 'name' => 'База Даних', + ], + + 'settings' => [ + 'company_name' => 'Назва компанії', + 'company_email' => 'Email Вашої Компанії', + 'admin_email' => 'Адміністратор електронної пошти', + 'admin_password' => 'Пароль адміністратора', + ], + + 'error' => [ + 'connection' => 'Помилка: Не вдалося підключитися до бази даних! Переконайтесь, що даніі є правильними.', + ], + +]; diff --git a/resources/lang/uk-UA/invoices.php b/resources/lang/uk-UA/invoices.php new file mode 100644 index 000000000..2a9626df0 --- /dev/null +++ b/resources/lang/uk-UA/invoices.php @@ -0,0 +1,50 @@ + 'Номер рахунку', + 'invoice_date' => 'Дата рахунку', + 'total_price' => 'Загальна сума', + 'due_date' => 'Термін дії', + 'order_number' => 'Номер замовлення', + 'bill_to' => 'Надсилання рахунків', + + 'quantity' => 'Кількість', + 'price' => 'Ціна', + 'sub_total' => 'Всього', + 'tax_total' => 'Всього пдв', + 'total' => 'Всього', + + 'item_name' => 'Назва товару', + + 'payment_due' => 'Очікуваний платіж', + 'paid' => 'Оплачено', + 'histories' => 'Історії', + 'payments' => 'Платежі', + 'add_payment' => 'Додати платіж', + 'mark_paid' => 'Позначити оплату', + 'mark_sent' => 'Позначити відправлено', + 'download_pdf' => 'Завантажити PDF', + 'send_mail' => 'Надіслати листа', + + 'status' => [ + 'draft' => 'Чернетка', + 'sent' => 'Надіслано', + 'viewed' => 'Переглянуті', + 'approved' => 'Затверджено', + 'partial' => 'Частково', + 'paid' => 'Оплачено', + ], + + 'messages' => [ + 'email_sent' => 'Повідомлення з рахунком було успішно відправлено!', + 'marked_sent' => 'Повідомлення з рахунком було успішно відправлено!', + 'email_required' => 'Немає адреси для цього клієнта!', + ], + + 'notification' => [ + 'message' => 'Ви отримуєте цей лист, тому що у вас є наступна: сума рахунку до: клієнта замовника.', + 'button' => 'Оплатити зараз', + ], + +]; diff --git a/resources/lang/uk-UA/items.php b/resources/lang/uk-UA/items.php new file mode 100644 index 000000000..4380df70d --- /dev/null +++ b/resources/lang/uk-UA/items.php @@ -0,0 +1,15 @@ + 'Кількість | Кількості', + 'sales_price' => 'Ціна продажу', + 'purchase_price' => 'Ціна покупки', + 'sku' => 'Артикул', + + 'notification' => [ + 'message' => 'Ви отримуєте це повідомлення, тому що : назва відсутня.', + 'button' => 'Переглянути зараз', + ], + +]; diff --git a/resources/lang/uk-UA/messages.php b/resources/lang/uk-UA/messages.php new file mode 100644 index 000000000..6b69aa47d --- /dev/null +++ b/resources/lang/uk-UA/messages.php @@ -0,0 +1,23 @@ + [ + 'added' => ': тип додано!', + 'updated' => ': тип оновлено!', + 'deleted' => ': тип видалено!', + 'duplicated' => ': тип продубльовано!', + 'imported' => ': тип імпортовано!', + ], + 'error' => [ + 'over_payment' => 'Помилка: Оплату не додано! Сума проходить загальна.', + 'not_user_company' => 'Помилка: Вам не дозволено керувати цією компанією!', + 'customer' => 'Помилка: Користувача не створено! : ця електронна адреса вже використовується.', + 'no_file' => 'Помилка: Файл не обрано!', + ], + 'warning' => [ + 'deleted' => 'Увага: Вам не дозволено видалити : ім\'я , оскільки воно має: текст, пов\'язані.', + 'disabled' => 'Увага: Вам не дозволяється відключати : ім\'я , оскільки воно має: текст, пов\'язані.', + ], + +]; diff --git a/resources/lang/uk-UA/modules.php b/resources/lang/uk-UA/modules.php new file mode 100644 index 000000000..75b1b6c75 --- /dev/null +++ b/resources/lang/uk-UA/modules.php @@ -0,0 +1,47 @@ + 'API маркер', + 'api_token' => 'Маркер', + 'top_paid' => 'Топ оплат', + 'new' => 'Нове', + 'top_free' => 'Топ безкоштовних', + 'free' => 'БЕЗКОШТОВНО', + 'install' => 'Встановити', + 'buy_now' => 'Купити зараз', + 'token_link' => 'натисніть тут щоб отримати ваш API маркер.', + 'no_apps' => 'Немає поки що додатків у цій категорії.', + 'developer' => 'Ви розробник? тут ви можете дізнатися, як створити додаток і почати продажі сьогодні!', + + 'about' => 'Про', + + 'added' => 'Додано', + 'updated' => 'Оновлено', + 'compatibility' => 'Сумiснiсть', + + 'installed' => ': модуль встановлено', + 'uninstalled' => ': модуль видалено', + //'updated' => ':module updated', + 'enabled' => ': модуль увімкнено', + 'disabled' => ': модуль вимкнено', + + 'tab' => [ + 'installation' => 'Встановлення', + 'faq' => 'Поширені запитання', + 'changelog' => 'Історія змін', + ], + + 'installation' => [ + 'header' => 'Встановлення додатку', + 'download' => 'Завантаження: файл модуля.', + 'unzip' => 'Вилучення: файли модуля.', + 'install' => 'Установка: файли модуля.', + ], + + 'button' => [ + 'uninstall' => 'Видалити', + 'disable' => 'Вимкнути', + 'enable' => 'Увімкнути', + ], +]; diff --git a/resources/lang/uk-UA/pagination.php b/resources/lang/uk-UA/pagination.php new file mode 100644 index 000000000..155e9ac2a --- /dev/null +++ b/resources/lang/uk-UA/pagination.php @@ -0,0 +1,9 @@ + '« Назад', + 'next' => 'Далі »', + 'showing' => 'Показ: перший до: останній з: загально: тип', + +]; diff --git a/resources/lang/uk-UA/passwords.php b/resources/lang/uk-UA/passwords.php new file mode 100644 index 000000000..f9ecb3bfd --- /dev/null +++ b/resources/lang/uk-UA/passwords.php @@ -0,0 +1,22 @@ + 'Пароль повинен бути щонайменше 6 символів довжиною та співпадати з підтвердженням.', + 'reset' => 'Ваш пароль змінено!', + 'sent' => 'Ми надіслали на Вашу електронну адресу посилання для зміни пароля!', + 'token' => 'Помилковий код для зміни пароля.', + 'user' => "Користувача з такою електронною адресою не знайдено.", + +]; diff --git a/resources/lang/uk-UA/reports.php b/resources/lang/uk-UA/reports.php new file mode 100644 index 000000000..688c7a898 --- /dev/null +++ b/resources/lang/uk-UA/reports.php @@ -0,0 +1,17 @@ + 'Цього року', + 'previous_year' => 'Минулий рік', + 'this_quarter' => 'Цей квартал', + 'previous_quarter' => 'Попередній квартал', + 'last_12_months' => 'Останні 12 місяців', + + 'summary' => [ + 'income' => 'Кінцевий результат', + 'expense' => 'Загальні витрати', + 'income_expense' => 'Дохід проти витрат', + ], + +]; diff --git a/resources/lang/uk-UA/settings.php b/resources/lang/uk-UA/settings.php new file mode 100644 index 000000000..b9aa4b79f --- /dev/null +++ b/resources/lang/uk-UA/settings.php @@ -0,0 +1,85 @@ + [ + 'name' => 'Ім’я', + 'email' => 'Електронна пошта', + 'phone' => 'Телефон', + 'address' => 'Адреса', + 'logo' => 'Логотип', + ], + 'localisation' => [ + 'tab' => 'Локалізація', + 'date' => [ + 'format' => 'Формат дати', + 'separator' => 'Роздільник дати', + 'dash' => 'Тире (–)', + 'dot' => 'Крапка (.)', + 'comma' => 'Кома ()', + 'slash' => 'Слеш (/)', + 'space' => '(Пробіл)', + ], + 'timezone' => 'Часовий пояс', + ], + 'invoice' => [ + 'tab' => 'Рахунок', + 'prefix' => 'Префікс номеру', + 'digit' => 'Кількість цифр', + 'next' => 'Наступний номер', + 'logo' => 'Логотип', + ], + 'default' => [ + 'tab' => 'За замовчуванням', + 'account' => 'Обліковий запис за замовчуванням', + 'currency' => 'Валюта за замовчуванням', + 'tax' => 'Ставка податку за замовчуванням', + 'payment' => 'Методу оплати за замовчуванням', + 'language' => 'Мова за замовчуванням', + ], + 'email' => [ + 'protocol' => 'Протокол', + 'php' => 'PHP Mail', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'SMTP хост', + 'port' => 'SMTP порт', + 'username' => 'SMTP ім\'я користувача', + 'password' => 'Пароль до SMTP', + 'encryption' => 'SMTP безпеки', + 'none' => 'Жодний', + ], + 'sendmail' => 'Надіслати пошту', + 'sendmail_path' => 'Шлях надсилання пошти', + 'log' => 'Журнал Електронної пошти ', + ], + 'scheduling' => [ + 'tab' => 'Планувальник', + 'send_invoice' => 'Надсилати нагадування рахунку', + 'invoice_days' => 'Надсилання після відповідних днів', + 'send_bill' => 'Відправити Нагадування', + 'bill_days' => 'Надсилання після відповідних днів', + 'cron_command' => 'Cron команда', + 'schedule_time' => 'Години, щоб запустити', + ], + 'appearance' => [ + 'tab' => 'Вигляд', + 'theme' => 'Тема', + 'light' => 'Світлий', + 'dark' => 'Темний', + 'list_limit' => 'Записів на сторінці', + 'use_gravatar' => 'Використання Gravatar', + ], + 'system' => [ + 'tab' => 'Система', + 'session' => [ + 'lifetime' => 'Тривалість сеансу (хв)', + 'handler' => 'Менеджер сесій', + 'file' => 'Файл', + 'database' => 'База Даних', + ], + 'file_size' => 'Максимальний об’єм файлу (Мб)', + 'file_types' => 'Допускається тип файлів', + ], + +]; diff --git a/resources/lang/uk-UA/taxes.php b/resources/lang/uk-UA/taxes.php new file mode 100644 index 000000000..99b2ce464 --- /dev/null +++ b/resources/lang/uk-UA/taxes.php @@ -0,0 +1,8 @@ + 'Оцінка', + 'rate_percent' => 'Оцінка (%)', + +]; diff --git a/resources/lang/uk-UA/transfers.php b/resources/lang/uk-UA/transfers.php new file mode 100644 index 000000000..a64cf70e0 --- /dev/null +++ b/resources/lang/uk-UA/transfers.php @@ -0,0 +1,8 @@ + 'З облікового запису', + 'to_account' => 'Обліковому запису', + +]; diff --git a/resources/lang/uk-UA/updates.php b/resources/lang/uk-UA/updates.php new file mode 100644 index 000000000..8a2c4f32d --- /dev/null +++ b/resources/lang/uk-UA/updates.php @@ -0,0 +1,15 @@ + 'Встановлена версія', + 'latest_version' => 'Остання версія', + 'update' => 'Оновити Akaunting до: версії версія', + 'changelog' => 'Історія змін', + 'check' => 'Позначити', + 'new_core' => 'Оновлена версію Akaunting доступна.', + 'latest_core' => 'Вітаємо! У вас є остання версія Akaunting. Майбутні оновлення безпеки буде застосовано автоматично.', + 'success' => 'Процес оновлення успішно завершено.', + 'error' => 'Процес оновлення не вдалий, будь ласка, спробуйте ще раз.', + +]; diff --git a/resources/lang/uk-UA/validation.php b/resources/lang/uk-UA/validation.php new file mode 100644 index 000000000..4289c50f1 --- /dev/null +++ b/resources/lang/uk-UA/validation.php @@ -0,0 +1,119 @@ + 'Ви повинні прийняти :attribute.', + 'active_url' => 'Поле :attribute не правильний URL.', + 'after' => 'Поле :attribute має містити дату не раніше :date.', + 'after_or_equal' => 'Поле :attribute має містити дату не раніше або дорівнювати :date.', + 'alpha' => 'Поле :attribute має містити лише літери.', + 'alpha_dash' => 'Поле :attribute має містити лише літери, цифри та підкреслення.', + 'alpha_num' => 'Поле :attribute має містити лише літери та цифри.', + 'array' => 'Поле :attribute має бути масивом.', + 'before' => 'Поле :attribute має містити дату не пізніше :date.', + 'before_or_equal' => 'Поле :attribute має містити дату не пізніше або дорівнюватися :date.', + 'between' => [ + 'numeric' => 'Поле :attribute має бути між :min та :max.', + 'file' => 'Розмір файлу в полі :attribute має бути не менше :min та не більше :max кілобайт.', + 'string' => 'Текст в полі :attribute має бути не менше :min та не більше :max символів.', + 'array' => 'Поле :attribute має містити від :min до :max елементів.', + ], + 'boolean' => 'Поле :attribute повинне містити логічний тип.', + 'confirmed' => 'Поле :attribute не збігається з підтвердженням.', + 'date' => 'Поле :attribute не є датою.', + 'date_format' => 'Поле :attribute не відповідає формату :format.', + 'different' => 'Поля :attribute та :other повинні бути різними.', + 'digits' => 'Довжина цифрового поля :attribute повинна дорівнювати :digits.', + 'digits_between' => 'Довжина цифрового поля :attribute повинна бути від :min до :max.', + 'dimensions' => 'Поле :attribute містить неприпустимі розміри зображення.', + 'distinct' => 'Поле :attribute містить значення, яке дублюється.', + 'email' => 'Поле :attribute повинне містити коректну електронну адресу.', + 'exists' => 'Вибране для :attribute значення не коректне.', + 'file' => 'Поле :attribute має містити файл.', + 'filled' => 'Поле :attribute є обов\'язковим для заповнення.', + 'image' => 'Поле :attribute має містити зображення.', + 'in' => 'Вибране для :attribute значення не коректне.', + 'in_array' => 'Значення поля :attribute не міститься в :other.', + 'integer' => 'Поле :attribute має містити ціле число.', + 'ip' => 'Поле :attribute має містити IP адресу.', + 'json' => 'Дані поля :attribute мають бути в форматі JSON.', + 'max' => [ + 'numeric' => 'Поле :attribute має бути не більше :max.', + 'file' => 'Файл в полі :attribute має бути не більше :max кілобайт.', + 'string' => 'Текст в полі :attribute повинен мати довжину не більшу за :max.', + 'array' => 'Поле :attribute повинне містити не більше :max елементів.', + ], + 'mimes' => 'Поле :attribute повинне містити файл одного з типів: :values.', + 'mimetypes' => 'Поле :attribute повинне містити файл одного з типів: :values.', + 'min' => [ + 'numeric' => 'Поле :attribute повинне бути не менше :min.', + 'file' => 'Розмір файлу в полі :attribute має бути не меншим :min кілобайт.', + 'string' => 'Текст в полі :attribute повинен містити не менше :min символів.', + 'array' => 'Поле :attribute повинне містити не менше :min елементів.', + ], + 'not_in' => 'Вибране для :attribute значення не коректне.', + 'numeric' => 'Поле :attribute повинно містити число.', + 'present' => 'Поле :attribute повинне бути присутнє.', + 'regex' => 'Поле :attribute має хибний формат.', + 'required' => 'Поле :attribute є обов\'язковим для заповнення.', + 'required_if' => 'Поле :attribute є обов\'язковим для заповнення, коли :other є рівним :value.', + 'required_unless' => 'Поле :attribute є обов\'язковим для заповнення, коли :other відрізняється від :values', + 'required_with' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.', + 'required_with_all' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.', + 'required_without' => 'Поле :attribute є обов\'язковим для заповнення, коли :values не вказано.', + 'required_without_all' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.', + 'same' => 'Поля :attribute та :other мають співпадати.', + 'size' => [ + 'numeric' => 'Поле :attribute має бути довжиною :size.', + 'file' => 'Файл в полі :attribute має бути розміром :size кілобайт.', + 'string' => 'Текст в полі :attribute повинен містити :size символів.', + 'array' => 'Поле :attribute повинне містити :size елементів.', + ], + 'string' => 'Поле :attribute повинне містити текст.', + 'timezone' => 'Поле :attribute повинне містити коректну часову зону.', + 'unique' => 'Таке значення поля :attribute вже існує.', + 'uploaded' => 'Завантаження поля :attribute не вдалося.', + 'url' => 'Формат поля :attribute неправильний.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'спеціальне повідомлення', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + +]; From 88dba23090a5c498d27bc5ba0cc7afc215852846 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 19:02:42 +0300 Subject: [PATCH 70/94] recurring command --- app/Console/Commands/RecurringCheck.php | 186 ++++++++++++++++++++++++ app/Console/Kernel.php | 1 + app/Models/Company/Company.php | 5 + composer.json | 1 + 4 files changed, 193 insertions(+) create mode 100644 app/Console/Commands/RecurringCheck.php diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php new file mode 100644 index 000000000..bc10544f0 --- /dev/null +++ b/app/Console/Commands/RecurringCheck.php @@ -0,0 +1,186 @@ + $company->id]); + + // Override settings and currencies + Overrider::load('settings'); + Overrider::load('currencies'); + + $company->setSettings(); + + $recurring = $company->recurring(); + + foreach ($recurring as $recur) { + $schedule = $this->schedule($recur); + + $current = Date::parse($schedule->current()->getStart()); + + // Check if should recur today + if ($today->ne($current)) { + continue; + } + + $type = end(explode('\\', $recur->recurable_type)); + + $model = $type::find($recur->recurable_id); + + if (!$model) { + continue; + } + + switch ($type) { + case 'Bill': + $this->recurBill($company, $model); + break; + case 'Invoice': + $this->recurInvoice($company, $model); + break; + case 'Payment': + case 'Revenue': + $model->duplicate(); + break; + } + } + } + + // Unset company_id + session()->forget('company_id'); + } + + protected function recurInvoice($company, $model) + { + $clone = $model->duplicate(); + + // Add invoice history + InvoiceHistory::create([ + 'company_id' => session('company_id'), + 'invoice_id' => $clone->id, + 'status_code' => 'draft', + 'notify' => 0, + 'description' => trans('messages.success.added', ['type' => $clone->invoice_number]), + ]); + + // Notify the customer + if ($clone->customer && !empty($clone->customer_email)) { + $clone->customer->notify(new InvoiceNotification($clone)); + } + + // Notify all users assigned to this company + foreach ($company->users as $user) { + if (!$user->can('read-notifications')) { + continue; + } + + $user->notify(new InvoiceNotification($clone)); + } + + // Update next invoice number + $this->increaseNextInvoiceNumber(); + } + + protected function recurBill($company, $model) + { + $clone = $model->duplicate(); + + // Add bill history + BillHistory::create([ + 'company_id' => session('company_id'), + 'bill_id' => $clone->id, + 'status_code' => 'draft', + 'notify' => 0, + 'description' => trans('messages.success.added', ['type' => $clone->bill_number]), + ]); + + // Notify all users assigned to this company + foreach ($company->users as $user) { + if (!$user->can('read-notifications')) { + continue; + } + + $user->notify(new BillNotification($clone)); + } + } + + protected function schedule($recur) + { + $config = new ArrayTransformerConfig(); + $config->enableLastDayOfMonthFix(); + + $transformer = new ArrayTransformer(); + $transformer->setConfig($config); + + return $transformer->transform($this->rule($recur)); + } + + protected function rule($recur) + { + $rule = (new Rule()) + ->setStartDate($recur->started_at) + ->setTimezone(setting('general.timezone')) + ->setFreq(strtoupper($recur->frequency)) + ->setInterval($recur->interval) + ->setCount($recur->count); + + return $rule; + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 2698c72d2..8aa2e40da 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -18,6 +18,7 @@ class Kernel extends ConsoleKernel Commands\Install::class, Commands\InvoiceReminder::class, Commands\ModuleInstall::class, + Commands\RecurringCheck::class, ]; /** diff --git a/app/Models/Company/Company.php b/app/Models/Company/Company.php index eb9f2190f..a9ecf4ff2 100644 --- a/app/Models/Company/Company.php +++ b/app/Models/Company/Company.php @@ -106,6 +106,11 @@ class Company extends Eloquent return $this->hasMany('App\Models\Expense\Payment'); } + public function recurring() + { + return $this->hasMany('App\Models\Common\Recurring'); + } + public function revenues() { return $this->hasMany('App\Models\Income\Revenue'); diff --git a/composer.json b/composer.json index 3aaab5d36..5c2b55bf0 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "nwidart/laravel-modules": "1.*", "plank/laravel-mediable": "2.5.*", "santigarcor/laratrust": "4.0.*", + "simshaun/recurr": "3.0.*", "sofa/eloquence": "5.4.*", "tucker-eric/eloquentfilter": "1.1.*" }, From 4f340cba263f0823b6623184a81f390d98cbd08b Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 22:05:00 +0300 Subject: [PATCH 71/94] added recurring to scheduler #315 --- app/Console/Kernel.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 8aa2e40da..a83c826cf 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -36,6 +36,7 @@ class Kernel extends ConsoleKernel $schedule->command('reminder:invoice')->dailyAt(setting('general.schedule_time', '09:00')); $schedule->command('reminder:bill')->dailyAt(setting('general.schedule_time', '09:00')); + $schedule->command('recurring:check')->dailyAt(setting('general.schedule_time', '09:00')); } /** From 17758a24ccab62a326bc6a7118f59956a631268a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 27 Apr 2018 22:16:35 +0300 Subject: [PATCH 72/94] update dates of new records #315 --- app/Console/Commands/RecurringCheck.php | 29 ++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php index bc10544f0..5e7b893d3 100644 --- a/app/Console/Commands/RecurringCheck.php +++ b/app/Console/Commands/RecurringCheck.php @@ -53,7 +53,7 @@ class RecurringCheck extends Command */ public function handle() { - $today = Date::today(); + $this->today = Date::today(); // Get all companies $companies = Company::all(); @@ -76,7 +76,7 @@ class RecurringCheck extends Command $current = Date::parse($schedule->current()->getStart()); // Check if should recur today - if ($today->ne($current)) { + if ($this->today->ne($current)) { continue; } @@ -97,7 +97,12 @@ class RecurringCheck extends Command break; case 'Payment': case 'Revenue': - $model->duplicate(); + // Create new record + $clone = $model->duplicate(); + + // Update date + $clone->paid_at = $this->today->format('Y-m-d'); + $clone->save(); break; } } @@ -109,8 +114,17 @@ class RecurringCheck extends Command protected function recurInvoice($company, $model) { + // Create new record $clone = $model->duplicate(); + // Days between invoiced and due date + $diff_days = Date::parse($clone->due_at)->diffInDays(Date::parse($clone->invoiced_at)); + + // Update dates + $clone->invoiced_at = $this->today->format('Y-m-d'); + $clone->due_at = $this->today->addDays($diff_days)->format('Y-m-d'); + $clone->save(); + // Add invoice history InvoiceHistory::create([ 'company_id' => session('company_id'), @@ -140,8 +154,17 @@ class RecurringCheck extends Command protected function recurBill($company, $model) { + // Create new record $clone = $model->duplicate(); + // Days between invoiced and due date + $diff_days = Date::parse($clone->due_at)->diffInDays(Date::parse($clone->invoiced_at)); + + // Update dates + $clone->billed_at = $this->today->format('Y-m-d'); + $clone->due_at = $this->today->addDays($diff_days)->format('Y-m-d'); + $clone->save(); + // Add bill history BillHistory::create([ 'company_id' => session('company_id'), From 0efd3721f6fc89b5213ce569a06e9b2698cac4b1 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 28 Apr 2018 11:56:11 +0300 Subject: [PATCH 73/94] added info message #315 --- app/Console/Commands/RecurringCheck.php | 27 +--------------- app/Models/Common/Recurring.php | 31 +++++++++++++++++++ resources/lang/en-GB/recurring.php | 1 + resources/views/expenses/bills/show.blade.php | 12 +++++++ .../views/expenses/payments/edit.blade.php | 12 +++++++ .../views/incomes/invoices/show.blade.php | 12 +++++++ .../views/incomes/revenues/edit.blade.php | 12 +++++++ 7 files changed, 81 insertions(+), 26 deletions(-) diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php index 5e7b893d3..6d4aebbd4 100644 --- a/app/Console/Commands/RecurringCheck.php +++ b/app/Console/Commands/RecurringCheck.php @@ -71,9 +71,7 @@ class RecurringCheck extends Command $recurring = $company->recurring(); foreach ($recurring as $recur) { - $schedule = $this->schedule($recur); - - $current = Date::parse($schedule->current()->getStart()); + $current = Date::parse($recur->schedule()->current()->getStart()->format('Y-m-d')); // Check if should recur today if ($this->today->ne($current)) { @@ -183,27 +181,4 @@ class RecurringCheck extends Command $user->notify(new BillNotification($clone)); } } - - protected function schedule($recur) - { - $config = new ArrayTransformerConfig(); - $config->enableLastDayOfMonthFix(); - - $transformer = new ArrayTransformer(); - $transformer->setConfig($config); - - return $transformer->transform($this->rule($recur)); - } - - protected function rule($recur) - { - $rule = (new Rule()) - ->setStartDate($recur->started_at) - ->setTimezone(setting('general.timezone')) - ->setFreq(strtoupper($recur->frequency)) - ->setInterval($recur->interval) - ->setCount($recur->count); - - return $rule; - } } diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php index bb308c77a..925e9bdc6 100644 --- a/app/Models/Common/Recurring.php +++ b/app/Models/Common/Recurring.php @@ -3,6 +3,11 @@ namespace App\Models\Common; use App\Models\Model; +use DateTime; +use DateTimeZone; +use Recurr\Rule; +use Recurr\Transformer\ArrayTransformer; +use Recurr\Transformer\ArrayTransformerConfig; class Recurring extends Model { @@ -24,4 +29,30 @@ class Recurring extends Model { return $this->morphTo(); } + + public function schedule() + { + $config = new ArrayTransformerConfig(); + $config->enableLastDayOfMonthFix(); + + $transformer = new ArrayTransformer(); + $transformer->setConfig($config); + + return $transformer->transform($this->rule()); + } + + public function rule() + { + // 0 means infinite + $count = ($this->count == 0) ? 999 : $this->count; + + $rule = (new Rule()) + ->setStartDate(new DateTime($this->started_at, new DateTimeZone(setting('general.timezone')))) + ->setTimezone(setting('general.timezone')) + ->setFreq(strtoupper($this->frequency)) + ->setInterval($this->interval) + ->setCount($count); + + return $rule; + } } diff --git a/resources/lang/en-GB/recurring.php b/resources/lang/en-GB/recurring.php index 52f9afada..92099c71c 100644 --- a/resources/lang/en-GB/recurring.php +++ b/resources/lang/en-GB/recurring.php @@ -15,5 +15,6 @@ return [ 'weeks' => 'Week(s)', 'months' => 'Month(s)', 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', ]; diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index a2e028f00..c0ee0e328 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -3,6 +3,18 @@ @section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number) @section('content') + @if ($bill->recurring()->count()) +
      +

      {{ trans('recurring.recurring') }}

      + +

      {{ trans('recurring.message', [ + 'type' => mb_strtolower(trans_choice('general.bills', 1)), + 'date' => $bill->recurring->schedule()->next()->getStart()->format($date_format) + ]) }} +

      +
      + @endif +
      {{ $bill->status->name }} diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index ba25a42c0..0681d3fdf 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -3,6 +3,18 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.payments', 1)])) @section('content') + @if ($payment->recurring()->count()) +
      +

      {{ trans('recurring.recurring') }}

      + +

      {{ trans('recurring.message', [ + 'type' => mb_strtolower(trans_choice('general.payments', 1)), + 'date' => $payment->recurring->schedule()->next()->getStart()->format($date_format) + ]) }} +

      +
      + @endif +
      {!! Form::model($payment, [ diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 39104d4fe..ea5d5f608 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -3,6 +3,18 @@ @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number) @section('content') + @if ($invoice->recurring()->count()) +
      +

      {{ trans('recurring.recurring') }}

      + +

      {{ trans('recurring.message', [ + 'type' => mb_strtolower(trans_choice('general.invoices', 1)), + 'date' => $invoice->recurring->schedule()->next()->getStart()->format($date_format) + ]) }} +

      +
      + @endif +
      {{ $invoice->status->name }} diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index 40e18bbba..d3c11b330 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -3,6 +3,18 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.revenues', 1)])) @section('content') + @if ($revenue->recurring()->count()) +
      +

      {{ trans('recurring.recurring') }}

      + +

      {{ trans('recurring.message', [ + 'type' => mb_strtolower(trans_choice('general.revenues', 1)), + 'date' => $revenue->recurring->schedule()->next()->getStart()->format($date_format) + ]) }} +

      +
      + @endif +
      {!! Form::model($revenue, [ From ac9cd85394036dbf87f8d0d32a83e0227a335e48 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 28 Apr 2018 15:58:40 +0300 Subject: [PATCH 74/94] no settings yet during installation --- resources/views/layouts/install.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/layouts/install.blade.php b/resources/views/layouts/install.blade.php index ee39a4b8b..e60f1eb96 100644 --- a/resources/views/layouts/install.blade.php +++ b/resources/views/layouts/install.blade.php @@ -1,4 +1,4 @@ - + @include('partials.install.head') From 34c869b0cfa5ed464baadd949563efc259c73999 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Sat, 28 Apr 2018 18:43:43 +0300 Subject: [PATCH 75/94] Invoice & Bill add discount style change --- app/Http/Controllers/Items/Items.php | 6 ++ public/css/app.css | 11 +++- resources/lang/en-GB/bills.php | 4 ++ resources/lang/en-GB/invoices.php | 4 ++ .../views/expenses/bills/create.blade.php | 65 ++++++++++++++++-- resources/views/expenses/bills/edit.blade.php | 66 +++++++++++++++++-- .../views/incomes/invoices/create.blade.php | 63 ++++++++++++++++-- .../views/incomes/invoices/edit.blade.php | 65 ++++++++++++++++-- 8 files changed, 260 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index e9f16cc4a..e1227a7ce 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -290,10 +290,16 @@ class Items extends Controller $json->sub_total = money($sub_total, $currency_code, true)->format(); + $json->discount_text= trans('invoices.add_discount'); + $json->discount_total = ''; + $json->tax_total = money($tax_total, $currency_code, true)->format(); // Apply discount to total if ($discount) { + $json->discount_text= trans('invoices.show_discount', ['discount' => $discount]); + $json->discount_total = money($sub_total * ($discount / 100), $currency_code, true)->format(); + $sub_total = $sub_total - ($sub_total * ($discount / 100)); } diff --git a/public/css/app.css b/public/css/app.css index 841126099..c22197cdf 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -586,7 +586,12 @@ input[type="number"] { width: 10%; } -.input-group-recurring { - padding-left: 0; - padding-right: 0; +.popover-content, .discount.box-body, .discount.box-footer { + padding-left: 0 !important; + padding-right: 0 !important; +} + +.discount-description { + margin-top: 6px; + margin-left: -20px; } diff --git a/resources/lang/en-GB/bills.php b/resources/lang/en-GB/bills.php index 20790a8ec..eadc48ef7 100644 --- a/resources/lang/en-GB/bills.php +++ b/resources/lang/en-GB/bills.php @@ -18,6 +18,10 @@ return [ 'item_name' => 'Item Name|Item Names', + 'show_discount' => ':discount % Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Payment Due', 'amount_due' => 'Amount Due', 'paid' => 'Paid', diff --git a/resources/lang/en-GB/invoices.php b/resources/lang/en-GB/invoices.php index d68e508aa..c4c8b5534 100644 --- a/resources/lang/en-GB/invoices.php +++ b/resources/lang/en-GB/invoices.php @@ -18,6 +18,10 @@ return [ 'item_name' => 'Item Name|Item Names', + 'show_discount' => ':discount % Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Payment Due', 'paid' => 'Paid', 'histories' => 'Histories', diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 462721caa..89a9879e6 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -77,12 +77,12 @@ 0 - {{ trans('bills.discount') }} + + {{ trans('bills.add_discount') }} + -
      -
      - {!! Form::number('discount', null, ['class' => 'form-control text-right']) !!} -
      + + {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right']) !!} @@ -256,6 +256,58 @@ }); }); + $('a[rel=popover]').popover({ + html: 'true', + placement: 'bottom', + title: '{{ trans('bills.discount') }}', + content: function () { + + html = '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::number('pre-discount', null, ['id' => 'pre-discount', 'class' => 'form-control text-right']) !!}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {{ trans('bills.discount_desc') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::button('  ' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount','class' => 'btn btn-success']) !!}'; + html += '  {{ trans('general.cancel') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + + return html; + } + }); + + $(document).on('keyup', '#pre-discount', function(e){ + e.preventDefault(); + + $('#discount').val($(this).val()); + + totalItem(); + }); + + $(document).on('click', '#save-discount', function(){ + $('a[rel=popover]').trigger('click'); + }); + + $(document).on('click', '#cancel-discount', function(){ + $('#discount').val(''); + + totalItem(); + + $('a[rel=popover]').trigger('click'); + }); + $(document).on('change', '#currency_code, #items tbody select', function(){ totalItem(); }); @@ -293,7 +345,10 @@ $('#item-total-' + key).html(value); }); + $('#discount-text').text(data.discount_text); + $('#sub-total').html(data.sub_total); + $('#discount-total').html(data.discount_total); $('#tax-total').html(data.tax_total); $('#grand-total').html(data.grand_total); } diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index 05d996868..84c9173f2 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -93,12 +93,12 @@ 0 - {{ trans('bills.discount') }} + + {{ trans('bills.add_discount') }} + -
      -
      - {!! Form::number('discount', $bill->discount, ['class' => 'form-control text-right']) !!} -
      + + {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right']) !!} @@ -289,6 +289,59 @@ }); }); + $('a[rel=popover]').popover({ + html: 'true', + placement: 'bottom', + title: '{{ trans('bills.discount') }}', + content: function () { + + html = '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::number('pre-discount', null, ['id' => 'pre-discount', 'class' => 'form-control text-right']) !!}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {{ trans('bills.discount_desc') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::button('  ' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount','class' => 'btn btn-success']) !!}'; + html += '  {{ trans('general.cancel') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + + return html; + } + }); + + $(document).on('keyup', '#pre-discount', function(e){ + e.preventDefault(); + + $('#discount').val($(this).val()); + + totalItem(); + }); + + $(document).on('click', '#save-discount', function(){ + $('a[rel=popover]').trigger('click'); + }); + + $(document).on('click', '#cancel-discount', function(){ + $('#discount').val(''); + + totalItem(); + + $('a[rel=popover]').trigger('click'); + }); + + $(document).on('change', '#currency_code, #items tbody select', function(){ totalItem(); }); @@ -326,7 +379,10 @@ $('#item-total-' + key).html(value); }); + $('#discount-text').text(data.discount_text); + $('#sub-total').html(data.sub_total); + $('#discount-total').html(data.discount_total); $('#tax-total').html(data.tax_total); $('#grand-total').html(data.grand_total); } diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index a4b1ccbe5..72744e372 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -77,12 +77,12 @@ 0 - {{ trans('invoices.discount') }} + + {{ trans('invoices.add_discount') }} + -
      -
      - {!! Form::number('discount', null, ['class' => 'form-control text-right']) !!} -
      + + {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right']) !!} @@ -257,10 +257,58 @@ }); }); - $(document).on('change', '#currency_code, #items tbody select', function(){ + $('a[rel=popover]').popover({ + html: 'true', + placement: 'bottom', + title: '{{ trans('invoices.discount') }}', + content: function () { + + html = '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::number('pre-discount', null, ['id' => 'pre-discount', 'class' => 'form-control text-right']) !!}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {{ trans('invoices.discount_desc') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::button('  ' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount','class' => 'btn btn-success']) !!}'; + html += '  {{ trans('general.cancel') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + + return html; + } + }); + + $(document).on('keyup', '#pre-discount', function(e){ + e.preventDefault(); + + $('#discount').val($(this).val()); + totalItem(); }); + $(document).on('click', '#save-discount', function(){ + $('a[rel=popover]').trigger('click'); + }); + + $(document).on('click', '#cancel-discount', function(){ + $('#discount').val(''); + + totalItem(); + + $('a[rel=popover]').trigger('click'); + }); + $(document).on('keyup', '#items tbody .form-control', function(){ totalItem(); }); @@ -294,7 +342,10 @@ $('#item-total-' + key).html(value); }); + $('#discount-text').text(data.discount_text); + $('#sub-total').html(data.sub_total); + $('#discount-total').html(data.discount_total); $('#tax-total').html(data.tax_total); $('#grand-total').html(data.grand_total); } diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index 98fb6f761..e2edbc93c 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -92,12 +92,12 @@ 0 - {{ trans('invoices.discount') }} + + {{ trans('invoices.add_discount') }} + -
      -
      - {!! Form::number('discount', $invoice->discount, ['class' => 'form-control text-right']) !!} -
      + + {!! Form::hidden('discount', null, ['id' => 'discount', 'class' => 'form-control text-right']) !!} @@ -288,6 +288,58 @@ }); }); + $('a[rel=popover]').popover({ + html: 'true', + placement: 'bottom', + title: '{{ trans('invoices.discount') }}', + content: function () { + + html = '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::number('pre-discount', null, ['id' => 'pre-discount', 'class' => 'form-control text-right']) !!}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {{ trans('invoices.discount_desc') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += '
      '; + html += ' {!! Form::button('  ' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount','class' => 'btn btn-success']) !!}'; + html += '  {{ trans('general.cancel') }}'; + html += '
      '; + html += '
      '; + html += '
      '; + + return html; + } + }); + + $(document).on('keyup', '#pre-discount', function(e){ + e.preventDefault(); + + $('#discount').val($(this).val()); + + totalItem(); + }); + + $(document).on('click', '#save-discount', function(){ + $('a[rel=popover]').trigger('click'); + }); + + $(document).on('click', '#cancel-discount', function(){ + $('#discount').val(''); + + totalItem(); + + $('a[rel=popover]').trigger('click'); + }); + $(document).on('change', '#currency_code, #items tbody select', function(){ totalItem(); }); @@ -325,7 +377,10 @@ $('#item-total-' + key).html(value); }); + $('#discount-text').text(data.discount_text); + $('#sub-total').html(data.sub_total); + $('#discount-total').html(data.discount_total); $('#tax-total').html(data.tax_total); $('#grand-total').html(data.grand_total); } From fe4f0fb734f4a057ebb4738fa45b9c8f95a8f166 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Sat, 28 Apr 2018 19:12:55 +0300 Subject: [PATCH 76/94] version update 1.1.15 to 1.2.0 RC --- config/version.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/version.php b/config/version.php index 61ff0185f..0f6463873 100644 --- a/config/version.php +++ b/config/version.php @@ -4,21 +4,21 @@ return [ 'name' => 'Akaunting', - 'code' => 'Import', + 'code' => 'Recurring', 'major' => '1', - 'minor' => '1', + 'minor' => '2', - 'patch' => '15', + 'patch' => '0', 'build' => '', - 'status' => 'Stable', + 'status' => 'RC', - 'date' => '13-March-2018', + 'date' => '28-April-2018', - 'time' => '16:00', + 'time' => '19:00', 'zone' => 'GMT +3', From 6079e105732616fa9af2b86eec7fbb2719d668c5 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 28 Apr 2018 19:20:06 +0300 Subject: [PATCH 77/94] styling --- public/css/app.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/css/app.css b/public/css/app.css index c22197cdf..5ff4e5923 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -586,6 +586,11 @@ input[type="number"] { width: 10%; } +.input-group-recurring { + padding-left: 0 !important; + padding-right: 0 !important; +} + .popover-content, .discount.box-body, .discount.box-footer { padding-left: 0 !important; padding-right: 0 !important; From 9c1faabb672b1360a9bf880bebb66012e61f16c3 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sun, 29 Apr 2018 01:04:19 +0300 Subject: [PATCH 78/94] he-IL translation --- config/language.php | 2 +- resources/lang/he-IL/accounts.php | 14 ++++ resources/lang/he-IL/auth.php | 30 +++++++ resources/lang/he-IL/bills.php | 46 +++++++++++ resources/lang/he-IL/companies.php | 13 +++ resources/lang/he-IL/currencies.php | 18 +++++ resources/lang/he-IL/customers.php | 11 +++ resources/lang/he-IL/dashboard.php | 24 ++++++ resources/lang/he-IL/demo.php | 17 ++++ resources/lang/he-IL/footer.php | 9 +++ resources/lang/he-IL/general.php | 117 +++++++++++++++++++++++++++ resources/lang/he-IL/header.php | 15 ++++ resources/lang/he-IL/import.php | 9 +++ resources/lang/he-IL/install.php | 44 ++++++++++ resources/lang/he-IL/invoices.php | 55 +++++++++++++ resources/lang/he-IL/items.php | 15 ++++ resources/lang/he-IL/messages.php | 25 ++++++ resources/lang/he-IL/modules.php | 48 +++++++++++ resources/lang/he-IL/pagination.php | 9 +++ resources/lang/he-IL/passwords.php | 22 +++++ resources/lang/he-IL/recurring.php | 20 +++++ resources/lang/he-IL/reports.php | 30 +++++++ resources/lang/he-IL/settings.php | 90 +++++++++++++++++++++ resources/lang/he-IL/taxes.php | 8 ++ resources/lang/he-IL/transfers.php | 8 ++ resources/lang/he-IL/updates.php | 15 ++++ resources/lang/he-IL/validation.php | 119 ++++++++++++++++++++++++++++ 27 files changed, 832 insertions(+), 1 deletion(-) create mode 100644 resources/lang/he-IL/accounts.php create mode 100644 resources/lang/he-IL/auth.php create mode 100644 resources/lang/he-IL/bills.php create mode 100644 resources/lang/he-IL/companies.php create mode 100644 resources/lang/he-IL/currencies.php create mode 100644 resources/lang/he-IL/customers.php create mode 100644 resources/lang/he-IL/dashboard.php create mode 100644 resources/lang/he-IL/demo.php create mode 100644 resources/lang/he-IL/footer.php create mode 100644 resources/lang/he-IL/general.php create mode 100644 resources/lang/he-IL/header.php create mode 100644 resources/lang/he-IL/import.php create mode 100644 resources/lang/he-IL/install.php create mode 100644 resources/lang/he-IL/invoices.php create mode 100644 resources/lang/he-IL/items.php create mode 100644 resources/lang/he-IL/messages.php create mode 100644 resources/lang/he-IL/modules.php create mode 100644 resources/lang/he-IL/pagination.php create mode 100644 resources/lang/he-IL/passwords.php create mode 100644 resources/lang/he-IL/recurring.php create mode 100644 resources/lang/he-IL/reports.php create mode 100644 resources/lang/he-IL/settings.php create mode 100644 resources/lang/he-IL/taxes.php create mode 100644 resources/lang/he-IL/transfers.php create mode 100644 resources/lang/he-IL/updates.php create mode 100644 resources/lang/he-IL/validation.php diff --git a/config/language.php b/config/language.php index b17a3c65d..3a26ff4c8 100644 --- a/config/language.php +++ b/config/language.php @@ -115,7 +115,7 @@ return [ | */ - 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-TW'], + 'allowed' => ['en-GB', 'ar-SA', 'bg-BG', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'he-IL', 'hr-HR', 'id-ID', 'it-IT', 'nb-NO', 'nl-NL', 'pt-BR', 'ru-RU', 'sq-AL', 'sv-SE', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-TW'], /* |-------------------------------------------------------------------------- diff --git a/resources/lang/he-IL/accounts.php b/resources/lang/he-IL/accounts.php new file mode 100644 index 000000000..e21b0b6df --- /dev/null +++ b/resources/lang/he-IL/accounts.php @@ -0,0 +1,14 @@ + 'שם החשבון', + 'number' => 'מספר', + 'opening_balance' => 'ליתרת הפתיחה', + 'current_balance' => 'היתרה הנוכחית', + 'bank_name' => 'שם הבנק', + 'bank_phone' => 'טלפון הבנק', + 'bank_address' => 'כתובת הבנק', + 'default_account' => 'חשבון ברירת מחדל', + +]; diff --git a/resources/lang/he-IL/auth.php b/resources/lang/he-IL/auth.php new file mode 100644 index 000000000..5cf953728 --- /dev/null +++ b/resources/lang/he-IL/auth.php @@ -0,0 +1,30 @@ + 'פרופיל', + 'logout' => 'יציאה', + 'login' => 'התחברות', + 'login_to' => 'התחבר כדי להתחיל את ה-session', + 'remember_me' => 'זכור אותי', + 'forgot_password' => 'שכחתי את הסיסמה שלי', + 'reset_password' => 'איפוס סיסמה', + 'enter_email' => 'הזן את כתובת הדוא"ל שלך', + 'current_email' => 'דוא ל הנוכחי', + 'reset' => 'איפוס', + 'never' => 'לעולם לא', + 'password' => [ + 'current' => 'סיסמה', + 'current_confirm' => 'אימות סיסמה', + 'new' => 'סיסמה חדשה', + 'new_confirm' => 'אימות סיסמה חדשה', + ], + 'error' => [ + 'self_delete' => 'שגיאה: לא ניתן למחוק את עצמך!' + ], + + 'failed' => 'פרטים אלה אינם תואמים את רישומינו.', + 'disabled' => 'חשבון זה אינו זמין. אנא, פנה אל מנהל המערכת.', + 'throttle' => 'ניסיונות כניסה רבים מדי. אנא נסו שוב בעוד :seconds שניות.', + +]; diff --git a/resources/lang/he-IL/bills.php b/resources/lang/he-IL/bills.php new file mode 100644 index 000000000..2c84c148a --- /dev/null +++ b/resources/lang/he-IL/bills.php @@ -0,0 +1,46 @@ + 'מספר החשבון', + 'bill_date' => 'תאריך החשבון', + 'total_price' => 'סה"כ מחיר', + 'due_date' => 'תאריך יעד', + 'order_number' => 'מספר הזמנה', + 'bill_from' => 'חשבון מ', + + 'quantity' => 'כמות', + 'price' => 'מחיר', + 'sub_total' => 'סכום ביניים', + 'discount' => 'הנחה', + 'tax_total' => 'סה כ מס', + 'total' => 'סה"כ', + + 'item_name' => 'פריט שם | שמות הפריטים', + + 'show_discount' => ':discount % הנחה', + 'add_discount' => 'הוסף הנחה', + 'discount_desc' => 'של ביניים', + + 'payment_due' => 'תשלום בשל', + 'amount_due' => 'סכום לחיוב', + 'paid' => 'שולם', + 'histories' => 'היסטוריה', + 'payments' => 'תשלומים', + 'add_payment' => 'הוספת תשלום', + 'mark_received' => 'סימון תקבול', + 'download_pdf' => 'הורדת PDF', + 'send_mail' => 'שלח דואר אלקטרוני', + + 'status' => [ + 'draft' => 'טיוטה', + 'received' => 'התקבל', + 'partial' => 'חלקי', + 'paid' => 'שולם', + ], + + 'messages' => [ + 'received' => 'חשבונות שסומנו התקבלו בהצלחה!', + ], + +]; diff --git a/resources/lang/he-IL/companies.php b/resources/lang/he-IL/companies.php new file mode 100644 index 000000000..cceda5a4e --- /dev/null +++ b/resources/lang/he-IL/companies.php @@ -0,0 +1,13 @@ + 'שם מתחם', + 'logo' => 'לוגו', + 'manage' => 'ניהול חברות', + 'all' => 'כל החברות', + 'error' => [ + 'delete_active' => 'שגיאה: יכול לא למחוק את החברה פעילה, בבקשה לשנות את זה קודם!', + ], + +]; diff --git a/resources/lang/he-IL/currencies.php b/resources/lang/he-IL/currencies.php new file mode 100644 index 000000000..73d5eca81 --- /dev/null +++ b/resources/lang/he-IL/currencies.php @@ -0,0 +1,18 @@ + 'קוד', + 'rate' => 'דירוג', + 'default' => 'מטבע ברירת מחדל', + 'decimal_mark' => 'סימן עשרוני', + 'thousands_separator' => 'מפריד אלפים', + 'precision' => 'דיוק', + 'symbol' => [ + 'symbol' => 'סמל', + 'position' => 'מיקום סמל', + 'before' => 'לפני הכמות', + 'after' => 'אחרי הכמות', + ] + +]; diff --git a/resources/lang/he-IL/customers.php b/resources/lang/he-IL/customers.php new file mode 100644 index 000000000..a002440f3 --- /dev/null +++ b/resources/lang/he-IL/customers.php @@ -0,0 +1,11 @@ + 'אפשר התחברות?', + 'user_created' => 'משתמש נוצר', + + 'error' => [ + 'email' => 'כתובת הדואר אלקטרוני כבר תפוסה.' + ] +]; diff --git a/resources/lang/he-IL/dashboard.php b/resources/lang/he-IL/dashboard.php new file mode 100644 index 000000000..1647e8ff5 --- /dev/null +++ b/resources/lang/he-IL/dashboard.php @@ -0,0 +1,24 @@ + 'סה"כ ההכנסות', + 'receivables' => 'חשבונות חייבים', + 'open_invoices' => 'חשבוניות פתוחות', + 'overdue_invoices' => 'חשבוניות שפרעונן חלף', + 'total_expenses' => 'סך כל ההוצאות', + 'payables' => 'לפקודת', + 'open_bills' => 'חשבונות פתוחים', + 'overdue_bills' => 'חשבונות באיחור תשלום', + 'total_profit' => 'הרווח הכולל', + 'open_profit' => 'רווח פתוח', + 'overdue_profit' => 'רווח שפרעונו חלף', + 'cash_flow' => 'תזרים מזומנים', + 'no_profit_loss' => 'אין רווח הפסד', + 'incomes_by_category' => 'הכנסות לפי קטגוריה', + 'expenses_by_category' => 'הוצאות לפי קטגוריה', + 'account_balance' => 'יתרת חשבון', + 'latest_incomes' => 'הכנסות אחרונות', + 'latest_expenses' => 'הוצאות אחרונות', + +]; diff --git a/resources/lang/he-IL/demo.php b/resources/lang/he-IL/demo.php new file mode 100644 index 000000000..f4210494f --- /dev/null +++ b/resources/lang/he-IL/demo.php @@ -0,0 +1,17 @@ + 'מזומנים', + 'categories_uncat' => 'ללא קטגוריה', + 'categories_deposit' => 'פיקדון', + 'categories_sales' => 'מכירות', + 'currencies_usd' => 'דולר אמריקאי', + 'currencies_eur' => 'יורו', + 'currencies_gbp' => 'לירה שטרלינג', + 'currencies_try' => 'לירה טורקית', + 'taxes_exempt' => 'פטור ממס', + 'taxes_normal' => 'מס רגיל', + 'taxes_sales' => 'מיסים מכירות', + +]; diff --git a/resources/lang/he-IL/footer.php b/resources/lang/he-IL/footer.php new file mode 100644 index 000000000..ef6f08d1d --- /dev/null +++ b/resources/lang/he-IL/footer.php @@ -0,0 +1,9 @@ + 'גירסה', + 'powered' => 'מופעל על ידי Akaunting', + 'software' => 'תוכנת הנהלת חשבונות חינם', + +]; diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php new file mode 100644 index 000000000..a484b33b0 --- /dev/null +++ b/resources/lang/he-IL/general.php @@ -0,0 +1,117 @@ + 'פריט | פריטים', + 'incomes' => 'הכנסה | ההכנסות', + 'invoices' => 'חשבונית | חשבוניות', + 'revenues' => 'הכנסה | הכנסות', + 'customers' => 'לקוח | לקוחות', + 'expenses' => 'הוצאה | הוצאות', + 'bills' => 'חשבון | חשבונות', + 'payments' => 'תשלום | תשלומים', + 'vendors' => 'ספק | ספקים', + 'accounts' => 'חשבון | חשבונות', + 'transfers' => 'העברה | העברות', + 'transactions' => 'תנועה | תנועות', + 'reports' => 'דוח | דוחות', + 'settings' => 'הגדרה | הגדרות', + 'categories' => 'קטגוריה | קטגוריות', + 'currencies' => 'מטבע | מטבעות', + 'tax_rates' => 'שיעור מס | שיעורי מס', + 'users' => 'משתמש | משתמשים', + 'roles' => 'תפקיד | תפקידים', + 'permissions' => 'הרשאה | הרשאות', + 'modules' => 'יישום | יישומים', + 'companies' => 'חברה | חברות', + 'profits' => 'רווח | רווחים', + 'taxes' => 'מס | מיסים', + 'logos' => 'לוגו | לוגואים', + 'pictures' => 'תמונה | תמונות', + 'types' => 'סוג | סוגים', + 'payment_methods' => 'שיטת התשלום | שיטות תשלום', + 'compares' => 'הכנסה לעומת הוצאה | הכנסות לעומת הוצאות', + 'notes' => 'הערה | הערות', + 'totals' => 'סיכום | סיכומים', + 'languages' => 'שפה | שפות', + 'updates' => 'עדכון | עדכונים', + 'numbers' => 'מספר | מספרים', + 'statuses' => 'מצב | מצבים', + 'others' => 'אחר | אחרים', + + 'dashboard' => 'לוח מחוונים', + 'banking' => 'בנקאות', + 'general' => 'כללי', + 'no_records' => 'לא רשומות.', + 'date' => 'תאריך', + 'amount' => 'כמות', + 'enabled' => 'מאופשר', + 'disabled' => 'מושבת', + 'yes' => 'כן', + 'no' => 'לא', + 'na' => 'לא זמין', + 'daily' => 'יומי', + 'monthly' => 'חודשי', + 'quarterly' => 'רבעוני', + 'yearly' => 'שנתי', + 'add' => 'הוסף', + 'add_new' => 'הוסף חדש', + 'show' => 'הצג', + 'edit' => 'ערוך', + 'delete' => 'מחק', + 'send' => 'שליחה', + 'download' => 'הורדה', + 'delete_confirm' => 'האם לאשר מחיקה :name :type?', + 'name' => 'שם', + 'email' => 'דואר אלקטרוני', + 'tax_number' => 'מספר מס', + 'phone' => 'טלפון', + 'address' => 'כתובת', + 'website' => 'אתר אינטרנט', + 'actions' => 'פעולות', + 'description' => 'תיאור', + 'manage' => 'ניהול', + 'code' => 'קוד', + 'alias' => 'שם חליפי', + 'balance' => 'מאזן', + 'reference' => 'רפרנס', + 'attachment' => 'קובץ מצורף', + 'change' => 'שנה', + 'switch' => 'מתג', + 'color' => 'צבע', + 'save' => 'שמור', + 'cancel' => 'ביטול', + 'from' => 'מאת', + 'to' => 'אל', + 'print' => 'הדפסה', + 'search' => 'חיפוש', + 'search_placeholder' => 'הקלד לחיפוש...', + 'filter' => 'סינון', + 'help' => 'עזרה', + 'all' => 'הכל', + 'all_type' => 'הכל :type', + 'upcoming' => 'בקרוב', + 'created' => 'נוצר', + 'id' => 'מזהה', + 'more_actions' => 'פעולות נוספות', + 'duplicate' => 'שכפל', + 'unpaid' => 'לא שולמו', + 'paid' => 'שולם', + 'overdue' => 'באיחור', + 'partially' => 'חלקי', + 'partially_paid' => 'תשלום חלקי', + + 'title' => [ + 'new' => ':type חדש', + 'edit' => 'עריכת :type', + ], + 'form' => [ + 'enter' => 'הכנס :field', + 'select' => [ + 'field' => '- בחר :field -', + 'file' => 'בחר קובץ', + ], + 'no_file_selected' => 'לא נבחר קובץ...', + ], + +]; diff --git a/resources/lang/he-IL/header.php b/resources/lang/he-IL/header.php new file mode 100644 index 000000000..bf7d7c0c4 --- /dev/null +++ b/resources/lang/he-IL/header.php @@ -0,0 +1,15 @@ + 'שינוי שפה', + 'last_login' => 'כניסה אחרונה :time', + 'notifications' => [ + 'counter' => '{0} אין התראות חדשות|{1} יש :count התראות|[2,*] יש :count התראות', + 'overdue_invoices' => '{1} :count חשבונית באיחור|[2,*] :count חשבוניות באיחור', + 'upcoming_bills' => '{1} :count חשבונית קרובה|[2,*] :count חשבוניות קרובות', + 'items_stock' => '{1} :count פריט אזל מהמלאי|[2,*] :count פריטים אזלו מהמלאי', + 'view_all' => 'הצג הכל' + ], + +]; diff --git a/resources/lang/he-IL/import.php b/resources/lang/he-IL/import.php new file mode 100644 index 000000000..902afb35a --- /dev/null +++ b/resources/lang/he-IL/import.php @@ -0,0 +1,9 @@ + 'ייבוא', + 'title' => 'ייבוא :type', + 'message' => 'סוגי קבצים מותרים: CSV, XLS. אנא, הורד את קובץ ההדגמה.', + +]; diff --git a/resources/lang/he-IL/install.php b/resources/lang/he-IL/install.php new file mode 100644 index 000000000..9e58c0e30 --- /dev/null +++ b/resources/lang/he-IL/install.php @@ -0,0 +1,44 @@ + 'הבא', + 'refresh' => 'רענן', + + 'steps' => [ + 'requirements' => 'בבקשה, לעמוד בדרישות הבאות!', + 'language' => 'שלב 1/3: בחירת שפה', + 'database' => 'שלב 2/3: הגדרות מסד נתונים', + 'settings' => 'שלב 3/3: פרטי החברה והמנהל', + ], + + 'language' => [ + 'select' => 'בחירת שפה', + ], + + 'requirements' => [ + 'enabled' => ':feature צריך להיות פעיל!', + 'disabled' => ':feature צריך להיות כבוי!', + 'extension' => ':extension סיומת צריך להיות טעון!', + 'directory' => ':directory צריכה להיות writable!', + ], + + 'database' => [ + 'hostname' => 'שם מארח', + 'username' => 'שם משתמש', + 'password' => 'סיסמה', + 'name' => 'בסיס נתונים', + ], + + 'settings' => [ + 'company_name' => 'שם החברה', + 'company_email' => 'כתובת הדואר האלקטרוני של החברה', + 'admin_email' => 'דוא"ל מנהל', + 'admin_password' => 'סיסמת מנהל מערכת', + ], + + 'error' => [ + 'connection' => 'שגיאה: לא היתה אפשרות להתחבר למסד הנתונים! בבקשה, ודא כי הפרטים נכונים.', + ], + +]; diff --git a/resources/lang/he-IL/invoices.php b/resources/lang/he-IL/invoices.php new file mode 100644 index 000000000..413725320 --- /dev/null +++ b/resources/lang/he-IL/invoices.php @@ -0,0 +1,55 @@ + 'מספר חשבונית', + 'invoice_date' => 'תאריך חשבונית', + 'total_price' => 'סה"כ מחיר', + 'due_date' => 'תאריך', + 'order_number' => 'מספר הזמנה', + 'bill_to' => 'חשבון עבור', + + 'quantity' => 'כמות', + 'price' => 'מחיר', + 'sub_total' => 'סכום ביניים', + 'discount' => 'הנחה', + 'tax_total' => 'סה"כ מס', + 'total' => 'סה"כ', + + 'item_name' => 'פריט שם | שמות הפריטים', + + 'show_discount' => ':discount % הנחה', + 'add_discount' => 'הוסף הנחה', + 'discount_desc' => 'של ביניים', + + 'payment_due' => 'תשלום בשל', + 'paid' => 'שולם', + 'histories' => 'היסטוריה', + 'payments' => 'תשלומים', + 'add_payment' => 'הוספת תשלום', + 'mark_paid' => 'סימון תקבול', + 'mark_sent' => 'סמן כנשלח', + 'download_pdf' => 'הורדת PDF', + 'send_mail' => 'שלח דואר אלקטרוני', + + 'status' => [ + 'draft' => 'טיוטה', + 'sent' => 'נשלח', + 'viewed' => 'נצפה', + 'approved' => 'אושר', + 'partial' => 'חלקי', + 'paid' => 'שולם', + ], + + 'messages' => [ + 'email_sent' => 'החשבונית נשלחה בהצלחה באמצעות הדואר האלקטרוני!', + 'marked_sent' => 'חשבונית סומנה שנשלחה בהצלחה!', + 'email_required' => 'אין דואר אלקטרוני מעודכן ללקוח זה!', + ], + + 'notification' => [ + 'message' => 'אתה מקבל את הודעת האימייל הזו מפני שקיימות :amount חשבוניות חדשות עבור הלקוח :customer.', + 'button' => 'שלם עכשיו', + ], + +]; diff --git a/resources/lang/he-IL/items.php b/resources/lang/he-IL/items.php new file mode 100644 index 000000000..75cbf69f5 --- /dev/null +++ b/resources/lang/he-IL/items.php @@ -0,0 +1,15 @@ + 'כמות | כמויות', + 'sales_price' => 'מחיר מבצע', + 'purchase_price' => 'מחיר רכישה', + 'sku' => 'מספר מזהה', + + 'notification' => [ + 'message' => 'אתה מקבל את האימייל הזה כי :name אזל מהמלאי.', + 'button' => 'הצג עכשיו', + ], + +]; diff --git a/resources/lang/he-IL/messages.php b/resources/lang/he-IL/messages.php new file mode 100644 index 000000000..3471b363d --- /dev/null +++ b/resources/lang/he-IL/messages.php @@ -0,0 +1,25 @@ + [ + 'added' => ':type נוסף!', + 'updated' => ':type עודכן!', + 'deleted' => ':type נמחק!', + 'duplicated' => ':type שוכפל!', + 'imported' => ':type יובא!', + ], + 'error' => [ + 'over_payment' => 'שגיאה: התשלום לא הוסף! הסכום עובר את הסכום הכולל.', + 'not_user_company' => 'שגיאה: אינך מורשה לנהל החברה זאת!', + 'customer' => 'שגיאה: המשתמש לא נוצר! :name כבר משתמש בכתוב הזאת.', + 'no_file' => 'שגיאה: אין קובץ שנבחר!', + 'last_category' => 'שגיאה: לא ניתן למחוק האחרונים :type קטגוריה!', + 'invalid_token' => 'שגיאה: ה-token שהוזן אינו חוקי!', + ], + 'warning' => [ + 'deleted' => 'אזהרה: אסור לך למחוק :name כי יש לו :text מקושר.', + 'disabled' => 'אזהרה: אינך מורשה לכבות :name כי יש לו :text מקושר.', + ], + +]; diff --git a/resources/lang/he-IL/modules.php b/resources/lang/he-IL/modules.php new file mode 100644 index 000000000..4d8aee6a8 --- /dev/null +++ b/resources/lang/he-IL/modules.php @@ -0,0 +1,48 @@ + 'אסימון API', + 'api_token' => 'אסימון', + 'top_paid' => 'תשלומים מובילים', + 'new' => 'חדש', + 'top_free' => 'מובילים חינם', + 'free' => 'חינם', + 'search' => 'חיפוש', + 'install' => 'התקנה', + 'buy_now' => 'קנה עכשיו', + 'token_link' => 'לחץ כאן כדי לקבל את ה-API אסימון.', + 'no_apps' => 'אין עדיין יישומים בקטגוריה זאת.', + 'developer' => 'האם אתה מפתח? כאן תלמד כיצד ליצור app ולהתחיל למכור היום!', + + 'about' => 'אודות', + + 'added' => 'הוסף', + 'updated' => 'עודכן', + 'compatibility' => 'תאימות', + + 'installed' => ':module הותקן', + 'uninstalled' => ':module הוסר', + //'updated' => ':module updated', + 'enabled' => ':module פעיל', + 'disabled' => ':module כבוי', + + 'tab' => [ + 'installation' => 'התקנה', + 'faq' => 'שאלות ותשובות', + 'changelog' => 'יומן שינויים', + ], + + 'installation' => [ + 'header' => 'התקנת יישום', + 'download' => 'מוריד קובץ :module.', + 'unzip' => 'חילוץ קובץ :module.', + 'install' => 'מתקין קבצים :module.', + ], + + 'button' => [ + 'uninstall' => 'הסרה', + 'disable' => 'השבת', + 'enable' => 'אפשר', + ], +]; diff --git a/resources/lang/he-IL/pagination.php b/resources/lang/he-IL/pagination.php new file mode 100644 index 000000000..1d184035b --- /dev/null +++ b/resources/lang/he-IL/pagination.php @@ -0,0 +1,9 @@ + '« הקודם', + 'next' => 'הבא »', + 'showing' => 'מציג :first ל- :last של :total :type', + +]; diff --git a/resources/lang/he-IL/passwords.php b/resources/lang/he-IL/passwords.php new file mode 100644 index 000000000..9381bc662 --- /dev/null +++ b/resources/lang/he-IL/passwords.php @@ -0,0 +1,22 @@ + 'סיסמאות חייב להיות לפחות שישה תווים ולהתאים את האישור.', + 'reset' => 'הסיסמה אופסה!', + 'sent' => 'שלחנו לך בדואר אלקטרוני קישור לאיפוס הסיסמה!', + 'token' => 'אסימון איפוס הסיסמה לא תקין.', + 'user' => "לא הצלחנו למצוא משתמש עם כתובת הדואר אלקטרוני שהוזן.", + +]; diff --git a/resources/lang/he-IL/recurring.php b/resources/lang/he-IL/recurring.php new file mode 100644 index 000000000..5ab077aa5 --- /dev/null +++ b/resources/lang/he-IL/recurring.php @@ -0,0 +1,20 @@ + 'חוזרות', + 'every' => 'כל', + 'period' => 'תקופת', + 'times' => 'פעמים', + 'daily' => 'יומי', + 'weekly' => 'שבועי', + 'monthly' => 'חודשי', + 'yearly' => 'שנתי', + 'custom' => 'מותאם אישית', + 'days' => 'ימים', + 'weeks' => 'שבועות', + 'months' => 'חודשים', + 'years' => 'שנים', + 'message' => ':type חזר. :type יווצר באופן אוטומטי במועד :date', + +]; diff --git a/resources/lang/he-IL/reports.php b/resources/lang/he-IL/reports.php new file mode 100644 index 000000000..1fe1a5ff3 --- /dev/null +++ b/resources/lang/he-IL/reports.php @@ -0,0 +1,30 @@ + 'השנה', + 'previous_year' => 'בשנה הקודמת', + 'this_quarter' => 'ברבעון הזה', + 'previous_quarter' => 'ברבעון הקודם', + 'last_12_months' => '12 החודשים האחרונים', + 'profit_loss' => 'רווח & הפסד', + 'gross_profit' => 'רווח גולמי', + 'net_profit' => 'הרווח הנקי', + 'total_expenses' => 'סך כל ההוצאות', + 'net' => 'נטו', + + 'summary' => [ + 'income' => 'סיכום הכנסות', + 'expense' => 'סיכום הוצאות', + 'income_expense' => 'הכנסה לעומת הוצאות', + 'tax' => 'סיכום מס', + ], + + 'quarter' => [ + '1' => 'ינואר-מרץ', + '2' => 'אפריל-יוני', + '3' => 'יולי-ספטמבר', + '4' => 'אוקטובר-דצמבר', + ], + +]; diff --git a/resources/lang/he-IL/settings.php b/resources/lang/he-IL/settings.php new file mode 100644 index 000000000..1dc3cdf7b --- /dev/null +++ b/resources/lang/he-IL/settings.php @@ -0,0 +1,90 @@ + [ + 'name' => 'שם', + 'email' => 'דואר אלקטרוני', + 'phone' => 'טלפון', + 'address' => 'כתובת', + 'logo' => 'לוגו', + ], + 'localisation' => [ + 'tab' => 'לוקליזציה', + 'date' => [ + 'format' => 'פורמט תאריך', + 'separator' => 'מפריד טקסט', + 'dash' => 'מקף (-)', + 'dot' => 'נקודה (.)', + 'comma' => 'פסיק (,)', + 'slash' => 'קו נטוי (/)', + 'space' => 'רווח ( )', + ], + 'timezone' => 'איזור זמן', + 'percent' => [ + 'title' => 'אחוז (%) מיקום', + 'before' => 'לפני המספר', + 'after' => 'לאחר המספר', + ], + ], + 'invoice' => [ + 'tab' => 'חשבונית', + 'prefix' => 'קידומת מספר', + 'digit' => 'מספר ספרות', + 'next' => 'המספר הבא', + 'logo' => 'לוגו', + ], + 'default' => [ + 'tab' => 'ברירת מחדל', + 'account' => 'חשבון ברירת מחדל', + 'currency' => 'מטבע ברירת מחדל', + 'tax' => 'שיעור המס ברירת מחדל', + 'payment' => 'שיטת התשלום המועדפת', + 'language' => 'שפת ברירת מחדל', + ], + 'email' => [ + 'protocol' => 'פרוטוקול', + 'php' => 'PHP דואר', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'SMTP Host', + 'port' => 'SMTP Port', + 'username' => 'שם משתמש SMTP', + 'password' => 'סיסמת SMTP', + 'encryption' => 'SMTP אבטחה', + 'none' => 'ללא', + ], + 'sendmail' => 'Sendmail', + 'sendmail_path' => 'Sendmail Path', + 'log' => 'Log Emails', + ], + 'scheduling' => [ + 'tab' => 'תזמון', + 'send_invoice' => 'שלח חשבונית תזכורת', + 'invoice_days' => 'שלח לאחר ימים', + 'send_bill' => 'שלח תזכורת חשבונית', + 'bill_days' => 'שלח לפני פירעון ימים', + 'cron_command' => 'הפקודה Cron', + 'schedule_time' => 'שעה ריצה', + ], + 'appearance' => [ + 'tab' => 'המראה', + 'theme' => 'ערכת עיצוב', + 'light' => 'בהיר', + 'dark' => 'כהה', + 'list_limit' => 'תוצאות לעמוד', + 'use_gravatar' => 'השתמש Gravatar', + ], + 'system' => [ + 'tab' => 'מערכת', + 'session' => [ + 'lifetime' => 'משך החיים של ההפעלה (דקות)', + 'handler' => 'Session Handler', + 'file' => 'קובץ', + 'database' => 'מסד נתונים', + ], + 'file_size' => 'גודל הקובץ מקסימלי (MB)', + 'file_types' => 'סוגי קבצים מותרים', + ], + +]; diff --git a/resources/lang/he-IL/taxes.php b/resources/lang/he-IL/taxes.php new file mode 100644 index 000000000..bd094b250 --- /dev/null +++ b/resources/lang/he-IL/taxes.php @@ -0,0 +1,8 @@ + 'דירוג', + 'rate_percent' => 'דירוג (%)', + +]; diff --git a/resources/lang/he-IL/transfers.php b/resources/lang/he-IL/transfers.php new file mode 100644 index 000000000..ffebd6b9b --- /dev/null +++ b/resources/lang/he-IL/transfers.php @@ -0,0 +1,8 @@ + 'מחשבון', + 'to_account' => 'לחשבון', + +]; diff --git a/resources/lang/he-IL/updates.php b/resources/lang/he-IL/updates.php new file mode 100644 index 000000000..4c990555e --- /dev/null +++ b/resources/lang/he-IL/updates.php @@ -0,0 +1,15 @@ + 'הגירסה המותקנת', + 'latest_version' => 'הגירסה האחרונה', + 'update' => 'עדכון Akaunting לגירסה :version', + 'changelog' => 'יומן שינויים', + 'check' => 'בדוק', + 'new_core' => 'עדכון גירסה חדש עבור Akaunting זמין.', + 'latest_core' => 'מזל טוב! יש לך את הגירסה העדכנית של Akaunting. עדכוני אבטחה עתידיים יוחלו באופן אוטומטי.', + 'success' => 'תהליך העדכון הושלם בהצלחה.', + 'error' => 'תהליך העדכון נכשל, אנא נסו שנית.', + +]; diff --git a/resources/lang/he-IL/validation.php b/resources/lang/he-IL/validation.php new file mode 100644 index 000000000..5e3926550 --- /dev/null +++ b/resources/lang/he-IL/validation.php @@ -0,0 +1,119 @@ + 'שדה :attribute חייב להיות מסומן.', + 'active_url' => 'שדה :attribute הוא לא כתובת אתר תקנית.', + 'after' => 'שדה :attribute חייב להיות תאריך אחרי :date.', + 'after_or_equal' => 'שדה :attribute חייב להיות תאריך מאוחר או שווה ל :date.', + 'alpha' => 'שדה :attribute יכול להכיל אותיות בלבד.', + 'alpha_dash' => 'שדה :attribute יכול להכיל אותיות, מספרים ומקפים בלבד.', + 'alpha_num' => 'שדה :attribute יכול להכיל אותיות ומספרים בלבד.', + 'array' => 'שדה :attribute חייב להיות מערך.', + 'before' => 'שדה :attribute חייב להיות תאריך לפני :date.', + 'before_or_equal' => 'שדה :attribute חייב להיות תאריך מוקדם או שווה ל :date.', + 'between' => [ + 'numeric' => 'שדה :attribute חייב להיות בין :min ל-:max.', + 'file' => 'שדה :attribute חייב להיות בין :min ל-:max קילובייטים.', + 'string' => 'שדה :attribute חייב להיות בין :min ל-:max תווים.', + 'array' => 'שדה :attribute חייב להיות בין :min ל-:max פריטים.', + ], + 'boolean' => 'שדה :attribute חייב להיות אמת או שקר.', + 'confirmed' => 'שדה האישור של :attribute לא תואם.', + 'date' => 'שדה :attribute אינו תאריך תקני.', + 'date_format' => 'שדה :attribute לא תואם את הפורמט :format.', + 'different' => 'שדה :attribute ושדה :other חייבים להיות שונים.', + 'digits' => 'שדה :attribute חייב להיות בעל :digits ספרות.', + 'digits_between' => 'שדה :attribute חייב להיות בין :min ו-:max ספרות.', + 'dimensions' => 'שדה :attribute מימדי התמונה לא תקינים', + 'distinct' => 'שדה :attribute קיים ערך כפול.', + 'email' => 'שדה :attribute חייב להיות כתובת אימייל תקנית.', + 'exists' => 'בחירת ה-:attribute אינה תקפה.', + 'file' => 'שדה :attribute חייב להיות קובץ.', + 'filled' => 'שדה :attribute הוא חובה.', + 'image' => 'שדה :attribute חייב להיות תמונה.', + 'in' => 'בחירת ה-:attribute אינה תקפה.', + 'in_array' => 'שדה :attribute לא קיים ב:other.', + 'integer' => 'שדה :attribute חייב להיות מספר שלם.', + 'ip' => 'שדה :attribute חייב להיות כתובת IP תקנית.', + 'json' => 'שדה :attribute חייב להיות מחרוזת JSON תקנית.', + 'max' => [ + 'numeric' => 'שדה :attribute אינו יכול להיות גדול מ-:max.', + 'file' => 'שדה :attribute לא יכול להיות גדול מ-:max קילובייטים.', + 'string' => 'שדה :attribute לא יכול להיות גדול מ-:max characters.', + 'array' => 'שדה :attribute לא יכול להכיל יותר מ-:max פריטים.', + ], + 'mimes' => 'שדה :attribute צריך להיות קובץ מסוג: :values.', + 'mimetypes' => 'שדה :attribute צריך להיות קובץ מסוג: :values.', + 'min' => [ + 'numeric' => 'שדה :attribute חייב להיות לפחות :min.', + 'file' => 'שדה :attribute חייב להיות לפחות :min קילובייטים.', + 'string' => 'שדה :attribute חייב להיות לפחות :min תווים.', + 'array' => 'שדה :attribute חייב להיות לפחות :min פריטים.', + ], + 'not_in' => 'בחירת ה-:attribute אינה תקפה.', + 'numeric' => 'שדה :attribute חייב להיות מספר.', + 'present' => 'שדה :attribute חייב להיות קיים.', + 'regex' => 'שדה :attribute בעל פורמט שאינו תקין.', + 'required' => 'שדה :attribute הוא חובה.', + 'required_if' => 'שדה :attribute נחוץ כאשר :other הוא :value.', + 'required_unless' => 'שדה :attribute נחוץ אלא אם כן :other הוא בין :values.', + 'required_with' => 'שדה :attribute נחוץ כאשר :values נמצא.', + 'required_with_all' => 'שדה :attribute נחוץ כאשר :values נמצא.', + 'required_without' => 'שדה :attribute נחוץ כאשר :values לא בנמצא.', + 'required_without_all' => 'שדה :attribute נחוץ כאשר אף אחד מ-:values נמצאים.', + 'same' => 'שדה :attribute ו-:other חייבים להיות זהים.', + 'size' => [ + 'numeric' => 'שדה :attribute חייב להיות :size.', + 'file' => 'שדה :attribute חייב להיות :size קילובייטים.', + 'string' => 'שדה :attribute חייב להיות :size תווים.', + 'array' => 'שדה :attribute חייב להכיל :size פריטים.', + ], + 'string' => 'שדה :attribute חייב להיות מחרוזת.', + 'timezone' => 'שדה :attribute חייב להיות איזור תקני.', + 'unique' => 'שדה :attribute כבר תפוס.', + 'uploaded' => 'שדה :attribute ארעה שגיאה בעת ההעלאה.', + 'url' => 'שדה :attribute בעל פורמט שאינו תקין.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'הודעה מותאמת אישית', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap attribute place-holders + | with something more reader friendly such as E-Mail Address instead + | of "email". This simply helps us make messages a little cleaner. + | + */ + + 'attributes' => [], + +]; From 1b47c33b54e2a12b22147678682de1f29c65ed41 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 30 Apr 2018 10:32:52 +0300 Subject: [PATCH 79/94] force item price to be double --- app/Http/Controllers/Expenses/Bills.php | 8 ++++---- app/Http/Controllers/Incomes/Invoices.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index b4483352b..7bfc98a0c 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -190,10 +190,10 @@ class Bills extends Controller $bill_item['name'] = str_limit($item['name'], 180, ''); $bill_item['sku'] = $item_sku; $bill_item['quantity'] = $item['quantity']; - $bill_item['price'] = $item['price']; + $bill_item['price'] = (double) $item['price']; $bill_item['tax'] = $tax; $bill_item['tax_id'] = $tax_id; - $bill_item['total'] = $item['price'] * $item['quantity']; + $bill_item['total'] = (double) $item['price'] * $item['quantity']; BillItem::create($bill_item); @@ -397,10 +397,10 @@ class Bills extends Controller $bill_item['name'] = str_limit($item['name'], 180, ''); $bill_item['sku'] = $item_sku; $bill_item['quantity'] = $item['quantity']; - $bill_item['price'] = $item['price']; + $bill_item['price'] = (double) $item['price']; $bill_item['tax'] = $tax; $bill_item['tax_id'] = $tax_id; - $bill_item['total'] = $item['price'] * $item['quantity']; + $bill_item['total'] = (double) $item['price'] * $item['quantity']; if (isset($tax_object)) { if (array_key_exists($tax_object->id, $taxes)) { diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 4166520a0..8398304f3 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -205,10 +205,10 @@ class Invoices extends Controller $invoice_item['name'] = str_limit($item['name'], 180, ''); $invoice_item['sku'] = $item_sku; $invoice_item['quantity'] = $item['quantity']; - $invoice_item['price'] = $item['price']; + $invoice_item['price'] = (double) $item['price']; $invoice_item['tax'] = $tax; $invoice_item['tax_id'] = $tax_id; - $invoice_item['total'] = $item['price'] * $item['quantity']; + $invoice_item['total'] = (double) $item['price'] * $item['quantity']; InvoiceItem::create($invoice_item); @@ -418,10 +418,10 @@ class Invoices extends Controller $invoice_item['name'] = str_limit($item['name'], 180, ''); $invoice_item['sku'] = $item_sku; $invoice_item['quantity'] = $item['quantity']; - $invoice_item['price'] = $item['price']; + $invoice_item['price'] = (double) $item['price']; $invoice_item['tax'] = $tax; $invoice_item['tax_id'] = $tax_id; - $invoice_item['total'] = $item['price'] * $item['quantity']; + $invoice_item['total'] = (double) $item['price'] * $item['quantity']; if (isset($tax_object)) { if (array_key_exists($tax_object->id, $taxes)) { From 1c8bcd8cb2c7ec15d97ad043223f1b352456ecf0 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 30 Apr 2018 11:49:47 +0300 Subject: [PATCH 80/94] decimal quantity --- app/Http/Controllers/Expenses/Bills.php | 12 +++--- app/Http/Controllers/Incomes/Invoices.php | 12 +++--- app/Http/Controllers/Items/Items.php | 2 +- composer.json | 1 + ...nge_quantity_column_invoice_bill_items.php | 38 +++++++++++++++++++ .../views/expenses/bills/create.blade.php | 10 ++--- resources/views/expenses/bills/edit.blade.php | 14 +++---- .../views/expenses/payments/create.blade.php | 2 +- .../views/expenses/payments/edit.blade.php | 2 +- .../views/incomes/invoices/create.blade.php | 10 ++--- .../views/incomes/invoices/edit.blade.php | 14 +++---- .../views/incomes/revenues/create.blade.php | 2 +- .../views/incomes/revenues/edit.blade.php | 2 +- resources/views/items/items/create.blade.php | 4 +- resources/views/items/items/edit.blade.php | 4 +- 15 files changed, 84 insertions(+), 45 deletions(-) create mode 100644 database/migrations/2018_04_30_000000_change_quantity_column_invoice_bill_items.php diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 7bfc98a0c..ecb0594c1 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -178,7 +178,7 @@ class Bills extends Controller $tax_id = $item['tax_id']; - $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate; + $tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate; // Apply discount to tax if ($discount) { @@ -189,11 +189,11 @@ class Bills extends Controller $bill_item['item_id'] = $item['item_id']; $bill_item['name'] = str_limit($item['name'], 180, ''); $bill_item['sku'] = $item_sku; - $bill_item['quantity'] = $item['quantity']; + $bill_item['quantity'] = (double) $item['quantity']; $bill_item['price'] = (double) $item['price']; $bill_item['tax'] = $tax; $bill_item['tax_id'] = $tax_id; - $bill_item['total'] = (double) $item['price'] * $item['quantity']; + $bill_item['total'] = (double) $item['price'] * (double) $item['quantity']; BillItem::create($bill_item); @@ -385,7 +385,7 @@ class Bills extends Controller $tax_id = $item['tax_id']; - $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate; + $tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate; // Apply discount to tax if ($discount) { @@ -396,11 +396,11 @@ class Bills extends Controller $bill_item['item_id'] = $item['item_id']; $bill_item['name'] = str_limit($item['name'], 180, ''); $bill_item['sku'] = $item_sku; - $bill_item['quantity'] = $item['quantity']; + $bill_item['quantity'] = (double) $item['quantity']; $bill_item['price'] = (double) $item['price']; $bill_item['tax'] = $tax; $bill_item['tax_id'] = $tax_id; - $bill_item['total'] = (double) $item['price'] * $item['quantity']; + $bill_item['total'] = (double) $item['price'] * (double) $item['quantity']; if (isset($tax_object)) { if (array_key_exists($tax_object->id, $taxes)) { diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 8398304f3..f56140581 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -193,7 +193,7 @@ class Invoices extends Controller $tax_id = $item['tax_id']; - $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate; + $tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate; // Apply discount to tax if ($discount) { @@ -204,11 +204,11 @@ class Invoices extends Controller $invoice_item['item_id'] = $item['item_id']; $invoice_item['name'] = str_limit($item['name'], 180, ''); $invoice_item['sku'] = $item_sku; - $invoice_item['quantity'] = $item['quantity']; + $invoice_item['quantity'] = (double) $item['quantity']; $invoice_item['price'] = (double) $item['price']; $invoice_item['tax'] = $tax; $invoice_item['tax_id'] = $tax_id; - $invoice_item['total'] = (double) $item['price'] * $item['quantity']; + $invoice_item['total'] = (double) $item['price'] * (double) $item['quantity']; InvoiceItem::create($invoice_item); @@ -406,7 +406,7 @@ class Invoices extends Controller $tax_id = $item['tax_id']; - $tax = (($item['price'] * $item['quantity']) / 100) * $tax_object->rate; + $tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate; // Apply discount to tax if ($discount) { @@ -417,11 +417,11 @@ class Invoices extends Controller $invoice_item['item_id'] = $item['item_id']; $invoice_item['name'] = str_limit($item['name'], 180, ''); $invoice_item['sku'] = $item_sku; - $invoice_item['quantity'] = $item['quantity']; + $invoice_item['quantity'] = (double) $item['quantity']; $invoice_item['price'] = (double) $item['price']; $invoice_item['tax'] = $tax; $invoice_item['tax_id'] = $tax_id; - $invoice_item['total'] = (double) $item['price'] * $item['quantity']; + $invoice_item['total'] = (double) $item['price'] * (double) $item['quantity']; if (isset($tax_object)) { if (array_key_exists($tax_object->id, $taxes)) { diff --git a/app/Http/Controllers/Items/Items.php b/app/Http/Controllers/Items/Items.php index e1227a7ce..be9105e93 100644 --- a/app/Http/Controllers/Items/Items.php +++ b/app/Http/Controllers/Items/Items.php @@ -262,7 +262,7 @@ class Items extends Controller if ($input_items) { foreach ($input_items as $key => $item) { $price = (double) $item['price']; - $quantity = (int) $item['quantity']; + $quantity = (double) $item['quantity']; $item_tax_total= 0; $item_sub_total = ($price * $quantity); diff --git a/composer.json b/composer.json index 5c2b55bf0..bb0ceebda 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "bkwld/cloner": "3.2.*", "consoletvs/charts": "4.6.*", "dingo/api": "1.0.0-beta8", + "doctrine/dbal": "2.5.*", "fideloper/proxy": "3.3.*", "guzzlehttp/guzzle": "6.3.*", "intervention/image": "2.3.*", diff --git a/database/migrations/2018_04_30_000000_change_quantity_column_invoice_bill_items.php b/database/migrations/2018_04_30_000000_change_quantity_column_invoice_bill_items.php new file mode 100644 index 000000000..1580e564e --- /dev/null +++ b/database/migrations/2018_04_30_000000_change_quantity_column_invoice_bill_items.php @@ -0,0 +1,38 @@ +double('quantity', 7, 2)->change(); + }); + + Schema::table('bill_items', function ($table) { + $table->double('quantity', 7, 2)->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('invoice_items', function ($table) { + $table->integer('quantity')->change(); + }); + + Schema::table('bill_items', function ($table) { + $table->integer('quantity')->change(); + }); + } +} diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index 89a9879e6..141b8e06e 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -31,7 +31,7 @@ {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }}
      - {!! Form::label('items', trans_choice('general.items', 1), ['class' => 'control-label']) !!} + {!! Form::label('items', trans_choice('general.items', 2), ['class' => 'control-label']) !!}
      @@ -55,10 +55,10 @@ '; html += ' '; html += ' '; html += '
      - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -153,10 +153,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' @@ -46,10 +46,10 @@ '; html += ' '; html += ' '; html += '
      - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -70,10 +70,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -159,10 +159,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' @@ -55,10 +55,10 @@ '; html += ' '; html += ' '; html += '
      - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, setting('general.default_tax'), ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -154,10 +154,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += ' @@ -45,10 +45,10 @@ '; html += ' '; html += ' '; html += ' - + @else @@ -126,7 +126,7 @@ @endif - + @endif diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index 2d5c50650..b3618f779 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -132,7 +132,7 @@ @foreach ($bill->totals as $total) @if ($total->code != 'total') - + @else diff --git a/resources/views/incomes/invoices/invoice.blade.php b/resources/views/incomes/invoices/invoice.blade.php index 91860a10a..bdf268463 100644 --- a/resources/views/incomes/invoices/invoice.blade.php +++ b/resources/views/incomes/invoices/invoice.blade.php @@ -115,7 +115,7 @@ @foreach ($invoice->totals as $total) @if ($total->code != 'total') - + @else diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index 2b4fdd175..dd51e5a48 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -134,7 +134,7 @@ @foreach ($invoice->totals as $total) @if ($total->code != 'total') - + @else From d67ec0ff9c0d161be223649ad179f67d6233dfcb Mon Sep 17 00:00:00 2001 From: denisdulici Date: Thu, 3 May 2018 12:16:18 +0300 Subject: [PATCH 93/94] updated translations --- resources/lang/ar-SA/bills.php | 5 ++ resources/lang/ar-SA/general.php | 126 ++++++++++++++-------------- resources/lang/ar-SA/header.php | 10 +-- resources/lang/ar-SA/invoices.php | 5 ++ resources/lang/ar-SA/messages.php | 6 +- resources/lang/ar-SA/modules.php | 1 + resources/lang/ar-SA/recurring.php | 20 +++++ resources/lang/ar-SA/reports.php | 13 +++ resources/lang/ar-SA/settings.php | 5 ++ resources/lang/bg-BG/bills.php | 5 ++ resources/lang/bg-BG/general.php | 1 + resources/lang/bg-BG/invoices.php | 5 ++ resources/lang/bg-BG/messages.php | 2 + resources/lang/bg-BG/modules.php | 1 + resources/lang/bg-BG/recurring.php | 20 +++++ resources/lang/bg-BG/reports.php | 13 +++ resources/lang/bg-BG/settings.php | 5 ++ resources/lang/cs-CZ/bills.php | 5 ++ resources/lang/cs-CZ/general.php | 2 + resources/lang/cs-CZ/invoices.php | 5 ++ resources/lang/cs-CZ/messages.php | 6 +- resources/lang/cs-CZ/modules.php | 1 + resources/lang/cs-CZ/recurring.php | 20 +++++ resources/lang/cs-CZ/reports.php | 13 +++ resources/lang/cs-CZ/settings.php | 5 ++ resources/lang/da-DK/bills.php | 5 ++ resources/lang/da-DK/general.php | 1 + resources/lang/da-DK/invoices.php | 5 ++ resources/lang/da-DK/messages.php | 2 + resources/lang/da-DK/modules.php | 1 + resources/lang/da-DK/recurring.php | 20 +++++ resources/lang/da-DK/reports.php | 13 +++ resources/lang/da-DK/settings.php | 5 ++ resources/lang/de-DE/bills.php | 11 ++- resources/lang/de-DE/currencies.php | 4 +- resources/lang/de-DE/dashboard.php | 2 +- resources/lang/de-DE/demo.php | 2 +- resources/lang/de-DE/general.php | 90 ++++++++++---------- resources/lang/de-DE/import.php | 2 +- resources/lang/de-DE/install.php | 2 +- resources/lang/de-DE/invoices.php | 15 ++-- resources/lang/de-DE/items.php | 6 +- resources/lang/de-DE/messages.php | 6 +- resources/lang/de-DE/modules.php | 1 + resources/lang/de-DE/pagination.php | 4 +- resources/lang/de-DE/passwords.php | 4 +- resources/lang/de-DE/recurring.php | 20 +++++ resources/lang/de-DE/reports.php | 21 ++++- resources/lang/de-DE/settings.php | 19 +++-- resources/lang/de-DE/taxes.php | 4 +- resources/lang/de-DE/updates.php | 2 +- resources/lang/de-DE/validation.php | 20 ++--- resources/lang/el-GR/auth.php | 4 +- resources/lang/el-GR/bills.php | 5 ++ resources/lang/el-GR/currencies.php | 2 +- resources/lang/el-GR/dashboard.php | 14 ++-- resources/lang/el-GR/general.php | 79 ++++++++--------- resources/lang/el-GR/header.php | 2 +- resources/lang/el-GR/install.php | 22 ++--- resources/lang/el-GR/invoices.php | 19 +++-- resources/lang/el-GR/messages.php | 6 +- resources/lang/el-GR/modules.php | 17 ++-- resources/lang/el-GR/pagination.php | 4 +- resources/lang/el-GR/passwords.php | 8 +- resources/lang/el-GR/recurring.php | 20 +++++ resources/lang/el-GR/reports.php | 13 +++ resources/lang/el-GR/settings.php | 7 +- resources/lang/el-GR/taxes.php | 4 +- resources/lang/el-GR/updates.php | 2 +- resources/lang/es-ES/bills.php | 5 ++ resources/lang/es-ES/general.php | 66 ++++++++------- resources/lang/es-ES/invoices.php | 5 ++ resources/lang/es-ES/messages.php | 6 +- resources/lang/es-ES/modules.php | 1 + resources/lang/es-ES/recurring.php | 20 +++++ resources/lang/es-ES/reports.php | 13 +++ resources/lang/es-ES/settings.php | 5 ++ resources/lang/es-MX/bills.php | 5 ++ resources/lang/es-MX/general.php | 2 + resources/lang/es-MX/invoices.php | 5 ++ resources/lang/es-MX/messages.php | 6 +- resources/lang/es-MX/modules.php | 1 + resources/lang/es-MX/recurring.php | 20 +++++ resources/lang/es-MX/reports.php | 13 +++ resources/lang/es-MX/settings.php | 5 ++ resources/lang/fa-IR/bills.php | 5 ++ resources/lang/fa-IR/general.php | 2 + resources/lang/fa-IR/invoices.php | 5 ++ resources/lang/fa-IR/messages.php | 6 +- resources/lang/fa-IR/modules.php | 1 + resources/lang/fa-IR/recurring.php | 20 +++++ resources/lang/fa-IR/reports.php | 13 +++ resources/lang/fa-IR/settings.php | 5 ++ resources/lang/fr-FR/bills.php | 5 ++ resources/lang/fr-FR/general.php | 2 + resources/lang/fr-FR/invoices.php | 5 ++ resources/lang/fr-FR/messages.php | 6 +- resources/lang/fr-FR/modules.php | 1 + resources/lang/fr-FR/recurring.php | 20 +++++ resources/lang/fr-FR/reports.php | 13 +++ resources/lang/fr-FR/settings.php | 5 ++ resources/lang/he-IL/general.php | 2 +- resources/lang/hr-HR/bills.php | 5 ++ resources/lang/hr-HR/general.php | 10 ++- resources/lang/hr-HR/invoices.php | 5 ++ resources/lang/hr-HR/messages.php | 6 +- resources/lang/hr-HR/modules.php | 1 + resources/lang/hr-HR/recurring.php | 20 +++++ resources/lang/hr-HR/reports.php | 13 +++ resources/lang/hr-HR/settings.php | 5 ++ resources/lang/id-ID/bills.php | 5 ++ resources/lang/id-ID/general.php | 2 + resources/lang/id-ID/invoices.php | 5 ++ resources/lang/id-ID/messages.php | 6 +- resources/lang/id-ID/modules.php | 1 + resources/lang/id-ID/recurring.php | 20 +++++ resources/lang/id-ID/reports.php | 13 +++ resources/lang/id-ID/settings.php | 5 ++ resources/lang/it-IT/bills.php | 5 ++ resources/lang/it-IT/general.php | 2 + resources/lang/it-IT/invoices.php | 5 ++ resources/lang/it-IT/messages.php | 6 +- resources/lang/it-IT/modules.php | 1 + resources/lang/it-IT/recurring.php | 20 +++++ resources/lang/it-IT/reports.php | 13 +++ resources/lang/it-IT/settings.php | 5 ++ resources/lang/nb-NO/bills.php | 5 ++ resources/lang/nb-NO/general.php | 2 + resources/lang/nb-NO/invoices.php | 5 ++ resources/lang/nb-NO/messages.php | 6 +- resources/lang/nb-NO/modules.php | 1 + resources/lang/nb-NO/recurring.php | 20 +++++ resources/lang/nb-NO/reports.php | 13 +++ resources/lang/nb-NO/settings.php | 5 ++ resources/lang/nb-NO/validation.php | 2 +- resources/lang/nl-NL/bills.php | 5 ++ resources/lang/nl-NL/general.php | 70 ++++++++-------- resources/lang/nl-NL/invoices.php | 5 ++ resources/lang/nl-NL/messages.php | 6 +- resources/lang/nl-NL/modules.php | 1 + resources/lang/nl-NL/recurring.php | 20 +++++ resources/lang/nl-NL/reports.php | 13 +++ resources/lang/nl-NL/settings.php | 5 ++ resources/lang/pt-BR/bills.php | 5 ++ resources/lang/pt-BR/general.php | 2 + resources/lang/pt-BR/invoices.php | 5 ++ resources/lang/pt-BR/messages.php | 6 +- resources/lang/pt-BR/modules.php | 1 + resources/lang/pt-BR/recurring.php | 20 +++++ resources/lang/pt-BR/reports.php | 13 +++ resources/lang/pt-BR/settings.php | 5 ++ resources/lang/ru-RU/bills.php | 13 ++- resources/lang/ru-RU/currencies.php | 14 ++-- resources/lang/ru-RU/customers.php | 6 +- resources/lang/ru-RU/general.php | 20 +++-- resources/lang/ru-RU/header.php | 2 +- resources/lang/ru-RU/import.php | 6 +- resources/lang/ru-RU/invoices.php | 19 +++-- resources/lang/ru-RU/items.php | 4 +- resources/lang/ru-RU/messages.php | 12 +-- resources/lang/ru-RU/modules.php | 31 +++---- resources/lang/ru-RU/recurring.php | 20 +++++ resources/lang/ru-RU/reports.php | 23 +++-- resources/lang/ru-RU/settings.php | 13 ++- resources/lang/sq-AL/bills.php | 5 ++ resources/lang/sq-AL/general.php | 2 + resources/lang/sq-AL/invoices.php | 5 ++ resources/lang/sq-AL/messages.php | 6 +- resources/lang/sq-AL/modules.php | 1 + resources/lang/sq-AL/recurring.php | 20 +++++ resources/lang/sq-AL/reports.php | 13 +++ resources/lang/sq-AL/settings.php | 5 ++ resources/lang/sv-SE/bills.php | 7 +- resources/lang/sv-SE/general.php | 2 + resources/lang/sv-SE/invoices.php | 11 ++- resources/lang/sv-SE/messages.php | 6 +- resources/lang/sv-SE/modules.php | 1 + resources/lang/sv-SE/recurring.php | 20 +++++ resources/lang/sv-SE/reports.php | 17 +++- resources/lang/sv-SE/settings.php | 5 ++ resources/lang/tr-TR/bills.php | 5 ++ resources/lang/tr-TR/general.php | 2 + resources/lang/tr-TR/invoices.php | 5 ++ resources/lang/tr-TR/messages.php | 6 +- resources/lang/tr-TR/modules.php | 1 + resources/lang/tr-TR/recurring.php | 20 +++++ resources/lang/tr-TR/reports.php | 13 +++ resources/lang/tr-TR/settings.php | 5 ++ resources/lang/uk-UA/bills.php | 11 ++- resources/lang/uk-UA/general.php | 11 +-- resources/lang/uk-UA/invoices.php | 9 +- resources/lang/uk-UA/messages.php | 2 + resources/lang/uk-UA/modules.php | 15 ++-- resources/lang/uk-UA/pagination.php | 2 +- resources/lang/uk-UA/recurring.php | 20 +++++ resources/lang/uk-UA/reports.php | 30 +++++-- resources/lang/uk-UA/settings.php | 29 ++++--- resources/lang/uk-UA/validation.php | 10 +-- resources/lang/vi-VN/bills.php | 5 ++ resources/lang/vi-VN/general.php | 2 + resources/lang/vi-VN/invoices.php | 5 ++ resources/lang/vi-VN/messages.php | 6 +- resources/lang/vi-VN/modules.php | 1 + resources/lang/vi-VN/recurring.php | 20 +++++ resources/lang/vi-VN/reports.php | 13 +++ resources/lang/vi-VN/settings.php | 5 ++ resources/lang/zh-TW/bills.php | 5 ++ resources/lang/zh-TW/general.php | 2 + resources/lang/zh-TW/invoices.php | 5 ++ resources/lang/zh-TW/messages.php | 6 +- resources/lang/zh-TW/modules.php | 1 + resources/lang/zh-TW/recurring.php | 20 +++++ resources/lang/zh-TW/reports.php | 13 +++ resources/lang/zh-TW/settings.php | 5 ++ 214 files changed, 1682 insertions(+), 466 deletions(-) create mode 100644 resources/lang/ar-SA/recurring.php create mode 100644 resources/lang/bg-BG/recurring.php create mode 100644 resources/lang/cs-CZ/recurring.php create mode 100644 resources/lang/da-DK/recurring.php create mode 100644 resources/lang/de-DE/recurring.php create mode 100644 resources/lang/el-GR/recurring.php create mode 100644 resources/lang/es-ES/recurring.php create mode 100644 resources/lang/es-MX/recurring.php create mode 100644 resources/lang/fa-IR/recurring.php create mode 100644 resources/lang/fr-FR/recurring.php create mode 100644 resources/lang/hr-HR/recurring.php create mode 100644 resources/lang/id-ID/recurring.php create mode 100644 resources/lang/it-IT/recurring.php create mode 100644 resources/lang/nb-NO/recurring.php create mode 100644 resources/lang/nl-NL/recurring.php create mode 100644 resources/lang/pt-BR/recurring.php create mode 100644 resources/lang/ru-RU/recurring.php create mode 100644 resources/lang/sq-AL/recurring.php create mode 100644 resources/lang/sv-SE/recurring.php create mode 100644 resources/lang/tr-TR/recurring.php create mode 100644 resources/lang/uk-UA/recurring.php create mode 100644 resources/lang/vi-VN/recurring.php create mode 100644 resources/lang/zh-TW/recurring.php diff --git a/resources/lang/ar-SA/bills.php b/resources/lang/ar-SA/bills.php index e113c5fc9..f855e5100 100644 --- a/resources/lang/ar-SA/bills.php +++ b/resources/lang/ar-SA/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'الكمية', 'price' => 'السعر', 'sub_total' => 'المبلغ الاجمالى', + 'discount' => 'Discount', 'tax_total' => 'اجمالى الضريبة', 'total' => 'اجمالى', 'item_name' => 'اسم الصنف | اسماء الصنف', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'استحقاق الدفع', 'amount_due' => 'استحقاق المبلغ', 'paid' => 'مدفوع', diff --git a/resources/lang/ar-SA/general.php b/resources/lang/ar-SA/general.php index b8eb3bb30..8afb0bc1b 100644 --- a/resources/lang/ar-SA/general.php +++ b/resources/lang/ar-SA/general.php @@ -2,47 +2,49 @@ return [ - 'items' => 'الصنف| أصناف', - 'incomes' => 'دخل | دخل', + 'items' => 'الصنف|أصناف', + 'incomes' => 'إيراد|إيرادات', 'invoices' => 'فاتورة|فواتير', - 'revenues' => 'الايراد | الايرادات', - 'customers' => 'العميل | العملاء', - 'expenses' => 'المصروف | المصروفات', - 'bills' => 'فاتورة شراء| فواتير شراء', - 'payments' => 'دفع | مدفوعات', - 'vendors' => 'المورد | الموردين', - 'accounts' => 'حساب | حسابات', - 'transfers' => 'تحويل | تحويلات', - 'transactions' => 'عملية | عمليات', - 'reports' => 'تقرير | تقارير', - 'settings' => 'اعداد | اعدادات', - 'categories' => 'الفئة | الفئات', - 'currencies' => 'عملة | عملات', - 'tax_rates' => 'معدل الضريبة | معدلات الضرائب', - 'users' => 'مستخدم | مستخدمين', - 'roles' => 'الوظيفة | الوظائف', - 'permissions' => 'تصريح | تصريحات', - 'modules' => 'تطبيق | تطبيقات', - 'companies' => 'شركة | شركات', - 'profits' => 'ربح | أرباح', - 'taxes' => 'ضريبة | ضرائب', - 'pictures' => 'صورة | صور', - 'types' => 'نوع | أنواع', - 'payment_methods' => 'طريقة الدفع | طرق الدفع', - 'compares' => 'الايراد مقابل المصروف | الايرادات مقابل المصروفات', - 'notes' => 'ملحوظة | ملاحظات', - 'totals' => 'اجمالى | اجماليات', - 'languages' => 'لغة | لغات', - 'updates' => 'تحديث | تحديثات', - 'numbers' => 'رقم | أرقام', - 'statuses' => 'حالة | حالات', + 'revenues' => 'الدخل|الدخل', + 'customers' => 'العميل|العملاء', + 'expenses' => 'المصروف|المصروفات', + 'bills' => 'سند | سندات الإيصال', + 'payments' => 'دفع|مدفوعات', + 'vendors' => 'المورد|الموردين', + 'accounts' => 'حساب|حسابات', + 'transfers' => 'تحويل|تحويلات', + 'transactions' => 'عملية|عمليات', + 'reports' => 'تقرير|تقارير', + 'settings' => 'اعداد|اعدادات', + 'categories' => 'الفئة|الفئات', + 'currencies' => 'عملة|عملات', + 'tax_rates' => 'معدل الضريبة|معدلات الضرائب', + 'users' => 'مستخدم|مستخدمين', + 'roles' => 'الوظيفة|الوظائف', + 'permissions' => 'تصريح|تصريحات', + 'modules' => 'تطبيق|تطبيقات', + 'companies' => 'شركة|شركات', + 'profits' => 'ربح|أرباح', + 'taxes' => 'ضريبة|ضرائب', + 'logos' => 'الشعار', + 'pictures' => 'صورة|صور', + 'types' => 'نوع|أنواع', + 'payment_methods' => 'طريقة الدفع|طرق الدفع', + 'compares' => 'الإيراد مقابل المصروف|الإيرادات مقابل المصروفات', + 'notes' => 'ملحوظة|ملاحظات', + 'totals' => 'المجموع|الإجمالي', + 'languages' => 'لغة|لغات', + 'updates' => 'تحديث|تحديثات', + 'numbers' => 'رقم|أرقام', + 'statuses' => 'حالة|حالات', + 'others' => 'Other|Others', 'dashboard' => 'لوحة التحكم', 'banking' => 'الخدمات المصرفية', 'general' => 'عام', 'no_records' => 'لا توجد سجلات.', 'date' => 'تاريخ', - 'amount' => 'قيمة', + 'amount' => 'المبلغ', 'enabled' => 'مفعل', 'disabled' => 'غير مفعل', 'yes' => 'نعم', @@ -52,64 +54,64 @@ return [ 'monthly' => 'شهرى', 'quarterly' => 'ربع سنوي', 'yearly' => 'سنوى', - 'add' => 'اضافة', - 'add_new' => 'اضافة جديد', + 'add' => 'إضافة', + 'add_new' => 'إضافة جديد', 'show' => 'عرض', 'edit' => 'تعديل', 'delete' => 'حذف', - 'send' => 'ارسال', - 'download' => 'تحميل', - 'delete_confirm' => 'تأكيد الحذف : الأسم : النوع؟', + 'send' => 'إرسال', + 'download' => 'تنزيل', + 'delete_confirm' => 'تأكيد الحذف :الاسم :type؟', 'name' => 'الاسم', 'email' => 'البريد الالكتروني', 'tax_number' => 'رقم الضريبة', 'phone' => 'هاتف', - 'address' => 'عنوان', + 'address' => 'العنوان', 'website' => 'الموقع الالكتروني', - 'actions' => 'الاجراءات', + 'actions' => 'الإجراءات', 'description' => 'الوصف', - 'manage' => 'ادارة', - 'code' => 'كود', + 'manage' => 'إدارة', + 'code' => 'الرمز', 'alias' => 'اسم مستعار', - 'balance' => 'رصيد', + 'balance' => 'الرصيد', 'reference' => 'مرجع', 'attachment' => 'مرفق', 'change' => 'تغيير', 'switch' => 'تبديل', - 'color' => 'لون', + 'color' => 'اللون', 'save' => 'حفظ', - 'cancel' => 'الغاء', + 'cancel' => 'إلغاء', 'from' => 'من', - 'to' => 'الى', + 'to' => 'إلى', 'print' => 'طباعة', 'search' => 'بحث', 'search_placeholder' => 'اكتب للبحث..', 'filter' => 'تصفية البحث', 'help' => 'مساعدة', 'all' => 'الكل', - 'all_type' => 'الكل : نوع', - 'upcoming' => 'المقبل', - 'created' => 'تم انشاؤه', - 'id' => 'الرقم المعرفى', + 'all_type' => 'الكل :type', + 'upcoming' => 'القادمة', + 'created' => 'تم إنشاؤه', + 'id' => 'رقم الهوية', 'more_actions' => 'المزيد من الاجراءات', 'duplicate' => 'تكرار', - 'unpaid' => 'Unpaid', - 'paid' => 'Paid', - 'overdue' => 'Overdue', - 'partially' => 'Partially', - 'partially_paid' => 'Partially Paid', + 'unpaid' => 'غير مدفوع', + 'paid' => 'مدفوع', + 'overdue' => 'مبلغ متأخر', + 'partially' => 'جزئي', + 'partially_paid' => 'مدفوع جزئياً', 'title' => [ - 'new' => 'جديد : نوع', - 'edit' => 'تعديل : نوع', + 'new' => 'جديد :type', + 'edit' => 'تعديل :type', ], 'form' => [ - 'enter' => 'ادخال : التخصص', + 'enter' => 'إدخال :field', 'select' => [ - 'field' => '-اختر : التخصص-', - 'file' => 'اختر ملف', + 'field' => '-اختر :field-', + 'file' => 'اختر ملفاً', ], - 'no_file_selected' => 'لم تختر أي ملف...', + 'no_file_selected' => 'لم يتم اختيار أي ملف...', ], ]; diff --git a/resources/lang/ar-SA/header.php b/resources/lang/ar-SA/header.php index 3752871b9..bd257ed99 100644 --- a/resources/lang/ar-SA/header.php +++ b/resources/lang/ar-SA/header.php @@ -3,12 +3,12 @@ return [ 'change_language' => 'تغيير اللغة', - 'last_login' => 'أخر تسجيل دخول : الوقت', + 'last_login' => 'آخر تسجيل دخول :time', 'notifications' => [ - 'counter' => '{0} ليس لديك تنبيهات|{1} لديك :عدد تنبيهات|[2,*] لديك :عدد تنبيهات', - 'overdue_invoices' => '{1} :عدد الفواتير المتأخرة|[2,*] :عدد الفواتير المتأخرة', - 'upcoming_bills' => '{1} :عدد فواتير البيع الغير مدفوعة|[2,*] :عدد فواتير المشتريات الغير مدفوعة', - 'items_stock' => '{1} :عدد الأصناف الغير متوفرة بالمخزن|[2,*] :عدد الأصناف الغير متوفرة بالمخزن', + 'counter' => '{0} ليس لديك تنبيهات|{1} لديك :count تنبيهات|[2,*] لديك :count تنبيهات', + 'overdue_invoices' => '{1} :count فاتورة متأخرة|[2,*] :count فواتير متأخرة', + 'upcoming_bills' => '{1} :count فاتورة بيع قادمة|[2,*] :count فواتير بيع قادمة', + 'items_stock' => '{1} :count منتج غير متوفر|[2,*] :count منتجات غير متوفرة', 'view_all' => 'عرض الكل' ], diff --git a/resources/lang/ar-SA/invoices.php b/resources/lang/ar-SA/invoices.php index 80921f318..003843efb 100644 --- a/resources/lang/ar-SA/invoices.php +++ b/resources/lang/ar-SA/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'الكمية', 'price' => 'السعر', 'sub_total' => 'المبلغ الاجمالى', + 'discount' => 'Discount', 'tax_total' => 'اجمالى الضريبة', 'total' => 'الاجمالى', 'item_name' => 'اسم الصنف | اسماء الاصناف', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'استحقاق الدفع', 'paid' => 'مدفوع', 'histories' => 'سجلات', diff --git a/resources/lang/ar-SA/messages.php b/resources/lang/ar-SA/messages.php index 57d187f3d..41e1bdf77 100644 --- a/resources/lang/ar-SA/messages.php +++ b/resources/lang/ar-SA/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':نوع تم الاستيراد!', ], 'error' => [ - 'payment_add' => 'خطأ: لا يمكنك إضافة الدفع! يجب عليك التحقق من إضافة المبلغ.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'خطأ: غير مسموح لك بادرة هذة الشركة!', - 'customer' => 'خطأ:غير مسموح لك باضافة مستخدم! :اسم استخدام هذا البريد الالكترونية.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'خطأ: لم يتم تحديد ملف!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'تحذير: غير مسموح لك بحذف :اسم لأن هذا : مرتبط ب.', diff --git a/resources/lang/ar-SA/modules.php b/resources/lang/ar-SA/modules.php index a32ed3828..a1abd8b2e 100644 --- a/resources/lang/ar-SA/modules.php +++ b/resources/lang/ar-SA/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'جديد', 'top_free' => 'المجانيات الأعلى', 'free' => 'مجانى', + 'search' => 'Search', 'install' => 'تثبيت', 'buy_now' => 'اشترى الأن', 'token_link' => 'اضغط هنا للحصول على رمز الوصول الخاص بك API.', diff --git a/resources/lang/ar-SA/recurring.php b/resources/lang/ar-SA/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/ar-SA/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/ar-SA/reports.php b/resources/lang/ar-SA/reports.php index e207a4892..5a4eff622 100644 --- a/resources/lang/ar-SA/reports.php +++ b/resources/lang/ar-SA/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'هذا الربع', 'previous_quarter' => 'الربع السابق', 'last_12_months' => 'آخر 12 شهر', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'ملخص الايرادات', 'expense' => 'مخلص المصروفات', 'income_expense' => 'الإيرادات مقابل المصروفات', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/ar-SA/settings.php b/resources/lang/ar-SA/settings.php index b8d1bade7..e0f637d18 100644 --- a/resources/lang/ar-SA/settings.php +++ b/resources/lang/ar-SA/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'مسافة ( )', ], 'timezone' => 'التوقيت', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'فاتورة الشراء', diff --git a/resources/lang/bg-BG/bills.php b/resources/lang/bg-BG/bills.php index 373df65d2..ca058cf99 100644 --- a/resources/lang/bg-BG/bills.php +++ b/resources/lang/bg-BG/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Количество', 'price' => 'Цена', 'sub_total' => 'Междинна сума', + 'discount' => 'Discount', 'tax_total' => 'Общо данък', 'total' => 'Общо', 'item_name' => 'Име на артикул | Имена на артикули', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Дължимото плащане', 'amount_due' => 'Дължимата сума', 'paid' => 'Платени', diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php index 02a3991a1..65fc2bd3d 100644 --- a/resources/lang/bg-BG/general.php +++ b/resources/lang/bg-BG/general.php @@ -37,6 +37,7 @@ return [ 'updates' => 'Актуализация | Актуализации', 'numbers' => 'Номер | Числа', 'statuses' => 'Статус | Статуси', + 'others' => 'Other|Others', 'dashboard' => 'Табло', 'banking' => 'Банкиране', diff --git a/resources/lang/bg-BG/invoices.php b/resources/lang/bg-BG/invoices.php index eb128ec19..5e7ca9e96 100644 --- a/resources/lang/bg-BG/invoices.php +++ b/resources/lang/bg-BG/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Количество', 'price' => 'Цена', 'sub_total' => 'Междинна сума', + 'discount' => 'Discount', 'tax_total' => 'Общо данък', 'total' => 'Общо', 'item_name' => 'Име на артикул | Имена на артикули', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Дължимото плащане', 'paid' => 'Платен', 'histories' => 'История', diff --git a/resources/lang/bg-BG/messages.php b/resources/lang/bg-BG/messages.php index 8ac1d5279..026be03bc 100644 --- a/resources/lang/bg-BG/messages.php +++ b/resources/lang/bg-BG/messages.php @@ -14,6 +14,8 @@ return [ 'not_user_company' => 'Грешка: Не ви е позволено да управлявате тази компания!', 'customer' => 'Грешка: Потребителят не е създаден! :name вече използва този имейл адрес.', 'no_file' => 'Грешка: Няма избран файл!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Предупреждение: Не ви е позволено да изтриете :name, защото има :text свързан.', diff --git a/resources/lang/bg-BG/modules.php b/resources/lang/bg-BG/modules.php index f5604040c..0f76b5796 100644 --- a/resources/lang/bg-BG/modules.php +++ b/resources/lang/bg-BG/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Нов', 'top_free' => 'Топ безплатни', 'free' => 'БЕЗПЛАТНО', + 'search' => 'Search', 'install' => 'Инсталирай', 'buy_now' => 'Купете сега', 'token_link' => 'Натиснете тук за да получите Вашия API token.', diff --git a/resources/lang/bg-BG/recurring.php b/resources/lang/bg-BG/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/bg-BG/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/bg-BG/reports.php b/resources/lang/bg-BG/reports.php index 2babe504d..24e23c49e 100644 --- a/resources/lang/bg-BG/reports.php +++ b/resources/lang/bg-BG/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Текущото тримесечие', 'previous_quarter' => 'Предходното тримесечие', 'last_12_months' => 'Последните 12 месеца', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Приходи', 'expense' => 'Разходи', 'income_expense' => 'Приходи срещу разходи', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/bg-BG/settings.php b/resources/lang/bg-BG/settings.php index 904bf0781..2f1e8677e 100644 --- a/resources/lang/bg-BG/settings.php +++ b/resources/lang/bg-BG/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Празно място ( )', ], 'timezone' => 'Часова зона', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Фактура', diff --git a/resources/lang/cs-CZ/bills.php b/resources/lang/cs-CZ/bills.php index 2d5556081..e95ad8e79 100644 --- a/resources/lang/cs-CZ/bills.php +++ b/resources/lang/cs-CZ/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Množství', 'price' => 'Cena', 'sub_total' => 'Mezisoučet', + 'discount' => 'Discount', 'tax_total' => 'Dph celkem', 'total' => 'Celkem', 'item_name' => 'Jméno položky | Jméno položek', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Splatnost platby', 'amount_due' => 'Dlužná částka', 'paid' => 'Zaplaceno', diff --git a/resources/lang/cs-CZ/general.php b/resources/lang/cs-CZ/general.php index 388d30f89..7d1327897 100644 --- a/resources/lang/cs-CZ/general.php +++ b/resources/lang/cs-CZ/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Společnost | Společnosti', 'profits' => 'Zisk | Zisky', 'taxes' => 'Daň | Daně', + 'logos' => 'Logo|Logos', 'pictures' => 'Obrázek | Obrázky', 'types' => 'Typ | Typy', 'payment_methods' => 'Způsob platby | Způsoby platby', @@ -36,6 +37,7 @@ return [ 'updates' => 'Aktualizace | Aktualizace', 'numbers' => 'Číslo | Čísla', 'statuses' => 'Stav | Stav', + 'others' => 'Other|Others', 'dashboard' => 'Ovládací panel', 'banking' => 'Bankovnictví', diff --git a/resources/lang/cs-CZ/invoices.php b/resources/lang/cs-CZ/invoices.php index ff76c44d4..76949adcd 100644 --- a/resources/lang/cs-CZ/invoices.php +++ b/resources/lang/cs-CZ/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Množství', 'price' => 'Cena', 'sub_total' => 'Mezisoučet', + 'discount' => 'Discount', 'tax_total' => 'Daň celkem', 'total' => 'Celkem', 'item_name' => 'Jméno položky | Jméno položek', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Splatnost platby', 'paid' => 'Zaplaceno', 'histories' => 'Historie', diff --git a/resources/lang/cs-CZ/messages.php b/resources/lang/cs-CZ/messages.php index d072822b2..88346a7a3 100644 --- a/resources/lang/cs-CZ/messages.php +++ b/resources/lang/cs-CZ/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importováno!', ], 'error' => [ - 'payment_add' => 'Chyba: Nelze přidat platbu! Měli byste přidat částku.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Chyba: nemůžeš provádět správu společností!', - 'customer' => 'Chyba: Nemůžeš vytvořit uživatele! :name používá tento email.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Chyba: Nebyl vybrán žádný soubor!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Upozornění: Nemůžeš odstranit :name protože je spojená s :text.', diff --git a/resources/lang/cs-CZ/modules.php b/resources/lang/cs-CZ/modules.php index 567d0a950..92acbd0ed 100644 --- a/resources/lang/cs-CZ/modules.php +++ b/resources/lang/cs-CZ/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nové', 'top_free' => 'Nejlepší zdarma', 'free' => 'ZDARMA', + 'search' => 'Search', 'install' => 'Instalovat', 'buy_now' => 'Koupit', 'token_link' => 'Klikni sem pro získání tokenu k API.', diff --git a/resources/lang/cs-CZ/recurring.php b/resources/lang/cs-CZ/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/cs-CZ/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/cs-CZ/reports.php b/resources/lang/cs-CZ/reports.php index 4266cf7ad..c1cb551a2 100644 --- a/resources/lang/cs-CZ/reports.php +++ b/resources/lang/cs-CZ/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Aktuální čtvrtletí', 'previous_quarter' => 'Předchozí čtvrtletí', 'last_12_months' => 'Posledních 12 měsíců', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Přehled příjmů', 'expense' => 'Přehled výdajů', 'income_expense' => 'Příjmy vs Výdaje', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/cs-CZ/settings.php b/resources/lang/cs-CZ/settings.php index c6871a4be..0ac5a7820 100644 --- a/resources/lang/cs-CZ/settings.php +++ b/resources/lang/cs-CZ/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Mezera ( )', ], 'timezone' => 'Časové pásmo', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Faktura', diff --git a/resources/lang/da-DK/bills.php b/resources/lang/da-DK/bills.php index cfa9b84c2..247f8b339 100644 --- a/resources/lang/da-DK/bills.php +++ b/resources/lang/da-DK/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Antal', 'price' => 'Pris', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Moms i alt', 'total' => 'I alt', 'item_name' => 'Punkt navn | Varenavne', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Betalingsfrist', 'amount_due' => 'Forfaldent beløb', 'paid' => 'Betalt', diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php index c1897c46d..02fc02b01 100644 --- a/resources/lang/da-DK/general.php +++ b/resources/lang/da-DK/general.php @@ -37,6 +37,7 @@ return [ 'updates' => 'Opdatering|Opdateringer', 'numbers' => 'Nummer|Numre', 'statuses' => 'Status|Statusser', + 'others' => 'Other|Others', 'dashboard' => 'Oversigt', 'banking' => 'Bank', diff --git a/resources/lang/da-DK/invoices.php b/resources/lang/da-DK/invoices.php index ecb3e2701..e000d1279 100644 --- a/resources/lang/da-DK/invoices.php +++ b/resources/lang/da-DK/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Antal', 'price' => 'Pris', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Moms i alt', 'total' => 'I alt', 'item_name' => 'Vare navn|Vare navne', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Betalingsfrist', 'paid' => 'Betalt', 'histories' => 'Historik', diff --git a/resources/lang/da-DK/messages.php b/resources/lang/da-DK/messages.php index 723f869eb..4220a09b1 100644 --- a/resources/lang/da-DK/messages.php +++ b/resources/lang/da-DK/messages.php @@ -14,6 +14,8 @@ return [ 'not_user_company' => 'Fejl: Du har ikke tilladelse til at kontrollere denne virksomhed!', 'customer' => 'Fejl: Brugeren ikke oprettet! :name bruger allerede denne e-mail.', 'no_file' => 'Fejl: Ingen fil valgt!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Advarsel: Du har ikke tilladelse tiil at slette :name fordi den er :text relateret.', diff --git a/resources/lang/da-DK/modules.php b/resources/lang/da-DK/modules.php index 2119497e5..f02cd71b6 100644 --- a/resources/lang/da-DK/modules.php +++ b/resources/lang/da-DK/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Ny', 'top_free' => 'Top gratis', 'free' => 'GRATIS', + 'search' => 'Search', 'install' => 'Installer', 'buy_now' => 'Køb nu', 'token_link' => 'Klik her for at få din API-token.', diff --git a/resources/lang/da-DK/recurring.php b/resources/lang/da-DK/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/da-DK/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/da-DK/reports.php b/resources/lang/da-DK/reports.php index 930b6eaf3..e0b2df6e8 100644 --- a/resources/lang/da-DK/reports.php +++ b/resources/lang/da-DK/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Dette kvartal', 'previous_quarter' => 'Foregående kvartal', 'last_12_months' => 'Seneste 12 måneder', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Indkomst Resumé', 'expense' => 'Udgift Resumé', 'income_expense' => 'Indkomst vs udgift', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/da-DK/settings.php b/resources/lang/da-DK/settings.php index ba3a42878..365f72e01 100644 --- a/resources/lang/da-DK/settings.php +++ b/resources/lang/da-DK/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Mellemrum ( )', ], 'timezone' => 'Tidszone', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Faktura', diff --git a/resources/lang/de-DE/bills.php b/resources/lang/de-DE/bills.php index 467c96e31..c8aeb95ac 100644 --- a/resources/lang/de-DE/bills.php +++ b/resources/lang/de-DE/bills.php @@ -12,19 +12,24 @@ return [ 'quantity' => 'Menge', 'price' => 'Preis', 'sub_total' => 'Zwischensumme', + 'discount' => 'Rabatt', 'tax_total' => 'Steuern Gesamt', 'total' => 'Gesamt', - 'item_name' => 'Artikel-Name | Artikel-Name', + 'item_name' => 'Artikel-Name|Artikel-Namen', + + 'show_discount' => ':discount % Rabatt', + 'add_discount' => 'füge Rabatt hinzu', + 'discount_desc' => 'Zwischensumme', 'payment_due' => 'Fälligkeit der Zahlung', - 'amount_due' => 'Summe bis', + 'amount_due' => 'Fälliger Betrag', 'paid' => 'Bezahlt', 'histories' => 'Historie', 'payments' => 'Zahlungen', 'add_payment' => 'Zahlung hinzufügen', 'mark_received' => 'Als erhalten markieren', - 'download_pdf' => 'PDF herunterladen', + 'download_pdf' => 'Als PDF herunterladen', 'send_mail' => 'E-Mail senden', 'status' => [ diff --git a/resources/lang/de-DE/currencies.php b/resources/lang/de-DE/currencies.php index 928c5ad1b..735a57eaa 100644 --- a/resources/lang/de-DE/currencies.php +++ b/resources/lang/de-DE/currencies.php @@ -2,8 +2,8 @@ return [ - 'code' => 'Code', - 'rate' => 'Preis', + 'code' => 'Kürzel', + 'rate' => 'Kurs', 'default' => 'Standardwährung', 'decimal_mark' => 'Dezimaltrennzeichen', 'thousands_separator' => 'Tausendertrennzeichen', diff --git a/resources/lang/de-DE/dashboard.php b/resources/lang/de-DE/dashboard.php index 24670b560..73b7934e1 100644 --- a/resources/lang/de-DE/dashboard.php +++ b/resources/lang/de-DE/dashboard.php @@ -18,7 +18,7 @@ return [ 'incomes_by_category' => 'Einkommen nach Kategorie', 'expenses_by_category' => 'Ausgaben nach Kategorie', 'account_balance' => 'Kontostand', - 'latest_incomes' => 'Neustes Einkommen', + 'latest_incomes' => 'Neuestes Einkommen', 'latest_expenses' => 'Letzte Ausgaben', ]; diff --git a/resources/lang/de-DE/demo.php b/resources/lang/de-DE/demo.php index 849e1a0d3..fcd03a6e5 100644 --- a/resources/lang/de-DE/demo.php +++ b/resources/lang/de-DE/demo.php @@ -5,7 +5,7 @@ return [ 'accounts_cash' => 'Bar', 'categories_uncat' => 'Unkategorisiert', 'categories_deposit' => 'Einzahlen', - 'categories_sales' => 'Vertrieb', + 'categories_sales' => 'Verkäufe', 'currencies_usd' => 'US-Dollar', 'currencies_eur' => 'Euro', 'currencies_gbp' => 'Britisches Pfund', diff --git a/resources/lang/de-DE/general.php b/resources/lang/de-DE/general.php index 0585624e4..3520eca35 100644 --- a/resources/lang/de-DE/general.php +++ b/resources/lang/de-DE/general.php @@ -2,47 +2,49 @@ return [ - 'items' => 'Artikel | Artikel', - 'incomes' => 'Einkommen | Einkommen', - 'invoices' => 'Rechnung | Rechnungen', - 'revenues' => 'Einnahmen | Einnahmen', - 'customers' => 'Kunde | Kunden', + 'items' => 'Artikel|Artikel', + 'incomes' => 'Einkommen|Einkommen', + 'invoices' => 'Rechnung|Rechnungen', + 'revenues' => 'Einnahme|Einnahmen', + 'customers' => 'Kunde|Kunden', 'expenses' => 'Ausgabe| Ausgaben', - 'bills' => 'Rechnung | Rechnungen', - 'payments' => 'Zahlung | Zahlungen', - 'vendors' => 'Kreditor | Kreditoren', - 'accounts' => 'Konto | Konten', - 'transfers' => 'Übertragung | Übertragungen', - 'transactions' => 'Transaktion | Transaktionen', - 'reports' => 'Bericht | Berichte', - 'settings' => 'Einstellung | Einstellungen', - 'categories' => 'Kategorie | Kategorien', - 'currencies' => 'Währung | Währungen', - 'tax_rates' => 'Steuersatz | Steuersätze', + 'bills' => 'Rechnung|Rechnungen', + 'payments' => 'Zahlung|Zahlungen', + 'vendors' => 'Kreditor|Kreditoren', + 'accounts' => 'Konto|Konten', + 'transfers' => 'Übertragung|Übertragungen', + 'transactions' => 'Transaktion|Transaktionen', + 'reports' => 'Bericht|Berichte', + 'settings' => 'Einstellung|Einstellungen', + 'categories' => 'Kategorie|Kategorien', + 'currencies' => 'Währung|Währungen', + 'tax_rates' => 'Steuersatz|Steuersätze', 'users' => 'Benutzer | Benutzer', - 'roles' => 'Rolle | Rollen', - 'permissions' => 'Berechtigung| Berechtigungen', - 'modules' => 'App | Apps', - 'companies' => 'Unternehmen | Unternehmen', - 'profits' => 'Gewinn | Gewinne', - 'taxes' => 'Steuer | Steuern', - 'pictures' => 'Bild | Bilder', - 'types' => 'Typ | Typen', - 'payment_methods' => 'Zahlungsmethode | Zahlungsmethoden', - 'compares' => 'Einkommen vs Kosten | Einkommen vs Kosten', - 'notes' => 'Notiz | Notizen', - 'totals' => 'Summe| Summen', - 'languages' => 'Sprache | Sprachen', - 'updates' => 'Aktualisierung| Aktualisierungen', - 'numbers' => 'Nummer| Nummern', - 'statuses' => 'Status | Stati', + 'roles' => 'Rolle|Rollen', + 'permissions' => 'Berechtigung|Berechtigungen', + 'modules' => 'App|Apps', + 'companies' => 'Unternehmen|Unternehmen', + 'profits' => 'Gewinn|Gewinne', + 'taxes' => 'Steuer|Steuern', + 'logos' => 'Logo|Logos', + 'pictures' => 'Bild|Bilder', + 'types' => 'Typ|Typen', + 'payment_methods' => 'Zahlungsmethode|Zahlungsmethoden', + 'compares' => 'Einkommen vs Kosten|Einkommen vs Kosten', + 'notes' => 'Notiz|Notizen', + 'totals' => 'Summe|Summen', + 'languages' => 'Sprache|Sprachen', + 'updates' => 'Aktualisierung|Aktualisierungen', + 'numbers' => 'Nummer|Nummern', + 'statuses' => 'Status|Stati', + 'others' => 'Anderer|Andere', 'dashboard' => 'Kontrollzentrum', - 'banking' => 'Banking', + 'banking' => 'Bankwesen', 'general' => 'Allgemein', 'no_records' => 'Keine Einträge.', 'date' => 'Datum', - 'amount' => 'Menge', + 'amount' => 'Betrag', 'enabled' => 'Aktiviert', 'disabled' => 'Deaktiviert', 'yes' => 'Ja', @@ -59,7 +61,7 @@ return [ 'delete' => 'Löschen', 'send' => 'Senden', 'download' => 'Herunterladen', - 'delete_confirm' => 'Löschen bestätigen: Name: Typ?', + 'delete_confirm' => 'Löschen bestätigen :name :type?', 'name' => 'Name', 'email' => 'E-Mail', 'tax_number' => 'Steuernummer', @@ -69,7 +71,7 @@ return [ 'actions' => 'Aktionen', 'description' => 'Beschreibung', 'manage' => 'Verwalten', - 'code' => 'Code', + 'code' => 'Kürzel', 'alias' => 'Alias', 'balance' => 'Kontostand', 'reference' => 'Referenz', @@ -83,28 +85,28 @@ return [ 'to' => 'An', 'print' => 'Drucken', 'search' => 'Suchen', - 'search_placeholder' => 'Typ um zu suchen..', + 'search_placeholder' => 'Suchbegriff eingeben..', 'filter' => 'Filter', 'help' => 'Hilfe', 'all' => 'Alle', - 'all_type' => 'Alle :Typ', + 'all_type' => 'Alle :type', 'upcoming' => 'Anstehend', 'created' => 'Erstellt', 'id' => 'ID', 'more_actions' => 'Weitere Aktionen', 'duplicate' => 'Duplizieren', - 'unpaid' => 'Unpaid', - 'paid' => 'Paid', - 'overdue' => 'Overdue', - 'partially' => 'Partially', - 'partially_paid' => 'Partially Paid', + 'unpaid' => 'Zahlung offen', + 'paid' => 'Bezahlt', + 'overdue' => 'Überfällig', + 'partially' => 'Teilweise', + 'partially_paid' => 'Teilweise bezahlt', 'title' => [ 'new' => 'Neu :type', 'edit' => 'Bearbeiten :type', ], 'form' => [ - 'enter' => 'Eingeben :field', + 'enter' => 'Geben Sie :field an', 'select' => [ 'field' => '- Auswählen :field -', 'file' => 'Datei auswählen', diff --git a/resources/lang/de-DE/import.php b/resources/lang/de-DE/import.php index 63214c2f9..5cfe33f39 100644 --- a/resources/lang/de-DE/import.php +++ b/resources/lang/de-DE/import.php @@ -4,6 +4,6 @@ return [ 'import' => 'Importieren', 'title' => ':type importieren', - 'message' => 'Erlaubte Datei-Typen: CSV, XLS. Bitte, laden Sie eine Beispiel-Datei.', + 'message' => 'Erlaubte Datei-Typen: CSV, XLS. Bitte, laden Sie eine Beispiel-Datei.', ]; diff --git a/resources/lang/de-DE/install.php b/resources/lang/de-DE/install.php index 82645fd91..cde7aa86d 100644 --- a/resources/lang/de-DE/install.php +++ b/resources/lang/de-DE/install.php @@ -38,7 +38,7 @@ return [ ], 'error' => [ - 'connection' => 'Fehler: Konnte keine Verbindung zur Datenbank hergestellt werden! Stellen Sie sicher, dass die Angaben korrekt sind.', + 'connection' => 'Fehler: Es konnte keine Verbindung zur Datenbank hergestellt werden! Stellen Sie sicher, dass die Angaben korrekt sind.', ], ]; diff --git a/resources/lang/de-DE/invoices.php b/resources/lang/de-DE/invoices.php index f43bdea23..22865cba6 100644 --- a/resources/lang/de-DE/invoices.php +++ b/resources/lang/de-DE/invoices.php @@ -7,15 +7,20 @@ return [ 'total_price' => 'Gesamtpreis', 'due_date' => 'Fälligkeitsdatum', 'order_number' => 'Bestellnummer', - 'bill_to' => 'Rechnung Zu', + 'bill_to' => 'Rechnung an', - 'quantity' => 'Menge', + 'quantity' => 'Betrag', 'price' => 'Preis', 'sub_total' => 'Zwischensumme', + 'discount' => 'Rabatt', 'tax_total' => 'Steuern Gesamt', 'total' => 'Gesamt', - 'item_name' => 'Artikel | Artikel', + 'item_name' => 'Artikelname|Artikel Namen', + + 'show_discount' => ':discount % Rabatt', + 'add_discount' => 'füge Rabatt hinzu', + 'discount_desc' => 'Zwischensumme', 'payment_due' => 'Fälligkeit der Zahlung', 'paid' => 'Bezahlt', @@ -23,7 +28,7 @@ return [ 'payments' => 'Zahlungen', 'add_payment' => 'Zahlung hinzufügen', 'mark_paid' => 'Als bezahlt markieren', - 'mark_sent' => 'Als versendet markieren', + 'mark_sent' => 'Als gesendet markieren', 'download_pdf' => 'PDF herunterladen', 'send_mail' => 'E-Mail senden', @@ -39,7 +44,7 @@ return [ 'messages' => [ 'email_sent' => 'Rechnungsemail wurde erfolgreich versendet!', 'marked_sent' => 'Rechnung als erfolgreich versendet markiert!', - 'email_required' => 'No email address for this customer!', + 'email_required' => 'Es existiert keine E-Mailadresse zu diesem Kunden!', ], 'notification' => [ diff --git a/resources/lang/de-DE/items.php b/resources/lang/de-DE/items.php index 7b5940e42..3b26afedd 100644 --- a/resources/lang/de-DE/items.php +++ b/resources/lang/de-DE/items.php @@ -2,13 +2,13 @@ return [ - 'quantities' => 'Menge | Mengen', + 'quantities' => 'Menge|Mengen', 'sales_price' => 'Verkaufspreis', 'purchase_price' => 'Einkaufspreis', - 'sku' => 'SKU', + 'sku' => 'Artikelnummer', 'notification' => [ - 'message' => 'Sie erhalten diese EMail, da :name nur noch begrenzt verfügbar ist.', + 'message' => 'Sie erhalten diese E-Mail, da :name nur noch begrenzt verfügbar ist.', 'button' => 'Jetzt ansehen', ], diff --git a/resources/lang/de-DE/messages.php b/resources/lang/de-DE/messages.php index e6e8dc597..d2f8d10b3 100644 --- a/resources/lang/de-DE/messages.php +++ b/resources/lang/de-DE/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importiert!', ], 'error' => [ - 'payment_add' => 'Fehler: Sie können die Zahlung nicht hinzufügen. Überprüfen Sie die Einträge und fügen sie einen Betrag hinzu.', + 'over_payment' => 'Fehler: Zahlung wurde nicht hinzugefügt! Betrag überschreitet die Gesamtsumme.', 'not_user_company' => 'Fehler: Sie haben nicht die Berechtigung um diese Firma zu verwalten!', - 'customer' => 'Fehler: Sie können diesen Benutzer nicht erstellen! Die Email wird durch :name bereits genutzt.', + 'customer' => 'Fehler: User wurde nicht angelegt! :name benutzt schon diese Email-Adresse.', 'no_file' => 'Fehler: Keine Datei ausgewählt!', + 'last_category' => 'Fehler: Kann die letzte Kategorie :type nicht löschen!', + 'invalid_token' => 'Fehler: Der eingegebene Token ist ungültig!', ], 'warning' => [ 'deleted' => 'Warnung: Sie dürfen :name nicht löschen, da :text dazu in Bezug steht.', diff --git a/resources/lang/de-DE/modules.php b/resources/lang/de-DE/modules.php index 4fb93835e..0c5b35e52 100644 --- a/resources/lang/de-DE/modules.php +++ b/resources/lang/de-DE/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Neu', 'top_free' => 'Top kostenlos', 'free' => 'Kostenlos', + 'search' => 'Suchen', 'install' => 'Installieren', 'buy_now' => 'Jetzt kaufen', 'token_link' => 'Hier klicken um Ihren API Token zu erhalten.', diff --git a/resources/lang/de-DE/pagination.php b/resources/lang/de-DE/pagination.php index 991fa6e6e..326e00e28 100644 --- a/resources/lang/de-DE/pagination.php +++ b/resources/lang/de-DE/pagination.php @@ -2,8 +2,8 @@ return [ - 'previous' => '« Zurück', - 'next' => 'Weiter »', + 'previous' => '« Vorherige', + 'next' => 'Nächste »', 'showing' => 'Zeige :first bis :last von :total :type', ]; diff --git a/resources/lang/de-DE/passwords.php b/resources/lang/de-DE/passwords.php index 99d0ffa88..6b225f12b 100644 --- a/resources/lang/de-DE/passwords.php +++ b/resources/lang/de-DE/passwords.php @@ -13,9 +13,9 @@ return [ | */ - 'password' => 'Das Passwort muss Sechs Zeichen haben und übereinstimmen.', + 'password' => 'Das Passwort muss mindestens sechs Zeichen haben und mit der Bestätigung übereinstimmen.', 'reset' => 'Ihr Passwort wurde zurückgesetzt!', - 'sent' => 'Wir haben den Link zum Zurücksetzen des Kennworts per E-Mail gesendet!', + 'sent' => 'Wir haben den Link zum zurücksetzen des Kennworts per E-Mail gesendet!', 'token' => 'Das Token um das Passwort zurückzusetzen ist ungültig.', 'user' => "Einen Benutzer mit dieser E-Mail-Adresse wurde nicht gefunden.", diff --git a/resources/lang/de-DE/recurring.php b/resources/lang/de-DE/recurring.php new file mode 100644 index 000000000..bd90a4994 --- /dev/null +++ b/resources/lang/de-DE/recurring.php @@ -0,0 +1,20 @@ + 'Wiederkehrend', + 'every' => 'Jeden', + 'period' => 'Zeitraum', + 'times' => 'mal', + 'daily' => 'Täglich', + 'weekly' => 'Wöchentlich', + 'monthly' => 'Monatlich', + 'yearly' => 'Jährlich', + 'custom' => 'Benutzerdefiniert', + 'days' => 'Tag(e)', + 'weeks' => 'Woche(n)', + 'months' => 'Monat(e)', + 'years' => 'Jahr(e)', + 'message' => 'Dies ist ein sich wiederholender :type und der nächste :type wird automatisch am :date erzeugt', + +]; diff --git a/resources/lang/de-DE/reports.php b/resources/lang/de-DE/reports.php index 574167e24..91646b683 100644 --- a/resources/lang/de-DE/reports.php +++ b/resources/lang/de-DE/reports.php @@ -6,12 +6,25 @@ return [ 'previous_year' => 'Vorheriges Jahr', 'this_quarter' => 'Dieses Quartal', 'previous_quarter' => 'Letztes Quartal', - 'last_12_months' => 'Letzte 12 Monate', + 'last_12_months' => 'Die letzten 12 Monate', + 'profit_loss' => 'Gewinn & Verlust', + 'gross_profit' => 'Bruttoertrag', + 'net_profit' => 'Reingewinn', + 'total_expenses' => 'Gesamtausgaben', + 'net' => 'Netto', 'summary' => [ - 'income' => 'Einkommen Zusammenfassung', - 'expense' => 'Ausgaben Übersicht', - 'income_expense' => 'Einkommen vs Kosten', + 'income' => 'Einkommensübersicht', + 'expense' => 'Ausgabenübersicht', + 'income_expense' => 'Einkommen vs Ausgaben', + 'tax' => 'Steuerzusammenfassung', + ], + + 'quarter' => [ + '1' => 'Jan-Mär', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Okt-Dez', ], ]; diff --git a/resources/lang/de-DE/settings.php b/resources/lang/de-DE/settings.php index 34637fa78..3773fe433 100644 --- a/resources/lang/de-DE/settings.php +++ b/resources/lang/de-DE/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Leerzeichen ( )', ], 'timezone' => 'Zeitzone', + 'percent' => [ + 'title' => 'Position des Prozent (%)', + 'before' => 'Vor der Zahl', + 'after' => 'Nach der Zahl', + ], ], 'invoice' => [ 'tab' => 'Rechnung', @@ -34,7 +39,7 @@ return [ 'account' => 'Standardkonto', 'currency' => 'Standardwährung', 'tax' => 'Standard-Steuersatz', - 'payment' => 'Standard-Zahlungsart', + 'payment' => 'Standard-Zahlungsmethode', 'language' => 'Standardsprache', ], 'email' => [ @@ -42,7 +47,7 @@ return [ 'php' => 'PHP-Mail', 'smtp' => [ 'name' => 'SMTP', - 'host' => 'SMTP Host', + 'host' => 'SMTP Server', 'port' => 'SMTP-Port', 'username' => 'SMTP Benutzername', 'password' => 'SMTP-Passwort', @@ -55,9 +60,9 @@ return [ ], 'scheduling' => [ 'tab' => 'Zeitpläne', - 'send_invoice' => 'Rechnung Erinnerung senden', - 'invoice_days' => 'Senden nach Überfälligkeit von', - 'send_bill' => 'Rechnungserinnerung senden', + 'send_invoice' => 'Erinnerung für Kundenrechnung senden', + 'invoice_days' => 'Senden nach Fälligkeit (Tage)', + 'send_bill' => 'Erinnerung für Ausgabenrechung senden', 'bill_days' => 'Senden vor Fälligkeit (Tage)', 'cron_command' => 'Cron-Befehl', 'schedule_time' => 'Stunde (Laufzeit)', @@ -73,8 +78,8 @@ return [ 'system' => [ 'tab' => 'System', 'session' => [ - 'lifetime' => 'Die Sitzungsdauer (Minuten)', - 'handler' => 'Session-Handler', + 'lifetime' => 'Sitzungsdauer (Minuten)', + 'handler' => 'Session-Verwaltung', 'file' => 'Datei', 'database' => 'Datenbank', ], diff --git a/resources/lang/de-DE/taxes.php b/resources/lang/de-DE/taxes.php index 505c3f0b3..f239d9c0f 100644 --- a/resources/lang/de-DE/taxes.php +++ b/resources/lang/de-DE/taxes.php @@ -2,7 +2,7 @@ return [ - 'rate' => 'Preis', - 'rate_percent' => 'Preis (%)', + 'rate' => 'Steuersatz', + 'rate_percent' => 'Steuersatz (%)', ]; diff --git a/resources/lang/de-DE/updates.php b/resources/lang/de-DE/updates.php index 7a8273c01..de37e3d3d 100644 --- a/resources/lang/de-DE/updates.php +++ b/resources/lang/de-DE/updates.php @@ -7,7 +7,7 @@ return [ 'update' => 'Update Akaunting auf Version :version', 'changelog' => 'Changelog', 'check' => 'Prüfen', - 'new_core' => 'Eine aktualisierte Version Akaunting ist verfügbar.', + 'new_core' => 'Eine aktualisierte Version von Akaunting ist verfügbar.', 'latest_core' => 'Glückwunsch! Sie nutzen die aktuellste Version von Akaunting. Zukünftige Sicherheitsupdates werden automatisch angewendet.', 'success' => 'Der Updateprozess wurde erfolgreich ausgeführt.', 'error' => 'Updateprozess fehlgeschlagen, bitte erneut versuchen.', diff --git a/resources/lang/de-DE/validation.php b/resources/lang/de-DE/validation.php index c72c1d457..8db5b0a3d 100644 --- a/resources/lang/de-DE/validation.php +++ b/resources/lang/de-DE/validation.php @@ -29,7 +29,7 @@ return [ 'string' => ':attribute muss mindestens :min und maximal :max Zeichen enthalten.', 'array' => ':attribute soll mindestens :min und darf maximal :max Stellen haben.', ], - 'boolean' => ':attribute muss true oder false sein.', + 'boolean' => ':attribute muss Wahr oder Falsch sein.', 'confirmed' => ':attribute Bestätigung stimmt nicht überein.', 'date' => ':attribute ist kein gültiges Datum.', 'date_format' => ':attribute passt nicht zur :format Formatierung.', @@ -52,7 +52,7 @@ return [ 'numeric' => ':attribute darf nicht größer als :max sein.', 'file' => ':attribute darf nicht größer als :max Kilobyte sein.', 'string' => ':attribute darf nicht mehr als :max Zeichen sein.', - 'array' => ':attribute darf nicht mehr als :max als :max Werte haben.', + 'array' => ':attribute darf nicht mehr als :max Werte haben.', ], 'mimes' => ':attribute muss eine Datei des Typs :values sein.', 'mimetypes' => ':attribute muss eine Datei des Typs :values sein.', @@ -60,19 +60,19 @@ return [ 'numeric' => ':attribute muss mindestens :min sein.', 'file' => ':attribute muss mindestens :min Kilobyte groß sein.', 'string' => ':attribute benötigt mindestens :min Zeichen.', - 'array' => ':attribute muss mindestens :min Kilobyte Artikel haben.', + 'array' => ':attribute muss mindestens :min Artikel haben.', ], 'not_in' => 'Das ausgewählte :attribute ist ungültig.', 'numeric' => ':attribute muss eine Zahl sein.', - 'present' => ':attribute muss vorhanden sein.', + 'present' => ':attribute Feld muss vorhanden sein.', 'regex' => ':attribute Format ist ungültig.', 'required' => ':attribute Feld muss ausgefüllt sein.', 'required_if' => ':attribute wird benötigt wenn :other :value entspricht.', - 'required_unless' => ':attribute wird benötigt wenn :other :value entspricht.', - 'required_with' => ':attribute wird benötigt wenn :value ausgewählt ist.', - 'required_with_all' => ':attribute wird benötigt wenn :value ausgewählt ist.', - 'required_without' => ':attribute wird benötigt wenn :value nicht ausgewählt ist.', - 'required_without_all' => ':attribute wird benötigt wenn :value ausgewählt ist.', + 'required_unless' => ':attribute wird benötigt es sei denn :other ist in :values .', + 'required_with' => ':attribute wird benötigt wenn :values vorhanden ist.', + 'required_with_all' => ':attribute wird benötigt wenn :values vorhanden ist.', + 'required_without' => ':attribute wird benötigt wenn :values nicht vorhanden ist.', + 'required_without_all' => ':attribute wird benötigt wenn keine :values vorhanden sind.', 'same' => ':attribute und :other müssen übereinstimmen.', 'size' => [ 'numeric' => ':attribute muss :size groß sein.', @@ -82,7 +82,7 @@ return [ ], 'string' => ':attribute muss ein String sein.', 'timezone' => ':attribute muss eine valide Zone sein.', - 'unique' => ':attribute schon benutzt.', + 'unique' => ':attribute wird schon benutzt.', 'uploaded' => ':attribute Fehler beim Hochladen.', 'url' => ':attribute Format ist ungültig.', diff --git a/resources/lang/el-GR/auth.php b/resources/lang/el-GR/auth.php index 412f5dcfe..5b750b694 100644 --- a/resources/lang/el-GR/auth.php +++ b/resources/lang/el-GR/auth.php @@ -23,8 +23,8 @@ return [ 'self_delete' => 'Σφάλμα: Δεν μπορείτε να διαγράψετε τον εαυτό σας!' ], - 'failed' => 'Αυτά τα στοιχεία εισόδου επαληθεύονται από τις εγγραφές μας.', + 'failed' => 'Αυτά τα στοιχεία εισόδου δεν επαληθεύονται από τις εγγραφές μας.', 'disabled' => 'Αυτός ο λογαριασμός είναι απενεργοποιημένος. Παρακαλώ, επικοινωνήστε με το διαχειριστή του συστήματος.', - 'throttle' => 'Υπερβολικές προσπάθειες σύνδεσης. Παρακαλώ δοκιμάστε ξανά σε :seconds δευτερόλεπτα.', + 'throttle' => 'Ξεπεράσατε τις επιτρεπόμενες απόπειρες σύνδεσης. Παρακαλώ δοκιμάστε ξανά σε :seconds δευτερόλεπτα.', ]; diff --git a/resources/lang/el-GR/bills.php b/resources/lang/el-GR/bills.php index f7aea13bd..c2d3a0170 100644 --- a/resources/lang/el-GR/bills.php +++ b/resources/lang/el-GR/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Ποσότητα', 'price' => 'Τιμή', 'sub_total' => 'Μερικό Σύνολο', + 'discount' => 'Έκπτωση', 'tax_total' => 'Συνολικό ΦΠΑ', 'total' => 'Σύνολο', 'item_name' => 'Όνομα/ονόματα Αντικειμένου', + 'show_discount' => ':discount % Έκπτωση', + 'add_discount' => 'Προσθήκη έκπτωσης', + 'discount_desc' => 'του μερικού συνόλου', + 'payment_due' => 'Πληρωτέο ποσό', 'amount_due' => 'Οφειλόμενο ποσό', 'paid' => 'Πληρωτέο', diff --git a/resources/lang/el-GR/currencies.php b/resources/lang/el-GR/currencies.php index 13b388512..624a79fb5 100644 --- a/resources/lang/el-GR/currencies.php +++ b/resources/lang/el-GR/currencies.php @@ -5,7 +5,7 @@ return [ 'code' => 'Κωδικός', 'rate' => 'Ποσοστό', 'default' => 'Προεπιλεγμένο νόμισμα', - 'decimal_mark' => 'Σύμβολο διαχωρισμού δεκαδικών', + 'decimal_mark' => 'Υποδιαστολή', 'thousands_separator' => 'Σύμβολο διαχωρισμού χιλιάδων', 'precision' => 'Ακρίβεια', 'symbol' => [ diff --git a/resources/lang/el-GR/dashboard.php b/resources/lang/el-GR/dashboard.php index 1ef356083..d0e202b3d 100644 --- a/resources/lang/el-GR/dashboard.php +++ b/resources/lang/el-GR/dashboard.php @@ -4,21 +4,21 @@ return [ 'total_incomes' => 'Συνολικά έσοδα', 'receivables' => 'Εισπρακτέα', - 'open_invoices' => 'Εκρεμή τιμολόγια', - 'overdue_invoices' => 'Ανεξόφλητα τιμολόγια', - 'total_expenses' => 'Συνολικές δαπάνες', + 'open_invoices' => 'Εκκρεμή τιμολόγια', + 'overdue_invoices' => 'Εκπρόθεσμα τιμολόγια', + 'total_expenses' => 'Συνολικά έξοδα', 'payables' => 'Πληρωτέα', - 'open_bills' => 'Ανοιχτοί λογαριασμοί', - 'overdue_bills' => 'Ανεξόφλητοι λογαριασμοί', + 'open_bills' => 'Εκκρεμείς λογαριασμοί', + 'overdue_bills' => 'Εκπρόθεσμοι λογαριασμοί', 'total_profit' => 'Συνολικό κέρδος', - 'open_profit' => 'Ανοιχτό κέρδος', + 'open_profit' => 'Εκκρεμές κέρδος', 'overdue_profit' => 'Εκπρόθεσμο κέρδος', 'cash_flow' => 'Ταμειακή ροή', 'no_profit_loss' => 'Καμία απώλεια κέρδους', 'incomes_by_category' => 'Έσοδα κατά κατηγορία', 'expenses_by_category' => 'Έξοδα ανά κατηγορία', 'account_balance' => 'Υπόλοιπο λογαριασμού', - 'latest_incomes' => 'Τελευταία έσοδα', + 'latest_incomes' => 'Τελευταία Έσοδα', 'latest_expenses' => 'Τελευταία έξοδα', ]; diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php index 85c027044..145451751 100644 --- a/resources/lang/el-GR/general.php +++ b/resources/lang/el-GR/general.php @@ -2,50 +2,51 @@ return [ - 'items' => 'Στοιχείο | Στοιχεία', - 'incomes' => 'Έσοδα | Εισοδήματα', - 'invoices' => 'Τιμολόγιο | Τιμολόγια', - 'revenues' => 'Έσοδα | Έσοδα', - 'customers' => 'Πελάτης | Πελάτες', - 'expenses' => 'Έξοδα | Έξοδα', - 'bills' => 'Λογαριασμός | Λογαριασμοί', - 'payments' => 'Πληρωμής | Πληρωμές', - 'vendors' => 'Προμηθευτής | Προμηθευτές', - 'accounts' => 'Λογαριασμός | Λογαριασμοί', - 'transfers' => 'Μεταφορά | Μεταφορές', - 'transactions' => 'Συναλλαγής | Συναλλαγές', - 'reports' => 'Αναφορά | Αναφορές', - 'settings' => 'Ρύθμιση | Ρυθμίσεις', - 'categories' => 'Κατηγορία | Κατηγορίες', - 'currencies' => 'Νόμισμα | Νομίσματα', - 'tax_rates' => 'Φορολογικός συντελεστής | Φορολογικοί συντελεστές', - 'users' => 'Χρήστη | Χρήστες', - 'roles' => 'Ρόλος | Ρόλοι', - 'permissions' => 'Δικαίωμα | Δικαιώματα', - 'modules' => 'Εφαρμογή | Εφαρμογές', - 'companies' => 'Εταιρεία | Εταιρείες', - 'profits' => 'Κέρδος | Κέρδη', - 'taxes' => 'Φόρος | Φόροι', - 'logos' => 'Λογότυπο | Λογότυπα', - 'pictures' => 'Εικόνα | Εικόνες', - 'types' => 'Τύπος | Τύποι', - 'payment_methods' => 'Μέθοδος πληρωμής | Μέθοδοι πληρωμής', - 'compares' => 'Έσοδο προς Έξοδο | Έσοδα προς Έξοδα', - 'notes' => 'Σημείωση | Σημειώσεις', - 'totals' => 'Σύνολο | Σύνολα', - 'languages' => 'Γλώσσα | Γλώσσες', - 'updates' => 'Ενημέρωση | Ενημερώσεις', - 'numbers' => 'Αριθμός | Αριθμοί', - 'statuses' => 'Κατάσταση | Καταστάσεις', + 'items' => 'Προϊόν|Προϊόντα', + 'incomes' => 'Έσοδα|Εισοδήματα', + 'invoices' => 'Τιμολόγιο|Τιμολόγια', + 'revenues' => 'Έσοδο|Έσοδα', + 'customers' => 'Πελάτης|Πελάτες', + 'expenses' => 'Έξοδο|Έξοδα', + 'bills' => 'Λογαριασμός|Λογαριασμοί', + 'payments' => 'Πληρωμή|Πληρωμές', + 'vendors' => 'Προμηθευτής|Προμηθευτές', + 'accounts' => 'Λογαριασμός|Λογαριασμοί', + 'transfers' => 'Μεταφορά|Μεταφορές', + 'transactions' => 'Συναλλαγή|Συναλλαγές', + 'reports' => 'Αναφορά|Αναφορές', + 'settings' => 'Ρύθμιση|Ρυθμίσεις', + 'categories' => 'Κατηγορία|Κατηγορίες', + 'currencies' => 'Νόμισμα|Νομίσματα', + 'tax_rates' => 'Φορολογικός συντελεστής|Φορολογικοί συντελεστές', + 'users' => 'Χρήστης|Χρήστες', + 'roles' => 'Ρόλος|Ρόλοι', + 'permissions' => 'Δικαίωμα|Δικαιώματα', + 'modules' => 'Εφαρμογή|Εφαρμογές', + 'companies' => 'Εταιρία|Εταιρίες', + 'profits' => 'Κέρδος|Κέρδη', + 'taxes' => 'Φόρος|Φόροι', + 'logos' => 'Λογότυπο|Λογότυπα', + 'pictures' => 'Εικόνα|Εικόνες', + 'types' => 'Τύπος|Τύποι', + 'payment_methods' => 'Μέθοδος πληρωμής|Μέθοδοι πληρωμής', + 'compares' => 'Έσοδο προς Έξοδο|Έσοδα προς Έξοδα', + 'notes' => 'Σημείωση|Σημειώσεις', + 'totals' => 'Σύνολο|Σύνολα', + 'languages' => 'Γλώσσα|Γλώσσες', + 'updates' => 'Ενημέρωση|Ενημερώσεις', + 'numbers' => 'Αριθμός|Αριθμοί', + 'statuses' => 'Κατάσταση|Καταστάσεις', + 'others' => 'Άλλο|Άλλα', 'dashboard' => 'Πίνακας ελέγχου', - 'banking' => 'Τραπεζική', + 'banking' => 'Τράπεζες', 'general' => 'Γενικά', 'no_records' => 'Καμία εγγραφή.', 'date' => 'Ημερομηνία', 'amount' => 'Ποσό', - 'enabled' => 'Ενεργοποιημένο', - 'disabled' => 'Απενεργοποιημένο', + 'enabled' => 'Eνεργό', + 'disabled' => 'Ανενεργό', 'yes' => 'Ναι', 'no' => 'Όχι', 'na' => 'Μη Διαθέσιμο', @@ -91,7 +92,7 @@ return [ 'all_type' => 'Όλα :type', 'upcoming' => 'Επερχόμενα', 'created' => 'Δημιουργήθηκε', - 'id' => 'ID', + 'id' => 'Α/Α', 'more_actions' => 'Περίσσότερες ενέργειες', 'duplicate' => 'Αντιγραφή', 'unpaid' => 'Ανεξόφλητο', diff --git a/resources/lang/el-GR/header.php b/resources/lang/el-GR/header.php index 9898f1a7e..ef189a187 100644 --- a/resources/lang/el-GR/header.php +++ b/resources/lang/el-GR/header.php @@ -8,7 +8,7 @@ return [ 'counter' => '{0} Δεν έχετε καμία ειδοποίηση |{1} Έχετε :count ειδοποίηση| [2 *] Έχετε :count ειδοποιήσεις', 'overdue_invoices' => '{1} :count εκπρόθεσμο τιμολόγιο | [2 *] :count εκπρόθεσμα τιμολόγια', 'upcoming_bills' => '{1} :count επερχόμενος λογαριασμός | [2 *] :count επερχόμενοι λογαριασμοί', - 'items_stock' => '{1} :count απόθεμα σε έλλειψη | {2,*} :count αποθέματα σε έλλειψη', + 'items_stock' => '{1} :count προϊόν έχει εξαντληθεί|[2,*] :count έχουν εξαντληθεί', 'view_all' => 'Προβολή Όλων' ], diff --git a/resources/lang/el-GR/install.php b/resources/lang/el-GR/install.php index 490433ed5..18da217d2 100644 --- a/resources/lang/el-GR/install.php +++ b/resources/lang/el-GR/install.php @@ -7,9 +7,9 @@ return [ 'steps' => [ 'requirements' => 'Παρακαλώ, να πληρούνται οι ακόλουθες προϋποθέσεις!', - 'language' => 'Βήμα 1 από 3: Επιλογή Γλώσσας', - 'database' => 'Βήμα 2 από 3: Εγκατάσταση Βάσης Δεδομένων', - 'settings' => 'Βήμα 3 από 3: Στοιχεία Εταιρείας και Διαχειριστή', + 'language' => 'Βήμα 1/3: Επιλογή Γλώσσας', + 'database' => 'Βήμα 2/3: Ρύθμιση Βάσης Δεδομένων', + 'settings' => 'Βήμα 3/3: Στοιχεία Εταιρείας και Διαχειριστή', ], 'language' => [ @@ -19,26 +19,26 @@ return [ 'requirements' => [ 'enabled' => ':feature πρέπει να ενεργοποιηθεί!', 'disabled' => ':feature πρέπει να απενεργοποιηθεί!', - 'extension' => ':extension η επέκταση πρέπει να φορτωθεί!', - 'directory' => ':directory ο καταλόγος πρέπει να είναι εγγράψιμος!', + 'extension' => 'Η επέκταση :extension πρέπει να φορτωθεί!', + 'directory' => 'Ο φάκελος :directory πρέπει να είναι εγγράψιμος!', ], 'database' => [ 'hostname' => 'Όνομα κεντρικού υπολογιστή', 'username' => 'Όνομα χρήστη', - 'password' => 'Κωδικός πρόσβασης', + 'password' => 'Συνθηματικό', 'name' => 'Βάση δεδομένων', ], 'settings' => [ - 'company_name' => 'Επωνυμία εταιρείας', - 'company_email' => 'Εταιρικό ηλεκτρονικό ταχυδρομείο', - 'admin_email' => 'Ηλεκτρονικού ταχυδρομείου Διαχειριστή', - 'admin_password' => 'Κωδικός Πρόσβασης Διαχειριστή', + 'company_name' => 'Επωνυμία Εταιρείας', + 'company_email' => 'Ηλεκτρονική Διεύθυνση Εταιρίας', + 'admin_email' => 'Ηλεκτρονική Διεύθυνση Διαχειριστή', + 'admin_password' => 'Συνθηματικό Διαχειριστή', ], 'error' => [ - 'connection' => 'Σφάλμα: Η σύνδεση με τη βάση δεδομένων ήταν αδύνατη! Παρακαλούμε, βεβαιωθείτε ότι τα στοιχεία είναι σωστά.', + 'connection' => 'Σφάλμα: Η σύνδεση με τη βάση δεδομένων δεν ήταν δυνατή! Παρακαλούμε, βεβαιωθείτε ότι τα στοιχεία είναι σωστά.', ], ]; diff --git a/resources/lang/el-GR/invoices.php b/resources/lang/el-GR/invoices.php index c1848ed77..a2ed6fbbe 100644 --- a/resources/lang/el-GR/invoices.php +++ b/resources/lang/el-GR/invoices.php @@ -12,16 +12,21 @@ return [ 'quantity' => 'Ποσότητα', 'price' => 'Τιμή', 'sub_total' => 'Μερικό Σύνολο', + 'discount' => 'Έκπτωση', 'tax_total' => 'Σύνολο φόρου', 'total' => 'Σύνολο', - 'item_name' => 'Όνομα Αντικειμένου | Ονόματα Αντικειμένων', + 'item_name' => 'Όνομα Προϊόντος|Ονόματα Προϊόντων', + + 'show_discount' => ':discount % Έκπτωση', + 'add_discount' => 'Προσθήκη έκπτωσης', + 'discount_desc' => 'του μερικού συνόλου', 'payment_due' => 'Οφειλόμενη Πληρωμή', 'paid' => 'Εξοφλημένο', 'histories' => 'Ιστορικό', 'payments' => 'Πληρωμές', - 'add_payment' => 'Προσθήκη πληρωμής', + 'add_payment' => 'Προσθήκη Πληρωμής', 'mark_paid' => 'Σημείωσε ως Εξοφλημένο', 'mark_sent' => 'Σημείωσε ως Απεσταλμένο', 'download_pdf' => 'Λήψη PDF', @@ -32,18 +37,18 @@ return [ 'sent' => 'Απεσταλμένο', 'viewed' => 'Έχει ανοιχτεί', 'approved' => 'Έχει εγκριθεί', - 'partial' => 'Μερικός', - 'paid' => 'Πληρωμένο', + 'partial' => 'Μερικώς εξοφλημένο', + 'paid' => 'Εξοφλημένο', ], 'messages' => [ - 'email_sent' => 'Τιμολόγιο email έχει σταλεί με επιτυχία!', - 'marked_sent' => 'Τιμολόγιο σημασμένο ως σταλμένο με επιτυχία!', + 'email_sent' => 'Το τιμολόγιο εστάλει με επιτυχία μέσω email!', + 'marked_sent' => 'Το τιμολόγιο επισημάνθηκε με επιτυχία ως σταλμένο!', 'email_required' => 'Δεν υπάρχει διεύθυνση email για αυτόν τον πελάτη!', ], 'notification' => [ - 'message' => 'Λαμβάνετε αυτό το μήνυμα επειδή έχετε ένα επερχόμενο: ποσό τιμολογίου σε : πελάτη πελάτη.', + 'message' => 'Λαμβάνετε αυτό το μήνυμα επειδή έχετε ένα επερχόμενο τιμολόγιο αξίας :amount προς τον/την πελάτη :customer.', 'button' => 'Εξόφληση τώρα', ], diff --git a/resources/lang/el-GR/messages.php b/resources/lang/el-GR/messages.php index 8421b4dfd..2f9fb3ce1 100644 --- a/resources/lang/el-GR/messages.php +++ b/resources/lang/el-GR/messages.php @@ -14,10 +14,12 @@ return [ 'not_user_company' => 'Σφάλμα: Δεν επιτρέπεται να διαχειριστείτε αυτή την εταιρεία!', 'customer' => 'Σφάλμα: Ο χρήστης δεν δημιουργήθηκε! Ο/Η :name χρησιμοποιεί ήδη αυτό το email.', 'no_file' => 'Σφάλμα: Δεν έχετε επιλέξει αρχείο!', + 'last_category' => 'Σφάλμα: Δεν μπορείτε να διαγράψετε την τελευταία κατηγορία :type!', + 'invalid_token' => 'Σφάλμα: Το κλειδί που εισάγατε είναι δεν είναι έγκυρο!', ], 'warning' => [ - 'deleted' => 'Προειδοποίηση: Δεν επιτρέπεται να διαγράψετε το :name επειδή έχει :text που σχετίζονται.', - 'disabled' => 'Προειδοποίηση: Δεν επιτρέπεται να διαγράψετε το : name επειδή έχει :text που σχετίζονται.', + 'deleted' => 'Προειδοποίηση: Δεν επιτρέπεται να διαγράψετε το :name, επειδή έχει :text που σχετίζονται.', + 'disabled' => 'Προειδοποίηση: Δεν επιτρέπεται να απενεργοποιήσετε το :name, επειδή έχει :text που σχετίζονται.', ], ]; diff --git a/resources/lang/el-GR/modules.php b/resources/lang/el-GR/modules.php index 45931ae68..ced943767 100644 --- a/resources/lang/el-GR/modules.php +++ b/resources/lang/el-GR/modules.php @@ -2,15 +2,16 @@ return [ - 'title' => 'Προσωπικό API token', - 'api_token' => 'Token', + 'title' => 'Κλειδί API', + 'api_token' => 'Κλειδί', 'top_paid' => 'Κορυφαία επί πληρωμή Προϊόντα', 'new' => 'Νέο', 'top_free' => 'Κορυφαία δωρεάν Προϊόντα', 'free' => 'ΔΩΡΕΑΝ', + 'search' => 'Αναζήτηση', 'install' => 'Εγκατάσταση', 'buy_now' => 'Αγοράστε τώρα', - 'token_link' => ' κάντε κλικ εδώ για να λάβετε το προσωπικό σας Token API.', + 'token_link' => ' κάντε κλικ εδώ για να λάβετε το προσωπικό σας κλειδί API.', 'no_apps' => 'Δεν υπάρχουν εφαρμογές σε αυτή την κατηγορία, ακόμα.', 'developer' => 'Είστε προγραμματιστής; εδώ μπορείτε να μάθετε πώς μπορείτε να δημιουργήσετε μια εφαρμογή και να αρχίσετε να την πουλάτε σήμερα κιόλας!', @@ -20,11 +21,11 @@ return [ 'updated' => 'Ενημερώθηκε', 'compatibility' => 'Συμβατότητα', - 'installed' => ':κομμάτι που έχει εγκατασταθεί', - 'uninstalled' => ':κομμάτι που έχει απεγκατασταθεί', + 'installed' => 'τo :module εγκαταστάθηκε', + 'uninstalled' => 'τo :module απεγκαταστάθηκε', //'updated' => ':module updated', - 'enabled' => ': κομμάτι που έχει ενεργοποιηθεί', - 'disabled' => ':κομμάτι που έχει απενεργοποιηθεί', + 'enabled' => 'τo :module ενεργοποιήθηκε', + 'disabled' => 'τo :module απενεργοποιήθηκε', 'tab' => [ 'installation' => 'Εγκατάσταση', @@ -34,7 +35,7 @@ return [ 'installation' => [ 'header' => 'Εγκατάσταση εφαρμογής', - 'download' => 'Λήψη :όνομα αρχείου.', + 'download' => 'Λήψη αρχείου :module.', 'unzip' => 'Εξαγωγή :όνομα αρχείου.', 'install' => 'Εγκατάσταση :όνομα αρχείου.', ], diff --git a/resources/lang/el-GR/pagination.php b/resources/lang/el-GR/pagination.php index e19f51a87..7032c0308 100644 --- a/resources/lang/el-GR/pagination.php +++ b/resources/lang/el-GR/pagination.php @@ -2,8 +2,8 @@ return [ - 'previous' => '« Προηγούμενο', + 'previous' => '« Προηγούμενη', 'next' => 'Επόμενη »', - 'showing' => 'Απεικόνιση :πρώτο σε :τελευταίο από :συνολικό :είδος', + 'showing' => 'Εμφάνιση :first έως :last από :total :type', ]; diff --git a/resources/lang/el-GR/passwords.php b/resources/lang/el-GR/passwords.php index 6bd075e7b..a85247da6 100644 --- a/resources/lang/el-GR/passwords.php +++ b/resources/lang/el-GR/passwords.php @@ -13,10 +13,10 @@ return [ | */ - 'password' => 'Το συνθηματικό πρέπει να έχει τουλάχιστον έξι χαρακτήρες και να ταιριάζει με την επαλήθευση.', + 'password' => 'Το συνθηματικό πρέπει να αποτελείται από τουλάχιστον έξι χαρακτήρες και να ταιριάζει με την επαλήθευση.', 'reset' => 'Έχει γίνει επαναφορά του συνθηματικού!', - 'sent' => 'Η υπενθύμιση του συνθηματικού εστάλη!', - 'token' => 'Το κλειδί αρχικοποίησης του συνθηματικού δεν είναι έγκυρο.', - 'user' => "Δεν βρέθηκε χρήστης με το συγκεκριμένο email.", + 'sent' => 'Η υπενθύμιση του συνθηματικού εστάλη στην ηλεκτρονική σας διεύθυνση!', + 'token' => 'Το κλειδί επαναφοράς του συνθηματικού σας δεν είναι έγκυρο.', + 'user' => "Δεν βρέθηκε χρήστης με τη συγκεκριμένη ηλεκτρονική διεύθυνση.", ]; diff --git a/resources/lang/el-GR/recurring.php b/resources/lang/el-GR/recurring.php new file mode 100644 index 000000000..e912f7bf5 --- /dev/null +++ b/resources/lang/el-GR/recurring.php @@ -0,0 +1,20 @@ + 'Επαναλαμβανόμενα', + 'every' => 'Κάθε', + 'period' => 'Περίοδος', + 'times' => 'Φορές', + 'daily' => 'Ημερήσια', + 'weekly' => 'Εβδομαδιαία', + 'monthly' => 'Μηνιαία', + 'yearly' => 'Ετήσια', + 'custom' => 'Προσαρμογή', + 'days' => 'Ημέρα(ες)', + 'weeks' => 'Εβδομάδα(ες)', + 'months' => 'Μήνα(ες)', + 'years' => 'Έτος(η)', + 'message' => 'Αυτό είναι ένα επαναλαμβανόμενο :type και το επόμενο :type θα δημιουργηθεί αυτόματα στις :date', + +]; diff --git a/resources/lang/el-GR/reports.php b/resources/lang/el-GR/reports.php index a03b80b78..504ae14d6 100644 --- a/resources/lang/el-GR/reports.php +++ b/resources/lang/el-GR/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Αυτό το τρίμηνο', 'previous_quarter' => 'Προηγούμενο τρίμηνο', 'last_12_months' => 'Τελευταίοι 12 μήνες', + 'profit_loss' => 'Κέρδη και Ζημίες', + 'gross_profit' => 'Μικτό Κέρδος', + 'net_profit' => 'Καθαρό Κέρδος', + 'total_expenses' => 'Συνολικά Έξοδα', + 'net' => 'Καθαρά', 'summary' => [ 'income' => 'Σύνοψη εσόδων', 'expense' => 'Σύνοψη εξόδων', 'income_expense' => 'Έσοδα με έξοδα', + 'tax' => 'Σύνοψη φόρων', + ], + + 'quarter' => [ + '1' => 'Ιαν-Μαρ', + '2' => 'Απρ-Ιουν', + '3' => 'Ιουλ-Σεπ', + '4' => 'Οκτ-Δεκ', ], ]; diff --git a/resources/lang/el-GR/settings.php b/resources/lang/el-GR/settings.php index 90a9973a2..b4e6ed096 100644 --- a/resources/lang/el-GR/settings.php +++ b/resources/lang/el-GR/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Κενό ( )', ], 'timezone' => 'Ζώνη ώρας', + 'percent' => [ + 'title' => 'Θέση συμβόλου ποσοστού (%)', + 'before' => 'Πριν από τον αριθμό', + 'after' => 'Μετά από τον αριθμό', + ], ], 'invoice' => [ 'tab' => 'Τιμολόγιο', @@ -45,7 +50,7 @@ return [ 'host' => 'Διακομιστής SMTP', 'port' => 'Θύρα SMTP', 'username' => 'Όνομα Χρήστη SMTP', - 'password' => 'Κωδικός πρόσβασης SMTP', + 'password' => 'Συνθηματικό SMTP', 'encryption' => 'Ασφάλεια SMTP', 'none' => 'Κανένα', ], diff --git a/resources/lang/el-GR/taxes.php b/resources/lang/el-GR/taxes.php index 2597fffdb..efa93a445 100644 --- a/resources/lang/el-GR/taxes.php +++ b/resources/lang/el-GR/taxes.php @@ -2,7 +2,7 @@ return [ - 'rate' => 'Ποσοστό', - 'rate_percent' => 'Ποσοστό (%)', + 'rate' => 'Συντελεστής', + 'rate_percent' => 'Συντελεστής (%)', ]; diff --git a/resources/lang/el-GR/updates.php b/resources/lang/el-GR/updates.php index 3e477b16c..3bd9e851b 100644 --- a/resources/lang/el-GR/updates.php +++ b/resources/lang/el-GR/updates.php @@ -8,7 +8,7 @@ return [ 'changelog' => 'Αρχείο καταγραφής αλλαγών', 'check' => 'Έλεγχος', 'new_core' => 'Διατίθεται μια ενημερωμένη έκδοση του Akaunting.', - 'latest_core' => 'Συγχαρητήρια! Έχετε την τελευταία έκδοση του Akaunting. Μελλοντικές ενημερωμένες εκδόσεις θα εφαρμοστούν αυτόματα.', + 'latest_core' => 'Συγχαρητήρια! Έχετε την τελευταία έκδοση του Akaunting. Οι μελλοντικές ενημερώσεις ασφαλείας θα εφαρμόζονται αυτόματα.', 'success' => 'Η ενημέρωση έχει ολοκληρωθεί επιτυχώς.', 'error' => 'Η ενημέρωση απέτυχε. Παρακαλώ προσπαθήστε ξανά.', diff --git a/resources/lang/es-ES/bills.php b/resources/lang/es-ES/bills.php index 659bc8214..986ed5b3f 100644 --- a/resources/lang/es-ES/bills.php +++ b/resources/lang/es-ES/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Cantidad', 'price' => 'Precio', 'sub_total' => 'Subtotal', + 'discount' => 'Descuento', 'tax_total' => 'Total Impuestos', 'total' => 'Total ', 'item_name' => 'Nombre del artículo | Nombres de artículo', + 'show_discount' => ':discount% Descuento', + 'add_discount' => 'Agregar Descuento', + 'discount_desc' => 'de subtotal', + 'payment_due' => 'Vencimiento de pago', 'amount_due' => 'Importe Vencido', 'paid' => 'Pagado', diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php index 8376b9f91..e45c0ad8d 100644 --- a/resources/lang/es-ES/general.php +++ b/resources/lang/es-ES/general.php @@ -2,40 +2,42 @@ return [ - 'items' => 'Artículo | Artículos', - 'incomes' => 'Ingresos | Ingresos', - 'invoices' => 'Factura | Facturas', - 'revenues' => 'Ingresos | Ingresos', - 'customers' => 'Cliente | Clientes', - 'expenses' => 'Gastos | Gastos', - 'bills' => 'Recibo | Recibos', - 'payments' => 'Pago | Pagos', - 'vendors' => 'Proveedor | Proveedores', - 'accounts' => 'Cuenta | Cuentas', - 'transfers' => 'Transferencia | Transferencias', - 'transactions' => 'Transacción | Transacciones', - 'reports' => 'Informe | Informes', - 'settings' => 'Ajuste | Ajustes', - 'categories' => 'Categoría | Categorías', - 'currencies' => 'Moneda | Monedas', - 'tax_rates' => 'Tasa de impuestos | Tasas de impuestos', - 'users' => 'Usuario | Usuarios', + 'items' => 'Artículo|Artículos', + 'incomes' => 'Ingresos|Ingresos', + 'invoices' => 'Factura|Facturas', + 'revenues' => 'Ingresos|Ingresos', + 'customers' => 'Cliente|Clientes', + 'expenses' => 'Gastos|Gastos', + 'bills' => 'Recibo|Recibos', + 'payments' => 'Pago|Pagos', + 'vendors' => 'Proveedor|Proveedores', + 'accounts' => 'Cuenta|Cuentas', + 'transfers' => 'Transferencia|Transferencias', + 'transactions' => 'Transacción|Transacciones', + 'reports' => 'Informe|Informes', + 'settings' => 'Ajuste|Ajustes', + 'categories' => 'Categoría|Categorías', + 'currencies' => 'Moneda|Monedas', + 'tax_rates' => 'Tasa de impuestos|Tasas de impuestos', + 'users' => 'Usuario|Usuarios', 'roles' => 'Rol|Roles', - 'permissions' => 'Permiso | Permisos', + 'permissions' => 'Permiso|Permisos', 'modules' => 'App|Apps', - 'companies' => 'Empresa | Empresas', - 'profits' => 'Beneficio | Beneficios', - 'taxes' => 'Impuestos | Impuestos', - 'pictures' => 'Imagen | Imágenes', - 'types' => 'Tipo | Tipos', - 'payment_methods' => 'Forma de pago | Métodos de pago', - 'compares' => 'Ingreso vs Gasto | Ingresos vs Gastos', - 'notes' => 'Nota | Notas', - 'totals' => 'Total | Totales', - 'languages' => 'Idioma | Idiomas', - 'updates' => 'Actualización | Actualizaciones', - 'numbers' => 'Número | Números', + 'companies' => 'Empresa|Empresas', + 'profits' => 'Beneficio|Beneficios', + 'taxes' => 'Impuestos|Impuestos', + 'logos' => 'Logo|Logos', + 'pictures' => 'Imagen|Imágenes', + 'types' => 'Tipo|Tipos', + 'payment_methods' => 'Forma de pago|Formas de pago', + 'compares' => 'Ingreso vs Gasto|Ingresos vs Gastos', + 'notes' => 'Nota|Notas', + 'totals' => 'Total|Totales', + 'languages' => 'Idioma|Idiomas', + 'updates' => 'Actualización|Actualizaciones', + 'numbers' => 'Número|Números', 'statuses' => 'Estado|Estados', + 'others' => 'Otro|Otros', 'dashboard' => 'Panel de Control', 'banking' => 'Banking', @@ -57,7 +59,7 @@ return [ 'show' => 'Mostrar', 'edit' => 'Editar', 'delete' => 'Borrar', - 'send' => 'Envíar', + 'send' => 'Enviar', 'download' => 'Descargar', 'delete_confirm' => 'Confirma el borrado de :name :type?', 'name' => 'Nombre', diff --git a/resources/lang/es-ES/invoices.php b/resources/lang/es-ES/invoices.php index 224d79872..854d9c515 100644 --- a/resources/lang/es-ES/invoices.php +++ b/resources/lang/es-ES/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Cantidad', 'price' => 'Precio', 'sub_total' => 'Subtotal', + 'discount' => 'Descuento', 'tax_total' => 'Total Impuestos', 'total' => 'Total ', 'item_name' => 'Nombre del artículo | Nombres de artículo', + 'show_discount' => ':discount% Descuento', + 'add_discount' => 'Agregar Descuento', + 'discount_desc' => 'de subtotal', + 'payment_due' => 'Vencimiento de pago', 'paid' => 'Pagado', 'histories' => 'Historias', diff --git a/resources/lang/es-ES/messages.php b/resources/lang/es-ES/messages.php index 00270165f..0f10fd173 100644 --- a/resources/lang/es-ES/messages.php +++ b/resources/lang/es-ES/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importado!', ], 'error' => [ - 'payment_add' => 'Error: No puede agregar pagos! Usted debe marcar agregar importe.', + 'over_payment' => 'Error: Pago no añadido! Importe mayor que el total.', 'not_user_company' => 'Error: No tiene permisos para administrar esta empresa!', - 'customer' => 'Error: No se puede crear el usuario! :name usa esta dirección de correo electrónico.', + 'customer' => 'Error: Usuario no creado! :name ya utiliza esta dirección de correo electrónico.', 'no_file' => 'Error: Ningún archivo seleccionado!', + 'last_category' => 'Error: No puede eliminar la última :type categoría!', + 'invalid_token' => 'Error: El token introducido es inválido!', ], 'warning' => [ 'deleted' => 'Advertencia: No puede borrar :name porque tiene :text relacionado.', diff --git a/resources/lang/es-ES/modules.php b/resources/lang/es-ES/modules.php index 47e90310d..b7ede6274 100644 --- a/resources/lang/es-ES/modules.php +++ b/resources/lang/es-ES/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nuevo', 'top_free' => 'Top gratis', 'free' => 'GRATIS', + 'search' => 'Buscar', 'install' => 'Instalar', 'buy_now' => 'Comprar ahora', 'token_link' => 'Haga Click aquí para obtener su API token.', diff --git a/resources/lang/es-ES/recurring.php b/resources/lang/es-ES/recurring.php new file mode 100644 index 000000000..c566fb382 --- /dev/null +++ b/resources/lang/es-ES/recurring.php @@ -0,0 +1,20 @@ + 'Repetitivo', + 'every' => 'Cada', + 'period' => 'Período', + 'times' => 'Veces', + 'daily' => 'Diariamente', + 'weekly' => 'Semanalmente', + 'monthly' => 'Mensualmente', + 'yearly' => 'Anualmente', + 'custom' => 'Personalizado', + 'days' => 'Día(s)', + 'weeks' => 'Semana(s)', + 'months' => 'Mes(es)', + 'years' => 'Año(s)', + 'message' => 'Éste es un :type periódico y el siguiente :type se generará automáticamente el día :date', + +]; diff --git a/resources/lang/es-ES/reports.php b/resources/lang/es-ES/reports.php index 1c4fb06d1..791af14f9 100644 --- a/resources/lang/es-ES/reports.php +++ b/resources/lang/es-ES/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Este Trimestre', 'previous_quarter' => 'Trimestre Anterior', 'last_12_months' => 'Últimos 12 meses', + 'profit_loss' => 'Ganancias y Pérdidas', + 'gross_profit' => 'Ganancia Bruta', + 'net_profit' => 'Ganancia Neta', + 'total_expenses' => 'Total de gastos', + 'net' => 'Neto', 'summary' => [ 'income' => 'Resumen de Ingresos', 'expense' => 'Resumen de Gastos', 'income_expense' => 'Ingresos vs Gastos', + 'tax' => 'Resumen de impuestos', + ], + + 'quarter' => [ + '1' => 'Ene-Mar', + '2' => 'Abr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dic', ], ]; diff --git a/resources/lang/es-ES/settings.php b/resources/lang/es-ES/settings.php index eb621ed9d..edfdd672b 100644 --- a/resources/lang/es-ES/settings.php +++ b/resources/lang/es-ES/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Espacio ( )', ], 'timezone' => 'Zona horaria', + 'percent' => [ + 'title' => 'Posición Porcentaje (%)', + 'before' => 'Antes del Número', + 'after' => 'Después del número', + ], ], 'invoice' => [ 'tab' => 'Factura', diff --git a/resources/lang/es-MX/bills.php b/resources/lang/es-MX/bills.php index c2cc647b5..fc2ee08db 100644 --- a/resources/lang/es-MX/bills.php +++ b/resources/lang/es-MX/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Cantidad', 'price' => 'Precio', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Total de Impuestos', 'total' => 'Total ', 'item_name' => 'Nombre del producto/servicio | Nombres de los productos/servicos', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Vencimiento del Pago', 'amount_due' => 'Importe Vencido', 'paid' => 'Pagado', diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php index 4a8498936..1514803e2 100644 --- a/resources/lang/es-MX/general.php +++ b/resources/lang/es-MX/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Empresa | Empresas', 'profits' => 'Ganancia | Ganancias', 'taxes' => 'Impuesto | Impuestos', + 'logos' => 'Logo|Logos', 'pictures' => 'Imagen | Imágenes', 'types' => 'Tipo | Tipos', 'payment_methods' => 'Método de Pago | Métodos de Pago', @@ -36,6 +37,7 @@ return [ 'updates' => 'Actualización | Actualizaciones', 'numbers' => 'Número | Números', 'statuses' => 'Estado|Estados', + 'others' => 'Other|Others', 'dashboard' => 'Panel de Control', 'banking' => 'Bancos', diff --git a/resources/lang/es-MX/invoices.php b/resources/lang/es-MX/invoices.php index f1d0bb4a7..27466afe4 100644 --- a/resources/lang/es-MX/invoices.php +++ b/resources/lang/es-MX/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Cantidad', 'price' => 'Precio', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Total de Impuestos', 'total' => 'Total ', 'item_name' => 'Nombre del producto/servicio | Nombres de los productos/servicos', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Vencimiento del Pago', 'paid' => 'Pagado', 'histories' => 'Historial', diff --git a/resources/lang/es-MX/messages.php b/resources/lang/es-MX/messages.php index f83903af0..26927a883 100644 --- a/resources/lang/es-MX/messages.php +++ b/resources/lang/es-MX/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => '¡:type importado!', ], 'error' => [ - 'payment_add' => 'Error: ¡No puede agregar el pago! Usted debe comprobar cantidad agregada.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Error: ¡No tiene permisos para administrar esta empresa!', - 'customer' => 'Error: ¡No se puede crear el usuario! :name usa esta dirección de correo electrónico.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: ¡Ningún archivo se ha seleccionado!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Advertencia: No puede borrar :name porque tiene :text relacionado.', diff --git a/resources/lang/es-MX/modules.php b/resources/lang/es-MX/modules.php index d0bc76f5a..25c8c64fc 100644 --- a/resources/lang/es-MX/modules.php +++ b/resources/lang/es-MX/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nuevo', 'top_free' => 'Top Gratis', 'free' => 'GRATIS', + 'search' => 'Search', 'install' => 'Instalar', 'buy_now' => 'Comprar Ahora', 'token_link' => 'Haga Haga click aquí para obtener su token de API.', diff --git a/resources/lang/es-MX/recurring.php b/resources/lang/es-MX/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/es-MX/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/es-MX/reports.php b/resources/lang/es-MX/reports.php index 4bc26fb0d..b602a46d9 100644 --- a/resources/lang/es-MX/reports.php +++ b/resources/lang/es-MX/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Este Trimestre', 'previous_quarter' => 'Trimestre Anterior', 'last_12_months' => 'Últimos 12 Meses', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Resumen de Ingresos', 'expense' => 'Resumen de Gastos', 'income_expense' => 'Ingresos vs Gastos', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/es-MX/settings.php b/resources/lang/es-MX/settings.php index 7688e5b0a..7b6586156 100644 --- a/resources/lang/es-MX/settings.php +++ b/resources/lang/es-MX/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Espacio ( )', ], 'timezone' => 'Zona Horaria', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Factura', diff --git a/resources/lang/fa-IR/bills.php b/resources/lang/fa-IR/bills.php index 7614ed34e..348eb76b0 100644 --- a/resources/lang/fa-IR/bills.php +++ b/resources/lang/fa-IR/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'تعداد', 'price' => 'قيمت', 'sub_total' => 'جمع کل', + 'discount' => 'Discount', 'tax_total' => 'مجموع مالیات', 'total' => 'مجموع', 'item_name' => 'نام آیتم | نام آیتم ها', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'سررسید پرداخت', 'amount_due' => 'مقدار سررسید', 'paid' => 'پرداخت شده', diff --git a/resources/lang/fa-IR/general.php b/resources/lang/fa-IR/general.php index 450ac5115..e0775edf7 100644 --- a/resources/lang/fa-IR/general.php +++ b/resources/lang/fa-IR/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'شرکت | شرکت ها', 'profits' => 'سود | سود', 'taxes' => 'مالیات | مالیات', + 'logos' => 'لوگو | لوگوها', 'pictures' => 'عکس | تصاویر', 'types' => 'نوع | انواع', 'payment_methods' => 'روش پرداخت | روش های پرداخت', @@ -36,6 +37,7 @@ return [ 'updates' => 'به روز رسانی | به روز رسانی', 'numbers' => 'شماره | تعداد', 'statuses' => 'وضعیت | وضعیت', + 'others' => 'Other|Others', 'dashboard' => 'پیشخوان', 'banking' => 'بانکداری', diff --git a/resources/lang/fa-IR/invoices.php b/resources/lang/fa-IR/invoices.php index 1e4dc89c6..540516e2a 100644 --- a/resources/lang/fa-IR/invoices.php +++ b/resources/lang/fa-IR/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'تعداد', 'price' => 'قيمت', 'sub_total' => 'جمع کل', + 'discount' => 'Discount', 'tax_total' => 'مجموع مالیات', 'total' => 'مجموع', 'item_name' => 'نام آیتم | نام آیتم ها', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'سررسید پرداخت', 'paid' => 'پرداخت شده', 'histories' => 'تاریخچه', diff --git a/resources/lang/fa-IR/messages.php b/resources/lang/fa-IR/messages.php index 6f047021e..ec366d73a 100644 --- a/resources/lang/fa-IR/messages.php +++ b/resources/lang/fa-IR/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type درون ریزی شد!', ], 'error' => [ - 'payment_add' => 'خطا: شما نمی توانید پرداخت داشته باشید! شما باید ابتدا مقدار اضافه شده را چک کنید.', + 'over_payment' => 'خطا: پرداخت اضافه نشده! مبلغ وارد شده از جمع کل بیشتر است.', 'not_user_company' => 'خطا: شما اجازه مدیریت این شرکت را ندارید!', - 'customer' => 'خطا در تعریف کاربر! :name از این ایمیل استفاده می‌کند.', + 'customer' => 'خطا: کاربر ایجاد نشد :name از ایمیل وارد شده استفاده می کند.', 'no_file' => 'خطا: فایلی انتخاب نشده است!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'هشدار: شما نمی توانید :name را به دلیل :text حذف کنید.', diff --git a/resources/lang/fa-IR/modules.php b/resources/lang/fa-IR/modules.php index 945ae4148..35308cec8 100644 --- a/resources/lang/fa-IR/modules.php +++ b/resources/lang/fa-IR/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'جدید', 'top_free' => 'بهترین رایگان', 'free' => 'رایگان', + 'search' => 'Search', 'install' => 'نصب', 'buy_now' => 'خرید', 'token_link' => 'دریافت Token.', diff --git a/resources/lang/fa-IR/recurring.php b/resources/lang/fa-IR/recurring.php new file mode 100644 index 000000000..72c041c9a --- /dev/null +++ b/resources/lang/fa-IR/recurring.php @@ -0,0 +1,20 @@ + 'دوره ای', + 'every' => 'دوره', + 'period' => 'زمان', + 'times' => 'زمان', + 'daily' => 'روزانه', + 'weekly' => 'هفتگی', + 'monthly' => 'ماهانه', + 'yearly' => 'سالانه', + 'custom' => 'دلخواه', + 'days' => 'روز', + 'weeks' => 'هفته', + 'months' => 'ماه', + 'years' => 'سال', + 'message' => 'تکرار :type و پرداخت بعدی :type در تاریخ :date ایجاد می شود.', + +]; diff --git a/resources/lang/fa-IR/reports.php b/resources/lang/fa-IR/reports.php index 43584072a..34896ed3e 100644 --- a/resources/lang/fa-IR/reports.php +++ b/resources/lang/fa-IR/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'سه ماه', 'previous_quarter' => 'سه ماهه قبلی', 'last_12_months' => '12 ماه گذشته', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'خلاصه درآمد', 'expense' => 'خلاصه هزینه', 'income_expense' => 'هزینه درآمد', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/fa-IR/settings.php b/resources/lang/fa-IR/settings.php index 6ad996ace..4f97f37e2 100644 --- a/resources/lang/fa-IR/settings.php +++ b/resources/lang/fa-IR/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'فضا ( )', ], 'timezone' => 'منطقه زمانی', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'فاکتور', diff --git a/resources/lang/fr-FR/bills.php b/resources/lang/fr-FR/bills.php index baeeed068..9020ac67a 100644 --- a/resources/lang/fr-FR/bills.php +++ b/resources/lang/fr-FR/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Quantité', 'price' => 'Prix', 'sub_total' => 'Sous-total', + 'discount' => 'Remise', 'tax_total' => 'Taxe totale', 'total' => 'Total', 'item_name' => 'Nom de marchandise|Noms des marchandises', + 'show_discount' => ':discount % de remise', + 'add_discount' => 'Ajouter une remise', + 'discount_desc' => 'du sous-total', + 'payment_due' => 'Paiement dû', 'amount_due' => 'Montant dû', 'paid' => 'Payé', diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php index 70b3f9e3e..1146f521a 100644 --- a/resources/lang/fr-FR/general.php +++ b/resources/lang/fr-FR/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Entreprise|Entreprises', 'profits' => 'Bénéfice|Bénéfices', 'taxes' => 'Taxe|Taxes', + 'logos' => 'Logo|Logos', 'pictures' => 'Photo|Photos', 'types' => 'Type|Types', 'payment_methods' => 'Mode de paiement|Modes de paiement', @@ -36,6 +37,7 @@ return [ 'updates' => 'Mise à jour|Mises à jour', 'numbers' => 'Numéro|Numéros', 'statuses' => 'Statut | Statuts', + 'others' => 'Autre|Autres', 'dashboard' => 'Tableau de bord', 'banking' => 'Banque', diff --git a/resources/lang/fr-FR/invoices.php b/resources/lang/fr-FR/invoices.php index 43fd565d3..61ee3af65 100644 --- a/resources/lang/fr-FR/invoices.php +++ b/resources/lang/fr-FR/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Quantité', 'price' => 'Prix', 'sub_total' => 'Sous-total', + 'discount' => 'Remise', 'tax_total' => 'Taxe totale', 'total' => 'Total', 'item_name' => 'Nom de marchandise|Noms des marchandises', + 'show_discount' => ':discount % de remise', + 'add_discount' => 'Ajouter une remise', + 'discount_desc' => 'du sous-total', + 'payment_due' => 'Paiement dû', 'paid' => 'Payé', 'histories' => 'Historiques', diff --git a/resources/lang/fr-FR/messages.php b/resources/lang/fr-FR/messages.php index 32df276fa..1650c762f 100644 --- a/resources/lang/fr-FR/messages.php +++ b/resources/lang/fr-FR/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importé !', ], 'error' => [ - 'payment_add' => 'Erreur : Vous ne pouvez pas ajouter ce paiement ! Vérifiez le montant.', + 'over_payment' => 'Erreur : le paiement n\'a pas été ajouté ! Le montant est supérieur au total.', 'not_user_company' => 'Erreur : Vous n’êtes pas autorisé à gérer cette société !', - 'customer' => 'Erreur : Vous ne pouvez pas créer cet utilisateur ! :name utilise cette adresse.', + 'customer' => 'Erreur : Utilisateur non créé ! :name utilise déjà cette adresse email.', 'no_file' => 'Erreur : Aucun fichier sélectionné !', + 'last_category' => 'Erreur : impossible de supprimer la dernière catégorie de type :type !', + 'invalid_token' => 'Erreur : le token est invalide !', ], 'warning' => [ 'deleted' => 'Avertissement : Vous n’êtes pas autorisé à supprimer :name parce qu’il est associé à :texte.', diff --git a/resources/lang/fr-FR/modules.php b/resources/lang/fr-FR/modules.php index 1f8ccd60f..31db76030 100644 --- a/resources/lang/fr-FR/modules.php +++ b/resources/lang/fr-FR/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nouveau', 'top_free' => 'Top gratuit', 'free' => 'GRATUIT', + 'search' => 'Rechercher', 'install' => 'Installation', 'buy_now' => 'Acheter maintenant', 'token_link' => 'Cliquez ici pour obtenir votre jeton de l\'API.', diff --git a/resources/lang/fr-FR/recurring.php b/resources/lang/fr-FR/recurring.php new file mode 100644 index 000000000..d969db075 --- /dev/null +++ b/resources/lang/fr-FR/recurring.php @@ -0,0 +1,20 @@ + 'Récurrent', + 'every' => 'Tous les', + 'period' => 'Période', + 'times' => 'Fois', + 'daily' => 'Quotidien', + 'weekly' => 'Hebdomadaire', + 'monthly' => 'Mensuel', + 'yearly' => 'Annuel', + 'custom' => 'Personnalisé', + 'days' => 'Jour(s)', + 'weeks' => 'Semaine(s)', + 'months' => 'Mois', + 'years' => 'Année(s)', + 'message' => 'Il s\'agit d\'un :type récurrent et le prochain :type sera automatiquement généré le :date', + +]; diff --git a/resources/lang/fr-FR/reports.php b/resources/lang/fr-FR/reports.php index a4127696e..94614d483 100644 --- a/resources/lang/fr-FR/reports.php +++ b/resources/lang/fr-FR/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Ce trimestre', 'previous_quarter' => 'Trimestre précédent', 'last_12_months' => '12 derniers mois', + 'profit_loss' => 'Gains & pertes', + 'gross_profit' => 'Bénéfices brut', + 'net_profit' => 'Bénéfices net', + 'total_expenses' => 'Total des dépenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Sommaire des revenus', 'expense' => 'Sommaire des dépenses', 'income_expense' => 'Revenus vs dépenses', + 'tax' => 'Résumé des taxes', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Avr-Jui', + '3' => 'Jui-Sep', + '4' => 'Oct-Déc', ], ]; diff --git a/resources/lang/fr-FR/settings.php b/resources/lang/fr-FR/settings.php index dec5432d9..47c2c8398 100644 --- a/resources/lang/fr-FR/settings.php +++ b/resources/lang/fr-FR/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Espace ( )', ], 'timezone' => 'Fuseau horaire', + 'percent' => [ + 'title' => 'Position du signe "pourcentage" (%)', + 'before' => 'Avant le nombre', + 'after' => 'Après le nombre', + ], ], 'invoice' => [ 'tab' => 'Facture', diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php index a484b33b0..13a415381 100644 --- a/resources/lang/he-IL/general.php +++ b/resources/lang/he-IL/general.php @@ -42,7 +42,7 @@ return [ 'dashboard' => 'לוח מחוונים', 'banking' => 'בנקאות', 'general' => 'כללי', - 'no_records' => 'לא רשומות.', + 'no_records' => 'אין רשומות.', 'date' => 'תאריך', 'amount' => 'כמות', 'enabled' => 'מאופשר', diff --git a/resources/lang/hr-HR/bills.php b/resources/lang/hr-HR/bills.php index 7a5b21837..7840be330 100644 --- a/resources/lang/hr-HR/bills.php +++ b/resources/lang/hr-HR/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Količina', 'price' => 'Cijena', 'sub_total' => 'Podzbroj', + 'discount' => 'Popust', 'tax_total' => 'Porez Ukupno', 'total' => 'Ukupno', 'item_name' => 'Naziv stavke|Nazivi stavaka', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Dospijeća plaćanja', 'amount_due' => 'Dospjeli iznos', 'paid' => 'Plaćeno', diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php index 1d6e4b926..b93d490a5 100644 --- a/resources/lang/hr-HR/general.php +++ b/resources/lang/hr-HR/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Tvrtka|Tvrtke', 'profits' => 'Dobit|Dobiti', 'taxes' => 'Porez|Porezi', + 'logos' => 'Logo|Logos', 'pictures' => 'Slika|Slike', 'types' => 'Tip|Tipovi', 'payment_methods' => 'Način plaćanja|Načini plaćanja', @@ -36,6 +37,7 @@ return [ 'updates' => 'Ažuriranje|Ažuriranja', 'numbers' => 'Broj|Brojevi', 'statuses' => 'Status|Statusi', + 'others' => 'Other|Others', 'dashboard' => 'Nadzorna ploča', 'banking' => 'Bankarstvo', @@ -93,11 +95,11 @@ return [ 'id' => 'ID', 'more_actions' => 'Više radnji', 'duplicate' => 'Dupliciraj', - 'unpaid' => 'Unpaid', - 'paid' => 'Paid', + 'unpaid' => 'Neplaćeno', + 'paid' => 'Plaćeno', 'overdue' => 'Overdue', - 'partially' => 'Partially', - 'partially_paid' => 'Partially Paid', + 'partially' => 'Djelomično', + 'partially_paid' => 'Djelomično plaćeno', 'title' => [ 'new' => 'Novo - :type', diff --git a/resources/lang/hr-HR/invoices.php b/resources/lang/hr-HR/invoices.php index de874660f..94245992b 100644 --- a/resources/lang/hr-HR/invoices.php +++ b/resources/lang/hr-HR/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Količina', 'price' => 'Cijena', 'sub_total' => 'Podzbroj', + 'discount' => 'Popust', 'tax_total' => 'Porez Ukupno', 'total' => 'Ukupno', 'item_name' => 'Ime stavke|Imena stavaka', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Dospijeća plaćanja', 'paid' => 'Plaćeno', 'histories' => 'Povijesti', diff --git a/resources/lang/hr-HR/messages.php b/resources/lang/hr-HR/messages.php index 0a0226419..e35f06bb9 100644 --- a/resources/lang/hr-HR/messages.php +++ b/resources/lang/hr-HR/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type uvezen!', ], 'error' => [ - 'payment_add' => 'Pogreška: Nije moguće dodati plaćanje! Trebali bi provjeriti dodani iznos.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Pogreška: Nije vam dozvoljeno upravljanje ovom tvrtkom!', - 'customer' => 'Pogreška: Nije moguće kreirati korisnika! :name koristite ovu e-mail adresu.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Pogreška: Nije odabrana nijedna datoteka!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Upozorenje: Nije vam dozvoljeno izbrisati :name jer postoji poveznica s :text.', diff --git a/resources/lang/hr-HR/modules.php b/resources/lang/hr-HR/modules.php index 6d4525a9c..093af68e0 100644 --- a/resources/lang/hr-HR/modules.php +++ b/resources/lang/hr-HR/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Novo', 'top_free' => 'Najbolje besplatno', 'free' => 'BESPLATNO', + 'search' => 'Search', 'install' => 'Instaliraj', 'buy_now' => 'Kupi odmah', 'token_link' => 'Kliknite ovdje da biste dobili svoj API token.', diff --git a/resources/lang/hr-HR/recurring.php b/resources/lang/hr-HR/recurring.php new file mode 100644 index 000000000..e7e80f2c4 --- /dev/null +++ b/resources/lang/hr-HR/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Dnevno', + 'weekly' => 'Tjedno', + 'monthly' => 'Mjesečno', + 'yearly' => 'Godišnje', + 'custom' => 'Custom', + 'days' => 'Dan(a)', + 'weeks' => 'Tjedan(a)', + 'months' => 'Mjesec(i)', + 'years' => 'Godine(a)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/hr-HR/reports.php b/resources/lang/hr-HR/reports.php index cc1adf3fb..f46995035 100644 --- a/resources/lang/hr-HR/reports.php +++ b/resources/lang/hr-HR/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Ovaj kvartal', 'previous_quarter' => 'Prethodni kvartal', 'last_12_months' => 'Zadnjih 12 mjeseci', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Sažetak prihoda', 'expense' => 'Sažetak troškova', 'income_expense' => 'Prihodi nasuprot troškovima', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/hr-HR/settings.php b/resources/lang/hr-HR/settings.php index 93f5ab8cd..b5feee95f 100644 --- a/resources/lang/hr-HR/settings.php +++ b/resources/lang/hr-HR/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Razmak ( )', ], 'timezone' => 'Vremenska zona', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Ispred broja', + 'after' => 'Nakon broja', + ], ], 'invoice' => [ 'tab' => 'Faktura', diff --git a/resources/lang/id-ID/bills.php b/resources/lang/id-ID/bills.php index 9bbf32668..12f52441c 100644 --- a/resources/lang/id-ID/bills.php +++ b/resources/lang/id-ID/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Jumlah', 'price' => 'Harga', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Total Pajak', 'total' => 'Total', 'item_name' => 'Nama Barang | Nama Barang', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Pembayaran Jatuh Tempo', 'amount_due' => 'Jumlah Jatuh Tempo', 'paid' => 'Dibayar', diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php index b41e6ed76..b32eca374 100644 --- a/resources/lang/id-ID/general.php +++ b/resources/lang/id-ID/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Perusahaan | Perusahaan', 'profits' => 'Keuntungan | Keuntungan', 'taxes' => 'Pajak | Pajak', + 'logos' => 'Logo|Logos', 'pictures' => 'Gambar | Gambar', 'types' => 'Jenis | Jenis', 'payment_methods' => 'Metode Pembayaran | Metode Pembayaran', @@ -36,6 +37,7 @@ return [ 'updates' => 'Pembaruan|Pembaruan', 'numbers' => 'Nomor | Nomor', 'statuses' => 'Status | Status', + 'others' => 'Other|Others', 'dashboard' => 'Dasbor', 'banking' => 'Perbankan', diff --git a/resources/lang/id-ID/invoices.php b/resources/lang/id-ID/invoices.php index 8d6a7a7c6..9a7835ca6 100644 --- a/resources/lang/id-ID/invoices.php +++ b/resources/lang/id-ID/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Kuantitas', 'price' => 'Harga', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Total Pajak', 'total' => 'Total', 'item_name' => 'Nama Item | Nama Item', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Tanggal Pembayaran', 'paid' => 'Dibayar', 'histories' => 'Sejarah', diff --git a/resources/lang/id-ID/messages.php b/resources/lang/id-ID/messages.php index 963ac95be..eb76b42e1 100644 --- a/resources/lang/id-ID/messages.php +++ b/resources/lang/id-ID/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type diimpor!', ], 'error' => [ - 'payment_add' => 'Kesalahan: Anda tidak dapat menambahkan pembayaran! Anda harus memeriksa jumlah tambah.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Kesalahan: Anda tidak diperbolehkan mengelola perusahaan ini!', - 'customer' => 'Kesalahan: Anda tidak dapat membuat pengguna! :nama pergunakan alama email ini.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Kesalahan: Tidak ada file dipilih!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'PeringatanL: Anda tidak boleh menghapus :name karena memiliki :text terkaitan.', diff --git a/resources/lang/id-ID/modules.php b/resources/lang/id-ID/modules.php index 21d5b811e..d2315d5e0 100644 --- a/resources/lang/id-ID/modules.php +++ b/resources/lang/id-ID/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Baru', 'top_free' => 'Gratis Teratas', 'free' => 'GRATIS', + 'search' => 'Search', 'install' => 'Pasang', 'buy_now' => 'Beli Sekarang', 'token_link' => 'Klik disini untuk mendapatkan API token anda.', diff --git a/resources/lang/id-ID/recurring.php b/resources/lang/id-ID/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/id-ID/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/id-ID/reports.php b/resources/lang/id-ID/reports.php index 893dd330e..d9f89a075 100644 --- a/resources/lang/id-ID/reports.php +++ b/resources/lang/id-ID/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Kuartal ini', 'previous_quarter' => 'Kuartal sebelumnya', 'last_12_months' => '12 Bulan terakhir', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Ringkasan Pendapatan', 'expense' => 'Ringkasan Pengeluaran', 'income_expense' => 'Pendapatan berbanding Pengeluaran', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/id-ID/settings.php b/resources/lang/id-ID/settings.php index b8824737a..f44a76f58 100644 --- a/resources/lang/id-ID/settings.php +++ b/resources/lang/id-ID/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Spasi ( )', ], 'timezone' => 'Zona Waktu', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Faktur', diff --git a/resources/lang/it-IT/bills.php b/resources/lang/it-IT/bills.php index d56833735..b6ffc9fd3 100644 --- a/resources/lang/it-IT/bills.php +++ b/resources/lang/it-IT/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Quantità', 'price' => 'Prezzo', 'sub_total' => 'Subtotale', + 'discount' => 'Discount', 'tax_total' => 'Totale imposta', 'total' => 'Totale', 'item_name' => 'Nome dell\'articolo|Nomi degli articoli', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Scadenza pagamento', 'amount_due' => 'Importo dovuto', 'paid' => 'Pagato', diff --git a/resources/lang/it-IT/general.php b/resources/lang/it-IT/general.php index f491ab427..1ce6f0dbe 100644 --- a/resources/lang/it-IT/general.php +++ b/resources/lang/it-IT/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Azienda|Aziende', 'profits' => 'Profitto|Profitti', 'taxes' => 'Tasso|Tassi', + 'logos' => 'Logo|Loghi', 'pictures' => 'Immagine|Immagini', 'types' => 'Tipo|Tipi', 'payment_methods' => 'Metodo di pagamento|Metodi di pagamento', @@ -36,6 +37,7 @@ return [ 'updates' => 'Aggiornamento|Aggiornamenti', 'numbers' => 'Numero|Numeri', 'statuses' => 'Stato|Stati', + 'others' => 'Other|Others', 'dashboard' => 'Cruscotto', 'banking' => 'Banca', diff --git a/resources/lang/it-IT/invoices.php b/resources/lang/it-IT/invoices.php index 80b384264..b7833d522 100644 --- a/resources/lang/it-IT/invoices.php +++ b/resources/lang/it-IT/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Quantità', 'price' => 'Prezzo', 'sub_total' => 'Subtotale', + 'discount' => 'Discount', 'tax_total' => 'Totale imposte', 'total' => 'Totale', 'item_name' => 'Nome dell\'articolo|Nomi degli articoli', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Scadenza pagamento', 'paid' => 'Pagato', 'histories' => 'Storico', diff --git a/resources/lang/it-IT/messages.php b/resources/lang/it-IT/messages.php index 7235204e8..ed4958f04 100644 --- a/resources/lang/it-IT/messages.php +++ b/resources/lang/it-IT/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importato!', ], 'error' => [ - 'payment_add' => 'Errore: Non è possibile aggiungere il pagamento! Si dovrebbe verificare di aggiungere la quantità.', + 'over_payment' => 'Errore: Pagamento non aggiunto! L\'importo supera il totale.', 'not_user_company' => 'Errore: Non hai i permessi per gestire questa azienda!', - 'customer' => 'Errore: Non è stato possibile creare l\'utente! :name usa questo indirizzo e-mail.', + 'customer' => 'Errore: Utente non creato! :name usa già questo indirizzo email.', 'no_file' => 'Errore: Nessun file selezionato!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Attenzione: Non è consentito eliminare :name perché ha :text collegato.', diff --git a/resources/lang/it-IT/modules.php b/resources/lang/it-IT/modules.php index 0a2342a64..f91e422fb 100644 --- a/resources/lang/it-IT/modules.php +++ b/resources/lang/it-IT/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nuovo', 'top_free' => 'Top gratis', 'free' => 'GRATIS', + 'search' => 'Search', 'install' => 'Installa', 'buy_now' => 'Acquista ora', 'token_link' => ' Clicca qui per ottenere il tuo API token.', diff --git a/resources/lang/it-IT/recurring.php b/resources/lang/it-IT/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/it-IT/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/it-IT/reports.php b/resources/lang/it-IT/reports.php index 971f3c0d7..01f3fbdea 100644 --- a/resources/lang/it-IT/reports.php +++ b/resources/lang/it-IT/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Trimestre Corrente', 'previous_quarter' => 'Trimestre precedente', 'last_12_months' => 'Ultimi 12 mesi', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Riepilogo di reddito', 'expense' => 'Riepilogo spese', 'income_expense' => 'Reddito vs Spese', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/it-IT/settings.php b/resources/lang/it-IT/settings.php index 22fdd4c3f..73e54129d 100644 --- a/resources/lang/it-IT/settings.php +++ b/resources/lang/it-IT/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Spazio ( )', ], 'timezone' => 'Fuso Orario', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Fattura', diff --git a/resources/lang/nb-NO/bills.php b/resources/lang/nb-NO/bills.php index ecefa84e1..c0cbdf30d 100644 --- a/resources/lang/nb-NO/bills.php +++ b/resources/lang/nb-NO/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Antall', 'price' => 'Pris', 'sub_total' => 'Sum', + 'discount' => 'Rabatt', 'tax_total' => 'Mva', 'total' => 'Totalt', 'item_name' => 'Enhetsnavn | Enhetsnavn', + 'show_discount' => ':discount% rabatt', + 'add_discount' => 'Legg til rabatt', + 'discount_desc' => 'av delsum', + 'payment_due' => 'Forfallsdato', 'amount_due' => 'Forfallsbeløp', 'paid' => 'Betalt', diff --git a/resources/lang/nb-NO/general.php b/resources/lang/nb-NO/general.php index fc48da820..98a05f00b 100644 --- a/resources/lang/nb-NO/general.php +++ b/resources/lang/nb-NO/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Foretak | Foretak', 'profits' => 'Fortjeneste | Fortjenester', 'taxes' => 'Avgift | Avgifter', + 'logos' => 'Logo|Logoer', 'pictures' => 'Bilde | Bilder', 'types' => 'Type | Typer', 'payment_methods' => 'Betalingsmåte | Betalingsmåter', @@ -36,6 +37,7 @@ return [ 'updates' => 'Oppdatering | Oppdateringer', 'numbers' => 'Nummer | Nummer', 'statuses' => 'Status | Statuser', + 'others' => 'Annen | Andre', 'dashboard' => 'Kontrollpanel', 'banking' => 'Bank', diff --git a/resources/lang/nb-NO/invoices.php b/resources/lang/nb-NO/invoices.php index 76bc27327..c428370c9 100644 --- a/resources/lang/nb-NO/invoices.php +++ b/resources/lang/nb-NO/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Antall', 'price' => 'Pris', 'sub_total' => 'Sum', + 'discount' => 'Rabatt', 'tax_total' => 'Totalt mva', 'total' => 'Totalt', 'item_name' => 'Enhetsnavn | Enhetsnavn', + 'show_discount' => ':discount% rabatt', + 'add_discount' => 'Legg til rabatt', + 'discount_desc' => 'av delsum', + 'payment_due' => 'Forfallsdato', 'paid' => 'Betalt', 'histories' => 'Historikk', diff --git a/resources/lang/nb-NO/messages.php b/resources/lang/nb-NO/messages.php index 1987d3984..afe4ab15e 100644 --- a/resources/lang/nb-NO/messages.php +++ b/resources/lang/nb-NO/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importert.', ], 'error' => [ - 'payment_add' => 'Feil: Du kan ikke legge til betaling. Du må krysse av for legg til beløp.', + 'over_payment' => 'Feil: Betaling ble ikke lagt til. Beløpet overstiger total.', 'not_user_company' => 'Feil: Du ikke kan administrere dette foretaket.', - 'customer' => 'Feil: Du kan ikke opprette bruker. :name bruker allerede denne e-postadressen.', + 'customer' => 'Feil: Bruker ble ikke opprettet. :name bruker allerede denne e-postadressen.', 'no_file' => 'Feil: Ingen fil er valgt.', + 'last_category' => 'Feil: Kan ikke slette siste :type kategori.', + 'invalid_token' => 'Feil: Angitt token er ugyldig.', ], 'warning' => [ 'deleted' => 'Advarsel: Du har ikke mulighet til å slette :name fordi kontoen har :text relatert.', diff --git a/resources/lang/nb-NO/modules.php b/resources/lang/nb-NO/modules.php index 44cf8c25d..ab962b3dd 100644 --- a/resources/lang/nb-NO/modules.php +++ b/resources/lang/nb-NO/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Ny', 'top_free' => 'Topp gratis', 'free' => 'GRATIS', + 'search' => 'Søk', 'install' => 'Installer', 'buy_now' => 'Kjøp nå', 'token_link' => 'Klikk her for å få din API-token.', diff --git a/resources/lang/nb-NO/recurring.php b/resources/lang/nb-NO/recurring.php new file mode 100644 index 000000000..fe559606c --- /dev/null +++ b/resources/lang/nb-NO/recurring.php @@ -0,0 +1,20 @@ + 'Gjentakende', + 'every' => 'Hver', + 'period' => 'Periode', + 'times' => 'Gjentakelser', + 'daily' => 'Daglig', + 'weekly' => 'Ukentlig', + 'monthly' => 'Månedlig', + 'yearly' => 'Årlig', + 'custom' => 'Egendefinert', + 'days' => 'Dag(er)', + 'weeks' => 'Uke(r)', + 'months' => 'Måned(er)', + 'years' => 'År', + 'message' => 'Dette er en gjentakende :type, neste :type genereres automatisk :date', + +]; diff --git a/resources/lang/nb-NO/reports.php b/resources/lang/nb-NO/reports.php index b68c32cec..fa6773283 100644 --- a/resources/lang/nb-NO/reports.php +++ b/resources/lang/nb-NO/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Inneværende kvartal', 'previous_quarter' => 'Foregående kvartal', 'last_12_months' => 'Siste 12 måneder', + 'profit_loss' => 'Resultat', + 'gross_profit' => 'Bruttofortjeneste', + 'net_profit' => 'Nettoresultat', + 'total_expenses' => 'Totale utgifter', + 'net' => 'NET', 'summary' => [ 'income' => 'Inntektsammendrag', 'expense' => 'Utgiftsammendrag', 'income_expense' => 'Inntekter mot utgifter', + 'tax' => 'Avgiftsammendrag', + ], + + 'quarter' => [ + '1' => 'Jan.-Mars', + '2' => 'April-Juni', + '3' => 'Juli-Sep.', + '4' => 'Okt.-Des.', ], ]; diff --git a/resources/lang/nb-NO/settings.php b/resources/lang/nb-NO/settings.php index e123dd6b0..04deec43f 100644 --- a/resources/lang/nb-NO/settings.php +++ b/resources/lang/nb-NO/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Mellomrom ( )', ], 'timezone' => 'Tidssone', + 'percent' => [ + 'title' => 'Prosentplassering (%)', + 'before' => 'Før nummer', + 'after' => 'Etter nummer', + ], ], 'invoice' => [ 'tab' => 'Faktura', diff --git a/resources/lang/nb-NO/validation.php b/resources/lang/nb-NO/validation.php index f2a3e9911..384c8f15a 100644 --- a/resources/lang/nb-NO/validation.php +++ b/resources/lang/nb-NO/validation.php @@ -20,7 +20,7 @@ return [ 'alpha' => ':attribute kan bare inneholde bokstaver.', 'alpha_dash' => ':attribute kan bare inneholde bokstaver, tall og bindestreker.', 'alpha_num' => ':attribute kan bare inneholde bokstaver og tall.', - 'array' => ':attribute må være en \'array\'.', + 'array' => ':attribute må være en kommaseparert liste.', 'before' => ':attribute må være en dato før :date.', 'before_or_equal' => ':attribute må være en dato før eller samme som :date.', 'between' => [ diff --git a/resources/lang/nl-NL/bills.php b/resources/lang/nl-NL/bills.php index d5b807199..e86efedbc 100644 --- a/resources/lang/nl-NL/bills.php +++ b/resources/lang/nl-NL/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Hoeveelheid', 'price' => 'Prijs', 'sub_total' => 'Subtotaal', + 'discount' => 'Discount', 'tax_total' => 'Totaal Btw', 'total' => 'Totaal', 'item_name' => 'Item naam', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Te betalen voor', 'amount_due' => 'Bedrag', 'paid' => 'Betaald', diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php index 2cdd6a2ad..b3bbfa4a4 100644 --- a/resources/lang/nl-NL/general.php +++ b/resources/lang/nl-NL/general.php @@ -2,40 +2,42 @@ return [ - 'items' => 'Item | Items', - 'incomes' => 'Betalingen', - 'invoices' => 'Factuur | Facturen', - 'revenues' => 'Inkomsten | Inkomsten', - 'customers' => 'Klant | Klanten', - 'expenses' => 'Kosten | Kosten', - 'bills' => 'Fakturen | Rekeningen', - 'payments' => 'Betaling | Betalingen', - 'vendors' => 'Leverancier | Leveranciers', - 'accounts' => 'Account | Rekeningen', - 'transfers' => 'Transfer | Overdrachten', - 'transactions' => 'Transactie | Transacties', - 'reports' => 'Verslag | Verslagen', - 'settings' => 'Instellen | Instellingen', - 'categories' => 'Categorie | Categorieën', - 'currencies' => 'Valuta | Valuta \'s', - 'tax_rates' => 'Btw-tarief | Belastingtarieven', - 'users' => 'Gebruiker | Gebruikers', - 'roles' => 'Rol | Rollen', - 'permissions' => 'Toestemming | Machtigingen', - 'modules' => 'App | Apps', - 'companies' => 'Bedrijf | Bedrijven', - 'profits' => 'Winst | Winst', - 'taxes' => 'Belasting | Btw', - 'pictures' => 'Foto | Foto \'s', - 'types' => 'Type | Types', - 'payment_methods' => 'Betalingsmethode | Betalingsmethoden', - 'compares' => 'Inkomen vs kosten | Inkomen vs kosten', - 'notes' => 'Opmerking | Notities', - 'totals' => 'Totaal | Totalen', - 'languages' => 'Taalpakketten', - 'updates' => 'Update | Updates', - 'numbers' => 'Nummer | Nummers', - 'statuses' => 'Status | Statussen', + 'items' => 'Item|Items', + 'incomes' => 'Betalingen|Betalingen', + 'invoices' => 'Factuur|Facturen', + 'revenues' => 'Inkomsten|Inkomsten', + 'customers' => 'Klant|Klanten', + 'expenses' => 'Kosten|Kosten', + 'bills' => 'Fakturen|Rekeningen', + 'payments' => 'Betaling|Betalingen', + 'vendors' => 'Leverancier|Leveranciers', + 'accounts' => 'Account|Rekeningen', + 'transfers' => 'Transfer|Overdrachten', + 'transactions' => 'Transactie|Transacties', + 'reports' => 'Verslag|Verslagen', + 'settings' => 'Instellen|Instellingen', + 'categories' => 'Categorie|Categorieën', + 'currencies' => 'Valuta|Valuta \'s', + 'tax_rates' => 'Btw-tarief|Belastingtarieven', + 'users' => 'Gebruiker|Gebruikers', + 'roles' => 'Rol|Rollen', + 'permissions' => 'Toestemming|Machtigingen', + 'modules' => 'App|Apps', + 'companies' => 'Bedrijf|Bedrijven', + 'profits' => 'Winst|Winst', + 'taxes' => 'Belasting|Btw', + 'logos' => 'Logo|Logos', + 'pictures' => 'Foto|Foto \'s', + 'types' => 'Type|Types', + 'payment_methods' => 'Betalingsmethode|Betalingsmethoden', + 'compares' => 'Inkomen vs kosten|Inkomen vs kosten', + 'notes' => 'Opmerking|Notities', + 'totals' => 'Totaal|Totalen', + 'languages' => 'Taalpakketten|Taalpakketten', + 'updates' => 'Update|Updates', + 'numbers' => 'Nummer|Nummers', + 'statuses' => 'Status|Statussen', + 'others' => 'Other|Others', 'dashboard' => 'Dashboard', 'banking' => 'Banken', diff --git a/resources/lang/nl-NL/invoices.php b/resources/lang/nl-NL/invoices.php index d91b5eefa..e757819b0 100644 --- a/resources/lang/nl-NL/invoices.php +++ b/resources/lang/nl-NL/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Hoeveelheid', 'price' => 'Prijs', 'sub_total' => 'Subtotaal', + 'discount' => 'Discount', 'tax_total' => 'Totaal Btw', 'total' => 'Totaal', 'item_name' => 'Item naam', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Te betalen voor', 'paid' => 'Betaald', 'histories' => 'Geschiedenis', diff --git a/resources/lang/nl-NL/messages.php b/resources/lang/nl-NL/messages.php index 1b488b1d3..1a7292a3b 100644 --- a/resources/lang/nl-NL/messages.php +++ b/resources/lang/nl-NL/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type imported!', ], 'error' => [ - 'payment_add' => 'Error: You can not add payment! You should check add amount.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Fout: U bent niet toegestaan voor het beheer van dit bedrijf!', - 'customer' => 'Fout: U kunt geen gebruiker aanmaken! : dit e-mailadres gebruikt in de naam.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: No file selected!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Waarschuwing: U bent niet toegestaan te verwijderen : naam omdat er: tekst gerelateerde.', diff --git a/resources/lang/nl-NL/modules.php b/resources/lang/nl-NL/modules.php index f9ce2df9d..7d1b0c175 100644 --- a/resources/lang/nl-NL/modules.php +++ b/resources/lang/nl-NL/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nieuw', 'top_free' => 'Top gratis', 'free' => 'GRATIS', + 'search' => 'Search', 'install' => 'Installeren', 'buy_now' => 'Koop Nu', 'token_link' => ' Klik hier om uw API token.', diff --git a/resources/lang/nl-NL/recurring.php b/resources/lang/nl-NL/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/nl-NL/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/nl-NL/reports.php b/resources/lang/nl-NL/reports.php index b5e4be090..4b625c4b7 100644 --- a/resources/lang/nl-NL/reports.php +++ b/resources/lang/nl-NL/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'This Quarter', 'previous_quarter' => 'Previous Quarter', 'last_12_months' => 'Last 12 Months', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Inkomsten Samenvatting', 'expense' => 'Kosten overzicht', 'income_expense' => 'Inkomen vs kosten', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/nl-NL/settings.php b/resources/lang/nl-NL/settings.php index a4190efd3..2f37dc440 100644 --- a/resources/lang/nl-NL/settings.php +++ b/resources/lang/nl-NL/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Ruimte()', ], 'timezone' => 'Tijdzone', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Factuur', diff --git a/resources/lang/pt-BR/bills.php b/resources/lang/pt-BR/bills.php index 6b220dc6b..070462c6e 100644 --- a/resources/lang/pt-BR/bills.php +++ b/resources/lang/pt-BR/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Quantidade', 'price' => 'Preço', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Taxa', 'total' => 'Total', 'item_name' => 'Nome(s) do(s) Item(s)', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Valor Devido', 'amount_due' => 'Total Devido', 'paid' => 'Pago', diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php index 622f0d994..50a2dac0a 100644 --- a/resources/lang/pt-BR/general.php +++ b/resources/lang/pt-BR/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Empresa|Empresas', 'profits' => 'Lucro|Lucros', 'taxes' => 'Imposto|Impostos', + 'logos' => 'Logo|Logos', 'pictures' => 'Imagen|Imagens', 'types' => 'Tipo|Tipos', 'payment_methods' => 'Método de pagamento|Método de pagamentos', @@ -36,6 +37,7 @@ return [ 'updates' => 'Atualização|Atualizações', 'numbers' => 'Número|Números', 'statuses' => 'Status|Statuses', + 'others' => 'Other|Others', 'dashboard' => 'Painel', 'banking' => 'Banco', diff --git a/resources/lang/pt-BR/invoices.php b/resources/lang/pt-BR/invoices.php index 9042d8440..7927c3bbe 100644 --- a/resources/lang/pt-BR/invoices.php +++ b/resources/lang/pt-BR/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Quantidade', 'price' => 'Preço', 'sub_total' => 'Subtotal', + 'discount' => 'Discount', 'tax_total' => 'Valor da taxa', 'total' => 'Total', 'item_name' => 'Item|Itens', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Pagamento vencido', 'paid' => 'Pago', 'histories' => 'Histórico', diff --git a/resources/lang/pt-BR/messages.php b/resources/lang/pt-BR/messages.php index 6a92a546c..877f00875 100644 --- a/resources/lang/pt-BR/messages.php +++ b/resources/lang/pt-BR/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type imported!', ], 'error' => [ - 'payment_add' => 'Error: You can not add payment! You should check add amount.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Erro: você não tem permissão para gerenciar esta empresa!', - 'customer' => 'Error: You can not created user! :name use this email address.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: No file selected!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Warning: You are not allowed to delete :name because it has :text related.', diff --git a/resources/lang/pt-BR/modules.php b/resources/lang/pt-BR/modules.php index 62e61ba7d..bb40b9a7d 100644 --- a/resources/lang/pt-BR/modules.php +++ b/resources/lang/pt-BR/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Novo', 'top_free' => 'Melhores Grátis', 'free' => 'Gratis', + 'search' => 'Search', 'install' => 'Instalar', 'buy_now' => 'Comprar Agora', 'token_link' => ' Clique aqui para obter o token de sua API.', diff --git a/resources/lang/pt-BR/recurring.php b/resources/lang/pt-BR/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/pt-BR/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/pt-BR/reports.php b/resources/lang/pt-BR/reports.php index a356d0c2d..1b24923ee 100644 --- a/resources/lang/pt-BR/reports.php +++ b/resources/lang/pt-BR/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'This Quarter', 'previous_quarter' => 'Previous Quarter', 'last_12_months' => 'Last 12 Months', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Resumo de Venda', 'expense' => 'Resumo de Despesas', 'income_expense' => 'Receita vs Despesa', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/pt-BR/settings.php b/resources/lang/pt-BR/settings.php index 53da679a8..2bcfd8517 100644 --- a/resources/lang/pt-BR/settings.php +++ b/resources/lang/pt-BR/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Espaço ( )', ], 'timezone' => 'Fuso Horário', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Faturas', diff --git a/resources/lang/ru-RU/bills.php b/resources/lang/ru-RU/bills.php index 41fd5a461..63c6c15f6 100644 --- a/resources/lang/ru-RU/bills.php +++ b/resources/lang/ru-RU/bills.php @@ -12,30 +12,35 @@ return [ 'quantity' => 'Количество', 'price' => 'Цена', 'sub_total' => 'Итого', + 'discount' => 'Discount', 'tax_total' => 'Итого с налогом', 'total' => 'Всего', 'item_name' => 'Имя пункта | Имена пунктов', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Оплатить до', 'amount_due' => 'Сумма', 'paid' => 'Оплачено', 'histories' => 'Истории', 'payments' => 'Платежи', 'add_payment' => 'Добавить платёж', - 'mark_received' => 'Mark Received', + 'mark_received' => 'Отметить как получено', 'download_pdf' => 'Скачать PDF', 'send_mail' => 'Отправить E-mail', 'status' => [ - 'draft' => 'Draft', - 'received' => 'Received', + 'draft' => 'Черновик', + 'received' => 'Получено', 'partial' => 'Частично', 'paid' => 'Оплачено', ], 'messages' => [ - 'received' => 'Bill marked as received successfully!', + 'received' => 'Счёт помечен как успешно получен!', ], ]; diff --git a/resources/lang/ru-RU/currencies.php b/resources/lang/ru-RU/currencies.php index 6e28d9bb7..ea40b9b75 100644 --- a/resources/lang/ru-RU/currencies.php +++ b/resources/lang/ru-RU/currencies.php @@ -5,14 +5,14 @@ return [ 'code' => 'Код', 'rate' => 'Оценка', 'default' => 'Валюта по-умолчанию', - 'decimal_mark' => 'Decimal Mark', - 'thousands_separator' => 'Thousands Separator', - 'precision' => 'Precision', + 'decimal_mark' => 'Десятичный знак', + 'thousands_separator' => 'Разделитель тысяч', + 'precision' => 'Точность', 'symbol' => [ - 'symbol' => 'Symbol', - 'position' => 'Symbol Position', - 'before' => 'Before Amount', - 'after' => 'After Amount', + 'symbol' => 'Символ', + 'position' => 'Позиция символа', + 'before' => 'До итоговой суммы', + 'after' => 'После итоговой суммы', ] ]; diff --git a/resources/lang/ru-RU/customers.php b/resources/lang/ru-RU/customers.php index cad4bc8b9..993d8819a 100644 --- a/resources/lang/ru-RU/customers.php +++ b/resources/lang/ru-RU/customers.php @@ -2,10 +2,10 @@ return [ - 'allow_login' => 'Allow Login?', - 'user_created' => 'User Created', + 'allow_login' => 'Разрешить вход?', + 'user_created' => 'Пользователь создан', 'error' => [ - 'email' => 'The email has already been taken.' + 'email' => 'Этот e-mail уже занят.' ] ]; diff --git a/resources/lang/ru-RU/general.php b/resources/lang/ru-RU/general.php index 926c172f6..e7d59a25b 100644 --- a/resources/lang/ru-RU/general.php +++ b/resources/lang/ru-RU/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Компания | Компании', 'profits' => 'Прибыль | Прибыль', 'taxes' => 'Налог | Налоги', + 'logos' => 'Логотип | Логотипы', 'pictures' => 'Фотография | Фотографии', 'types' => 'Тип | Типы', 'payment_methods' => 'Способ оплаты | Способы оплаты', @@ -36,6 +37,7 @@ return [ 'updates' => 'Обновление | Обновления', 'numbers' => 'Номер | Номера', 'statuses' => 'Статус | Статусы', + 'others' => 'Other|Others', 'dashboard' => 'Панель управления', 'banking' => 'Банки', @@ -50,7 +52,7 @@ return [ 'na' => 'Н/Д', 'daily' => 'Ежедневно', 'monthly' => 'Ежемесячно', - 'quarterly' => 'Quarterly', + 'quarterly' => 'Ежеквартально', 'yearly' => 'Ежегодно', 'add' => 'Добавить', 'add_new' => 'Добавить новый', @@ -75,7 +77,7 @@ return [ 'reference' => 'Ссылка', 'attachment' => 'Вложение', 'change' => 'Изменить', - 'switch' => 'Switch', + 'switch' => 'Переключить', 'color' => 'Цвет', 'save' => 'Сохранить', 'cancel' => 'Отмена', @@ -91,13 +93,13 @@ return [ 'upcoming' => 'Предстоящие', 'created' => 'Создан', 'id' => 'ID', - 'more_actions' => 'More Actions', - 'duplicate' => 'Duplicate', - 'unpaid' => 'Unpaid', - 'paid' => 'Paid', - 'overdue' => 'Overdue', - 'partially' => 'Partially', - 'partially_paid' => 'Partially Paid', + 'more_actions' => 'Дополнительные действия', + 'duplicate' => 'Дублировать', + 'unpaid' => 'Невыплаченные', + 'paid' => 'Выплаченные', + 'overdue' => 'Просроченные', + 'partially' => 'Частично', + 'partially_paid' => 'Частично выплаченные', 'title' => [ 'new' => 'Создать :type', diff --git a/resources/lang/ru-RU/header.php b/resources/lang/ru-RU/header.php index d2a7f66f7..ab8df5bb9 100644 --- a/resources/lang/ru-RU/header.php +++ b/resources/lang/ru-RU/header.php @@ -8,7 +8,7 @@ return [ 'counter' => '{0} Уведомления отсутствуют|{1} У Вас :count уведомление|[2,3,4] уведомления|[5,*]У Вас :count уведомлений', 'overdue_invoices' => '{1} :count просроченная квитанция|[2,3,4] :count просроченные квитанции|[5,*] :count просроченных квитанций', 'upcoming_bills' => '{1} :count входящий счёт|[2,3,4] :count входящих счёта|[5,*] :count входящих счетов', - 'items_stock' => '{1} :count item out of stock|[2,*] :count items out of stock', + 'items_stock' => '{1} : количество распроданного товара | [2, *]: количество распроданных товаров', 'view_all' => 'Просмотреть все' ], diff --git a/resources/lang/ru-RU/import.php b/resources/lang/ru-RU/import.php index fe5acbbc0..ec39da908 100644 --- a/resources/lang/ru-RU/import.php +++ b/resources/lang/ru-RU/import.php @@ -2,8 +2,8 @@ return [ - 'import' => 'Import', - 'title' => 'Import :type', - 'message' => 'Allowed file types: CSV, XLS. Please, download the sample file.', + 'import' => 'Импортировать', + 'title' => 'Импорт :type', + 'message' => 'Допустимые типы файлов: CSV, XLS. Пожалуйста, скачайте файл примера.', ]; diff --git a/resources/lang/ru-RU/invoices.php b/resources/lang/ru-RU/invoices.php index 1c1965444..53951a871 100644 --- a/resources/lang/ru-RU/invoices.php +++ b/resources/lang/ru-RU/invoices.php @@ -12,18 +12,23 @@ return [ 'quantity' => 'Количество', 'price' => 'Цена', 'sub_total' => 'Итого', + 'discount' => 'Discount', 'tax_total' => 'Итого с налогом', 'total' => 'Всего', 'item_name' => 'Имя пункта | Имена пунктов', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Оплатить до', 'paid' => 'Оплачено', 'histories' => 'Истории', 'payments' => 'Платежи', 'add_payment' => 'Добавить платёж', - 'mark_paid' => 'Mark Paid', - 'mark_sent' => 'Mark Sent', + 'mark_paid' => 'Пометить как оплачено', + 'mark_sent' => 'Пометить как отправлено', 'download_pdf' => 'Скачать PDF', 'send_mail' => 'Отправить E-mail', @@ -37,14 +42,14 @@ return [ ], 'messages' => [ - 'email_sent' => 'Invoice email has been sent successfully!', - 'marked_sent' => 'Invoice marked as sent successfully!', - 'email_required' => 'No email address for this customer!', + 'email_sent' => 'Счет-фактура успешно отправлена на e-mail!', + 'marked_sent' => 'Счет-фактура помечена как успешно отправлена!', + 'email_required' => 'Отсутствует e-mail адрес для этого клиента!', ], 'notification' => [ - 'message' => 'You are receiving this email because you have an upcoming :amount invoice to :customer customer.', - 'button' => 'Pay Now', + 'message' => 'Вы получили это письмо потому, что у Вас имеются входящие :amount счета на :customer клиента.', + 'button' => 'Оплатить сейчас', ], ]; diff --git a/resources/lang/ru-RU/items.php b/resources/lang/ru-RU/items.php index 7becf60f4..cb17b7737 100644 --- a/resources/lang/ru-RU/items.php +++ b/resources/lang/ru-RU/items.php @@ -8,8 +8,8 @@ return [ 'sku' => 'SKU', 'notification' => [ - 'message' => 'You are receiving this email because the :name is running out of stock.', - 'button' => 'View Now', + 'message' => 'Вы получили это письмо, потому что :name заканчивается.', + 'button' => 'Просмотреть сейчас', ], ]; diff --git a/resources/lang/ru-RU/messages.php b/resources/lang/ru-RU/messages.php index 00c73d055..13504348a 100644 --- a/resources/lang/ru-RU/messages.php +++ b/resources/lang/ru-RU/messages.php @@ -6,14 +6,16 @@ return [ 'added' => ':type добавлено!', 'updated' => ':type обновлено!', 'deleted' => ':type удалено!', - 'duplicated' => ':type duplicated!', - 'imported' => ':type imported!', + 'duplicated' => ':type продублировано!', + 'imported' => ':type импортировано!', ], 'error' => [ - 'payment_add' => 'Error: You can not add payment! You should check add amount.', + 'over_payment' => 'Ошибка: Оплата не добавлена! Сумма проходит, как общая.', 'not_user_company' => 'Ошибка: Вы не можете управлять этой компанией!', - 'customer' => 'Error: You can not created user! :name use this email address.', - 'no_file' => 'Error: No file selected!', + 'customer' => 'Ошибка: Пользователь не создан! :name уже использует этот адрес электронной почты.', + 'no_file' => 'Ошибка: Файл не выбран!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Предупреждение: Вы не можете удалить :name потому что имеется связь с :text.', diff --git a/resources/lang/ru-RU/modules.php b/resources/lang/ru-RU/modules.php index 46eede39d..dada78343 100644 --- a/resources/lang/ru-RU/modules.php +++ b/resources/lang/ru-RU/modules.php @@ -8,35 +8,36 @@ return [ 'new' => 'Новый', 'top_free' => 'Топ бесплатных', 'free' => 'БЕСПЛАТНО', + 'search' => 'Search', 'install' => 'Установить', 'buy_now' => 'Купить сейчас', 'token_link' => 'Нажмите здесь чтобы получить Ваш API ключ.', - 'no_apps' => 'There are no apps in this category, yet.', - 'developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', + 'no_apps' => 'В этой категории еще нет приложений.', + 'developer' => 'Вы разработчик? Здесь вы можете узнать, как создать приложение и начать продавать уже сегодня!', - 'about' => 'About', + 'about' => 'О нас', - 'added' => 'Added', - 'updated' => 'Updated', - 'compatibility' => 'Compatibility', + 'added' => 'Добавлено', + 'updated' => 'Обновлено', + 'compatibility' => 'Совместимость', - 'installed' => ':module installed', - 'uninstalled' => ':module uninstalled', + 'installed' => ':module установлен', + 'uninstalled' => ':module удалён', //'updated' => ':module updated', - 'enabled' => ':module enabled', - 'disabled' => ':module disabled', + 'enabled' => ':module включен', + 'disabled' => ':module отключен', 'tab' => [ - 'installation' => 'Installation', - 'faq' => 'FAQ', - 'changelog' => 'Changelog', + 'installation' => 'Установка', + 'faq' => 'ЧаВо', + 'changelog' => 'История изменений', ], 'installation' => [ - 'header' => 'App Installation', + 'header' => 'Установка приложения', 'download' => 'Скачивание :module модуля.', 'unzip' => 'Распаковка :module модуля.', - 'install' => 'Installing :module files.', + 'install' => 'Установка :module модуля.', ], 'button' => [ diff --git a/resources/lang/ru-RU/recurring.php b/resources/lang/ru-RU/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/ru-RU/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/ru-RU/reports.php b/resources/lang/ru-RU/reports.php index bd9674520..b754d054b 100644 --- a/resources/lang/ru-RU/reports.php +++ b/resources/lang/ru-RU/reports.php @@ -2,16 +2,29 @@ return [ - 'this_year' => 'This Year', - 'previous_year' => 'Previous Year', - 'this_quarter' => 'This Quarter', - 'previous_quarter' => 'Previous Quarter', - 'last_12_months' => 'Last 12 Months', + 'this_year' => 'Этот год', + 'previous_year' => 'Предыдущий год', + 'this_quarter' => 'Этот квартал', + 'previous_quarter' => 'Предыдущий квартал', + 'last_12_months' => 'Последние 12 месяцев', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Сводка поступлений', 'expense' => 'Сводка расходов', 'income_expense' => 'Поступления vs Расходы', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/ru-RU/settings.php b/resources/lang/ru-RU/settings.php index 3efbf0be5..80e200a07 100644 --- a/resources/lang/ru-RU/settings.php +++ b/resources/lang/ru-RU/settings.php @@ -21,13 +21,18 @@ return [ 'space' => 'Пробел ( )', ], 'timezone' => 'Часовой пояс', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Квитанция', - 'prefix' => 'Number Prefix', - 'digit' => 'Number Digit', - 'next' => 'Next Number', - 'logo' => 'Logo', + 'prefix' => 'Номерной префикс', + 'digit' => 'Цифрой префикс', + 'next' => 'Следующий номер', + 'logo' => 'Логотип', ], 'default' => [ 'tab' => 'Умолчания', diff --git a/resources/lang/sq-AL/bills.php b/resources/lang/sq-AL/bills.php index c9033883a..653604efc 100644 --- a/resources/lang/sq-AL/bills.php +++ b/resources/lang/sq-AL/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Sasia', 'price' => 'Çmimi', 'sub_total' => 'Nëntotali', + 'discount' => 'Discount', 'tax_total' => 'Tatimi Gjithsej', 'total' => 'Totali', 'item_name' => 'Emri i Artikullit | Emrat e Artikullit', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Pagesa e Duhur', 'amount_due' => 'Shuma e Duhur', 'paid' => 'I paguar', diff --git a/resources/lang/sq-AL/general.php b/resources/lang/sq-AL/general.php index 43b034470..71d8c6937 100644 --- a/resources/lang/sq-AL/general.php +++ b/resources/lang/sq-AL/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Kompania | Kompanitë', 'profits' => 'Fitimi | Fitimet', 'taxes' => 'Tatim | Tatimet', + 'logos' => 'Logo | Logot', 'pictures' => 'Foto | Fotografitë', 'types' => 'Lloji | Llojet', 'payment_methods' => 'Metoda e Pagesës | Metodat e Pagesës', @@ -36,6 +37,7 @@ return [ 'updates' => 'Përditësimi | Përditësimet', 'numbers' => 'Numri | Numrat', 'statuses' => 'Statusi | Statuset', + 'others' => 'Other|Others', 'dashboard' => 'Paneli Kryesor', 'banking' => 'Veprime Bankare', diff --git a/resources/lang/sq-AL/invoices.php b/resources/lang/sq-AL/invoices.php index ce1df9fb0..fbb85d940 100644 --- a/resources/lang/sq-AL/invoices.php +++ b/resources/lang/sq-AL/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Sasia', 'price' => 'Çmimi', 'sub_total' => 'Nëntotali', + 'discount' => 'Discount', 'tax_total' => 'Tatimi Gjithsej', 'total' => 'Totali', 'item_name' => 'Emri i Artikullit | Emrat e Artikullit', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Pagesa e Duhur', 'paid' => 'I paguar', 'histories' => 'Historitë', diff --git a/resources/lang/sq-AL/messages.php b/resources/lang/sq-AL/messages.php index 221d565fc..88788cb57 100644 --- a/resources/lang/sq-AL/messages.php +++ b/resources/lang/sq-AL/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type importuar!', ], 'error' => [ - 'payment_add' => 'Gabim: Ju nuk mund të shtoni pagesa! Ju duhet të kontrolloni shtimin e shumës.', + 'over_payment' => 'Gabim: Pagesa nuk u shtua! Shuma kalon totalin.', 'not_user_company' => 'Gabim: Nuk ju lejohet të menaxhoni këtë kompani!', - 'customer' => 'Gabim: Ju nuk mund të krijoni përdorues! :name përdor këtë adresë e-maili.', + 'customer' => 'Gabim: Përdoruesi nuk u krijua! :name tashmë përdor këtë adresë e-maili.', 'no_file' => 'Gabim: Asnjë skedar i përzgjedhur!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Njoftim: :name nuk mund të fshihet sepse ka :text të lidhur.', diff --git a/resources/lang/sq-AL/modules.php b/resources/lang/sq-AL/modules.php index fe8555e1f..0620e9abe 100644 --- a/resources/lang/sq-AL/modules.php +++ b/resources/lang/sq-AL/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'I ri', 'top_free' => 'Më të mirët Falas', 'free' => 'FALAS', + 'search' => 'Search', 'install' => 'Instalo', 'buy_now' => 'Bli Tani', 'token_link' => 'Kliko këtupër të marrë shenjën tuaj API.', diff --git a/resources/lang/sq-AL/recurring.php b/resources/lang/sq-AL/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/sq-AL/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/sq-AL/reports.php b/resources/lang/sq-AL/reports.php index fe9b6e384..83291a035 100644 --- a/resources/lang/sq-AL/reports.php +++ b/resources/lang/sq-AL/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Këtë Tremujor', 'previous_quarter' => 'Tremujor i Kaluar', 'last_12_months' => '12 Muajt e Fundit', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Përmbledhje e të Ardhurave', 'expense' => 'Përmbledhje e Shpenzimeve', 'income_expense' => 'Të Ardhurat vs Shpenzimet', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/sq-AL/settings.php b/resources/lang/sq-AL/settings.php index 661f00eb5..169b8b81a 100644 --- a/resources/lang/sq-AL/settings.php +++ b/resources/lang/sq-AL/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Hapësirë ( )', ], 'timezone' => 'Zona Kohore', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Faturë', diff --git a/resources/lang/sv-SE/bills.php b/resources/lang/sv-SE/bills.php index a7894b1ed..b9d1927ea 100644 --- a/resources/lang/sv-SE/bills.php +++ b/resources/lang/sv-SE/bills.php @@ -3,7 +3,7 @@ return [ 'bill_number' => 'Fakturanummer', - 'bill_date' => 'Leverantörsfakturadatum', + 'bill_date' => 'Fakturadatum', 'total_price' => 'Summa pris', 'due_date' => 'Förfallodatum', 'order_number' => 'Ordernummer', @@ -12,11 +12,16 @@ return [ 'quantity' => 'Antal', 'price' => 'Pris', 'sub_total' => 'Delsumma', + 'discount' => 'Rabatt', 'tax_total' => 'Summa moms', 'total' => 'Summa', 'item_name' => 'Artikelnamn | Artikelnamn', + 'show_discount' => ':discount % Rabatt', + 'add_discount' => 'Lägg till rabatt', + 'discount_desc' => 'av delsumman', + 'payment_due' => 'Betalning', 'amount_due' => 'Fordran', 'paid' => 'Betald', diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php index dcf0260da..4b420e3a0 100644 --- a/resources/lang/sv-SE/general.php +++ b/resources/lang/sv-SE/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Företag | Företag', 'profits' => 'Vinst | Vinster', 'taxes' => 'Moms | Moms', + 'logos' => 'Logotyp | Logotyper', 'pictures' => 'Bild | Bilder', 'types' => 'Typ | Typer', 'payment_methods' => 'Betalningsmetod | Betalningsmetoder', @@ -36,6 +37,7 @@ return [ 'updates' => 'Uppdatering | Uppdateringar', 'numbers' => 'Siffra | Siffror', 'statuses' => 'Status | Statusar', + 'others' => 'Andra | Andra', 'dashboard' => 'Översikt', 'banking' => 'Banktjänster', diff --git a/resources/lang/sv-SE/invoices.php b/resources/lang/sv-SE/invoices.php index 246333ab2..5703aed08 100644 --- a/resources/lang/sv-SE/invoices.php +++ b/resources/lang/sv-SE/invoices.php @@ -4,7 +4,7 @@ return [ 'invoice_number' => 'Fakturanummer', 'invoice_date' => 'Fakturadatum', - 'total_price' => 'Totalbelopp', + 'total_price' => 'Summa pris', 'due_date' => 'Förfallodatum', 'order_number' => 'Ordernummer', 'bill_to' => 'Fakturera till', @@ -12,14 +12,19 @@ return [ 'quantity' => 'Antal', 'price' => 'Pris', 'sub_total' => 'Delsumma', + 'discount' => 'Rabatt', 'tax_total' => 'Summa Skatt', - 'total' => 'Summa', + 'total' => 'Totalt', 'item_name' => 'Artikelnamn | Artikelnamn', + 'show_discount' => ':discount % Rabatt', + 'add_discount' => 'Lägg till rabatt', + 'discount_desc' => 'av delsumman', + 'payment_due' => 'Betalning', 'paid' => 'Betald', - 'histories' => 'Hävda', + 'histories' => 'Historia', 'payments' => 'Betalningar', 'add_payment' => 'Lägg till betalning', 'mark_paid' => 'Markera som betald', diff --git a/resources/lang/sv-SE/messages.php b/resources/lang/sv-SE/messages.php index 6f0900323..390212eb0 100644 --- a/resources/lang/sv-SE/messages.php +++ b/resources/lang/sv-SE/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type uppdaterad!', ], 'error' => [ - 'payment_add' => 'Fel: Du kan inte lägga till betalning! Du bör kontrollera lägg till beloppet.', + 'over_payment' => 'Fel: Betalning inte tillagd! Belopp överskrider totalen.', 'not_user_company' => 'Fel: Du får inte hantera detta företag!', - 'customer' => 'Fel: Du kan inte skapat användare! :name använder denna e-postadress.', + 'customer' => 'Fel: Användaren inte skapad! :name använder redan denna e-postadress.', 'no_file' => 'Fel: Ingen fil har valts!', + 'last_category' => 'Fel: Kan inte ta bort sista :type kategorin!', + 'invalid_token' => 'Fel: Den symbolen som angetts är ogiltigt!', ], 'warning' => [ 'deleted' => 'Varning: Du får inte ta bort :name eftersom den har :text relaterade.', diff --git a/resources/lang/sv-SE/modules.php b/resources/lang/sv-SE/modules.php index e8ceb5f0c..7af0cf352 100644 --- a/resources/lang/sv-SE/modules.php +++ b/resources/lang/sv-SE/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Nytt', 'top_free' => 'Bästa gratis', 'free' => 'Fri', + 'search' => 'Sök', 'install' => 'Installera', 'buy_now' => 'Köp nu', 'token_link' => 'Klicka här att få din API-token.', diff --git a/resources/lang/sv-SE/recurring.php b/resources/lang/sv-SE/recurring.php new file mode 100644 index 000000000..0dbd6e00a --- /dev/null +++ b/resources/lang/sv-SE/recurring.php @@ -0,0 +1,20 @@ + 'Återkommande', + 'every' => 'Varje', + 'period' => 'Period', + 'times' => 'Gånger', + 'daily' => 'Dagligen', + 'weekly' => 'Veckovis', + 'monthly' => 'Månadsvis', + 'yearly' => 'Årligen', + 'custom' => 'Anpassa', + 'days' => 'Dag(ar)', + 'weeks' => 'Vecka(or)', + 'months' => 'Månad(er)', + 'years' => 'År', + 'message' => 'Detta är ett återkommande :type och nästa :type genereras automatiskt den :date', + +]; diff --git a/resources/lang/sv-SE/reports.php b/resources/lang/sv-SE/reports.php index 2baae70ce..475bd2fa5 100644 --- a/resources/lang/sv-SE/reports.php +++ b/resources/lang/sv-SE/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Detta kvartal', 'previous_quarter' => 'Föregående kvartal', 'last_12_months' => 'Senaste 12 månaderna', + 'profit_loss' => 'Vinst & förlust', + 'gross_profit' => 'Bruttovinst', + 'net_profit' => 'Nettoförtjänst', + 'total_expenses' => 'Summa kostnader', + 'net' => 'Netto', 'summary' => [ - 'income' => 'Inkomst Sammanfattning', - 'expense' => 'Utgiftsrapports Sammanfattning', + 'income' => 'Inkomstrapport', + 'expense' => 'Utgiftsrapports', 'income_expense' => 'Inkomst mot Utgifter', + 'tax' => 'Skatt Sammanfattning', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Okt-Dec', ], ]; diff --git a/resources/lang/sv-SE/settings.php b/resources/lang/sv-SE/settings.php index 6dffa169d..d0bce18b9 100644 --- a/resources/lang/sv-SE/settings.php +++ b/resources/lang/sv-SE/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Mellanslag ( )', ], 'timezone' => 'Tidszon', + 'percent' => [ + 'title' => 'Procent (%) Ställning', + 'before' => 'Innan nummret', + 'after' => 'Efter nummret', + ], ], 'invoice' => [ 'tab' => 'Faktura', diff --git a/resources/lang/tr-TR/bills.php b/resources/lang/tr-TR/bills.php index dc5cd3429..07b00465b 100644 --- a/resources/lang/tr-TR/bills.php +++ b/resources/lang/tr-TR/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Adet', 'price' => 'Fiyat', 'sub_total' => 'Ara Toplam', + 'discount' => 'İndirim', 'tax_total' => 'Vergi Toplamı', 'total' => 'Toplam', 'item_name' => 'Öğe Adı | Öğe Adları', + 'show_discount' => '%:discount İndirim', + 'add_discount' => 'İndirim Ekle', + 'discount_desc' => 'ara toplam üzerinden', + 'payment_due' => 'Son Ödeme Tarihi', 'amount_due' => 'Ödenecek Miktar', 'paid' => 'Ödenmiş', diff --git a/resources/lang/tr-TR/general.php b/resources/lang/tr-TR/general.php index 03e4514e5..a74bfa3cc 100644 --- a/resources/lang/tr-TR/general.php +++ b/resources/lang/tr-TR/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Şirket|Şirketler', 'profits' => 'Kar|Kar', 'taxes' => 'Vergi Oranı|Vergi Oranları', + 'logos' => 'Logo|Logolar', 'pictures' => 'Resim|Resimler', 'types' => 'Tip|Tipler', 'payment_methods' => 'Ödeme Yöntemi|Ödeme Yöntemleri', @@ -36,6 +37,7 @@ return [ 'updates' => 'Güncelleme|Güncellemeler', 'numbers' => 'Sayı|Sayılar', 'statuses' => 'Durum|Durumlar', + 'others' => 'Diğer|Diğerleri', 'dashboard' => 'Kontrol Paneli', 'banking' => 'Banka', diff --git a/resources/lang/tr-TR/invoices.php b/resources/lang/tr-TR/invoices.php index eed745565..73d98548c 100644 --- a/resources/lang/tr-TR/invoices.php +++ b/resources/lang/tr-TR/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Adet', 'price' => 'Fiyat', 'sub_total' => 'Ara Toplam', + 'discount' => 'İndirim', 'tax_total' => 'Vergi Toplamı', 'total' => 'Toplam', 'item_name' => 'Öğe Adı | Öğe Adları', + 'show_discount' => '%:discount İndirim', + 'add_discount' => 'İndirim Ekle', + 'discount_desc' => 'ara toplam üzerinden', + 'payment_due' => 'Son Ödeme Tarihi', 'paid' => 'Ödenmiş', 'histories' => 'Geçmiş', diff --git a/resources/lang/tr-TR/messages.php b/resources/lang/tr-TR/messages.php index 5161ddbb3..d4e050893 100644 --- a/resources/lang/tr-TR/messages.php +++ b/resources/lang/tr-TR/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type içe aktarıldı!', ], 'error' => [ - 'payment_add' => 'Hata: Ödeme eklenmedi. Ödeme tutarını kontrol ediniz.', + 'over_payment' => 'Hata: Ödeme eklenmedi. Girilen tutar toplamı geçiyor.', 'not_user_company' => 'Hata: Bu şirketi yönetme yetkiniz yok!', - 'customer' => 'Hata: :name bu email adresini kullanmaktadır.', + 'customer' => 'Hata: Kullanıcı oluşturulamadı. :name bu e-posta adresini kullanmaktadır.', 'no_file' => 'Hata: Dosya seçilmedi!', + 'last_category' => 'Hata: Son :type kategorisini silemezsiniz!', + 'invalid_token' => 'Hata: Girilen token yanlış!', ], 'warning' => [ 'deleted' => 'Uyarı: :name silinemez çünkü :text ile ilişkilidir.', diff --git a/resources/lang/tr-TR/modules.php b/resources/lang/tr-TR/modules.php index 276f2a6d2..be197a98f 100644 --- a/resources/lang/tr-TR/modules.php +++ b/resources/lang/tr-TR/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Yeni', 'top_free' => 'Popüler Ücretsiz', 'free' => 'Ücretsiz', + 'search' => 'Arama', 'install' => 'Yükle', 'buy_now' => 'Şimdi Satın Al', 'token_link' => 'API token almak için buraya tıklayın.', diff --git a/resources/lang/tr-TR/recurring.php b/resources/lang/tr-TR/recurring.php new file mode 100644 index 000000000..249a56343 --- /dev/null +++ b/resources/lang/tr-TR/recurring.php @@ -0,0 +1,20 @@ + 'Tekrarlanan', + 'every' => 'Her', + 'period' => 'Aralık', + 'times' => 'Kez', + 'daily' => 'Günlük', + 'weekly' => 'Haftalık', + 'monthly' => 'Aylık', + 'yearly' => 'Yıllık', + 'custom' => 'Özel', + 'days' => 'Gün', + 'weeks' => 'Hafta', + 'months' => 'Ay', + 'years' => 'Yıl', + 'message' => 'Bu tekrarlayan bir :type ve bir sonraki :type otomatik olarak :date tarihinde oluşturulacaktır.', + +]; diff --git a/resources/lang/tr-TR/reports.php b/resources/lang/tr-TR/reports.php index c5a17b0cf..a9d2ae77d 100644 --- a/resources/lang/tr-TR/reports.php +++ b/resources/lang/tr-TR/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'Bu Çeyrek', 'previous_quarter' => 'Önceki Çeyrek', 'last_12_months' => 'Son 12 Ay', + 'profit_loss' => 'Kar ve Zarar', + 'gross_profit' => 'Brüt Kar', + 'net_profit' => 'Net Kar', + 'total_expenses' => 'Toplam Gider', + 'net' => 'NET', 'summary' => [ 'income' => 'Gelir Özeti', 'expense' => 'Gider Özeti', 'income_expense' => 'Gelir Gider Dengesi', + 'tax' => 'Vergi Özeti', + ], + + 'quarter' => [ + '1' => 'Oca-Mar', + '2' => 'Nis-Haz', + '3' => 'Tem-Eyl', + '4' => 'Eki-Ara', ], ]; diff --git a/resources/lang/tr-TR/settings.php b/resources/lang/tr-TR/settings.php index 96bc5bba6..4470f4398 100644 --- a/resources/lang/tr-TR/settings.php +++ b/resources/lang/tr-TR/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Boşluk ( )', ], 'timezone' => 'Saat dilimi', + 'percent' => [ + 'title' => 'Yüzde (%) Konumu', + 'before' => 'Sayıdan Önce', + 'after' => 'Sayıdan Sonra', + ], ], 'invoice' => [ 'tab' => 'Fatura', diff --git a/resources/lang/uk-UA/bills.php b/resources/lang/uk-UA/bills.php index 81b530c79..d53ba1b26 100644 --- a/resources/lang/uk-UA/bills.php +++ b/resources/lang/uk-UA/bills.php @@ -3,7 +3,7 @@ return [ 'bill_number' => 'Номер рахунку', - 'bill_date' => 'Дата', + 'bill_date' => 'Дата рахунку', 'total_price' => 'Загальна сума', 'due_date' => 'Термін дії', 'order_number' => 'Номер замовлення', @@ -12,14 +12,19 @@ return [ 'quantity' => 'Кількість', 'price' => 'Ціна', 'sub_total' => 'Всього', + 'discount' => 'Знижка', 'tax_total' => 'Всього пдв', 'total' => 'Всього', 'item_name' => 'Назва товару', + 'show_discount' => ': знижка % Знижка', + 'add_discount' => 'Додати знижку', + 'discount_desc' => 'Підсумок', + 'payment_due' => 'Очікуваний платіж', - 'amount_due' => 'Сума боргу', - 'paid' => 'Оплачений', + 'amount_due' => 'Заборгованість', + 'paid' => 'Оплачено', 'histories' => 'Історії', 'payments' => 'Платежі', 'add_payment' => 'Додати платіж', diff --git a/resources/lang/uk-UA/general.php b/resources/lang/uk-UA/general.php index 18812be13..631a7c5cd 100644 --- a/resources/lang/uk-UA/general.php +++ b/resources/lang/uk-UA/general.php @@ -2,11 +2,11 @@ return [ - 'items' => 'Позиція | Позиції', + 'items' => 'Позиція|Позиції', 'incomes' => 'Прибуток | Прибутки', 'invoices' => 'Рахунок | Рахунки', - 'revenues' => 'Дохід | Доходи', - 'customers' => 'Клієнт | Клієнти', + 'revenues' => 'Прибуток | Прибутки', + 'customers' => 'Клієнт|Клієнти', 'expenses' => 'Витрати | Витрати', 'bills' => 'Рахунок | Рахунки', 'payments' => 'Платіж | Платежі', @@ -37,13 +37,14 @@ return [ 'updates' => 'Оновлення | Оновлення', 'numbers' => 'Номер | Номери', 'statuses' => 'Статус | Статуси', + 'others' => 'Інший | Інші', 'dashboard' => 'Панель інструментів', 'banking' => 'Банківська справа', 'general' => 'Головний', 'no_records' => 'Немає записів.', 'date' => 'Дата', - 'amount' => 'Сума', + 'amount' => 'Підсумок', 'enabled' => 'Увімкнено', 'disabled' => 'Вимкнено', 'yes' => 'Так', @@ -60,7 +61,7 @@ return [ 'delete' => 'Видалити', 'send' => 'Надіслати', 'download' => 'Завантажити', - 'delete_confirm' => 'Підтвердити видалення: ім\'я: тип?', + 'delete_confirm' => 'Підтвердьте видалення: ім\'я: тип?', 'name' => 'Ім’я', 'email' => 'E-mail', 'tax_number' => 'Податковий номер', diff --git a/resources/lang/uk-UA/invoices.php b/resources/lang/uk-UA/invoices.php index 2a9626df0..60101da87 100644 --- a/resources/lang/uk-UA/invoices.php +++ b/resources/lang/uk-UA/invoices.php @@ -7,16 +7,21 @@ return [ 'total_price' => 'Загальна сума', 'due_date' => 'Термін дії', 'order_number' => 'Номер замовлення', - 'bill_to' => 'Надсилання рахунків', + 'bill_to' => 'Рахунок-фактура', 'quantity' => 'Кількість', 'price' => 'Ціна', 'sub_total' => 'Всього', + 'discount' => 'Знижка', 'tax_total' => 'Всього пдв', 'total' => 'Всього', 'item_name' => 'Назва товару', + 'show_discount' => ': знижка % Знижка', + 'add_discount' => 'Додати знижку', + 'discount_desc' => 'підсумок', + 'payment_due' => 'Очікуваний платіж', 'paid' => 'Оплачено', 'histories' => 'Історії', @@ -39,7 +44,7 @@ return [ 'messages' => [ 'email_sent' => 'Повідомлення з рахунком було успішно відправлено!', 'marked_sent' => 'Повідомлення з рахунком було успішно відправлено!', - 'email_required' => 'Немає адреси для цього клієнта!', + 'email_required' => 'Немає повідомлень цього клієнта!', ], 'notification' => [ diff --git a/resources/lang/uk-UA/messages.php b/resources/lang/uk-UA/messages.php index 6b69aa47d..2d926fb66 100644 --- a/resources/lang/uk-UA/messages.php +++ b/resources/lang/uk-UA/messages.php @@ -14,6 +14,8 @@ return [ 'not_user_company' => 'Помилка: Вам не дозволено керувати цією компанією!', 'customer' => 'Помилка: Користувача не створено! : ця електронна адреса вже використовується.', 'no_file' => 'Помилка: Файл не обрано!', + 'last_category' => 'Помилка: Неможливо видалити :type категорію!', + 'invalid_token' => 'Помилка: Введений токен невірний!', ], 'warning' => [ 'deleted' => 'Увага: Вам не дозволено видалити : ім\'я , оскільки воно має: текст, пов\'язані.', diff --git a/resources/lang/uk-UA/modules.php b/resources/lang/uk-UA/modules.php index 75b1b6c75..bc0d0fe14 100644 --- a/resources/lang/uk-UA/modules.php +++ b/resources/lang/uk-UA/modules.php @@ -4,10 +4,11 @@ return [ 'title' => 'API маркер', 'api_token' => 'Маркер', - 'top_paid' => 'Топ оплат', + 'top_paid' => 'Топ Paid', 'new' => 'Нове', 'top_free' => 'Топ безкоштовних', 'free' => 'БЕЗКОШТОВНО', + 'search' => 'Пошук', 'install' => 'Встановити', 'buy_now' => 'Купити зараз', 'token_link' => 'натисніть тут щоб отримати ваш API маркер.', @@ -20,11 +21,11 @@ return [ 'updated' => 'Оновлено', 'compatibility' => 'Сумiснiсть', - 'installed' => ': модуль встановлено', - 'uninstalled' => ': модуль видалено', + 'installed' => ':module встановлено', + 'uninstalled' => ':module видалено', //'updated' => ':module updated', - 'enabled' => ': модуль увімкнено', - 'disabled' => ': модуль вимкнено', + 'enabled' => ':module увімкнено', + 'disabled' => ':module вимкнено', 'tab' => [ 'installation' => 'Встановлення', @@ -35,8 +36,8 @@ return [ 'installation' => [ 'header' => 'Встановлення додатку', 'download' => 'Завантаження: файл модуля.', - 'unzip' => 'Вилучення: файли модуля.', - 'install' => 'Установка: файли модуля.', + 'unzip' => 'Вилучення файлів :module.', + 'install' => 'Установка файлів : module .', ], 'button' => [ diff --git a/resources/lang/uk-UA/pagination.php b/resources/lang/uk-UA/pagination.php index 155e9ac2a..4b37f31f1 100644 --- a/resources/lang/uk-UA/pagination.php +++ b/resources/lang/uk-UA/pagination.php @@ -4,6 +4,6 @@ return [ 'previous' => '« Назад', 'next' => 'Далі »', - 'showing' => 'Показ: перший до: останній з: загально: тип', + 'showing' => 'Показ :first до :last з :total :type', ]; diff --git a/resources/lang/uk-UA/recurring.php b/resources/lang/uk-UA/recurring.php new file mode 100644 index 000000000..d515ccc7a --- /dev/null +++ b/resources/lang/uk-UA/recurring.php @@ -0,0 +1,20 @@ + 'Поточний', + 'every' => 'Кожен', + 'period' => 'Період', + 'times' => 'Час', + 'daily' => 'Щоденно', + 'weekly' => 'Щотижня', + 'monthly' => 'Щомісяця', + 'yearly' => 'Щорічно', + 'custom' => 'Інший', + 'days' => 'День(дні)', + 'weeks' => 'Тиждень(тиждні)', + 'months' => 'Місяць(місяці)', + 'years' => 'Рік(роки)', + 'message' => 'Це повторюється: тип і наступний: тип буде автоматично згенеровано на: дата', + +]; diff --git a/resources/lang/uk-UA/reports.php b/resources/lang/uk-UA/reports.php index 688c7a898..3fe064929 100644 --- a/resources/lang/uk-UA/reports.php +++ b/resources/lang/uk-UA/reports.php @@ -2,16 +2,30 @@ return [ - 'this_year' => 'Цього року', - 'previous_year' => 'Минулий рік', - 'this_quarter' => 'Цей квартал', - 'previous_quarter' => 'Попередній квартал', - 'last_12_months' => 'Останні 12 місяців', + 'this_year' => 'Цього Року', + 'previous_year' => 'Минулий Рік', + 'this_quarter' => 'Цей Квартал', + 'previous_quarter' => 'Попередній Квартал', + 'last_12_months' => 'Останні 12 Місяців', + 'profit_loss' => 'Прибуток & Збиток', + 'gross_profit' => 'Загальний Прибуток +', + 'net_profit' => 'Новий Прибуток', + 'total_expenses' => 'Загальні витрати', + 'net' => 'NET', 'summary' => [ - 'income' => 'Кінцевий результат', - 'expense' => 'Загальні витрати', - 'income_expense' => 'Дохід проти витрат', + 'income' => 'Підсумковий Прибуток', + 'expense' => 'Звіт про Витрати', + 'income_expense' => 'Дохід vs Витрати', + 'tax' => 'Підсумковий Податок', + ], + + 'quarter' => [ + '1' => 'Січень-Березень', + '2' => 'Квітень-Червень', + '3' => 'Липень-Вересень', + '4' => 'Жовтень-Грудень', ], ]; diff --git a/resources/lang/uk-UA/settings.php b/resources/lang/uk-UA/settings.php index b9aa4b79f..8f0de08ab 100644 --- a/resources/lang/uk-UA/settings.php +++ b/resources/lang/uk-UA/settings.php @@ -16,15 +16,20 @@ return [ 'separator' => 'Роздільник дати', 'dash' => 'Тире (–)', 'dot' => 'Крапка (.)', - 'comma' => 'Кома ()', + 'comma' => 'Кома (,)', 'slash' => 'Слеш (/)', - 'space' => '(Пробіл)', + 'space' => 'Пробіл ( )', ], 'timezone' => 'Часовий пояс', + 'percent' => [ + 'title' => 'Відсоток (%) Позиція', + 'before' => 'Перед Номером', + 'after' => 'Після Номеру', + ], ], 'invoice' => [ 'tab' => 'Рахунок', - 'prefix' => 'Префікс номеру', + 'prefix' => 'Префікс Рахунку', 'digit' => 'Кількість цифр', 'next' => 'Наступний номер', 'logo' => 'Логотип', @@ -34,7 +39,7 @@ return [ 'account' => 'Обліковий запис за замовчуванням', 'currency' => 'Валюта за замовчуванням', 'tax' => 'Ставка податку за замовчуванням', - 'payment' => 'Методу оплати за замовчуванням', + 'payment' => 'Стандартний Спосіб Оплати', 'language' => 'Мова за замовчуванням', ], 'email' => [ @@ -42,7 +47,7 @@ return [ 'php' => 'PHP Mail', 'smtp' => [ 'name' => 'SMTP', - 'host' => 'SMTP хост', + 'host' => 'SMTP Сервер', 'port' => 'SMTP порт', 'username' => 'SMTP ім\'я користувача', 'password' => 'Пароль до SMTP', @@ -55,12 +60,12 @@ return [ ], 'scheduling' => [ 'tab' => 'Планувальник', - 'send_invoice' => 'Надсилати нагадування рахунку', - 'invoice_days' => 'Надсилання після відповідних днів', - 'send_bill' => 'Відправити Нагадування', - 'bill_days' => 'Надсилання після відповідних днів', + 'send_invoice' => 'Надсилати Рахунок-Фактуру', + 'invoice_days' => 'Надсилати після відповідних днів', + 'send_bill' => 'Відправити Квитанцію про отримання', + 'bill_days' => 'Надіслати після відповідних днів', 'cron_command' => 'Cron команда', - 'schedule_time' => 'Години, щоб запустити', + 'schedule_time' => 'Години до запуску', ], 'appearance' => [ 'tab' => 'Вигляд', @@ -73,13 +78,13 @@ return [ 'system' => [ 'tab' => 'Система', 'session' => [ - 'lifetime' => 'Тривалість сеансу (хв)', + 'lifetime' => 'Тривалість Сеансу (Хвилин)', 'handler' => 'Менеджер сесій', 'file' => 'Файл', 'database' => 'База Даних', ], 'file_size' => 'Максимальний об’єм файлу (Мб)', - 'file_types' => 'Допускається тип файлів', + 'file_types' => 'Допускається Тип Файлів', ], ]; diff --git a/resources/lang/uk-UA/validation.php b/resources/lang/uk-UA/validation.php index 4289c50f1..d92eaced8 100644 --- a/resources/lang/uk-UA/validation.php +++ b/resources/lang/uk-UA/validation.php @@ -14,9 +14,9 @@ return [ */ 'accepted' => 'Ви повинні прийняти :attribute.', - 'active_url' => 'Поле :attribute не правильний URL.', + 'active_url' => ':attribute не правильний URL.', 'after' => 'Поле :attribute має містити дату не раніше :date.', - 'after_or_equal' => 'Поле :attribute має містити дату не раніше або дорівнювати :date.', + 'after_or_equal' => ':attribute має містити дату не раніше або дорівнювати :date.', 'alpha' => 'Поле :attribute має містити лише літери.', 'alpha_dash' => 'Поле :attribute має містити лише літери, цифри та підкреслення.', 'alpha_num' => 'Поле :attribute має містити лише літери та цифри.', @@ -36,7 +36,7 @@ return [ 'different' => 'Поля :attribute та :other повинні бути різними.', 'digits' => 'Довжина цифрового поля :attribute повинна дорівнювати :digits.', 'digits_between' => 'Довжина цифрового поля :attribute повинна бути від :min до :max.', - 'dimensions' => 'Поле :attribute містить неприпустимі розміри зображення.', + 'dimensions' => ':attribute містить неприпустимі розміри зображення.', 'distinct' => 'Поле :attribute містить значення, яке дублюється.', 'email' => 'Поле :attribute повинне містити коректну електронну адресу.', 'exists' => 'Вибране для :attribute значення не коректне.', @@ -72,10 +72,10 @@ return [ 'required_with' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.', 'required_with_all' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.', 'required_without' => 'Поле :attribute є обов\'язковим для заповнення, коли :values не вказано.', - 'required_without_all' => 'Поле :attribute є обов\'язковим для заповнення, коли :values вказано.', + 'required_without_all' => ':attribute є обов\'язковим для заповнення, коли :values вказано.', 'same' => 'Поля :attribute та :other мають співпадати.', 'size' => [ - 'numeric' => 'Поле :attribute має бути довжиною :size.', + 'numeric' => ':attribute має бути довжиною :size.', 'file' => 'Файл в полі :attribute має бути розміром :size кілобайт.', 'string' => 'Текст в полі :attribute повинен містити :size символів.', 'array' => 'Поле :attribute повинне містити :size елементів.', diff --git a/resources/lang/vi-VN/bills.php b/resources/lang/vi-VN/bills.php index 9e3f3b11a..0e25aa3cd 100644 --- a/resources/lang/vi-VN/bills.php +++ b/resources/lang/vi-VN/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Số lượng', 'price' => 'Đơn giá', 'sub_total' => 'Tổng phụ', + 'discount' => 'Discount', 'tax_total' => 'Tổng thuế', 'total' => 'Tổng số', 'item_name' => 'Tên mục | Tên mục', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Hạn thanh toán', 'amount_due' => 'Số tiền phải trả', 'paid' => 'Đã thanh toán', diff --git a/resources/lang/vi-VN/general.php b/resources/lang/vi-VN/general.php index a73eccc1f..a601efb6c 100644 --- a/resources/lang/vi-VN/general.php +++ b/resources/lang/vi-VN/general.php @@ -26,6 +26,7 @@ return [ 'companies' => 'Công ty | Công ty', 'profits' => 'Lợi nhuận | Lợi nhuận', 'taxes' => 'Thuế | Thuế', + 'logos' => 'Logo|Logos', 'pictures' => 'Hình ảnh | Hình ảnh', 'types' => 'Loại | Loại', 'payment_methods' => 'Phương thức thanh toán | Phương thức thanh toán', @@ -36,6 +37,7 @@ return [ 'updates' => 'Cập Nhật | Cập Nhật', 'numbers' => 'Số | Số', 'statuses' => 'Tình trạng | Trạng thái', + 'others' => 'Other|Others', 'dashboard' => 'Bảng điều khiển', 'banking' => 'Ngân hàng', diff --git a/resources/lang/vi-VN/invoices.php b/resources/lang/vi-VN/invoices.php index 1a0529c07..307e0b757 100644 --- a/resources/lang/vi-VN/invoices.php +++ b/resources/lang/vi-VN/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => 'Số lượng', 'price' => 'Đơn giá', 'sub_total' => 'Tổng phụ', + 'discount' => 'Discount', 'tax_total' => 'Tổng thuế', 'total' => 'Tổng số', 'item_name' => 'Tên mục | Tên mục', + 'show_discount' => ':discount% Discount', + 'add_discount' => 'Add Discount', + 'discount_desc' => 'of subtotal', + 'payment_due' => 'Hạn thanh toán', 'paid' => 'Đã thanh toán', 'histories' => 'Lịch sử thanh toán', diff --git a/resources/lang/vi-VN/messages.php b/resources/lang/vi-VN/messages.php index 5370cf9af..b730f9bf0 100644 --- a/resources/lang/vi-VN/messages.php +++ b/resources/lang/vi-VN/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type imported!', ], 'error' => [ - 'payment_add' => 'Error: You can not add payment! You should check add amount.', + 'over_payment' => 'Error: Payment not added! Amount passes the total.', 'not_user_company' => 'Lỗi: Bạn không được phép để quản lý công ty này!', - 'customer' => 'Lỗi: Bạn có thể không tạo người dùng! :name đã sử dụng địa chỉ email này.', + 'customer' => 'Error: User not created! :name already uses this email address.', 'no_file' => 'Error: No file selected!', + 'last_category' => 'Error: Can not delete the last :type category!', + 'invalid_token' => 'Error: The token entered is invalid!', ], 'warning' => [ 'deleted' => 'Chú ý: Bạn không được phép xoá :name này bởi vì nó có :text liên quan.', diff --git a/resources/lang/vi-VN/modules.php b/resources/lang/vi-VN/modules.php index b24a8ce1e..9a1f706cd 100644 --- a/resources/lang/vi-VN/modules.php +++ b/resources/lang/vi-VN/modules.php @@ -8,6 +8,7 @@ return [ 'new' => 'Mới', 'top_free' => 'Top miễn phí', 'free' => 'MIỄN PHÍ', + 'search' => 'Search', 'install' => 'Cài đặt', 'buy_now' => 'Mua ngay', 'token_link' => ' Click vào đây để lấy API token của bạn.', diff --git a/resources/lang/vi-VN/recurring.php b/resources/lang/vi-VN/recurring.php new file mode 100644 index 000000000..92099c71c --- /dev/null +++ b/resources/lang/vi-VN/recurring.php @@ -0,0 +1,20 @@ + 'Recurring', + 'every' => 'Every', + 'period' => 'Period', + 'times' => 'Times', + 'daily' => 'Daily', + 'weekly' => 'Weekly', + 'monthly' => 'Monthly', + 'yearly' => 'Yearly', + 'custom' => 'Custom', + 'days' => 'Day(s)', + 'weeks' => 'Week(s)', + 'months' => 'Month(s)', + 'years' => 'Year(s)', + 'message' => 'This is a recurring :type and the next :type will be automatically generated at :date', + +]; diff --git a/resources/lang/vi-VN/reports.php b/resources/lang/vi-VN/reports.php index 9d0c79952..3a2fd6b03 100644 --- a/resources/lang/vi-VN/reports.php +++ b/resources/lang/vi-VN/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => 'This Quarter', 'previous_quarter' => 'Previous Quarter', 'last_12_months' => 'Last 12 Months', + 'profit_loss' => 'Profit & Loss', + 'gross_profit' => 'Gross Profit', + 'net_profit' => 'Net Profit', + 'total_expenses' => 'Total Expenses', + 'net' => 'NET', 'summary' => [ 'income' => 'Tổng hợp thu nhập', 'expense' => 'Tổng hợp chi phí', 'income_expense' => 'Thu nhập vs Chi phí', + 'tax' => 'Tax Summary', + ], + + 'quarter' => [ + '1' => 'Jan-Mar', + '2' => 'Apr-Jun', + '3' => 'Jul-Sep', + '4' => 'Oct-Dec', ], ]; diff --git a/resources/lang/vi-VN/settings.php b/resources/lang/vi-VN/settings.php index 81df2c056..d447e1fb5 100644 --- a/resources/lang/vi-VN/settings.php +++ b/resources/lang/vi-VN/settings.php @@ -21,6 +21,11 @@ return [ 'space' => 'Khoảng trắng ( )', ], 'timezone' => 'Múi giờ', + 'percent' => [ + 'title' => 'Percent (%) Position', + 'before' => 'Before Number', + 'after' => 'After Number', + ], ], 'invoice' => [ 'tab' => 'Hoá đơn', diff --git a/resources/lang/zh-TW/bills.php b/resources/lang/zh-TW/bills.php index c7c1d2f78..ad69e76a3 100644 --- a/resources/lang/zh-TW/bills.php +++ b/resources/lang/zh-TW/bills.php @@ -12,11 +12,16 @@ return [ 'quantity' => '數量', 'price' => '售價', 'sub_total' => '小計', + 'discount' => '折扣', 'tax_total' => '稅額', 'total' => '總計', 'item_name' => '產品名稱 | 產品名稱', + 'show_discount' => ':discount% 折扣', + 'add_discount' => '新增折扣', + 'discount_desc' => '小計', + 'payment_due' => '付款到期日', 'amount_due' => '到期金額', 'paid' => '已付款', diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index 06df3ffbe..f40aa0d89 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -26,6 +26,7 @@ return [ 'companies' => '公司 | 公司', 'profits' => '利潤 | 利潤', 'taxes' => '稅額 | 稅額', + 'logos' => '標誌 | 標誌', 'pictures' => '圖片 | 圖片', 'types' => '類型 | 類型', 'payment_methods' => '付款方式 | 付款方式', @@ -36,6 +37,7 @@ return [ 'updates' => '更新 | 更新', 'numbers' => '編號 | 編號', 'statuses' => '狀態 | 狀態', + 'others' => '其他 | 其他', 'dashboard' => '控制面板', 'banking' => '銀行', diff --git a/resources/lang/zh-TW/invoices.php b/resources/lang/zh-TW/invoices.php index 5d7c99013..fed4f1eda 100644 --- a/resources/lang/zh-TW/invoices.php +++ b/resources/lang/zh-TW/invoices.php @@ -12,11 +12,16 @@ return [ 'quantity' => '數量', 'price' => '售價', 'sub_total' => '小計', + 'discount' => '折扣', 'tax_total' => '稅額', 'total' => '總計', 'item_name' => '產品名稱 | 產品名稱', + 'show_discount' => ':discount% 折扣', + 'add_discount' => '新增折扣', + 'discount_desc' => '小計', + 'payment_due' => '付款到期日', 'paid' => '已付款', 'histories' => '歷史記錄', diff --git a/resources/lang/zh-TW/messages.php b/resources/lang/zh-TW/messages.php index 684ec1726..9705afd7f 100644 --- a/resources/lang/zh-TW/messages.php +++ b/resources/lang/zh-TW/messages.php @@ -10,10 +10,12 @@ return [ 'imported' => ':type 已匯入！', ], 'error' => [ - 'payment_add' => '錯誤：您不能新增付款！您需要檢查新增金額。', + 'over_payment' => '錯誤：未加入付款方式！數量超過總計。', 'not_user_company' => '錯誤：您不允許管理此公司！', - 'customer' => '錯誤：您不能使用此電子郵件建立使用者 :name ！', + 'customer' => '錯誤：未建立使用者！:name已經使用此電子郵件。', 'no_file' => '錯誤：沒有選擇檔案！', + 'last_category' => '錯誤：無法刪除最後一個 :type 分類！', + 'invalid_token' => '錯誤：token輸入錯誤！', ], 'warning' => [ 'deleted' => '警告：由於和 :text 相關，你不能刪除:name。', diff --git a/resources/lang/zh-TW/modules.php b/resources/lang/zh-TW/modules.php index e430f6a84..7703db779 100644 --- a/resources/lang/zh-TW/modules.php +++ b/resources/lang/zh-TW/modules.php @@ -8,6 +8,7 @@ return [ 'new' => '新增', 'top_free' => '最佳免費', 'free' => '免費', + 'search' => '搜尋', 'install' => '安裝', 'buy_now' => '現在購買', 'token_link' => '點這裡取得您的 API token.', diff --git a/resources/lang/zh-TW/recurring.php b/resources/lang/zh-TW/recurring.php new file mode 100644 index 000000000..b90ddf55d --- /dev/null +++ b/resources/lang/zh-TW/recurring.php @@ -0,0 +1,20 @@ + '循環', + 'every' => '每個', + 'period' => '週期', + 'times' => '次', + 'daily' => '每日', + 'weekly' => '每週', + 'monthly' => '每月', + 'yearly' => '每年', + 'custom' => '自訂', + 'days' => '天', + 'weeks' => '週', + 'months' => '月', + 'years' => '年', + 'message' => '這是一個循環的 :type 且下次的 :type 將會自動產生於 :date', + +]; diff --git a/resources/lang/zh-TW/reports.php b/resources/lang/zh-TW/reports.php index 00fc44353..1ec9165f9 100644 --- a/resources/lang/zh-TW/reports.php +++ b/resources/lang/zh-TW/reports.php @@ -7,11 +7,24 @@ return [ 'this_quarter' => '本季', 'previous_quarter' => '前一季', 'last_12_months' => '過去 12 個月', + 'profit_loss' => '損益', + 'gross_profit' => '毛利', + 'net_profit' => '初始利潤', + 'total_expenses' => '總費用', + 'net' => '初始', 'summary' => [ 'income' => '收入概要', 'expense' => '支出概要', 'income_expense' => '收入 vs 支出', + 'tax' => '稅務概要', + ], + + 'quarter' => [ + '1' => '一至三月', + '2' => '四至六月', + '3' => '七至九月', + '4' => '十至十二月', ], ]; diff --git a/resources/lang/zh-TW/settings.php b/resources/lang/zh-TW/settings.php index fbf4032a5..e46a9ff3c 100644 --- a/resources/lang/zh-TW/settings.php +++ b/resources/lang/zh-TW/settings.php @@ -21,6 +21,11 @@ return [ 'space' => '空格 ( )', ], 'timezone' => '時區', + 'percent' => [ + 'title' => '百分比 (%) 位置', + 'before' => '編號之前', + 'after' => '編號之後', + ], ], 'invoice' => [ 'tab' => '訂單', From 17e74d160558cbf2da47d2ee7f9c9c6310b57334 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Thu, 3 May 2018 15:40:51 +0300 Subject: [PATCH 94/94] Invoice, Bill change quantity column type (double) --- database/migrations/2017_09_01_000000_create_bills_table.php | 2 +- database/migrations/2017_09_01_000000_create_invoices_table.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database/migrations/2017_09_01_000000_create_bills_table.php b/database/migrations/2017_09_01_000000_create_bills_table.php index 66e27ae10..2ba4376fb 100644 --- a/database/migrations/2017_09_01_000000_create_bills_table.php +++ b/database/migrations/2017_09_01_000000_create_bills_table.php @@ -45,7 +45,7 @@ class CreateBillsTable extends Migration $table->integer('item_id')->nullable(); $table->string('name'); $table->string('sku')->nullable(); - $table->integer('quantity'); + $table->double('quantity', 7, 2); $table->double('price', 15, 4); $table->double('total', 15, 4); $table->float('tax', 15, 4)->default('0.0000'); diff --git a/database/migrations/2017_09_01_000000_create_invoices_table.php b/database/migrations/2017_09_01_000000_create_invoices_table.php index 072a302d6..123a2f850 100644 --- a/database/migrations/2017_09_01_000000_create_invoices_table.php +++ b/database/migrations/2017_09_01_000000_create_invoices_table.php @@ -45,7 +45,7 @@ class CreateInvoicesTable extends Migration $table->integer('item_id')->nullable(); $table->string('name'); $table->string('sku')->nullable(); - $table->integer('quantity'); + $table->double('quantity', 7, 2); $table->double('price', 15, 4); $table->double('total', 15, 4); $table->double('tax', 15, 4)->default('0.0000');
      - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, $item->tax_id, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control tax-select2', 'placeholder' => trans('general.form.enter', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -69,10 +69,10 @@ - + - + {!! Form::select('item[' . $item_row . '][tax_id]', $taxes, null, ['id'=> 'item-tax-'. $item_row, 'class' => 'form-control select2', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)])]) !!} @@ -158,10 +158,10 @@ html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; - html += ' '; + html += ' '; html += ' '; html += '
      + @if (setting('general.use_gravatar', '0') == '1') + {{ $item->name }} + @else @if ($item->picture) - {{ $item->name }} + {{ $item->name }} + @endif @endif {{ $item->name }} From 31e2b2cf8ad81c391e8c125577f04313c5da5272 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Tue, 1 May 2018 16:35:56 +0300 Subject: [PATCH 85/94] Create Item category new button --- public/css/app.css | 2 +- resources/views/items/items/create.blade.php | 98 +++++++++++++++++++- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index f349813e2..6b0d5092a 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -601,6 +601,6 @@ input[type="number"] { margin-left: -20px; } -.user.user-menu, .user.user-menu a { +.user.user-menu, .user.user-menu a.dropdown-toggle { min-height: 50px; } diff --git a/resources/views/items/items/create.blade.php b/resources/views/items/items/create.blade.php index 55b8e6cd6..b4bd4af29 100644 --- a/resources/views/items/items/create.blade.php +++ b/resources/views/items/items/create.blade.php @@ -22,7 +22,17 @@ {{ Form::selectGroup('tax_id', trans_choice('general.taxes', 1), 'percent', $taxes, setting('general.default_tax'), []) }} - {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories, null, []) }} +
      + {!! Form::label('category_id', trans_choice('general.categories', 1), ['class' => 'control-label']) !!} +
      +
      + {!! Form::select('category_id', $categories, null, array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)])])) !!} +
      + +
      +
      + {!! $errors->first('category_id', '

      :message

      ') !!} +
      {{ Form::fileGroup('picture', trans_choice('general.pictures', 1)) }} @@ -41,10 +51,12 @@ @push('js') + @endpush @push('css') + @endpush @push('scripts') @@ -71,5 +83,89 @@ placeholder : '{{ trans('general.form.no_file_selected') }}' }); }); + + function createCategory() { + $('#modal-create-category').remove(); + + modal = ''; + + $('body').append(modal); + + $('#category-color-picker').colorpicker(); + + $('#modal-create-category').modal('show'); + } + + $(document).on('click', '#button-create-category', function (e) { + $('#modal-create-category .modal-header').before(''); + + $.ajax({ + url: '{{ url("settings/categories/category") }}', + type: 'POST', + dataType: 'JSON', + data: $("#form-create-category").serialize(), + beforeSend: function () { + $(".form-group").removeClass("has-error"); + $(".help-block").remove(); + }, + success: function(data) { + $('#span-loading').remove(); + + $('#modal-create-category').modal('hide'); + + $("#category_id").append(''); + $("#category_id").select2('refresh'); + }, + error: function(error, textStatus, errorThrown) { + $('#span-loading').remove(); + + if (error.responseJSON.name) { + $("input[name='name']").parent().parent().addClass('has-error'); + $("input[name='name']").parent().after('

      ' + error.responseJSON.name + '

      '); + } + + if (error.responseJSON.color) { + $("input[name='color']").parent().parent().addClass('has-error'); + $("input[name='color']").parent().after('

      ' + error.responseJSON.color + '

      '); + } + } + }); + }); @endpush From 0a5136bd40f3a4d551b07ba0261987564e83b6c8 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 1 May 2018 19:00:33 +0300 Subject: [PATCH 86/94] fixed recurring command #315 --- app/Console/Commands/RecurringCheck.php | 38 +++++++------ app/Http/Controllers/Expenses/Bills.php | 1 + app/Http/Controllers/Expenses/Payments.php | 1 + app/Http/Controllers/Incomes/Invoices.php | 1 + app/Http/Controllers/Incomes/Revenues.php | 3 ++ app/Models/Common/Recurring.php | 2 +- app/Models/Expense/Bill.php | 4 +- app/Models/Expense/Payment.php | 4 +- app/Models/Income/Invoice.php | 4 +- app/Models/Income/Revenue.php | 4 +- .../2018_04_30_000000_add_parent_column.php | 54 +++++++++++++++++++ 11 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 database/migrations/2018_04_30_000000_add_parent_column.php diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php index 6d4aebbd4..049391287 100644 --- a/app/Console/Commands/RecurringCheck.php +++ b/app/Console/Commands/RecurringCheck.php @@ -3,13 +3,8 @@ namespace App\Console\Commands; use App\Models\Company\Company; -use App\Models\Common\Recurring; -use App\Models\Expense\Bill; use App\Models\Expense\BillHistory; -use App\Models\Expense\Payment; -use App\Models\Income\Invoice; use App\Models\Income\InvoiceHistory; -use App\Models\Income\Revenue; use App\Notifications\Expense\Bill as BillNotification; use App\Notifications\Income\Invoice as InvoiceNotification; use App\Traits\Incomes; @@ -68,9 +63,7 @@ class RecurringCheck extends Command $company->setSettings(); - $recurring = $company->recurring(); - - foreach ($recurring as $recur) { + foreach ($company->recurring as $recur) { $current = Date::parse($recur->schedule()->current()->getStart()->format('Y-m-d')); // Check if should recur today @@ -78,29 +71,30 @@ class RecurringCheck extends Command continue; } - $type = end(explode('\\', $recur->recurable_type)); - - $model = $type::find($recur->recurable_id); + $model = $recur->recurable; if (!$model) { continue; } - switch ($type) { - case 'Bill': + switch ($recur->recurable_type) { + case 'App\Models\Expense\Bill': $this->recurBill($company, $model); break; - case 'Invoice': + case 'App\Models\Income\Invoice': $this->recurInvoice($company, $model); break; - case 'Payment': - case 'Revenue': + case 'App\Models\Expense\Payment': + case 'App\Models\Income\Revenue': + $model->cloneable_relations = []; + // Create new record $clone = $model->duplicate(); - // Update date + $clone->parent_id = $model->id; $clone->paid_at = $this->today->format('Y-m-d'); $clone->save(); + break; } } @@ -112,9 +106,14 @@ class RecurringCheck extends Command protected function recurInvoice($company, $model) { + $model->cloneable_relations = ['items', 'totals']; + // Create new record $clone = $model->duplicate(); + // Set original invoice id + $clone->parent_id = $model->id; + // Days between invoiced and due date $diff_days = Date::parse($clone->due_at)->diffInDays(Date::parse($clone->invoiced_at)); @@ -152,9 +151,14 @@ class RecurringCheck extends Command protected function recurBill($company, $model) { + $model->cloneable_relations = ['items', 'totals']; + // Create new record $clone = $model->duplicate(); + // Set original bill id + $clone->parent_id = $model->id; + // Days between invoiced and due date $diff_days = Date::parse($clone->due_at)->diffInDays(Date::parse($clone->invoiced_at)); diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index ecb0594c1..0fcd92356 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -469,6 +469,7 @@ class Bills extends Controller */ public function destroy(Bill $bill) { + $bill->recurring()->delete(); $bill->delete(); /* diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index fcb6ac7ed..25fc05f3a 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -222,6 +222,7 @@ class Payments extends Controller return redirect('expenses/payments'); } + $payment->recurring()->delete(); $payment->delete(); $message = trans('messages.success.deleted', ['type' => trans_choice('general.payments', 1)]); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index f56140581..51b45357b 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -490,6 +490,7 @@ class Invoices extends Controller */ public function destroy(Invoice $invoice) { + $invoice->recurring()->delete(); $invoice->delete(); /* diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php index 835968775..7bdc017db 100644 --- a/app/Http/Controllers/Incomes/Revenues.php +++ b/app/Http/Controllers/Incomes/Revenues.php @@ -172,6 +172,8 @@ class Revenues extends Controller $payment_methods = Modules::getPaymentMethods(); + $a = $revenue->recurring->schedule()->next(); + return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods')); } @@ -224,6 +226,7 @@ class Revenues extends Controller return redirect('incomes/revenues'); } + $revenue->recurring()->delete(); $revenue->delete(); $message = trans('messages.success.deleted', ['type' => trans_choice('general.revenues', 1)]); diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php index 925e9bdc6..81f4529ed 100644 --- a/app/Models/Common/Recurring.php +++ b/app/Models/Common/Recurring.php @@ -23,7 +23,7 @@ class Recurring extends Model /** - * Get all of the owning recurrable models. + * Get all of the owning recurable models. */ public function recurable() { diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index dba2b8044..06338223f 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -30,7 +30,7 @@ class Bill extends Model * * @var array */ - protected $fillable = ['company_id', 'bill_number', 'order_number', 'bill_status_code', 'billed_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'vendor_id', 'vendor_name', 'vendor_email', 'vendor_tax_number', 'vendor_phone', 'vendor_address', 'notes', 'category_id']; + protected $fillable = ['company_id', 'bill_number', 'order_number', 'bill_status_code', 'billed_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'vendor_id', 'vendor_name', 'vendor_email', 'vendor_tax_number', 'vendor_phone', 'vendor_address', 'notes', 'category_id', 'parent_id']; /** * Sortable columns. @@ -59,7 +59,7 @@ class Bill extends Model * * @var array */ - protected $cloneable_relations = ['items', 'recurring', 'totals']; + public $cloneable_relations = ['items', 'recurring', 'totals']; public function category() { diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php index d179d5854..3924e4d8a 100644 --- a/app/Models/Expense/Payment.php +++ b/app/Models/Expense/Payment.php @@ -24,7 +24,7 @@ class Payment extends Model * * @var array */ - protected $fillable = ['company_id', 'account_id', 'paid_at', 'amount', 'currency_code', 'currency_rate', 'vendor_id', 'description', 'category_id', 'payment_method', 'reference']; + protected $fillable = ['company_id', 'account_id', 'paid_at', 'amount', 'currency_code', 'currency_rate', 'vendor_id', 'description', 'category_id', 'payment_method', 'reference', 'parent_id']; /** * Sortable columns. @@ -50,7 +50,7 @@ class Payment extends Model * * @var array */ - protected $cloneable_relations = ['recurring']; + public $cloneable_relations = ['recurring']; public function account() { diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index cbbe8a094..9a1588fea 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -31,7 +31,7 @@ class Invoice extends Model * * @var array */ - protected $fillable = ['company_id', 'invoice_number', 'order_number', 'invoice_status_code', 'invoiced_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'customer_id', 'customer_name', 'customer_email', 'customer_tax_number', 'customer_phone', 'customer_address', 'notes', 'category_id']; + protected $fillable = ['company_id', 'invoice_number', 'order_number', 'invoice_status_code', 'invoiced_at', 'due_at', 'amount', 'currency_code', 'currency_rate', 'customer_id', 'customer_name', 'customer_email', 'customer_tax_number', 'customer_phone', 'customer_address', 'notes', 'category_id', 'parent_id']; /** * Sortable columns. @@ -60,7 +60,7 @@ class Invoice extends Model * * @var array */ - protected $cloneable_relations = ['items', 'recurring', 'totals']; + public $cloneable_relations = ['items', 'recurring', 'totals']; public function category() { diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php index 95c3d008b..db4ced07e 100644 --- a/app/Models/Income/Revenue.php +++ b/app/Models/Income/Revenue.php @@ -24,7 +24,7 @@ class Revenue extends Model * * @var array */ - protected $fillable = ['company_id', 'account_id', 'paid_at', 'amount', 'currency_code', 'currency_rate', 'customer_id', 'description', 'category_id', 'payment_method', 'reference']; + protected $fillable = ['company_id', 'account_id', 'paid_at', 'amount', 'currency_code', 'currency_rate', 'customer_id', 'description', 'category_id', 'payment_method', 'reference', 'parent_id']; /** * Sortable columns. @@ -51,7 +51,7 @@ class Revenue extends Model * * @var array */ - protected $cloneable_relations = ['recurring']; + public $cloneable_relations = ['recurring']; public function user() { diff --git a/database/migrations/2018_04_30_000000_add_parent_column.php b/database/migrations/2018_04_30_000000_add_parent_column.php new file mode 100644 index 000000000..89ba2776a --- /dev/null +++ b/database/migrations/2018_04_30_000000_add_parent_column.php @@ -0,0 +1,54 @@ +integer('parent_id')->default(0); + }); + + Schema::table('revenues', function ($table) { + $table->integer('parent_id')->default(0); + }); + + Schema::table('bills', function ($table) { + $table->integer('parent_id')->default(0); + }); + + Schema::table('payments', function ($table) { + $table->integer('parent_id')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('invoices', function ($table) { + $table->dropColumn('parent_id'); + }); + + Schema::table('revenues', function ($table) { + $table->dropColumn('parent_id'); + }); + + Schema::table('bills', function ($table) { + $table->dropColumn('parent_id'); + }); + + Schema::table('payments', function ($table) { + $table->dropColumn('parent_id'); + }); + } +} From 7e21634d77e0fdc465c104d027ddaa1f5dda0364 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Tue, 1 May 2018 19:25:04 +0300 Subject: [PATCH 87/94] removed test line --- app/Http/Controllers/Incomes/Revenues.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php index 7bdc017db..1ca3080f9 100644 --- a/app/Http/Controllers/Incomes/Revenues.php +++ b/app/Http/Controllers/Incomes/Revenues.php @@ -172,8 +172,6 @@ class Revenues extends Controller $payment_methods = Modules::getPaymentMethods(); - $a = $revenue->recurring->schedule()->next(); - return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods')); } From c049b8ce738b9cafb8352217ade12602c73ba099 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 2 May 2018 00:59:55 +0300 Subject: [PATCH 88/94] fixed all recurring issues #315 --- app/Console/Commands/RecurringCheck.php | 8 +- app/Models/Common/Recurring.php | 33 +------ app/Traits/Recurring.php | 94 +++++++++++++++++++ resources/views/expenses/bills/show.blade.php | 4 +- .../views/expenses/payments/edit.blade.php | 4 +- .../views/incomes/invoices/show.blade.php | 4 +- .../views/incomes/revenues/edit.blade.php | 4 +- 7 files changed, 110 insertions(+), 41 deletions(-) diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php index 049391287..323cc223c 100644 --- a/app/Console/Commands/RecurringCheck.php +++ b/app/Console/Commands/RecurringCheck.php @@ -64,10 +64,14 @@ class RecurringCheck extends Command $company->setSettings(); foreach ($company->recurring as $recur) { - $current = Date::parse($recur->schedule()->current()->getStart()->format('Y-m-d')); + if (!$current = $recur->current()) { + continue; + } + + $current_date = Date::parse($current->format('Y-m-d')); // Check if should recur today - if ($this->today->ne($current)) { + if ($this->today->ne($current_date)) { continue; } diff --git a/app/Models/Common/Recurring.php b/app/Models/Common/Recurring.php index 81f4529ed..fe1c14924 100644 --- a/app/Models/Common/Recurring.php +++ b/app/Models/Common/Recurring.php @@ -3,14 +3,11 @@ namespace App\Models\Common; use App\Models\Model; -use DateTime; -use DateTimeZone; -use Recurr\Rule; -use Recurr\Transformer\ArrayTransformer; -use Recurr\Transformer\ArrayTransformerConfig; +use App\Traits\Recurring as RecurringTrait; class Recurring extends Model { + use RecurringTrait; protected $table = 'recurring'; @@ -29,30 +26,4 @@ class Recurring extends Model { return $this->morphTo(); } - - public function schedule() - { - $config = new ArrayTransformerConfig(); - $config->enableLastDayOfMonthFix(); - - $transformer = new ArrayTransformer(); - $transformer->setConfig($config); - - return $transformer->transform($this->rule()); - } - - public function rule() - { - // 0 means infinite - $count = ($this->count == 0) ? 999 : $this->count; - - $rule = (new Rule()) - ->setStartDate(new DateTime($this->started_at, new DateTimeZone(setting('general.timezone')))) - ->setTimezone(setting('general.timezone')) - ->setFreq(strtoupper($this->frequency)) - ->setInterval($this->interval) - ->setCount($count); - - return $rule; - } } diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php index ac693787a..7035bc1d4 100644 --- a/app/Traits/Recurring.php +++ b/app/Traits/Recurring.php @@ -2,6 +2,12 @@ namespace App\Traits; +use DateTime; +use DateTimeZone; +use Recurr\Rule; +use Recurr\Transformer\ArrayTransformer; +use Recurr\Transformer\ArrayTransformerConfig; + trait Recurring { @@ -55,4 +61,92 @@ trait Recurring 'count' => (int) $request['recurring_count'], ]); } + + public function current() + { + if (!$schedule = $this->schedule()) { + return false; + } + + return $schedule->current()->getStart(); + } + + public function next() + { + if (!$schedule = $this->schedule()) { + return false; + } + + if (!$next = $schedule->next()) { + return false; + } + + return $next->getStart(); + } + + public function first() + { + if (!$schedule = $this->schedule()) { + return false; + } + + return $schedule->first()->getStart(); + } + + public function last() + { + if (!$schedule = $this->schedule()) { + return false; + } + + return $schedule->last()->getStart(); + } + + public function schedule() + { + $config = new ArrayTransformerConfig(); + $config->enableLastDayOfMonthFix(); + + $transformer = new ArrayTransformer(); + $transformer->setConfig($config); + + return $transformer->transform($this->getRule()); + } + + public function getRule() + { + $rule = (new Rule()) + ->setStartDate($this->getRuleStartDate()) + ->setTimezone($this->getRuleTimeZone()) + ->setFreq($this->getRuleFrequency()) + ->setInterval($this->interval); + + // 0 means infinite + if ($this->count != 0) { + $rule->setCount($this->getRuleCount()); + } + + return $rule; + } + + public function getRuleStartDate() + { + return new DateTime($this->started_at, new DateTimeZone($this->getRuleTimeZone())); + } + + public function getRuleTimeZone() + { + return setting('general.timezone'); + } + + public function getRuleCount() + { + // Fix for humans + return $this->count + 1; + } + + public function getRuleFrequency() + { + return strtoupper($this->frequency); + } } \ No newline at end of file diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index c0ee0e328..bcca9640e 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -3,13 +3,13 @@ @section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number) @section('content') - @if ($bill->recurring()->count()) + @if (($recurring = $invoice->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      {{ trans('recurring.message', [ 'type' => mb_strtolower(trans_choice('general.bills', 1)), - 'date' => $bill->recurring->schedule()->next()->getStart()->format($date_format) + 'date' => $next->format($date_format) ]) }}

      diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index f9b26dde2..cacf864c9 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -3,13 +3,13 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.payments', 1)])) @section('content') - @if ($payment->recurring()->count()) + @if (($recurring = $invoice->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      {{ trans('recurring.message', [ 'type' => mb_strtolower(trans_choice('general.payments', 1)), - 'date' => $payment->recurring->schedule()->next()->getStart()->format($date_format) + 'date' => $next->format($date_format) ]) }}

      diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php index ea5d5f608..2b4fdd175 100644 --- a/resources/views/incomes/invoices/show.blade.php +++ b/resources/views/incomes/invoices/show.blade.php @@ -3,13 +3,13 @@ @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number) @section('content') - @if ($invoice->recurring()->count()) + @if (($recurring = $invoice->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      {{ trans('recurring.message', [ 'type' => mb_strtolower(trans_choice('general.invoices', 1)), - 'date' => $invoice->recurring->schedule()->next()->getStart()->format($date_format) + 'date' => $next->format($date_format) ]) }}

      diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index 23580657d..97b69340b 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -3,13 +3,13 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.revenues', 1)])) @section('content') - @if ($revenue->recurring()->count()) + @if (($recurring = $invoice->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      {{ trans('recurring.message', [ 'type' => mb_strtolower(trans_choice('general.revenues', 1)), - 'date' => $revenue->recurring->schedule()->next()->getStart()->format($date_format) + 'date' => $next->format($date_format) ]) }}

      From 9d28b26f7a4d5b1c93e5bfa6409f2a2735e4724e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 2 May 2018 10:31:05 +0300 Subject: [PATCH 89/94] fixed #323 --- resources/views/expenses/bills/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php index bcca9640e..2d5c50650 100644 --- a/resources/views/expenses/bills/show.blade.php +++ b/resources/views/expenses/bills/show.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number) @section('content') - @if (($recurring = $invoice->recurring) && ($next = $recurring->next())) + @if (($recurring = $bill->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      From 334e4fb933d0092456a786de1c204227e0fcb5c7 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 2 May 2018 18:56:05 +0300 Subject: [PATCH 90/94] wrong variable --- resources/views/expenses/payments/edit.blade.php | 2 +- resources/views/incomes/revenues/edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php index cacf864c9..e6f38269b 100644 --- a/resources/views/expenses/payments/edit.blade.php +++ b/resources/views/expenses/payments/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.payments', 1)])) @section('content') - @if (($recurring = $invoice->recurring) && ($next = $recurring->next())) + @if (($recurring = $payment->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php index 97b69340b..6e1673e53 100644 --- a/resources/views/incomes/revenues/edit.blade.php +++ b/resources/views/incomes/revenues/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans('general.title.edit', ['type' => trans_choice('general.revenues', 1)])) @section('content') - @if (($recurring = $invoice->recurring) && ($next = $recurring->next())) + @if (($recurring = $revenue->recurring) && ($next = $recurring->next()))

      {{ trans('recurring.recurring') }}

      From 654bd509bd348d401ac2060defd4520998ed924d Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 2 May 2018 22:12:18 +0300 Subject: [PATCH 91/94] added invoice/bill category to customer/vendor summary page --- app/Http/Controllers/Expenses/Vendors.php | 4 +--- app/Http/Controllers/Incomes/Customers.php | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Expenses/Vendors.php b/app/Http/Controllers/Expenses/Vendors.php index 0cd4fb7fb..2a5046831 100644 --- a/app/Http/Controllers/Expenses/Vendors.php +++ b/app/Http/Controllers/Expenses/Vendors.php @@ -64,9 +64,7 @@ class Vendors extends Controller $payments = 0; foreach ($item->payments as $payment) { - $payment->category = new \stdClass(); - $payment->category->id = 0; - $payment->category->name = trans_choice('general.bills', 2); + $payment->category = $item->category; $bill_payments[] = $payment; diff --git a/app/Http/Controllers/Incomes/Customers.php b/app/Http/Controllers/Incomes/Customers.php index 273030037..e187f2763 100644 --- a/app/Http/Controllers/Incomes/Customers.php +++ b/app/Http/Controllers/Incomes/Customers.php @@ -64,9 +64,7 @@ class Customers extends Controller $payments = 0; foreach ($item->payments as $payment) { - $payment->category = new \stdClass(); - $payment->category->id = 0; - $payment->category->name = trans_choice('general.invoices', 2); + $payment->category = $item->category; $invoice_payments[] = $payment; From 7beb5a7fad9b9834c9e757f244c5a392e823d281 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 2 May 2018 22:33:28 +0300 Subject: [PATCH 92/94] fixed tax report --- app/Models/Expense/BillTotal.php | 44 +++++++++++-------- app/Models/Income/InvoiceTotal.php | 44 +++++++++++-------- resources/views/expenses/bills/bill.blade.php | 4 +- resources/views/expenses/bills/show.blade.php | 2 +- .../views/incomes/invoices/invoice.blade.php | 2 +- .../views/incomes/invoices/show.blade.php | 2 +- 6 files changed, 57 insertions(+), 41 deletions(-) diff --git a/app/Models/Expense/BillTotal.php b/app/Models/Expense/BillTotal.php index 62ba24114..12b96e5b9 100644 --- a/app/Models/Expense/BillTotal.php +++ b/app/Models/Expense/BillTotal.php @@ -12,6 +12,13 @@ class BillTotal extends Model protected $table = 'bill_totals'; + /** + * The accessors to append to the model's array form. + * + * @var array + */ + protected $appends = ['title']; + /** * Attributes that should be mass-assignable. * @@ -40,39 +47,40 @@ class BillTotal extends Model * * @return string */ - public function getNameAttribute($value) + public function getTitleAttribute() { - $name = $value; + $title = $this->name; $percent = 0; - // Discount - if ($this->code == 'discount') { - $name = trans($name); - $percent = $this->bill->discount; - } + switch ($this->code) { + case 'discount': + $title = trans($title); + $percent = $this->bill->discount; - // Tax - if ($this->code == 'tax') { - $rate = Tax::where('name', $name)->value('rate'); + break; + case 'tax': + $rate = Tax::where('name', $title)->value('rate'); - if (!empty($rate)) { - $percent = $rate; - } + if (!empty($rate)) { + $percent = $rate; + } + + break; } if (!empty($percent)) { - $name .= ' ('; + $title .= ' ('; if (setting('general.percent_position', 'after') == 'after') { - $name .= $percent . '%'; + $title .= $percent . '%'; } else { - $name .= '%' . $percent; + $title .= '%' . $percent; } - $name .= ')'; + $title .= ')'; } - return $name; + return $title; } } diff --git a/app/Models/Income/InvoiceTotal.php b/app/Models/Income/InvoiceTotal.php index 88345a38e..30f15493f 100644 --- a/app/Models/Income/InvoiceTotal.php +++ b/app/Models/Income/InvoiceTotal.php @@ -12,6 +12,13 @@ class InvoiceTotal extends Model protected $table = 'invoice_totals'; + /** + * The accessors to append to the model's array form. + * + * @var array + */ + protected $appends = ['title']; + /** * Attributes that should be mass-assignable. * @@ -40,39 +47,40 @@ class InvoiceTotal extends Model * * @return string */ - public function getNameAttribute($value) + public function getTitleAttribute() { - $name = $value; + $title = $this->name; $percent = 0; - // Discount - if ($this->code == 'discount') { - $name = trans($name); - $percent = $this->invoice->discount; - } + switch ($this->code) { + case 'discount': + $title = trans($title); + $percent = $this->invoice->discount; - // Tax - if ($this->code == 'tax') { - $rate = Tax::where('name', $name)->value('rate'); + break; + case 'tax': + $rate = Tax::where('name', $title)->value('rate'); - if (!empty($rate)) { - $percent = $rate; - } + if (!empty($rate)) { + $percent = $rate; + } + + break; } if (!empty($percent)) { - $name .= ' ('; + $title .= ' ('; if (setting('general.percent_position', 'after') == 'after') { - $name .= $percent . '%'; + $title .= $percent . '%'; } else { - $name .= '%' . $percent; + $title .= '%' . $percent; } - $name .= ')'; + $title .= ')'; } - return $name; + return $title; } } diff --git a/resources/views/expenses/bills/bill.blade.php b/resources/views/expenses/bills/bill.blade.php index 1cc02c139..e109a1539 100644 --- a/resources/views/expenses/bills/bill.blade.php +++ b/resources/views/expenses/bills/bill.blade.php @@ -115,7 +115,7 @@ @foreach($bill->totals as $total) @if ($total->code != 'total')
      {{ trans($total->name) }}:{{ trans($total->title) }}: @money($total->amount, $bill->currency_code, true)
      {{ trans($total['name']) }}:{{ trans($total->name) }}: @money($total->amount - $bill->paid, $bill->currency_code, true)
      {{ trans($total->name) }}:{{ trans($total->title) }}: @money($total->amount, $bill->currency_code, true)
      {{ trans($total->name) }}:{{ trans($total->title) }}: @money($total->amount, $invoice->currency_code, true)
      {{ trans($total->name) }}:{{ trans($total->title) }}: @money($total->amount, $invoice->currency_code, true)