From c675ec750f15a3d1d4368a00dec29c58a7745de7 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Wed, 3 Jun 2020 18:05:16 +0300 Subject: [PATCH 001/208] text overlapping problem is solved on some widgets --- resources/views/widgets/account_balance.blade.php | 2 +- resources/views/widgets/latest_expenses.blade.php | 2 +- resources/views/widgets/latest_income.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/widgets/account_balance.blade.php b/resources/views/widgets/account_balance.blade.php index 375a966f9..fdc57a8d0 100644 --- a/resources/views/widgets/account_balance.blade.php +++ b/resources/views/widgets/account_balance.blade.php @@ -13,7 +13,7 @@ @foreach($accounts as $item) - {{ $item->name }} + {{ $item->name }} @money($item->balance, $item->currency_code, true) @endforeach diff --git a/resources/views/widgets/latest_expenses.blade.php b/resources/views/widgets/latest_expenses.blade.php index cc80bb3ab..a9f0e619c 100644 --- a/resources/views/widgets/latest_expenses.blade.php +++ b/resources/views/widgets/latest_expenses.blade.php @@ -17,7 +17,7 @@ @foreach($transactions as $item) @date($item->paid_at) - {{ $item->category->name }} + {{ $item->category->name }} @money($item->amount, $item->currency_code, true) @endforeach diff --git a/resources/views/widgets/latest_income.blade.php b/resources/views/widgets/latest_income.blade.php index cc80bb3ab..a9f0e619c 100644 --- a/resources/views/widgets/latest_income.blade.php +++ b/resources/views/widgets/latest_income.blade.php @@ -17,7 +17,7 @@ @foreach($transactions as $item) @date($item->paid_at) - {{ $item->category->name }} + {{ $item->category->name }} @money($item->amount, $item->currency_code, true) @endforeach From fd5d1398f1b03d1a3ab15e23037d93e94b50ae1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 3 Jun 2020 23:23:41 +0300 Subject: [PATCH 002/208] log update failure --- app/Console/Commands/FinishUpdate.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Console/Commands/FinishUpdate.php b/app/Console/Commands/FinishUpdate.php index 8d3b32f06..86e810157 100644 --- a/app/Console/Commands/FinishUpdate.php +++ b/app/Console/Commands/FinishUpdate.php @@ -43,6 +43,8 @@ class FinishUpdate extends Command // Check if file mirror was successful $version = ($alias == 'core') ? version('short') : module($alias)->get('version'); if ($version != $new) { + logger($alias . ' update failed:: file version > ' . $version . ' -vs- ' . 'request version > ' . $new); + throw new \Exception(trans('modules.errors.finish', ['module' => $alias])); } From 83359e84bd9e7f0de5226a863147fb9415534c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 4 Jun 2020 14:09:57 +0300 Subject: [PATCH 003/208] updated translations --- resources/lang/bn-BD/accounts.php | 6 +- resources/lang/bn-BD/auth.php | 16 ++-- resources/lang/bn-BD/bills.php | 25 +++-- resources/lang/bn-BD/bulk_actions.php | 14 +-- resources/lang/bn-BD/demo.php | 2 +- resources/lang/bn-BD/email_templates.php | 10 +- resources/lang/bn-BD/errors.php | 6 +- resources/lang/bn-BD/footer.php | 2 +- resources/lang/bn-BD/general.php | 116 +++++++++++------------ resources/lang/bn-BD/header.php | 8 +- resources/lang/bn-BD/import.php | 4 +- resources/lang/bn-BD/install.php | 14 +-- resources/lang/bn-BD/modules.php | 1 - resources/lang/is-IS/auth.php | 1 + resources/lang/is-IS/bills.php | 12 ++- resources/lang/is-IS/bulk_actions.php | 6 +- resources/lang/is-IS/companies.php | 5 +- resources/lang/is-IS/customers.php | 2 +- resources/lang/is-IS/dashboard.php | 23 ----- resources/lang/is-IS/dashboards.php | 11 +++ resources/lang/is-IS/demo.php | 35 +++++-- resources/lang/is-IS/email_templates.php | 6 +- resources/lang/is-IS/errors.php | 29 +++--- resources/lang/is-IS/general.php | 77 ++++++++++----- resources/lang/is-IS/install.php | 1 + resources/lang/is-IS/invoices.php | 18 +++- resources/lang/is-IS/maintenance.php | 8 +- resources/lang/is-IS/messages.php | 3 + resources/lang/is-IS/modules.php | 9 +- resources/lang/is-IS/pagination.php | 4 +- resources/lang/is-IS/passwords.php | 1 + resources/lang/is-IS/reconciliations.php | 2 +- resources/lang/is-IS/reports.php | 2 +- resources/lang/is-IS/settings.php | 10 ++ resources/lang/is-IS/taxes.php | 2 +- resources/lang/is-IS/validation.php | 7 +- resources/lang/is-IS/widgets.php | 23 +++++ resources/lang/nl-NL/bills.php | 6 +- resources/lang/nl-NL/bulk_actions.php | 1 + resources/lang/nl-NL/email_templates.php | 36 +++---- resources/lang/nl-NL/errors.php | 18 ++-- resources/lang/nl-NL/general.php | 102 ++++++++++---------- resources/lang/nl-NL/install.php | 1 + resources/lang/nl-NL/invoices.php | 33 ++++--- resources/lang/nl-NL/maintenance.php | 6 +- resources/lang/nl-NL/messages.php | 12 +-- resources/lang/nl-NL/modules.php | 29 +++--- resources/lang/nl-NL/pagination.php | 8 +- resources/lang/nl-NL/passwords.php | 2 +- resources/lang/nl-NL/reconciliations.php | 2 +- resources/lang/nl-NL/reports.php | 8 +- resources/lang/nl-NL/settings.php | 70 +++++++------- resources/lang/nl-NL/taxes.php | 2 +- resources/lang/nl-NL/validation.php | 2 +- resources/lang/nl-NL/widgets.php | 36 +++---- resources/lang/zh-CN/bills.php | 8 +- resources/lang/zh-CN/bulk_actions.php | 6 +- resources/lang/zh-CN/install.php | 1 + resources/lang/zh-CN/invoices.php | 5 + resources/lang/zh-CN/messages.php | 2 + resources/lang/zh-CN/modules.php | 1 - resources/lang/zh-CN/passwords.php | 1 + resources/lang/zh-CN/settings.php | 6 ++ resources/lang/zh-CN/validation.php | 7 +- 64 files changed, 530 insertions(+), 402 deletions(-) delete mode 100644 resources/lang/is-IS/dashboard.php create mode 100644 resources/lang/is-IS/dashboards.php create mode 100644 resources/lang/is-IS/widgets.php diff --git a/resources/lang/bn-BD/accounts.php b/resources/lang/bn-BD/accounts.php index 69848564a..461c20bfc 100644 --- a/resources/lang/bn-BD/accounts.php +++ b/resources/lang/bn-BD/accounts.php @@ -4,11 +4,11 @@ return [ 'account_name' => 'অ্যাকাউন্টের নাম', 'number' => 'সংখ্যা', - 'opening_balance' => 'প্রারম্ভিক স্থিতি', - 'current_balance' => 'বর্তমান হিসাব', + 'opening_balance' => 'শুরুর ব্যালেন্স', + 'current_balance' => 'বর্তমান ব্যালেন্স', 'bank_name' => 'ব্যাংকের নাম', 'bank_phone' => 'ব্যাংকের ফোন নাম্বার', 'bank_address' => 'ব্যাংকের ঠিকানা', - 'default_account' => 'পূর্ব-নির্ধারিত হিসাব', + 'default_account' => 'ডিফল্ট একাউন্ট', ]; diff --git a/resources/lang/bn-BD/auth.php b/resources/lang/bn-BD/auth.php index cab6ef2e6..b50cd9733 100644 --- a/resources/lang/bn-BD/auth.php +++ b/resources/lang/bn-BD/auth.php @@ -2,16 +2,17 @@ return [ - 'profile' => 'বৃত্তান্ত', + 'profile' => 'প্রোফাইল', 'logout' => 'প্রস্থান', 'login' => 'প্রবেশ', - 'login_to' => 'আপনার সেশন শুরু করতে প্রবেশ করুন', - 'remember_me' => 'আমাকে মনে রেখো', + 'login_to' => 'আপনার সেশন শুরু করতে লগ ইন করুন', + 'remember_me' => 'আমাকে মনে রাখুন', 'forgot_password' => 'আমি আমার পাসওয়ার্ড ভুলে গেছি', - 'reset_password' => 'পাসওয়ার্ড পুনরুদ্ধার করুন', + 'reset_password' => 'পাসওয়ার্ড রিসেট করুন +', 'enter_email' => 'আপনার ই-মেইল ঠিকানা লিখুন', 'current_email' => 'বর্তমান ই-মেইল', - 'reset' => 'পূর্বাবস্থায় ফিরুন', + 'reset' => 'রিসেট', 'never' => 'কখনো না', 'landing_page' => 'প্রথম পাতা ', @@ -29,13 +30,14 @@ return [ ], 'failed' => 'এই পরিচয়পত্র আমাদের রেকর্ডের সাথে মেলে না।', - 'disabled' => 'এই অ্যাকাউন্টটি নিষ্ক্রিয় করা হয়েছে। দয়া করে সিস্টেম পরিচালকের সাথে যোগাযোগ করুন।', + 'disabled' => 'এই অ্যাকাউন্টটি নিষ্ক্রিয় করা হয়েছে। দয়া করে সিস্টেম অ্যাডমিনস্ট্রেটরের সাথে যোগাযোগ করুন।', 'throttle' => 'প্রবেশ করার জন্য অনেকবার চেষ্টা করেছেন। :seconds সেকেন্ড পরে আবার চেষ্টা করুন।', 'notification' => [ 'message_1' => 'আপনি এই ই-মেলটি গ্রহণ করছেন কারণ আমরা আপনার অ্যাকাউন্টের জন্য পাসওয়ার্ড পুনরুদ্ধার করার একটি অনুরোধ পেয়েছি।', 'message_2' => 'যদি আপনি পাসওয়ার্ড পুনরুদ্ধারের অনুরোধ না করে থাকেন, তবে কোনও পদক্ষেপের প্রয়োজন নেই।', - 'button' => 'পাসওয়ার্ড পুনরুদ্ধার করুন', + 'button' => 'পাসওয়ার্ড রিসেট করুন +', ], ]; diff --git a/resources/lang/bn-BD/bills.php b/resources/lang/bn-BD/bills.php index a86826a2f..0a96112d1 100644 --- a/resources/lang/bn-BD/bills.php +++ b/resources/lang/bn-BD/bills.php @@ -9,15 +9,15 @@ return [ 'order_number' => 'অর্ডার নম্বর', 'bill_from' => 'বিল থেকে', - 'quantity' => 'পরিমান', + 'quantity' => 'পরিমাণ', 'price' => 'মূল্য', 'sub_total' => 'সাবটোটাল', - 'discount' => 'ডিসকাউন্ট', + 'discount' => 'ছাড়', 'item_discount' => 'লাইন ছাড়/রেয়াত', 'tax_total' => 'মোট ট্যাক্স', 'total' => 'মোট', - 'item_name' => 'আইটেম নাম|আইটেম নাম', + 'item_name' => 'আইটেমের নাম | আইটেমগুলোর নাম', 'show_discount' => ':discount% ছাড়', 'add_discount' => 'ডিসকাউন্ট যুক্ত করুন', @@ -25,12 +25,11 @@ return [ 'payment_due' => 'বাকি টাকা', 'amount_due' => 'বাকি আছে', - 'paid' => 'দেওয়া', + 'paid' => 'পরিশোধিত', 'histories' => 'ইতিহাস', - 'payments' => 'টাকা প্রদান -', + 'payments' => 'পেমেন্টগুলো', 'add_payment' => 'পেমেন্ট যুক্ত করুন', - 'mark_paid' => 'পরিশোধিত হিসাবে চিহ্নিত কর', + 'mark_paid' => 'পরিশোধিত হিসাবে চিহ্নিত করুন', 'mark_received' => 'পেয়েছেন হিসাবে চিহ্নত করুন', 'mark_cancelled' => 'বাতিলকৃত হিসাবে চিহ্নিত', 'download_pdf' => 'PDF ডাউনলোড', @@ -43,7 +42,7 @@ return [ 'draft' => 'খসড়া', 'received' => 'প্রাপ্ত', 'partial' => 'আংশিক', - 'paid' => 'দেওয়া', + 'paid' => 'পরিশোধিত', 'overdue' => 'বিলম্বিত', 'unpaid' => 'অপরিশোধিত', 'cancelled' => 'বাতিলকৃত', @@ -53,16 +52,16 @@ return [ 'marked_received' => 'বিলটি পরিশোধিত হিসাবে চিহ্নিত করা হয়েছে!', 'marked_paid' => 'বিলটি পরিশোধিত হিসাবে চিহ্নিত করা হয়েছে!', 'marked_cancelled' => 'বিলটি বাতিলকৃত হিসাবে চিহ্নিত করা হয়েছে', - 'draft' => 'এটি একটি খসড়া বিল এবং এটি চার্টে দ্যাখা যাবে যখন এটি গ্রহণ করা হবে ।', + 'draft' => 'এটি একটি খসড়া বিল এবং এটি গৃহীত হওয়ার পর চার্টে দেখা যাবে।', 'status' => [ - 'created' => 'তৈরি করা: তারিখ ', + 'created' => 'তৈরি করা: :date', 'receive' => [ - 'draft' => 'পাঠানো না', - 'received' => 'গ্রহণ করা হয়েছে : তারিখ ', + 'draft' => 'অপ্রেরিত', + 'received' => 'গ্রহণ করা হয়েছে :date', ], 'paid' => [ - 'await' => 'পেমেন্ট অপেক্ষা', + 'await' => 'পেমেন্ট অপেক্ষমান', ], ], ], diff --git a/resources/lang/bn-BD/bulk_actions.php b/resources/lang/bn-BD/bulk_actions.php index 1f899df60..32ee0031b 100644 --- a/resources/lang/bn-BD/bulk_actions.php +++ b/resources/lang/bn-BD/bulk_actions.php @@ -4,18 +4,18 @@ return [ 'bulk_actions' => 'গণ পদক্ষেপ | গণ পদক্ষেপসমূহ', 'selected' => 'নির্বাচিত', - 'no_action' => 'কোন পদক্ষেপ উপলভ্য নেই', + 'no_action' => 'কোন কার্যক্রম নেই', 'message' => [ - 'duplicate' => 'আপনি কি নির্বাচিত দ্বিনকল ভুক্তিটি মুছে ফেলতে বদ্ধপরিকর ?', - 'delete' => 'আপনি কি নির্বাচিত ভুক্তিটি মুছে ফেলতে বদ্ধ পরিকর ?| আপনি কি নির্বাচিত ভুক্তিসমূহ মুছে ফেলতে বদ্ধ পরিকর ?', - 'export' => 'আপনি কি নির্বাচিত ভুক্তি টি রপ্তানী করতে বদ্ধপরিকর ? | আপনি কি নির্বাচিত ভুক্তি সমূহ রপ্তানী করতে বদ্ধপরিকর ? ', - 'enable' => 'আপনি কি নির্বাচিত ভুক্তিটি সক্রিয় করতে বদ্ধপরিকর ? | আপনি কি নির্বাচিত ভুক্তি সমূহ রপ্তানী করতে বদ্ধপরিকর ? ', - 'disable' => 'আপনি কি নির্বাচিত ভুক্তিটি নিষ্ক্রিয় করতে বদ্ধপরিকর ? | আপনি কি নির্বাচিত ভুক্তি সমূহ নিষ্ক্রিয় করতে বদ্ধপরিকর ? ', + 'duplicate' => 'আপনি কি নির্বাচিত রেকর্ডটি ডুপ্লিকেট করতে নিশ্চিত?', + 'delete' => 'আপনি কি নির্বাচিত রেকর্ডটি মুছে ফেলতে নিশ্চিত?| আপনি কি নির্বাচিত রেকর্ডসমূহ মুছে ফেলতে নিশ্চিত ?', + 'export' => 'আপনি কি নির্বাচিত রেকর্ডটি এক্সপোর্ট করতে নিশ্চিত ? | আপনি কি নির্বাচিত রেকর্ডসমূহ এক্সপোর্ট করতে নিশ্চিত ? ', + 'enable' => 'আপনি কি নির্বাচিত রেকর্ডটি সক্রিয় করতে নিশ্চিত ? | আপনি কি নির্বাচিত রেকর্ডসমূহ সক্রিয় করতে নিশ্চিত ? ', + 'disable' => 'আপনি কি নির্বাচিত রেকর্ডটি নিষ্ক্রিয় করতে নিশ্চিত ? | আপনি কি নির্বাচিত রেকর্ডসমূহ নিষ্ক্রিয় করতে নিশ্চিত ? ', 'paid' => 'আপনি কি নির্বাচিত ইনভয়েসটিকে পরিশোধিত হিসাবে চিহ্নিত করতে চান ? | আপনি কি নির্বাচিত ইনভয়েসটিগুলোকে পরিশোধিত হিসাবে চিহ্নিত করতে চান ?', 'sent' => 'আপনি কি নির্বাচিত ইনভয়েসটিকে পাঠানো হিসাবে চিহ্নিত করতে চান ? | আপনি কি নির্বাচিত ইনভয়েসগুলোকে পাঠানো হিসাবে চিহ্নিত করতে চান', 'received' => 'আপনি কি নির্বাচিত বিলটিকে প্রাপ্ত হিসাবে চিহ্নিত করতে চান ? | আপনি কি নির্বাচিত বিলগুলোকে প্রাপ্ত হিসাবে চিহ্নিত করতে চান ? ', - 'cancelled' => 'আপনি কি নির্বাচিত বিল/ইনভয়েসটি বাতিল করতে বদ্ধপরিকর ?| আপনি কি নির্বাচিত বিল/ইনভয়েসগুলোকে বাতিল করতে বদ্ধপরিকর ?', + 'cancelled' => 'আপনি কি নির্বাচিত বিল/ইনভয়েসটি বাতিল করতে নিশ্চিত?| আপনি কি নির্বাচিত বিল/ইনভয়েসগুলোকে বাতিল করতে নিশ্চিত?', ], ]; diff --git a/resources/lang/bn-BD/demo.php b/resources/lang/bn-BD/demo.php index 2fa9cdc2d..d8bfe64c5 100644 --- a/resources/lang/bn-BD/demo.php +++ b/resources/lang/bn-BD/demo.php @@ -20,7 +20,7 @@ return [ 'offline_payments' => [ 'cash' => 'নগদ', - 'bank' => 'ব্যাংক হিসাবে স্থানান্তর', + 'bank' => 'ব্যাংক ট্রান্সফার', ], 'reports' => [ diff --git a/resources/lang/bn-BD/email_templates.php b/resources/lang/bn-BD/email_templates.php index 5b27e684e..faf220281 100644 --- a/resources/lang/bn-BD/email_templates.php +++ b/resources/lang/bn-BD/email_templates.php @@ -4,12 +4,12 @@ return [ 'invoice_new_customer' => [ 'subject' => '{invoice_number} ইনভয়েস তৈরি করা হয়েছে', - 'body' => 'সুপ্রিয় {customer_name},

আমরা আপনার সুবিধার্থে এই ইনভয়েসটি তৈরি করেছিঃ {invoice_number}.

ইনভয়েসের বিস্তারিত বিবরণ দেখতে এবং পে-মেন্ট করতে অগ্রসর হতে নিচের লিংকে ক্লিক করুনঃ {invoice_number}.

কোন জিজ্ঞাসা থাকলে নিঃসংকোচে যোগাযোগ করুন ।

ধন্যবাদান্তে,
{company_name}', + 'body' => 'সুপ্রিয় {customer_name},

আমরা আপনার সুবিধার্থে এই ইনভয়েসটি তৈরি করেছিঃ {invoice_number}.

ইনভয়েসের বিস্তারিত বিবরণ দেখতে এবং পে-মেন্ট করতে নিচের লিংকে ক্লিক করুনঃ {invoice_number}.

কোন জিজ্ঞাসা থাকলে নিঃসংকোচে যোগাযোগ করুন ।

ধন্যবাদান্তে,
{company_name}', ], 'invoice_remind_customer' => [ 'subject' => '{invoice_number} সময়োত্তীর্ণ ইনভয়েসের বিজ্ঞপ্তি', - 'body' => 'প্রিয় সুধী {customer_name},

This is an overdue notice for {invoice_number} invoice.

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

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

ধন্যবাদান্তে,
{company_name}', + 'body' => 'প্রিয় {customer_name},

এটি ইনভয়েস নম্বর: {invoice_number} এর সময় উত্তীর্ণ হওয়ার নোটিশ।

ইনভয়েসের সর্বমোট মূল্য {invoice_total} এবং সময়সীমা {invoice_due_date} পর্যন্ত ছিল।

ইনভয়েসের বিস্তারিত দেখতে এবং পেমেন্ট করতে এই লিংক ভিজিট করুন: {invoice_number}.

ধন্যবাদান্তে,
{company_name}', ], 'invoice_remind_admin' => [ @@ -24,7 +24,7 @@ return [ 'invoice_recur_admin' => [ 'subject' => '{invoice_number} আবর্তক ইনভয়েস তৈরি করা হয়েছে', - 'body' => 'সুপ্রিয় সুধী

{customer_name} আবর্তক চক্রের ভিত্তিতে {invoice_number} স্বয়ংক্রিয়ভাবে ইনভয়েসটি তৈরি করা হয়েছে।

নিচের লিংকে ইনভয়েসের বিস্তারিত বিবরণ পাবেনঃ {invoice_number}.

ধন্যবাদান্তে,
{company_name}', + 'body' => 'প্রিয়

{customer_name} আবর্তক চক্রের ভিত্তিতে {invoice_number} স্বয়ংক্রিয়ভাবে ইনভয়েসটি তৈরি করা হয়েছে।

নিচের লিংকে ইনভয়েসের বিস্তারিত বিবরণ পাবেনঃ {invoice_number}.

ধন্যবাদান্তে,
{company_name}', ], 'invoice_payment_customer' => [ @@ -33,13 +33,13 @@ return [ ], 'invoice_payment_admin' => [ - 'subject' => 'এই {invoice_number} ইনভয়েসের জন্য পেমেন্ট গৃহীত হয়েছে', + 'subject' => '{invoice_number} ইনভয়েসের জন্য পেমেন্ট গৃহীত হয়েছে', 'body' => 'প্রিয়,

{customer_name} {invoice_number} ইনভয়েসের জন্য একটি পেমেন্ট নথিভুক্ত করেছেন

ইনভয়েসের বিস্তারিত বিবরণ নিচের লিংকে পাবেনঃ {invoice_number}.

ধন্যবাদান্তে,
{company_name}।', ], 'bill_remind_admin' => [ 'subject' => '{bill_number} বিল অনুস্মারক বিজ্ঞপ্তি', - 'body' => 'প্রিয় ,

এটি {vendor_name} কে প্রদত্ত {bill_number} বিল পরিমোধের অনুস্মারক বিজ্ঞপ্তি।

মোট বিল {bill_total} এবং পরিশোধের তারিখ {bill_due_date}।

নিচের লিংক থেকে আপনি বিলের বিশদ বিবরণ দেখতে পাবেনঃ {bill_number}.

ধন্যবাদান্তে,
{company_name}।', + 'body' => 'প্রিয় ,

এটি {vendor_name} কে প্রদত্ত {bill_number} বিল পরিশোধের অনুস্মারক বিজ্ঞপ্তি।

মোট বিল {bill_total} এবং পরিশোধের তারিখ {bill_due_date}।

নিচের লিংক থেকে আপনি বিলের বিশদ বিবরণ দেখতে পাবেনঃ {bill_number}.

ধন্যবাদান্তে,
{company_name}।', ], 'bill_recur_admin' => [ diff --git a/resources/lang/bn-BD/errors.php b/resources/lang/bn-BD/errors.php index 091db65cf..81ff83a34 100644 --- a/resources/lang/bn-BD/errors.php +++ b/resources/lang/bn-BD/errors.php @@ -3,7 +3,7 @@ return [ 'title' => [ - '403' => 'ওহহো! অননুমোদিত অনুপ্রবেশের চেষ্টা', + '403' => 'ওহহো! প্রবেশাধিকার সংরক্ষিত', '404' => 'ওহহো ! পৃষ্ঠাটি খুঁজে পাওয়া গেল না', '500' => 'ওহহো! কিছু একটা সমস্যা হয়েছে।', ], @@ -15,8 +15,8 @@ return [ ], 'message' => [ - '403' => 'আপনি এই পৃষ্ঠায় অনুপ্রবেশ করতে পারবেন না', - '404' => 'আপনার উদ্দিষ্ট পৃষ্ঠাটি খুঁজে পাওয়া গেল না ।', + '403' => 'আপনি এই পৃষ্ঠায় প্রবেশ করতে পারবেন না', + '404' => 'আপনার সন্ধানকৃত পৃষ্ঠাটি খুঁজে পাওয়া গেল না ।', '500' => 'আমরা এই বিষয়টি দ্রুত সমাধানের চেষ্টা করবো।', ], diff --git a/resources/lang/bn-BD/footer.php b/resources/lang/bn-BD/footer.php index 6d681f6f9..a28ec2fc6 100644 --- a/resources/lang/bn-BD/footer.php +++ b/resources/lang/bn-BD/footer.php @@ -3,7 +3,7 @@ return [ 'version' => 'সংস্করণ', - 'powered' => 'চালিত হচ্ছে Akaunting দিয়েঃ ', + 'powered' => 'অ্যাকাউন্টিং(Akaunting) দ্বারা চালিত', 'link' => 'https://akaunting.com', 'software' => 'মুক্ত হিসাবরক্ষণ সফটওয়্যার', diff --git a/resources/lang/bn-BD/general.php b/resources/lang/bn-BD/general.php index 3f8b2a113..286c166ed 100644 --- a/resources/lang/bn-BD/general.php +++ b/resources/lang/bn-BD/general.php @@ -3,60 +3,60 @@ return [ 'dashboards' => 'ড্যাসবোর্ড | ড্যাসবোর্ড গুলো', - 'items' => 'আইটেম | আইটেমগুলো', - 'incomes' => 'আয় | আয়', - 'invoices' => 'ইনভয়েস | ইনভয়েসগুলো', - 'revenues' => 'রাজস্ব | রাজস্ব', + 'items' => 'আইটেম | আইটেমসমূহ', + 'incomes' => 'আয় | আয়সমূহ', + 'invoices' => 'ইনভয়েস | ইনভয়েসসমূহ', + 'revenues' => 'রাজস্ব | রাজস্বসমূহ', 'customers' => 'ক্রেতা | ক্রেতাবৃন্দ', 'expenses' => 'খরচ | খরচসমূহ', - 'bills' => 'বিল | বিলগুলো', - 'payments' => 'পেমেন্ট | পেমেন্টগুলো', + 'bills' => 'বিল | বিলসমূহ', + 'payments' => 'পেমেন্ট | পেমেন্টসমূহ', 'vendors' => 'সরবরাহকারী | সরবরাহকারীবৃন্দ ', - 'accounts' => 'একাউন্ট | একাউন্টগুলো', - 'transfers' => 'স্থানান্তর | স্থানান্তরসমূহ', + 'accounts' => 'একাউন্ট | একাউন্টসমূহ', + 'transfers' => 'ট্রান্সফার|ট্রান্সফারসমূহ', 'transactions' => 'লেনদেন | লেনদেনসমূহ', 'reports' => 'প্রতিবেদন | প্রতিবেদনসমূহ', - 'settings' => 'নিয়ামক | নিয়ামকসমূহ', - 'categories' => 'ক্যাটেগরি | ক্যাটেগরিগুলো', + 'settings' => 'সেটিংস| সেটিংস', + 'categories' => 'ধরণ | ধরণসমূহ', 'currencies' => 'মুদ্রা | মুদ্রাসমূহ', 'tax_rates' => 'করের হার | করের হার সমূহ', 'users' => 'ব্যবহারকারি | ব্যবহারকারিবৃন্দ', 'roles' => 'ভুমিকা | ভুমিকাসমূহ', 'permissions' => 'অনুমতি | অনুমতিসমূহ', - 'modules' => 'অ্যাপ | অ্যাপগুলো', + 'modules' => 'অ্যাপ | অ্যাপসমূহ', 'companies' => 'প্রতিষ্ঠান | প্রতিষ্ঠানসমূহ', 'profits' => 'লাভ | লাভ', 'taxes' => 'কর | করসমূহ', - 'logos' => 'লোগো | লোগোগুলো', - 'pictures' => 'ছবি | ছবিগুলো', + 'logos' => 'লোগো | লোগোসমূহ', + 'pictures' => 'ছবি | ছবিসমূহ', 'types' => 'ধরণ | ধরণসমূহ', 'payment_methods' => 'পেমেন্টের পদ্ধতি | পেমেন্টের পদ্ধতিসমূহ', 'compares' => 'আয় বনাম ব্যয় | আয়সমূহ বনাম ব্যয়সমূহ', 'notes' => 'দ্রষ্টব্য | দ্রষ্টব্যসমূহ', 'totals' => 'সর্বমোট | সর্বমোটসমূহ', 'languages' => 'ভাষা | ভাষাসমূহ', - 'updates' => 'পরিবর্ধন | পরিবর্ধনসমূহ', + 'updates' => 'আপডেট| আপডেটসমূহ', 'numbers' => 'সংখ্যা | সংখ্যাগুলো', 'statuses' => 'অবস্থা | অবস্থাসমূহ', 'others' => 'অন্যান্য | অন্যান্যগুলো', 'contacts' => 'কন্টাক্ট | কন্টাক্টগুলো', 'reconciliations' => 'সমন্বয় | সমন্বয়সমূহ', - 'developers' => 'ডেভেলপার | ডেভেলপাররা', + 'developers' => 'ডেভেলপার | ডেভেলপারবৃন্দ', 'schedules' => 'তফসিল | তফসিলসমূহ', 'groups' => 'গোষ্ঠী | গোষ্ঠীসমূহ', 'charts' => 'চার্ট | চার্টগুলো', 'localisations' => 'স্থানীয়করণ | স্থানীয়করণসমূহ', 'defaults' => 'পূর্বনির্ধারিত | পূর্বনির্ধারিতসমূহ', 'widgets' => 'উইজেট | উইজেটগুলো', - 'templates' => 'ছাঁচ | ছাঁচসমূহ', + 'templates' => 'টেমপ্লেট| টেমপ্লেটসমূহ', 'sales' => 'বিক্রয় | বিক্রয়সমূহ', 'purchases' => 'ক্রয় | ক্রয়সমূহ', - 'welcome' => 'সুস্বাগতম', + 'welcome' => 'স্বাগতম', 'banking' => 'ব্যাংকিং', 'general' => 'সাধারণ', - 'no_records' => 'কোন ভুক্তি নেই', + 'no_records' => 'রেকর্ড নেই', 'date' => 'তারিখ', 'amount' => 'পরিমাণ', 'enabled' => 'সক্রিয়', @@ -71,13 +71,13 @@ return [ 'quarterly' => 'ত্রৈমাসিক', 'yearly' => 'বাৎসরিক', 'add' => 'যোগ', - 'add_new' => 'যোগ কর নতুন', - 'add_income' => 'আয় যোগ কর', - 'add_expense' => 'ব্যয় যোগ কর', - 'show' => 'দেখাও', + 'add_new' => 'নতুন যোগ করুন', + 'add_income' => 'আয় যোগ করুন', + 'add_expense' => 'ব্যয় যোগ করুন', + 'show' => 'দেখান', 'edit' => 'সম্পাদনা', - 'delete' => 'মুছে ফেল', - 'send' => 'পাঠাও', + 'delete' => 'মুছুন', + 'send' => 'পাঠান', 'share' => 'শেয়ার করুন', 'download' => 'ডাউনলোড', 'delete_confirm' => 'নিশ্চিতভাবে মুছে ফেলতে চান :name :type?', @@ -87,7 +87,7 @@ return [ 'phone' => 'ফোন', 'address' => 'ঠিকানা', 'website' => 'ওয়েবসাইট', - 'actions' => 'কর্মকান্ডসমূহ', + 'actions' => 'ব্যবস্থাসমুহ', 'description' => 'বিবরণ', 'manage' => 'ব্যবস্থাপনা', 'code' => 'কোড', @@ -95,27 +95,27 @@ return [ 'balance' => 'স্থিতি', 'reference' => 'সুত্র', 'attachment' => 'সংযুক্তি', - 'change' => 'পরিবর্তন কর', - 'change_type' => 'পরিবর্তন কর :type', - 'switch' => 'সুইচ কর', + 'change' => 'পরিবর্তন', + 'change_type' => 'পরিবর্তন করুন :type', + 'switch' => 'সুইচ করুন', 'color' => 'রং', 'save' => 'সংরক্ষণ', 'confirm' => 'নিশ্চিত', 'cancel' => 'বাতিল', - 'loading' => 'লোড হচ্ছে…', + 'loading' => 'লোডিং…', 'from' => 'প্রেরক', 'to' => 'প্রাপক', - 'print' => 'প্রিন্ট কর', + 'print' => 'প্রিন্ট', 'search' => 'অনুসন্ধান', 'search_placeholder' => 'অনুসন্ধান করতে লিখুন.....', - 'filter' => 'ছাঁকনি', + 'filter' => 'ফিল্টার', 'help' => 'সহায়িকা', 'all' => 'সকল', 'all_type' => 'সকল :type', 'upcoming' => 'আসন্ন', - 'created' => 'তৈরির নির্ঘন্ট', + 'created' => 'তৈরি', 'id' => 'আইডি', - 'more_actions' => 'আরও কর্মকান্ড', + 'more_actions' => 'আরও ব্যবস্থা', 'duplicate' => 'প্রতিলিপি', 'unpaid' => 'অপরিশোধিত', 'paid' => 'পরিশোধিত', @@ -125,18 +125,18 @@ return [ 'partially_paid' => 'আংশিক পরিশোধিত', 'export' => 'রপ্তানি', 'finish' => 'সম্পন্ন', - 'wizard' => 'যাদুকর', - 'skip' => 'এড়িয়ে চল', - 'enable' => 'সক্রিয় কর', - 'disable' => 'নিষ্ক্রিয় কর', - 'select_all' => 'সব নির্বাচন কর', - 'unselect_all' => 'সবকিছু অনির্বাচিত কর', + 'wizard' => 'উইজার্ড', + 'skip' => 'এড়িয়ে যান', + 'enable' => 'সক্রিয় করুন', + 'disable' => 'নিষ্ক্রিয় করুন', + 'select_all' => 'সব নির্বাচন করুন', + 'unselect_all' => 'সবকিছু অনির্বাচিত করুন', 'created_date' => 'তৈরির তারিখ', 'period' => 'ব্যপ্তি', 'frequency' => 'স্পন্দনহার', 'start' => 'শুরু', 'end' => 'শেষ', - 'clear' => 'মুছে ফেল', + 'clear' => 'মুছে ফেলুন', 'difference' => 'পার্থক্য', 'footer' => 'ফুটার', 'start_date' => 'শুরুর তারিখ', @@ -145,16 +145,16 @@ return [ 'accrual' => 'উপচিতি', 'cash' => 'নগদ', 'group_by' => 'গোষ্ঠীবদ্ধকরণের ভিত্তি', - 'accounting' => 'হিসাব রক্ষণ', - 'sort' => 'বিন্যস্ত কর', + 'accounting' => 'হিসাবরক্ষণ', + 'sort' => 'সাজান', 'width' => 'প্রস্থ', 'month' => 'মাস', 'year' => 'বছর', - 'type_item_name' => 'আইটেমের নামটি লিখুন', - 'no_data' => 'কোন উপাত্ত নেই', + 'type_item_name' => 'আইটেমের নাম লিখুন', + 'no_data' => 'কোন তথ্য নেই', 'no_matching_data' => 'সামঞ্জস্যপূর্ণ কোন উপাত্ত নেই', - 'clear_cache' => 'ক্যাসে মুছে ফেল', - 'go_to_dashboard' => 'ড্যাসবোর্ডে যাও', + 'clear_cache' => 'ক্যাশ ক্লিয়ার করুন', + 'go_to_dashboard' => 'ড্যাসবোর্ডে যান', 'card' => [ 'name' => 'কার্ডে লিখিত নাম', @@ -166,21 +166,21 @@ return [ 'title' => [ 'new' => 'নতুন :type', 'edit' => 'সম্পাদনা :type', - 'delete' => 'তৈরি কর :type', + 'delete' => 'তৈরি করুন :type', 'create' => 'তৈরি কর :type', - 'send' => 'পাঠাও :type', - 'get' => 'পাও :type', - 'add' => 'যোগ কর :type', + 'send' => 'পাঠান :type', + 'get' => 'পান :type', + 'add' => 'যোগ করুন :type', 'manage' => 'ব্যবস্থাপনা :type', ], 'form' => [ 'enter' => 'প্রবেশ করান :field', 'select' => [ - 'field' => '- নির্বাচন কর :field -', - 'file' => 'ফাইল নির্বাচন কর', + 'field' => '- নির্বাচন করুন :field -', + 'file' => 'ফাইল নির্বাচন করুন', ], - 'add_new' => 'নতুন :field যোগ কর', + 'add_new' => 'নতুন :field যোগ করুন', 'no_file_selected' => 'কোন ফাইল নির্বাচন করা হয়নি......', ], @@ -193,17 +193,17 @@ return [ ], 'empty' => [ - 'documentation' => 'বিস্তারিত জানতে ডকুমেন্টেসন ঘেঁটে দেখুন।', + 'documentation' => 'বিস্তারিত জানতে ডকুমেন্টেশন ঘেঁটে দেখুন।', 'items' => 'আইটেমগুলো হতে পারে পণ্য কিংবা সেবা। ইনভয়েস এবং বিল তৈরির করার সময় আপনি আইটেম ব্যবহার করে পূর্ব থেকেই মূল্য, ট্যাক্স ইত্যাদি তৈরি অবস্থায় দেখতে পাবেন ।', 'invoices' => 'ইনভয়েসগুলো হতে পারে একবারের কিংবা আবর্তক। আপনি সেগুলো ক্রেতাকে পাঠাতে পারেন এবং অনলাইন পেমন্ট গ্রহণ করতে শুরু করুন।', 'revenues' => 'রাজস্ব হলো মূল্য পরিশোধিত আয় লেনদেন। এটি হতে পারে একটি একক ভুক্তি (যেমনঃ জমা) কিংবা কোন ইনভয়েসে সংযুক্ত ।', 'customers' => 'আপনি ইনভয়েস তৈরি করতে চাইলে ক্রেতা আবশ্যক। তারাও \'ক্লায়েন্ট পোর্টাল\' এ প্রবেশ করে তাদের স্থিতির অবস্থা পর্যবেক্ষণ করতে পারেন।', 'bills' => 'বিল এককালীন কিংবা আবর্তক হতে পারে। বিল বলতে বোঝায় আপনার ক্রয়কৃত পণ্য কিংবা সেবা সরবরাহকারীদের নিকট আপনার দেনা।', 'payments' => 'পেমেন্ট হলো মূল্য পরিশোধিত ব্যয়ের লেনদেন। বিল হতে পারে একটি একক ভুক্তি (যেমনঃ খাবারের রশিদ) কিংবা বিলের সাথে সংযুক্ত।', - 'vendors' => 'বিল তৈরি করতে চাইলে সরবরাহকারী থাকা আবশ্যক । You can see the balance you owe and filter reports by the vendor.', - 'transfers' => 'স্থানান্তর আপনাকে সুযোগ করে দেয় একটা একাউন্ট থেকে অন্য অ্যাকাউন্টে টাকা হস্তান্তর, তাতে তারা একই মুদ্রা ব্যবহার করুক বা না করুক।', - 'taxes' => 'ট্যাক্স বলতে বোঝায় ইনভয়েস কিংবা বিলে প্রযোজ্য অতিরিক্ত ফি। Your financials are affected by these regulatory taxes.', - 'reconciliations' => 'ব্যাংক সমন্বয়করণ এমন একটি ব্যবস্থা যাতে নিশ্চিত করা হয় যে আপনার ব্যাংকের ভুক্তিসমূহও সঠিকভাবে ভুক্ত করা হয়েছে কি না।', + 'vendors' => 'বিল তৈরি করতে চাইলে সরবরাহকারী থাকা আবশ্যক । সরবরাহকারীদের কাছে আপনার দেনার স্থিতি ও রিপোর্ট দেখতে পারেন।', + 'transfers' => 'ট্রান্সফার আপনাকে সুযোগ করে দেয় একটা একাউন্ট থেকে অন্য অ্যাকাউন্টে টাকা হস্তান্তর, তাতে তারা একই মুদ্রা ব্যবহার করুক বা না করুক।', + 'taxes' => 'ট্যাক্স বলতে বোঝায় ইনভয়েস কিংবা বিলে প্রযোজ্য অতিরিক্ত ফি। নির্ধারিত করসমূহ আপনার বিভিন্ন অর্থনৈতিক কার্যক্রম প্রভাবিত করবে।', + 'reconciliations' => 'ব্যাংক সমন্বয়করণ এমন একটি ব্যবস্থা যাতে নিশ্চিত করা হয় যে আপনার ব্যাংকের রেকর্ডসমূহও সঠিকভাবে সংরক্ষণ করা হয়েছে কি না।', ], ]; diff --git a/resources/lang/bn-BD/header.php b/resources/lang/bn-BD/header.php index 9131909e3..69b080830 100644 --- a/resources/lang/bn-BD/header.php +++ b/resources/lang/bn-BD/header.php @@ -3,12 +3,12 @@ return [ 'change_language' => 'ভাষা পরিবর্তন', - 'last_login' => 'সর্বশেষ প্রবেশ :time', + 'last_login' => 'সর্বশেষ লগইন :time', 'notifications' => [ - 'counter' => '{0} কোন অবহিতকরণ নেই |{1} : count টি বিজ্ঞপ্তি |[2,*] :count টি বিজ্ঞপ্তি', + 'counter' => '{0} কোন নোটিফিকেশন নেই |{1} : count টি বিজ্ঞপ্তি |[2,*] :count টি বিজ্ঞপ্তি', 'overdue_invoices' => '{1} :count টি সময়োত্তীর্ণ ইনভয়েস |[2,*] :count টি সময়োত্তীর্ণ ইনভয়েস |', - 'upcoming_bills' => '{1} :count টি সমাগত বিল|[2,*] :count টি সমাগত বিল', - 'view_all' => 'সবগুলো দেখাও' + 'upcoming_bills' => '{1} :count টি আসন্ন বিল|[2,*] :count টি আসন্ন বিল', + 'view_all' => 'সবগুলো দেখুন' ], 'docs_link' => 'https://akaunting.com/docs', 'support_link' => 'https://akaunting.com/support', diff --git a/resources/lang/bn-BD/import.php b/resources/lang/bn-BD/import.php index 93586f9e2..d3c7e473a 100644 --- a/resources/lang/bn-BD/import.php +++ b/resources/lang/bn-BD/import.php @@ -2,8 +2,8 @@ return [ - 'import' => 'আমদানি', - 'title' => 'আমদানি :type', + 'import' => 'ইমপোর্ট', + 'title' => 'ইমপোর্ট :type', 'message' => 'অনুমোদিত ফাইলের ধরণসমূহ হলোঃ XLS, XLSX । দয়া করে নমুনা ফাইল ডাউনলোড করুন।', ]; diff --git a/resources/lang/bn-BD/install.php b/resources/lang/bn-BD/install.php index badf090b7..8922a3366 100644 --- a/resources/lang/bn-BD/install.php +++ b/resources/lang/bn-BD/install.php @@ -3,13 +3,13 @@ return [ 'next' => 'পরবর্তী', - 'refresh' => 'নবোদ্যম', + 'refresh' => 'রিফ্রেশ', 'steps' => [ 'requirements' => 'দয়া করে আপনার হোস্টিং সেবা প্রদানকারীকে অনুরোধ করুন সমস্যা গুলোর সমাধান করে দিতে!', 'language' => 'ধাপ ১/৩ : ভাষা নির্বাচন', 'database' => 'ধাপ ২/৩ : ডাটাবেজ সেট-আপ', - 'settings' => 'ধাপ ৩/৩ : কোম্পানি এবং প্রশাসকের বিশদ বিবরণ', + 'settings' => 'ধাপ ৩/৩ : কোম্পানি এবং এডমিনের বিবরণ', ], 'language' => [ @@ -19,23 +19,23 @@ return [ 'requirements' => [ 'enabled' => ':feature সক্রিয় করা আবশ্যক!', 'disabled' => ':feature নিষ্ক্রিয় করা আবশ্যক!', - 'extension' => ':extension এক্সটেসনটি সংস্থাপন করে লোড করা আবশ্যক!', + 'extension' => ':extension এক্সটেসনটি ইন্সটল করে লোড করা আবশ্যক!', 'directory' => ':directory ডিরেক্টরিটি লিখনযোগ্য হওয়া আবশ্যক!', 'executable' => 'PHP CLI ফাইলটি চালানো যাচ্ছে না কিংবা এটি সংজ্ঞায়িত নয় , অথবা এর ভার্সনটি :php_version কিংবা তার উর্দ্ধে নয় ! দয়া করে আপনার হোস্টিং কোম্পানিকে PHP_BINARY কিংবা PHP_PATH environment variable টি সঠিক ভাবে নির্ধারণ করে দিতে বলুন।', ], 'database' => [ 'hostname' => 'হোস্টের নাম', - 'username' => 'ব্যবহারকারি নাম', - 'password' => 'কূটশব্দ', + 'username' => 'ব্যবহারকারীর নাম', + 'password' => 'পাসওয়ার্ড', 'name' => 'ডেটাবেজ', ], 'settings' => [ 'company_name' => 'কোম্পানির নাম', 'company_email' => 'কোম্পানির ই-মেইল', - 'admin_email' => 'প্রশাসকের ই-মেইল', - 'admin_password' => 'প্রশাসকের কূটশব্দ', + 'admin_email' => 'এ্যাডমিন ই-মেইল', + 'admin_password' => 'এ্যাডমিন পাসওয়ার্ড', ], 'error' => [ diff --git a/resources/lang/bn-BD/modules.php b/resources/lang/bn-BD/modules.php index 1857bbe2b..e9277631d 100644 --- a/resources/lang/bn-BD/modules.php +++ b/resources/lang/bn-BD/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'নতুন', 'top_free' => 'বিনামূল্যের জনপ্রিয় গুলো', 'free' => 'বিনামূল্যের', - 'search' => 'অনুসন্ধান', 'install' => 'ইনস্টল', 'buy_now' => 'এখুনি কিনুন', 'get_api_key' => 'আপনার API কী টি পেতে এখানে ক্লিক করুন।', diff --git a/resources/lang/is-IS/auth.php b/resources/lang/is-IS/auth.php index 676a8ae63..bedc62079 100644 --- a/resources/lang/is-IS/auth.php +++ b/resources/lang/is-IS/auth.php @@ -13,6 +13,7 @@ return [ 'current_email' => 'Núverandi netfang', 'reset' => 'Endursetja', 'never' => 'aldrei', + 'landing_page' => 'Upphafssíða', 'password' => [ 'current' => 'Lykilorð', diff --git a/resources/lang/is-IS/bills.php b/resources/lang/is-IS/bills.php index fe2a2f70c..dbc951003 100644 --- a/resources/lang/is-IS/bills.php +++ b/resources/lang/is-IS/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Verð', 'sub_total' => 'Samtals', 'discount' => 'Afsláttur', + 'item_discount' => 'Línuafsláttur', 'tax_total' => 'VSK', 'total' => 'Samtals', @@ -28,7 +29,9 @@ return [ 'histories' => 'Yfirlit', 'payments' => 'Greiðslur', 'add_payment' => 'Bæta við greiðslu', + 'mark_paid' => 'Merkt greitt', 'mark_received' => 'Móttekið', + 'mark_cancelled' => 'Merkt afturkallað', 'download_pdf' => 'Niðurhala PDF', 'send_mail' => 'Senda tölvupóst', 'create_bill' => 'Skapa reikning', @@ -38,12 +41,17 @@ return [ 'statuses' => [ 'draft' => 'Uppkast', 'received' => 'Móttekið', - 'partial' => 'Hluta', + 'partial' => 'Partial', 'paid' => 'Greitt', + 'overdue' => 'Vanskil', + 'unpaid' => 'Ógreitt', + 'cancelled' => 'Afturkallað', ], 'messages' => [ - 'received' => 'Reikningur merktur sem móttekinn!', + 'marked_received' => 'Reikningur merktur mótekinn', + 'marked_paid' => 'Reikningur merktur greiddur', + 'marked_cancelled' => 'Reikningur merktur afturkallaður', 'draft' => 'Þetta er PRUFU reikningur sem sést á kortum eftir að hann er móttekinn.', 'status' => [ diff --git a/resources/lang/is-IS/bulk_actions.php b/resources/lang/is-IS/bulk_actions.php index 2e5268e29..c30f1ba72 100644 --- a/resources/lang/is-IS/bulk_actions.php +++ b/resources/lang/is-IS/bulk_actions.php @@ -2,8 +2,9 @@ return [ - 'bulk_actions' => 'Magn aðgerð|Magn aðgerðir', - 'selected' => 'valið', + 'bulk_actions' => 'Magn aðgerð|Magn aðgerðir', + 'selected' => 'valið', + 'no_action' => 'No action available', 'message' => [ 'duplicate' => 'Ertu viss um að þú viljir afrita valda færslu?', @@ -14,6 +15,7 @@ return [ 'paid' => 'Ertu viss um að þú viljir merkja valdann reikning sem greiddur?|Ertu viss um að þú viljir merkja valda reikninga sem greiddir?', 'sent' => 'Ertu viss um að þú viljir merkja valdann reikning sem sendan?|Ertu viss um að þú viljir merkja valda reikninga sem sendir?', 'received' => 'Ertu viss um að þú viljir merkja valdann reikning sem mótekinn?|Ertu viss um að þú viljir merkja valda reikninga sem mótteknir?', + 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/is-IS/companies.php b/resources/lang/is-IS/companies.php index 3d5897c5e..fd12c8e7c 100644 --- a/resources/lang/is-IS/companies.php +++ b/resources/lang/is-IS/companies.php @@ -4,12 +4,11 @@ return [ 'domain' => 'Lén', 'logo' => 'Firmamerki', - 'manage' => 'Stjórna fyrirtækjum', - 'all' => 'Öll fyrirtæki', 'error' => [ 'not_user_company' => 'Villa: Þú hefur ekki heimild til að stjórna þessu fyrirtæki!', - 'delete_active' => 'Villa: Ekki er hægt að eyða virku fyrirtæki, vinsamlega breytið fyrst!', + 'delete_active' => 'Error: Can not delete the active company. Please, switch to another first!', + 'disable_active' => 'Error: Can not disable the active company. Please, switch to another first!', ], ]; diff --git a/resources/lang/is-IS/customers.php b/resources/lang/is-IS/customers.php index 6c278c06f..39822a490 100644 --- a/resources/lang/is-IS/customers.php +++ b/resources/lang/is-IS/customers.php @@ -6,7 +6,7 @@ return [ 'user_created' => 'Notandi stofnaður', 'error' => [ - 'email' => 'Þetta netfang er þegar skráð.' + 'email' => 'Þetta netfang er þegar skráð.', ], ]; diff --git a/resources/lang/is-IS/dashboard.php b/resources/lang/is-IS/dashboard.php deleted file mode 100644 index dfc282e95..000000000 --- a/resources/lang/is-IS/dashboard.php +++ /dev/null @@ -1,23 +0,0 @@ - 'Heildar inkoma', - 'receivables' => 'Viðskiptakröfur', - 'open_invoices' => 'Reikningar', - 'overdue_invoices' => 'Vanskil', - 'total_expenses' => 'Samtals kostnaður', - 'payables' => 'Skuldir', - 'open_bills' => 'Reikningar', - 'overdue_bills' => 'Vanskil', - 'total_profit' => 'Hagnaður samtals', - 'open_profit' => 'Hagnaður', - 'overdue_profit' => 'Vanskil hagnaður', - 'cash_flow' => 'Fjárstreymi', - 'no_profit_loss' => 'Tap', - 'incomes_by_category' => 'Tekjur eftir flokkum', - 'expenses_by_category' => 'Kostnaður eftir flokkum', - 'account_balance' => 'Staða', - 'latest_incomes' => 'Síðustu tekjur', - 'latest_expenses' => 'Síðasti kostnaður', -]; diff --git a/resources/lang/is-IS/dashboards.php b/resources/lang/is-IS/dashboards.php new file mode 100644 index 000000000..cdee3cb28 --- /dev/null +++ b/resources/lang/is-IS/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'Error: You are not allowed to change this dashboard!', + 'delete_last' => 'Error: Can not delete the last dashboard. Please, create a new one first!', + 'disable_last' => 'Error: Can not disable the last dashboard. Please, create a new one first!', + ], + +]; diff --git a/resources/lang/is-IS/demo.php b/resources/lang/is-IS/demo.php index 36a2d91ca..ef1472d27 100644 --- a/resources/lang/is-IS/demo.php +++ b/resources/lang/is-IS/demo.php @@ -2,12 +2,33 @@ return [ - 'accounts_cash' => 'Peningar', - 'categories_deposit' => 'Innlegg', - 'categories_sales' => 'Sala', - 'currencies_usd' => 'Dollarar', - 'currencies_eur' => 'Evra', - 'currencies_gbp' => 'Pund', - 'currencies_try' => 'Lira', + 'accounts' => [ + 'cash' => 'Cash', + ], + + 'categories' => [ + 'deposit' => 'Deposit', + 'sales' => 'Sales', + ], + + 'currencies' => [ + 'usd' => 'US Dollar', + 'eur' => 'Euro', + 'gbp' => 'British Pound', + 'try' => 'Turkish Lira', + ], + + 'offline_payments' => [ + 'cash' => 'Cash', + 'bank' => 'Bank Transfer', + ], + + 'reports' => [ + 'income' => 'Monthly income summary by category.', + 'expense' => 'Monthly expense summary by category.', + 'income_expense' => 'Monthly income vs expense by category.', + 'tax' => 'Quarterly tax summary.', + 'profit_loss' => 'Quarterly profit & loss by category.', + ], ]; diff --git a/resources/lang/is-IS/email_templates.php b/resources/lang/is-IS/email_templates.php index 77c6e5ac1..418aa3275 100644 --- a/resources/lang/is-IS/email_templates.php +++ b/resources/lang/is-IS/email_templates.php @@ -24,12 +24,12 @@ return [ 'invoice_recur_admin' => [ 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Hello,

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

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

Best Regards,
{company_name}', + 'body' => 'Hello,

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

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

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

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

-------------------------------------------------

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

-------------------------------------------------

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

Feel free to contact us for any question.

Best Regards,
{company_name}', + 'body' => 'Dear {customer_name},

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

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

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

Feel free to contact us for any question.

Best Regards,
{company_name}', ], 'invoice_payment_admin' => [ @@ -44,7 +44,7 @@ return [ 'bill_recur_admin' => [ 'subject' => '{bill_number} recurring bill created', - 'body' => 'Hello,

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

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

Best Regards,
{company_name}', + 'body' => 'Hello,

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

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

Best Regards,
{company_name}', ], ]; diff --git a/resources/lang/is-IS/errors.php b/resources/lang/is-IS/errors.php index 4c0d358a3..c72a47530 100644 --- a/resources/lang/is-IS/errors.php +++ b/resources/lang/is-IS/errors.php @@ -2,23 +2,22 @@ return [ - 'forbidden_access' => 'Aðgangur bannaður', - 'error_page' => 'Villusíða', - 'page_not_found' => 'Síða finnst ekki', - - 'body' => [ - 'forbidden_access' => 'Úps! Agangur bannaður.', - 'error_page' => 'Úps! Eitthvað misheppnaðist.', - 'page_not_found' => 'Úps! Síða finnst ekki.', + 'title' => [ + '403' => 'Oops! Forbidden Access', + '404' => 'Oops! Page not found', + '500' => 'Oops! Something went wrong', ], - 'messages' => [ - 'forbidden_access' => 'Þú kemst ekki á þessa síðu. - Á meðan getur þú farið á forsíðu.', - 'error_page' => 'Við reynum að laga þetta eins fljótt og við getum. - Á meðan getur þú farið á forsíðu.', - 'page_not_found' => 'Við finnum ekki síðuna sem þú ert að leita að. - Á meðan getur þú farið á forsíðu.', + 'header' => [ + '403' => '403 Forbidden', + '404' => '404 Not Found', + '500' => '500 Internal Server Error', + ], + + 'message' => [ + '403' => 'You can not access this page.', + '404' => 'We could not find the page you were looking for.', + '500' => 'We will work on fixing that right away.', ], ]; diff --git a/resources/lang/is-IS/general.php b/resources/lang/is-IS/general.php index 0bd12c32b..81bf81aa9 100644 --- a/resources/lang/is-IS/general.php +++ b/resources/lang/is-IS/general.php @@ -2,13 +2,13 @@ return [ - 'dashboards' => 'Dashboard|Dashboards', - 'items' => 'Magn|Magn', + 'dashboards' => 'Stjórnborð', + 'items' => 'Vara|Vörur', 'incomes' => 'Tekjur|Tekjur', 'invoices' => 'Reikningur|Reikningar', 'revenues' => 'Tekjur|Tekjur', 'customers' => 'Viðskiptavinur|Viðskiptavinir', - 'expenses' => 'Kostnaður|Kostnaður', + 'expenses' => 'Gjöld|Gjöld', 'bills' => 'Reikningur|Reikningar', 'payments' => 'Greiðsla|Greiðslur', 'vendors' => 'Söluaðili|Söluaðilar', @@ -42,15 +42,17 @@ return [ 'contacts' => 'Tengill|Tenglar', 'reconciliations' => 'Uppgjör|Uppgjör', 'developers' => 'Hönnuður|Hönnuðir', - 'schedules' => 'Schedule|Schedules', - 'groups' => 'Group|Groups', - 'charts' => 'Chart|Charts', - 'localisations' => 'Localisation|Localisations', - 'defaults' => 'Default|Defaults', + 'schedules' => 'Áætlun|Áætlanir', + 'groups' => 'Hópur|Hópar', + 'charts' => 'Rit', + 'localisations' => 'Staðfært|Staðfærslur', + 'defaults' => 'Sjálfgefið|Sjálfgefin', 'widgets' => 'Widget|Widgets', + 'templates' => 'Sniðmót', + 'sales' => 'Sala|Sölur', + 'purchases' => 'Kaup', - 'dashboard' => 'Stjórnborð', - 'welcome' => 'Welcome', + 'welcome' => 'Velkomin', 'banking' => 'Banki', 'general' => 'Almennt', 'no_records' => 'Engin skrá.', @@ -62,16 +64,19 @@ return [ 'no' => 'Nei', 'na' => 'Ekki tiltækt', 'daily' => 'Daglega', - 'weekly' => 'Weekly', + 'weekly' => 'Vikuleg', 'monthly' => 'Mánaðarlega', 'quarterly' => 'Ársfjórðungslega', 'yearly' => 'Árlega', 'add' => 'Bæta við', 'add_new' => 'Nýtt', + 'add_income' => 'Skrá tekjur', + 'add_expense' => 'Skrá útgjöld', 'show' => 'Sýna', 'edit' => 'Breyta', 'delete' => 'Eyða', 'send' => 'Senda', + 'share' => 'Deila', 'download' => 'Niðurhala', 'delete_confirm' => 'Staðfesta eyðingu :name :type?', 'name' => 'Nafn', @@ -93,7 +98,7 @@ return [ 'switch' => 'Skipta', 'color' => 'Litur', 'save' => 'Vista', - 'confirm' => 'Confirm', + 'confirm' => 'Staðfesta', 'cancel' => 'Hætta við', 'loading' => 'Hleð...', 'from' => 'Form', @@ -123,30 +128,47 @@ return [ 'disable' => 'Gera óvirkt', 'select_all' => 'Velja allt', 'unselect_all' => 'Afvelja allt', - 'go_to' => 'Fara til :name', 'created_date' => 'Búið til', 'period' => 'Tímabil', - 'frequency' => 'Frequency', + 'frequency' => 'Fjöldi', 'start' => 'Byrja', 'end' => 'Hætta', 'clear' => 'Hreinsa', 'difference' => 'Mismunur', - 'footer' => 'Footer', - 'start_date' => 'Start Date', - 'basis' => 'Basis', - 'accrual' => 'Accrual', - 'cash' => 'Cash', - 'group_by' => 'Group By', - 'accounting' => 'Accounting', + 'footer' => 'Síðufótur', + 'start_date' => 'Upphafsdagur', + 'end_date' => 'Lokadagur', + 'basis' => 'Grunnur', + 'accrual' => 'Uppsafnað', + 'cash' => 'Reiðufé', + 'group_by' => 'Flokka eftir', + 'accounting' => 'Reikningshald', + 'sort' => 'Raða', + 'width' => 'Breidd', + 'month' => 'Mánuður', + 'year' => 'Ár', + 'type_item_name' => 'Skrá vöruheiti', + 'no_data' => 'Engar upplýsingar', + 'no_matching_data' => 'Engin sambærileg gögn', + 'clear_cache' => 'Hreinsa minni', + 'go_to_dashboard' => 'Fara á stjórnborð', + + 'card' => [ + 'name' => 'Nafn á korti', + 'number' => 'Kortanúmer', + 'expiration_date' => 'Endadagsetning', + 'cvv' => 'CVV korts', + ], 'title' => [ 'new' => 'Nýtt :type', 'edit' => 'Breyta :type', - 'delete' => 'Delete :type', + 'delete' => 'Eyða', 'create' => 'Búa til :type', 'send' => 'Senda :type', 'get' => 'Sækja :type', - 'add' => 'Add :type', + 'add' => 'Skrá', + 'manage' => 'Umsýsla', ], 'form' => [ @@ -155,7 +177,7 @@ return [ 'field' => '- Velja :field -', 'file' => 'Velja skrá', ], - 'add_new' => 'Add New :field', + 'add_new' => 'Skrá nýtt', 'no_file_selected' => 'Engin skrá valin...', ], @@ -168,14 +190,17 @@ return [ ], 'empty' => [ - 'documentation' => 'Check out the documentation for more details.', - 'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.', + 'documentation' => 'Athugið leiðbeiningarnar fyrir frekari upplýsingar', + 'items' => 'Vörur ná yfir bæði vörur og þjónustu. Með að nota vörur, þegar sölu- og kaupreikningar eru stofnaðir, eru skattar og verð skráð sjálfvirkt.', 'invoices' => 'Invoices can be one time or recurring. You can send them to customers and start accepting online payments.', 'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.', 'customers' => 'Customers are required if you want to create invoices. They may also log in to Client Portal and see their balance.', 'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.', 'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.', 'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.', + 'transfers' => 'Transfers allow you to move money from one account to another, whether they use the same currency or not.', + 'taxes' => 'Taxes are used to apply extra fees to invoices and bills. Your financials are affected by these regulatory taxes.', + 'reconciliations' => 'Bank reconciliation is a process performed to ensure that your company bank records are also correct.', ], ]; diff --git a/resources/lang/is-IS/install.php b/resources/lang/is-IS/install.php index c36804a0f..005cd0531 100644 --- a/resources/lang/is-IS/install.php +++ b/resources/lang/is-IS/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature þarf að vera afvalinn!', 'extension' => ':extension viðbót þarf að vera uppsett og hlaðin inn!', 'directory' => ':directory mappa þarf að vera skrifanleg!', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/is-IS/invoices.php b/resources/lang/is-IS/invoices.php index 4c92131b2..1384b117a 100644 --- a/resources/lang/is-IS/invoices.php +++ b/resources/lang/is-IS/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'Verð', 'sub_total' => 'Samtals', 'discount' => 'Afsláttur', + 'item_discount' => 'Line Discount', 'tax_total' => 'VSK', 'total' => 'Samtals', @@ -29,6 +30,8 @@ return [ 'add_payment' => 'Bæta við greiðslu', 'mark_paid' => 'Merja greitt', 'mark_sent' => 'Merkja sent', + 'mark_viewed' => 'Mark Viewed', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Niðurhala PDF', 'send_mail' => 'Senda tölvupóst', 'all_invoices' => 'Skráðu þig inn til að sjá alla reikninga', @@ -38,18 +41,23 @@ return [ 'accept_payments' => 'Taka á moti netgreiðslu', 'statuses' => [ - 'draft' => 'Uppkast', + 'draft' => 'Draft', 'sent' => 'Sent', - 'viewed' => 'Skoðað', - 'approved' => 'Samþykkt', - 'partial' => 'Hluta', - 'paid' => 'Greitt', + 'viewed' => 'Viewed', + 'approved' => 'Approved', + 'partial' => 'Partial', + 'paid' => 'Paid', + 'overdue' => 'Overdue', + 'unpaid' => 'Unpaid', + 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => 'Invoice email has been sent!', 'marked_sent' => 'Invoice marked as sent!', 'marked_paid' => 'Invoice marked as paid!', + 'marked_viewed' => 'Invoice marked as viewed!', + 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => 'Engin tölvupóstur fyrir þennan viðskiptavin!', 'draft' => 'Þetta er PRUFU reikningur sem sést á kortum eftir að hann er móttekinn.', diff --git a/resources/lang/is-IS/maintenance.php b/resources/lang/is-IS/maintenance.php index 08d595e60..514800dcd 100644 --- a/resources/lang/is-IS/maintenance.php +++ b/resources/lang/is-IS/maintenance.php @@ -2,10 +2,10 @@ return [ - 'title' => 'Maintenance Mode', + 'title' => 'Under Maintenance', - 'message' => 'We\'re currently working on the site, please try again later!', + 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', - 'last-updated' => 'This message was last updated :timestamp', + 'last-updated' => 'This message was last updated :timestamp.', -]; \ No newline at end of file +]; diff --git a/resources/lang/is-IS/messages.php b/resources/lang/is-IS/messages.php index 8164c34d6..817f91c5d 100644 --- a/resources/lang/is-IS/messages.php +++ b/resources/lang/is-IS/messages.php @@ -8,6 +8,7 @@ return [ 'deleted' => ':type eytt!', 'duplicated' => ':type afritað!', 'imported' => ':type innflutt!', + 'exported' => ':type exported!', 'enabled' => ':type virkjað!', 'disabled' => ':type slökkt!', ], @@ -27,6 +28,8 @@ return [ 'warning' => [ 'deleted' => 'Viðvörun: Þú mátt ekki eyða :name vegna þess að það hefur: textatengsl.', 'disabled' => 'Viðvörun: Þú mátt ekki slökkva á :name vegna þess að það hefur: textatengsl.', + 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', + 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', 'disable_code' => 'Viðvörun: Ekki er heimilt að gera óvirkt eða breyta gjaldmiðli :name vegna þess að hann hefur: textatengsl.', 'payment_cancel' => 'Warning: You have cancelled your recent :method payment!', ], diff --git a/resources/lang/is-IS/modules.php b/resources/lang/is-IS/modules.php index 3b584c2c7..ef57daf1b 100644 --- a/resources/lang/is-IS/modules.php +++ b/resources/lang/is-IS/modules.php @@ -9,13 +9,11 @@ return [ 'new' => 'Nýtt', 'top_free' => 'Hæst ókeypis', 'free' => 'ÓKEYPIS', - 'search' => 'Leita', 'install' => 'Setja upp', 'buy_now' => 'Kaupa núna', - 'api_key_link' => 'Click here to get your API key.', + 'get_api_key' => 'Click here to get your API key.', 'no_apps' => 'Það eru engir öpp í þessum flokki, ennþá.', - 'developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', - + 'become_developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', 'recommended_apps' => 'Meðmælt öpp', 'about' => 'Um', @@ -80,5 +78,6 @@ return [ ], 'na' => 'Engar skoðanir skráðar' - ] + ], + ]; diff --git a/resources/lang/is-IS/pagination.php b/resources/lang/is-IS/pagination.php index b3facac98..de9b8023e 100644 --- a/resources/lang/is-IS/pagination.php +++ b/resources/lang/is-IS/pagination.php @@ -2,8 +2,8 @@ return [ - 'previous' => '« Fyrri', - 'next' => 'Næsta »', + 'previous' => 'Previous', + 'next' => 'Next', 'showing' => ':first-:last of :total records.', 'page' => 'per page.', diff --git a/resources/lang/is-IS/passwords.php b/resources/lang/is-IS/passwords.php index 80b81f8f0..a96e342a9 100644 --- a/resources/lang/is-IS/passwords.php +++ b/resources/lang/is-IS/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => 'Við sendum þér tölvupóst með slóð til að endurheimta lykilorðið þitt.', 'token' => 'Kóðinn til að endurheimta lykilorðið er rangur.', 'user' => "Notandi með þetta netfang finnst ekki.", + 'throttle' => 'Please wait before retrying.', ]; diff --git a/resources/lang/is-IS/reconciliations.php b/resources/lang/is-IS/reconciliations.php index 75e0f4f05..4c787700b 100644 --- a/resources/lang/is-IS/reconciliations.php +++ b/resources/lang/is-IS/reconciliations.php @@ -6,7 +6,7 @@ return [ 'reconciled' => 'Sameinað', 'closing_balance' => 'Lokastaða', 'unreconciled' => 'Ósameinað', - 'transactions' => 'Transactions', + 'transactions' => 'Færslur', 'start_date' => 'Upphafsdagsetning', 'end_date' => 'Lokadagsetning', 'cleared_amount' => 'Samþykkt upphæð', diff --git a/resources/lang/is-IS/reports.php b/resources/lang/is-IS/reports.php index 91dc4aca0..a68102053 100644 --- a/resources/lang/is-IS/reports.php +++ b/resources/lang/is-IS/reports.php @@ -12,7 +12,7 @@ return [ 'net_profit' => 'Hagnaður', 'total_expenses' => 'Heildarkostnaður', 'net' => 'NET', - 'income-expense' => 'Income & Expense', + 'income_expense' => 'Income & Expense', 'summary' => [ 'income' => 'Samtals tekjur', diff --git a/resources/lang/is-IS/settings.php b/resources/lang/is-IS/settings.php index 26c1b1e9a..666d586e5 100644 --- a/resources/lang/is-IS/settings.php +++ b/resources/lang/is-IS/settings.php @@ -29,6 +29,12 @@ return [ 'before' => 'Á undan númeri', 'after' => 'Á eftir númeri', ], + 'discount_location' => [ + 'name' => 'Discount Location', + 'item' => 'At line', + 'total' => 'At total', + 'both' => 'Both line and total', + ], ], 'invoice' => [ @@ -52,6 +58,10 @@ return [ 'subheading' => 'Subheading', 'due_receipt' => 'Due upon receipt', 'due_days' => 'Due within :days days', + 'choose_template' => 'Choose invoice template', + 'default' => 'Default', + 'classic' => 'Classic', + 'modern' => 'Modern', ], 'default' => [ diff --git a/resources/lang/is-IS/taxes.php b/resources/lang/is-IS/taxes.php index 1f811e6bf..c3c0004c8 100644 --- a/resources/lang/is-IS/taxes.php +++ b/resources/lang/is-IS/taxes.php @@ -7,5 +7,5 @@ return [ 'normal' => 'Venjulegt', 'inclusive' => 'Tekið með', 'compound' => 'Leggst við', - 'fixed' => 'Fixed', + 'fixed' => 'Fastur', ]; diff --git a/resources/lang/is-IS/validation.php b/resources/lang/is-IS/validation.php index b4831dd29..5fac8052e 100644 --- a/resources/lang/is-IS/validation.php +++ b/resources/lang/is-IS/validation.php @@ -100,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'sérsniðin skilaboð', + 'rule-name' => 'sérsniðin skilaboð', ], - 'invalid_currency' => 'Reiturinn :attribute er ekki á réttu formi.', - 'invalid_amount' => 'Reiturinn :attribute er ógildur.', + 'invalid_currency' => 'Reiturinn :attribute er ekki á réttu formi.', + 'invalid_amount' => 'Reiturinn :attribute er ógildur.', + 'invalid_extension' => 'The file extension is invalid.', ], /* diff --git a/resources/lang/is-IS/widgets.php b/resources/lang/is-IS/widgets.php new file mode 100644 index 000000000..f9fe1fce6 --- /dev/null +++ b/resources/lang/is-IS/widgets.php @@ -0,0 +1,23 @@ + 'Total Income', + 'receivables' => 'Receivables', + 'open_invoices' => 'Open Invoices', + 'overdue_invoices' => 'Overdue Invoices', + 'total_expenses' => 'Total Expenses', + 'payables' => 'Payables', + 'open_bills' => 'Open Bills', + 'overdue_bills' => 'Overdue Bills', + 'total_profit' => 'Total Profit', + 'open_profit' => 'Open Profit', + 'overdue_profit' => 'Overdue Profit', + 'cash_flow' => 'Cash Flow', + 'no_profit_loss' => 'No Profit Loss', + 'income_by_category' => 'Income By Category', + 'expenses_by_category' => 'Expenses By Category', + 'account_balance' => 'Account Balance', + 'latest_income' => 'Latest Income', + 'latest_expenses' => 'Latest Expenses', +]; diff --git a/resources/lang/nl-NL/bills.php b/resources/lang/nl-NL/bills.php index 9a6cd09fe..3818555fd 100644 --- a/resources/lang/nl-NL/bills.php +++ b/resources/lang/nl-NL/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Prijs', 'sub_total' => 'Subtotaal', 'discount' => 'Korting', + 'item_discount' => 'Vaste korting', 'tax_total' => 'Totaal BTW', 'total' => 'Totaal', @@ -30,6 +31,7 @@ return [ 'add_payment' => 'Een betaling toevoegen', 'mark_paid' => 'Als betaald markeren', 'mark_received' => 'Markeer als ontvangen', + 'mark_cancelled' => 'Markeren als geannuleerd', 'download_pdf' => 'PDF downloaden', 'send_mail' => 'Verstuur e-mail', 'create_bill' => 'Factuur maken', @@ -43,11 +45,13 @@ return [ 'paid' => 'Betaald', 'overdue' => 'Verlopen', 'unpaid' => 'Onbetaald', + 'cancelled' => 'Geannuleerd', ], 'messages' => [ - 'received' => 'Factuur als \'succesvol ontvangen\' gemarkeerd!', + 'marked_received' => 'Factuur gemarkeerd als ontvangen!', 'marked_paid' => 'Factuur gemarkeerd als betaald!', + 'marked_cancelled' => 'Factuur gemarkeerd als geannuleerd!', 'draft' => 'Dit is een CONCEPT factuur en zal terugkomen in de statistieken wanneer het verzonden is.', 'status' => [ diff --git a/resources/lang/nl-NL/bulk_actions.php b/resources/lang/nl-NL/bulk_actions.php index ee0f9f661..0ada1ac49 100644 --- a/resources/lang/nl-NL/bulk_actions.php +++ b/resources/lang/nl-NL/bulk_actions.php @@ -15,6 +15,7 @@ return [ 'paid' => 'Weet u zeker dat u de geselecteerde factuur als betaald wilt markeren?|Weet u zeker dat u de geselecteerde facturen als betaald wilt markeren?', 'sent' => 'Weet u zeker dat u de geselecteerde factuur als verzonden wilt markeren?|Weet u zeker dat u de geselecteerde facturen als verzonden wilt markeren?', 'received' => 'Weet u zeker dat u de geselecteerde rekening als ontvangen wilt markeren?|Weet u zeker dat u de geselecteerde rekeningen als ontvangen wilt markeren?', + 'cancelled' => 'Weet u zeker dat u het geselecteerde record wilt annuleren?|Weet u zeker dat u de geselecteerde records wilt annuleren?', ], ]; diff --git a/resources/lang/nl-NL/email_templates.php b/resources/lang/nl-NL/email_templates.php index 59e874483..1d7ff32dc 100644 --- a/resources/lang/nl-NL/email_templates.php +++ b/resources/lang/nl-NL/email_templates.php @@ -3,48 +3,48 @@ return [ 'invoice_new_customer' => [ - 'subject' => '{invoice_number} invoice created', - 'body' => 'Dear {customer_name},

We have prepared the following invoice for you: {invoice_number}.

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

Feel free to contact us for any question.

Best Regards,
{company_name}', + 'subject' => 'Factuur {invoice_number} aangemaakt', + 'body' => 'Geachte {customer_name},

De volgende factuur staat voor u klaar {invoice_number}.

U kunt de factuurgegevens bekijken en de betaling verrichten via de volgende link: {invoice_number}.

Neem gerust contact met ons op indien u vragen heeft.

Met vriendelijke groet.
{company_name}', ], 'invoice_remind_customer' => [ - 'subject' => '{invoice_number} invoice overdue notice', - 'body' => 'Dear {customer_name},

This is an overdue notice for {invoice_number} invoice.

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

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

Best Regards,
{company_name}', + 'subject' => 'Factuur {invoice_numer} is vervallen', + 'body' => 'Geachte {customer_name},

Dit is een tijdige kennisgeving voor factuur: {invoice_number}.

Het totaalbedrag van de factuur is {invoice_total} en was vervallen op {invoice_due_date}.

U kunt de factuurgegevens zien de betaling verichten via de volgende link: {invoice_number}.

Met vriendelijke groeten,
{company_name}', ], 'invoice_remind_admin' => [ - 'subject' => '{invoice_number} invoice overdue notice', - 'body' => 'Hello,

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

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

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

Best Regards,
{company_name}', + 'subject' => 'Betalingsherinnering factuur: {invoice_number}', + 'body' => 'Hallo,

Dit is een herinneringsmelding voor rekening {bill_number} aan {vendor_name}.

Het totaal van de rekening is {bill_total} en vervalt op {bill_due_date}.

Je kunt de rekeninggegevens zien van de volgende link: {bill_number}.

Met vriendelijke groeten,
{company_name}', ], 'invoice_recur_customer' => [ - 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Dear {customer_name},

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

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

Feel free to contact us for any question.

Best Regards,
{company_name}', + 'subject' => 'Abonnementsfactuur {invoice_number} aangemaakt', + 'body' => 'Geachte {customer_name},

gebaseerd op uw abonnement, we hebben de volgende factuur voor u klaargezet: {invoice_number}.

U kunt de factuurgegevens bekijken en een betaling uitvoeren via de volgende link: {invoice_number}.

Neem gerust contact met ons op voor elke vraag.

Met vriendelijke groet.
{company_name}', ], 'invoice_recur_admin' => [ - 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Hello,

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

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

Best Regards,
{company_name}', + 'subject' => 'Abonnementsfactuur {invoice_number} aangemaakt', + 'body' => 'Hallo,

{customer_name} heeft een betaling uitgevoerd van factuur {invoice_number}.

U kunt de factuurgegevens bekijken via de volgende link: {invoice_number}.

Met vriendelijke groeten,
{company_name}', ], 'invoice_payment_customer' => [ - 'subject' => 'Payment received for {invoice_number} invoice', - 'body' => 'Dear {customer_name},

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

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

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

Feel free to contact us for any question.

Best Regards,
{company_name}', + 'subject' => 'Betaling ontvangen voor factuur: {invoice_number}', + 'body' => 'Geachte {customer_name},

Bedankt voor uw betaling. U vind de betalingsgegevens hieronder:

-------------------------------------------------
Bedrag: {transaction_total}
Datum: {transaction_paid_date}
Factuurnummer: {invoice_number}
-------------------------------------------------

Je kunt altijd de factuurgegevens zien van de volgende link: {invoice_number}.

Neem gerust contact met ons op indien u vragen heeft.

Met vriendelijke groeten,
{company_name}', ], 'invoice_payment_admin' => [ - 'subject' => 'Payment received for {invoice_number} invoice', - 'body' => 'Hello,

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

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

Best Regards,
{company_name}', + 'subject' => 'Betaling ontvangen voor factuur: {invoice_number}', + 'body' => 'Hallo,

{customer_name} heeft betaling uitgevoerd van factuur {invoice_number}.

U kunt de factuurgegevens bekijken via de volgende link: {invoice_number}.

Met vriendelijke groeten,
{company_name}', ], 'bill_remind_admin' => [ - 'subject' => '{bill_number} bill reminding notice', - 'body' => 'Hello,

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

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

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

Best Regards,
{company_name}', + 'subject' => 'Rekening herinnering voor: {bill_number}', + 'body' => 'Hallo,

Dit is een herinneringsmelding voor rekening {bill_number} aan {vendor_name}.

Het totaal van de rekening is {bill_total} en vervalt op {bill_due_date}.

Je kunt de rekeninggegevens zien van de volgende link: {bill_number}.

Met vriendelijke groeten,
{company_name}', ], 'bill_recur_admin' => [ - 'subject' => '{bill_number} recurring bill created', - 'body' => 'Hello,

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

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

Best Regards,
{company_name}', + 'subject' => 'Periodieke rekening {bill_number} aangemaakt', + 'body' => 'Hallo,

gebaseerd op {vendor_name} terugkerende betalingen, is rekening {bill_number} automatisch aangemaakt.

Je kunt de rekeninggegevens bekijken via de volgende link: {bill_number}.

Met vriendelijke groeten,
{company_name}', ], ]; diff --git a/resources/lang/nl-NL/errors.php b/resources/lang/nl-NL/errors.php index c72a47530..f8a97178f 100644 --- a/resources/lang/nl-NL/errors.php +++ b/resources/lang/nl-NL/errors.php @@ -3,21 +3,21 @@ return [ 'title' => [ - '403' => 'Oops! Forbidden Access', - '404' => 'Oops! Page not found', - '500' => 'Oops! Something went wrong', + '403' => 'Oeps! Verboden toegang', + '404' => 'Oeps! Pagina niet gevonden!', + '500' => 'Oeps! Er is iets misgegaan.', ], 'header' => [ - '403' => '403 Forbidden', - '404' => '404 Not Found', - '500' => '500 Internal Server Error', + '403' => '403 Verboden', + '404' => '404 niet gevonden', + '500' => '500 Interne serverfout', ], 'message' => [ - '403' => 'You can not access this page.', - '404' => 'We could not find the page you were looking for.', - '500' => 'We will work on fixing that right away.', + '403' => 'U heeft geen toegang tot deze pagina.', + '404' => 'We konden de pagina die je zocht niet vinden.', + '500' => 'We gaan meteen opzoek naar een oplossing,', ], ]; diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php index 8d06f988b..318441a60 100644 --- a/resources/lang/nl-NL/general.php +++ b/resources/lang/nl-NL/general.php @@ -42,17 +42,17 @@ return [ 'contacts' => 'Contactpersoon|Contactpersonen', 'reconciliations' => 'Afstemming | Afstemmingen', 'developers' => 'Ontwikkelaar | Ontwikkelaars', - 'schedules' => 'Schedule|Schedules', - 'groups' => 'Group|Groups', - 'charts' => 'Chart|Charts', - 'localisations' => 'Localisation|Localisations', - 'defaults' => 'Default|Defaults', + 'schedules' => 'Schema|Schema\'s', + 'groups' => 'Groep|Groepen', + 'charts' => 'Grafiek|Grafieken', + 'localisations' => 'Lokalisatie|Lokalisaties', + 'defaults' => 'Standaardwaarden', 'widgets' => 'Widget|Widgets', - 'templates' => 'Template|Templates', - 'sales' => 'Sale|Sales', - 'purchases' => 'Purchase|Purchases', + 'templates' => 'Sjabloon|Slablonen', + 'sales' => 'Verkoop|Verkopen', + 'purchases' => 'Inkoop|Inkopen', - 'welcome' => 'Welcome', + 'welcome' => 'Welkom', 'banking' => 'Banken', 'general' => 'Algemeen', 'no_records' => 'Geen gegevens.', @@ -64,19 +64,19 @@ return [ 'no' => 'Nee', 'na' => 'N.v.t.', 'daily' => 'Dagelijks', - 'weekly' => 'Weekly', + 'weekly' => 'Wekelijks', 'monthly' => 'Maandelijks', 'quarterly' => 'Per kwartaal', 'yearly' => 'Jaarlijks', 'add' => 'Toevoegen', 'add_new' => 'Nieuwe toevoegen', - 'add_income' => 'Add Income', - 'add_expense' => 'Add Expense', + 'add_income' => 'Inkomsten toevoegen', + 'add_expense' => 'Onkosten toevoegen', 'show' => 'Weergeven', 'edit' => 'Bewerken', 'delete' => 'Verwijderen', 'send' => 'Verzenden', - 'share' => 'Share', + 'share' => 'Delen', 'download' => 'Download', 'delete_confirm' => 'Weet u zeker dat u dit wilt verwijderen, :name :type?', 'name' => 'Naam', @@ -94,11 +94,11 @@ return [ 'reference' => 'Referentie', 'attachment' => 'Bijlage', 'change' => 'Wijzigen', - 'change_type' => 'Change :type', + 'change_type' => 'Wijzig :type', 'switch' => 'Omschakelen', 'color' => 'Kleur', 'save' => 'Opslaan', - 'confirm' => 'Confirm', + 'confirm' => 'Bevestigen', 'cancel' => 'Annuleren', 'loading' => 'Bezig met laden...', 'from' => 'Van', @@ -130,45 +130,45 @@ return [ 'unselect_all' => 'Alles deselecteren', 'created_date' => 'Aanmaakdatum', 'period' => 'Periode', - 'frequency' => 'Frequency', + 'frequency' => 'Frequentie:', 'start' => 'Begin', 'end' => 'Eind', 'clear' => 'Wis', 'difference' => 'Verschil', - 'footer' => 'Footer', - 'start_date' => 'Start Date', - 'end_date' => 'End Date', + 'footer' => 'Voettekst', + 'start_date' => 'Start Datum', + 'end_date' => 'Eind Datum', 'basis' => 'Basis', - 'accrual' => 'Accrual', - 'cash' => 'Cash', - 'group_by' => 'Group By', - 'accounting' => 'Accounting', - 'sort' => 'Sort', - 'width' => 'Width', - 'month' => 'Month', - 'year' => 'Year', - 'type_item_name' => 'Type an item name', - 'no_data' => 'No data', - 'no_matching_data' => 'No matching data', - 'clear_cache' => 'Clear Cache', - 'go_to_dashboard' => 'Go to dashboard', + 'accrual' => 'Opbouw', + 'cash' => 'Contant', + 'group_by' => 'Groeperen op', + 'accounting' => 'Boekhouder', + 'sort' => 'Sorteren', + 'width' => 'Breedte', + 'month' => 'Maand', + 'year' => 'Jaar', + 'type_item_name' => 'Typ een item naam', + 'no_data' => 'Geen gegevens', + 'no_matching_data' => 'Geen overeenkomende gegevens', + 'clear_cache' => 'Cache wissen', + 'go_to_dashboard' => 'Ga naar dashboard', 'card' => [ - 'name' => 'Name on Card', - 'number' => 'Card Number', - 'expiration_date' => 'Expiration Date', - 'cvv' => 'Card CVV', + 'name' => 'Naam op kaart', + 'number' => 'Kaartnummer', + 'expiration_date' => 'Vervaldatum', + 'cvv' => 'Creditcard CVV', ], 'title' => [ 'new' => 'Nieuwe :type', 'edit' => ':type bewerken', - 'delete' => 'Delete :type', + 'delete' => ':type verwijderen', 'create' => 'Creëer :type', 'send' => 'Stuur :type', 'get' => 'Ontvang :type', - 'add' => 'Add :type', - 'manage' => 'Manage :type', + 'add' => ':type toevoegen', + 'manage' => 'Beheer :type', ], 'form' => [ @@ -177,7 +177,7 @@ return [ 'field' => '- Selecteer :field -', 'file' => 'Selecteer bestand', ], - 'add_new' => 'Add New :field', + 'add_new' => 'Nieuw :field toevoegen', 'no_file_selected' => 'Geen bestand geselecteerd...', ], @@ -190,17 +190,17 @@ return [ ], 'empty' => [ - 'documentation' => 'Check out the documentation for more details.', - 'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.', - 'invoices' => 'Invoices can be one time or recurring. You can send them to customers and start accepting online payments.', - 'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.', - 'customers' => 'Customers are required if you want to create invoices. They may also log in to Client Portal and see their balance.', - 'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.', - 'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.', - 'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.', - 'transfers' => 'Transfers allow you to move money from one account to another, whether they use the same currency or not.', - 'taxes' => 'Taxes are used to apply extra fees to invoices and bills. Your financials are affected by these regulatory taxes.', - 'reconciliations' => 'Bank reconciliation is a process performed to ensure that your company bank records are also correct.', + 'documentation' => 'Bekijk de documentatie voor meer details.', + 'items' => 'Items kunnen producten of diensten zijn. U kunt items gebruiken bij het maken van facturen en facturen om de prijs, belastingvelden etc. te laten invullen.', + 'invoices' => 'Facturen kunnen eenmalig of herhalend zijn. U kunt ze naar klanten sturen en online betalingen accepteren.', + 'revenues' => 'Omzet is een betaalde inkomstentransactie. Het kan een onafhankelijk record zijn (deposit) of gekoppeld aan een factuur.', + 'customers' => 'Klanten zijn verplicht als u facturen wilt aanmaken. Het is ook mogelijk voor klanten om op de klantenportal in te loggen om hun facturen te bekijken', + 'bills' => 'Rekeningen kunnen eenmalig of herhalend zijn. Ze geven aan wat je je leveranciers verschuldigd bent voor de producten of diensten die je koopt.', + 'payments' => 'Betaling is een betaalde uitgave transactie. Het kan een onafhankelijk dossier zijn (bijv. bon van een etentje) of gekoppeld aan een contract.', + 'vendors' => 'Leveranciers zijn vereist als u facturen wilt creëren. U kunt het saldo zien dat u ze verschuldigd bent en rapportages filteren per leverancier.', + 'transfers' => 'Overboekingen maken het mogelijk om geld van de ene rekening naar de andere over te brengen, of ze nu dezelfde valuta gebruiken of niet.', + 'taxes' => 'Belastingen worden gebruikt om extra kosten toe te passen op facturen en facturen. Uw financiën worden beïnvloed door deze wettelijke belastingen.', + 'reconciliations' => 'Bankverzoening is een proces uitgevoerd om ervoor te zorgen dat de bankgegevens van uw bedrijf ook correct zijn.', ], ]; diff --git a/resources/lang/nl-NL/install.php b/resources/lang/nl-NL/install.php index e7884ec25..fd43553ee 100644 --- a/resources/lang/nl-NL/install.php +++ b/resources/lang/nl-NL/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature moet worden uitgeschakeld!', 'extension' => ':extension extentie moet worden geïnstalleerd en geladen!', 'directory' => ':directory map moet schrijfbaar zijn!', + 'executable' => 'De PHP CLI uitvoerbare bestand is niet gedefinieerd/werkbaar, of de versie is niet :php_version of hoger! Vraag uw hostingbedrijf om PHP_BINARY of PHP_PATH omgeving correct in te stellen.', ], 'database' => [ diff --git a/resources/lang/nl-NL/invoices.php b/resources/lang/nl-NL/invoices.php index 77d5414f2..4e729d49a 100644 --- a/resources/lang/nl-NL/invoices.php +++ b/resources/lang/nl-NL/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'Prijs', 'sub_total' => 'Subtotaal', 'discount' => 'Korting', + 'item_discount' => 'Lijn korting', 'tax_total' => 'Totaal BTW', 'total' => 'Totaal', @@ -29,36 +30,40 @@ return [ 'add_payment' => 'Een betaling toevoegen', 'mark_paid' => 'Als betaald markeren', 'mark_sent' => 'Als verstuurd markeren', - 'mark_viewed' => 'Mark Viewed', + 'mark_viewed' => 'Markeren als bekeken', + 'mark_cancelled' => 'Markeren als geannuleerd', 'download_pdf' => 'PDF downloaden', 'send_mail' => 'E-mail versturen', 'all_invoices' => 'Log in om alle facturen te bekijken', 'create_invoice' => 'Factuur maken', 'send_invoice' => 'Factuur sturen', 'get_paid' => 'Betaling afstemmen', - 'accept_payments' => 'Accept Online Payments', + 'accept_payments' => 'Online betalingen accepteren', 'statuses' => [ - 'draft' => 'Draft', - 'sent' => 'Sent', - 'viewed' => 'Viewed', - 'approved' => 'Approved', - 'partial' => 'Partial', - 'paid' => 'Paid', - 'overdue' => 'Overdue', - 'unpaid' => 'Unpaid', + 'draft' => 'Concept', + 'sent' => 'Verzonden', + 'viewed' => 'Bekeken', + 'approved' => 'Goedgekeurd', + 'partial' => 'Gedeeltelijk', + 'paid' => 'Betaald', + 'overdue' => 'Vervallen', + 'unpaid' => 'Onbetaald', + 'cancelled' => 'Geannuleerd', ], 'messages' => [ - 'email_sent' => 'Invoice email has been sent!', - 'marked_sent' => 'Invoice marked as sent!', - 'marked_paid' => 'Invoice marked as paid!', + 'email_sent' => 'Factuur is via email verzonden!', + 'marked_sent' => 'Factuur gemarkeerd als verzonden!', + 'marked_paid' => 'Factuur gemarkeerd als betaald!', + 'marked_viewed' => 'Factuur gemarkeerd als gelezen!', + 'marked_cancelled' => 'Factuur gemarkeerd als geannuleerd!', 'email_required' => 'Er is geen e-mailadres bekend van deze klant!', 'draft' => 'Dit is een CONCEPT factuur en zal terugkomen in de statistieken wanneer het verzonden is.', 'status' => [ 'created' => 'Gemaakt op :date', - 'viewed' => 'Viewed', + 'viewed' => 'Bekeken', 'send' => [ 'draft' => 'Niet verstuurd', 'sent' => 'Verzonden op :date', diff --git a/resources/lang/nl-NL/maintenance.php b/resources/lang/nl-NL/maintenance.php index 514800dcd..a9e39ac39 100644 --- a/resources/lang/nl-NL/maintenance.php +++ b/resources/lang/nl-NL/maintenance.php @@ -2,10 +2,10 @@ return [ - 'title' => 'Under Maintenance', + 'title' => 'In onderhoud', - 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', + 'message' => 'Sorry, we zijn offline voor onderhoud. Probeer het later opnieuw!', - 'last-updated' => 'This message was last updated :timestamp.', + 'last-updated' => 'Dit bericht is voor het laatst bijgewerkt op :timestamp.', ]; diff --git a/resources/lang/nl-NL/messages.php b/resources/lang/nl-NL/messages.php index cb4cdde91..f365a39ca 100644 --- a/resources/lang/nl-NL/messages.php +++ b/resources/lang/nl-NL/messages.php @@ -8,7 +8,7 @@ return [ 'deleted' => ':type verwijderd!', 'duplicated' => ':type gedupliceerd!', 'imported' => ':type geïmporteerd!', - 'exported' => ':type exported!', + 'exported' => ':type geëxporteerd!', 'enabled' => ':type ingeschakeld!', 'disabled' => ':type uitgeschakeld!', ], @@ -19,8 +19,8 @@ return [ 'customer' => 'Fout: Gebruiker niet aangemaakt! :name heeft dit e-mailadres al in gebruik.', 'no_file' => 'Fout: geen bestand geselecteerd!', 'last_category' => 'Fout: Kan de laatste categorie niet verwijderen: :type', - 'change_type' => 'Error: Can not change the type because it has :text related!', - 'invalid_apikey' => 'Error: The API Key entered is invalid!', + 'change_type' => 'Fout: Kan het type niet wijzigen omdat :text gerelateerd is!', + 'invalid_apikey' => 'Fout: De ingevoerde API-sleutel is ongeldig!', 'import_column' => 'Fout: :message Blad naam: :sheet. Lijnnummer: :line.', 'import_sheet' => 'Fout: Bladnaam is niet geldig. Vergelijk het met het voorbeeldbestand.', ], @@ -28,10 +28,10 @@ return [ 'warning' => [ 'deleted' => 'Waarschuwing: Het is voor u niet toegestaan om :name te verwijderen omdat het gerelateerd is aan :text.', 'disabled' => 'Waarschuwing: U mag :name niet uitschakelen omdat het gerelateerd is aan :text.', - 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', - 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', + 'reconciled_tran' => 'Waarschuwing: U heeft geen toestemming om de transactie te wijzigen/verwijderen omdat deze is afgestemd!', + 'reconciled_doc' => 'Waarschuwing: U heeft geen rechten om :type te wijzigen/wijzigen omdat deze transacties is afgestemd!', 'disable_code' => 'Waarschuwing: U mag :name niet uitschakelen omdat het gerelateerd is aan :text.', - 'payment_cancel' => 'Warning: You have cancelled your recent :method payment!', + 'payment_cancel' => 'U heeft uw recente :method betaling geannuleerd!', ], ]; diff --git a/resources/lang/nl-NL/modules.php b/resources/lang/nl-NL/modules.php index f75253bf7..427207399 100644 --- a/resources/lang/nl-NL/modules.php +++ b/resources/lang/nl-NL/modules.php @@ -2,19 +2,18 @@ return [ - 'api_key' => 'API Key', + 'api_key' => 'API sleutel', 'my_apps' => 'Mijn Apps', 'pre_sale' => 'Pre-Sale', 'top_paid' => 'Top betaald', 'new' => 'Nieuw', 'top_free' => 'Top gratis', 'free' => 'GRATIS', - 'search' => 'Zoeken', 'install' => 'Installeer', 'buy_now' => 'Nu kopen', - 'get_api_key' => 'Click here to get your API key.', + 'get_api_key' => 'Klik hier om je API-sleutel te ontvangen.', 'no_apps' => 'Er zijn nog geen Apps in deze categorie beschikbaar.', - 'become_developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', + 'become_developer' => 'Bent u een ontwikkelaar? Hier leert u hoe u vandaag nog een app kunt maken en deze kunt verkopen!', 'recommended_apps' => 'Aanbevolen Apps', 'about' => 'Over ons', @@ -41,20 +40,20 @@ return [ 'installation' => [ 'header' => 'App installatie', - 'download' => 'Downloading :module', - 'unzip' => 'Extracting :module files', - 'file_copy' => 'Copying :module files', - 'finish' => 'Finalizing :module installation', - 'redirect' => ':module installed, redirecting to updates page', - 'install' => 'Installing :module', + 'download' => ':module aan het downloaden', + 'unzip' => 'Bezig met uitpakken van de bestanden van :module.', + 'file_copy' => 'Bezig met het kopiëren van de bestanden van :module.', + 'finish' => 'Bezig met voltooien van de installatie van :module', + 'redirect' => ':module is geïnstalleerd, u wordt doorverwezen naar de updatepagina', + 'install' => 'Bezit met installatie van :module', ], 'errors' => [ - 'download' => 'Not able to download :module', - 'zip' => 'Not able to create :module zip file', - 'unzip' => 'Not able to unzip :module', - 'file_copy' => 'Not able to copy :module files', - 'finish' => 'Not able to finalize :module installation', + 'download' => 'Downloaden van :module mislukt', + 'zip' => 'Het creëren van een zip-bestand van :module is mislukt', + 'unzip' => 'Uitpakken van het zip-bestand van :module is mislukt', + 'file_copy' => 'Kopiëren van bestanden van :module is mislukt', + 'finish' => 'Niet in staat om de installatie van :module af te ronden', ], 'badge' => [ diff --git a/resources/lang/nl-NL/pagination.php b/resources/lang/nl-NL/pagination.php index de9b8023e..3242d8a20 100644 --- a/resources/lang/nl-NL/pagination.php +++ b/resources/lang/nl-NL/pagination.php @@ -2,9 +2,9 @@ return [ - 'previous' => 'Previous', - 'next' => 'Next', - 'showing' => ':first-:last of :total records.', - 'page' => 'per page.', + 'previous' => 'Vorige', + 'next' => 'Volgende', + 'showing' => ':first-:last van :total items', + 'page' => 'per pagina', ]; diff --git a/resources/lang/nl-NL/passwords.php b/resources/lang/nl-NL/passwords.php index 6910c6012..6726841c0 100644 --- a/resources/lang/nl-NL/passwords.php +++ b/resources/lang/nl-NL/passwords.php @@ -18,6 +18,6 @@ return [ 'sent' => 'Wij hebben uw wachtwoord reset link per e-mail naar u verstuurd!', 'token' => 'Dit wachtwoord reset-token is ongeldig.', 'user' => "Wij kunnen geen gebruiker met dat e-mail adres vinden.", - 'throttle' => 'Please wait before retrying.', + 'throttle' => 'Wacht alsjeblieft even voor je het opnieuw probeert.', ]; diff --git a/resources/lang/nl-NL/reconciliations.php b/resources/lang/nl-NL/reconciliations.php index 967fb3cae..ebec4a3de 100644 --- a/resources/lang/nl-NL/reconciliations.php +++ b/resources/lang/nl-NL/reconciliations.php @@ -6,7 +6,7 @@ return [ 'reconciled' => 'Afgestemd', 'closing_balance' => 'Eindsaldo', 'unreconciled' => 'Nog af te stemmen', - 'transactions' => 'Transactions', + 'transactions' => 'Transacties', 'start_date' => 'Start Datum', 'end_date' => 'Eind Datum', 'cleared_amount' => 'Vrijgemaakt bedrag', diff --git a/resources/lang/nl-NL/reports.php b/resources/lang/nl-NL/reports.php index 5fd267c79..1260a18e6 100644 --- a/resources/lang/nl-NL/reports.php +++ b/resources/lang/nl-NL/reports.php @@ -12,7 +12,7 @@ return [ 'net_profit' => 'Nettowinst', 'total_expenses' => 'Totale uitgaven', 'net' => 'NET', - 'income_expense' => 'Income & Expense', + 'income_expense' => 'Inkomsten & Uitgaven', 'summary' => [ 'income' => 'Samenvatting inkomsten', @@ -22,9 +22,9 @@ return [ ], 'charts' => [ - 'line' => 'Line', - 'bar' => 'Bar', - 'pie' => 'Pie', + 'line' => 'Lijn', + 'bar' => 'Balk', + 'pie' => 'Cirkel', ], ]; diff --git a/resources/lang/nl-NL/settings.php b/resources/lang/nl-NL/settings.php index 05f846b23..010815a41 100644 --- a/resources/lang/nl-NL/settings.php +++ b/resources/lang/nl-NL/settings.php @@ -3,7 +3,7 @@ return [ 'company' => [ - 'description' => 'Change company name, email, address, tax number etc', + 'description' => 'Bedrijfsnaam, e-mail, adres, belastingnummer etc. wijzigen', 'name' => 'Naam', 'email' => 'E-mail', 'phone' => 'Telefoonnummer', @@ -12,7 +12,7 @@ return [ ], 'localisation' => [ - 'description' => 'Set fiscal year, time zone, date format and more locals', + 'description' => 'Stel fiscaal jaar, tijdzone, datumnotatie en meer lokale instellingen in.', 'financial_start' => 'Start financieel boekjaar', 'timezone' => 'Tijdzone', 'date' => [ @@ -29,10 +29,16 @@ return [ 'before' => 'Voor aantal', 'after' => 'Na aantal', ], + 'discount_location' => [ + 'name' => 'Korting locatie', + 'item' => 'Op regel', + 'total' => 'In totaal', + 'both' => 'Zowel lijn als totaal', + ], ], 'invoice' => [ - 'description' => 'Customize invoice prefix, number, terms, footer etc', + 'description' => 'Factuurprefix, nummer, betaaltermijn, voettekst etc. aanpassen', 'prefix' => 'Nummer voorvoegsel', 'digit' => 'Aantal cijfers', 'next' => 'Volgende nummer', @@ -47,25 +53,25 @@ return [ 'rate' => 'Tarief', 'quantity_name' => 'Hoeveelheid label', 'quantity' => 'Aantal', - 'payment_terms' => 'Payment Terms', - 'title' => 'Title', - 'subheading' => 'Subheading', - 'due_receipt' => 'Due upon receipt', - 'due_days' => 'Due within :days days', - 'choose_template' => 'Choose invoice template', - 'default' => 'Default', - 'classic' => 'Classic', + 'payment_terms' => 'Betalingsvoorwaarden', + 'title' => 'Titel', + 'subheading' => 'Subkop', + 'due_receipt' => 'Vervalt bij ontvangst', + 'due_days' => 'Vervalt binnen :days', + 'choose_template' => 'Factuursjabloon kiezen', + 'default' => 'Standaard', + 'classic' => 'Klassiek', 'modern' => 'Modern', ], 'default' => [ - 'description' => 'Default account, currency, language of your company', - 'list_limit' => 'Records Per Page', - 'use_gravatar' => 'Use Gravatar', + 'description' => 'Standaard rekening, valuta, taal van uw bedrijf', + 'list_limit' => 'Resultaten per pagina', + 'use_gravatar' => 'Gebruik Gravatar', ], 'email' => [ - 'description' => 'Change the sending protocol and email templates', + 'description' => 'Wijzig de verzendprotocol en e-mailsjablonen', 'protocol' => 'Protocol', 'php' => 'PHP mail', 'smtp' => [ @@ -82,24 +88,24 @@ return [ 'log' => 'E-mail logs', 'templates' => [ - 'subject' => 'Subject', - 'body' => 'Body', - 'tags' => 'Available Tags: :tag_list', - 'invoice_new_customer' => 'New Invoice Template (sent to customer)', - 'invoice_remind_customer' => 'Invoice Reminder Template (sent to customer)', - 'invoice_remind_admin' => 'Invoice Reminder Template (sent to admin)', - 'invoice_recur_customer' => 'Invoice Recurring Template (sent to customer)', - 'invoice_recur_admin' => 'Invoice Recurring Template (sent to admin)', - 'invoice_payment_customer' => 'Payment Received Template (sent to customer)', - 'invoice_payment_admin' => 'Payment Received Template (sent to admin)', - 'bill_remind_admin' => 'Bill Reminder Template (sent to admin)', - 'bill_recur_admin' => 'Bill Recurring Template (sent to admin)', + 'subject' => 'Onderwerp', + 'body' => 'Inhoud', + 'tags' => 'Beschikbare tags: :tag_list', + 'invoice_new_customer' => 'Nieuw factuursjabloon (verzonden naar de klant)', + 'invoice_remind_customer' => 'Nieuw factuursjabloon (verzonden naar de klant)', + 'invoice_remind_admin' => 'Nieuw factuursjabloon (verzonden naar de klant)', + 'invoice_recur_customer' => 'Nieuw factuursjabloon (verzonden naar de klant)', + 'invoice_recur_admin' => 'Nieuw factuursjabloon (verzonden naar de klant)', + 'invoice_payment_customer' => 'Betaling ontvangen sjabloom (verzonden naar de klant)', + 'invoice_payment_admin' => 'Betaling ontvangen sjabloon (verzonden naar admin)', + 'bill_remind_admin' => 'Betalingsherinnering Template (verzonden naar admin) ', + 'bill_recur_admin' => 'Abonnementsfactuur sjabloon (verzonden naar admin)', ], ], 'scheduling' => [ - 'name' => 'Scheduling', - 'description' => 'Automatic reminders and command for recurring', + 'name' => 'Planning', + 'description' => 'Automatische herinneringen en abonnementsfacturen', 'send_invoice' => 'Factuur herinnering sturen', 'invoice_days' => 'Aantal dagen na vervaldatum sturen', 'send_bill' => 'Factuur herinnering sturen', @@ -109,15 +115,15 @@ return [ ], 'categories' => [ - 'description' => 'Unlimited categories for income, expense, and item', + 'description' => 'Onbeperkt aantal categorieën voor inkomen, uitgaven en producten', ], 'currencies' => [ - 'description' => 'Create and manage currencies and set their rates', + 'description' => 'Maak en beheer valuta en stel de koersen in', ], 'taxes' => [ - 'description' => 'Fixed, normal, inclusive, and compound tax rates', + 'description' => 'Vaste normaal, inclusief, en samengestelde belastingtarieven', ], ]; diff --git a/resources/lang/nl-NL/taxes.php b/resources/lang/nl-NL/taxes.php index 32069736d..047bf5907 100644 --- a/resources/lang/nl-NL/taxes.php +++ b/resources/lang/nl-NL/taxes.php @@ -7,5 +7,5 @@ return [ 'normal' => 'Normaal', 'inclusive' => 'Inclusief', 'compound' => 'Samenstelling', - 'fixed' => 'Fixed', + 'fixed' => 'Vast', ]; diff --git a/resources/lang/nl-NL/validation.php b/resources/lang/nl-NL/validation.php index 2170953dc..affccbf6f 100644 --- a/resources/lang/nl-NL/validation.php +++ b/resources/lang/nl-NL/validation.php @@ -104,7 +104,7 @@ return [ ], 'invalid_currency' => ':attribute code is ongeldig.', 'invalid_amount' => 'De hoeveelheid :attribute is ongeldig.', - 'invalid_extension' => 'The file extension is invalid.', + 'invalid_extension' => 'De bestandsextensie is ongeldig.', ], /* diff --git a/resources/lang/nl-NL/widgets.php b/resources/lang/nl-NL/widgets.php index f9fe1fce6..6791dfdd3 100644 --- a/resources/lang/nl-NL/widgets.php +++ b/resources/lang/nl-NL/widgets.php @@ -2,22 +2,22 @@ return [ - 'total_income' => 'Total Income', - 'receivables' => 'Receivables', - 'open_invoices' => 'Open Invoices', - 'overdue_invoices' => 'Overdue Invoices', - 'total_expenses' => 'Total Expenses', - 'payables' => 'Payables', - 'open_bills' => 'Open Bills', - 'overdue_bills' => 'Overdue Bills', - 'total_profit' => 'Total Profit', - 'open_profit' => 'Open Profit', - 'overdue_profit' => 'Overdue Profit', - 'cash_flow' => 'Cash Flow', - 'no_profit_loss' => 'No Profit Loss', - 'income_by_category' => 'Income By Category', - 'expenses_by_category' => 'Expenses By Category', - 'account_balance' => 'Account Balance', - 'latest_income' => 'Latest Income', - 'latest_expenses' => 'Latest Expenses', + 'total_income' => 'Totale inkomsten', + 'receivables' => 'Debiteuren', + 'open_invoices' => 'Openstaande facturen', + 'overdue_invoices' => 'Vervallen facturen', + 'total_expenses' => 'Totale uitgaven', + 'payables' => 'Schulden', + 'open_bills' => 'Openstaande rekeningen', + 'overdue_bills' => 'Achterstallige rekeningen', + 'total_profit' => 'Totale winst', + 'open_profit' => 'Openstaande winst', + 'overdue_profit' => 'Achterstallige winst', + 'cash_flow' => 'Geldstroom', + 'no_profit_loss' => 'Geen winstderving', + 'income_by_category' => 'Inkomsten per categorie', + 'expenses_by_category' => 'Uitgaves per categorie', + 'account_balance' => 'Rekeningsaldo', + 'latest_income' => 'Laatste inkomsten', + 'latest_expenses' => 'Laatste uitgaven', ]; diff --git a/resources/lang/zh-CN/bills.php b/resources/lang/zh-CN/bills.php index 07a60aee6..b8889aef5 100644 --- a/resources/lang/zh-CN/bills.php +++ b/resources/lang/zh-CN/bills.php @@ -13,6 +13,7 @@ return [ 'price' => '价格', 'sub_total' => '小计', 'discount' => '折扣', + 'item_discount' => 'Line Discount', 'tax_total' => '税率', 'total' => '总计', @@ -28,7 +29,9 @@ return [ 'histories' => '历史记录', 'payments' => '付款方式', 'add_payment' => '新增付款方式', + 'mark_paid' => 'Mark Paid', 'mark_received' => '标记已收到', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => '下载 PDF格式', 'send_mail' => '发送邮件', 'create_bill' => '创建帐单', @@ -42,10 +45,13 @@ return [ 'paid' => '已付款', 'overdue' => '已逾期', 'unpaid' => '未付款', + 'cancelled' => 'Cancelled', ], 'messages' => [ - 'received' => '成功标记账单为已收到！', + 'marked_received' => 'Bill marked as received!', + 'marked_paid' => 'Bill marked as paid!', + 'marked_cancelled' => 'Bill marked as cancelled!', 'draft' => '这是 草稿 账单, 在收到后将反映在图表上。', 'status' => [ diff --git a/resources/lang/zh-CN/bulk_actions.php b/resources/lang/zh-CN/bulk_actions.php index 08aefb90f..171d6f910 100644 --- a/resources/lang/zh-CN/bulk_actions.php +++ b/resources/lang/zh-CN/bulk_actions.php @@ -2,8 +2,9 @@ return [ - 'bulk_actions' => '批量操作', - 'selected' => '已选中', + 'bulk_actions' => '批量操作', + 'selected' => '已选中', + 'no_action' => 'No action available', 'message' => [ 'duplicate' => '你确定要 复制这些选定的记录的吗?', @@ -14,6 +15,7 @@ return [ 'paid' => '您确定要将选定的发票标记为 已支付吗? 您确定要将选定的发票标记为 已支付 吗？', 'sent' => '您确定要将选定的发票标记为 已发送吗？ 您确定要将选定的发票标记为 已发送 吗？', 'received' => '您确定要将选定的账单标记为 已接收吗？ 您确定要将选定的账单标记为 已接收 吗？', + 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/zh-CN/install.php b/resources/lang/zh-CN/install.php index a8089c7fc..994b0c5cc 100644 --- a/resources/lang/zh-CN/install.php +++ b/resources/lang/zh-CN/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature 必須關閉！', 'extension' => ':extension 必須載入！', 'directory' => ':directory 必須可寫入！', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/zh-CN/invoices.php b/resources/lang/zh-CN/invoices.php index 3c50346d3..ee80fafe7 100644 --- a/resources/lang/zh-CN/invoices.php +++ b/resources/lang/zh-CN/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => '价格', 'sub_total' => '小计', 'discount' => '折扣', + 'item_discount' => 'Line Discount', 'tax_total' => '税额', 'total' => '总计', @@ -30,6 +31,7 @@ return [ 'mark_paid' => '标记为已付款', 'mark_sent' => '标记为已发送', 'mark_viewed' => '标记已查看', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => '下载 PDF格式', 'send_mail' => '发送邮件', 'all_invoices' => '登录以查看所有发票', @@ -47,12 +49,15 @@ return [ 'paid' => '已付款', 'overdue' => '已逾期', 'unpaid' => '未付款', + 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => '发票邮件已发送', 'marked_sent' => '发票标记为已发送！', 'marked_paid' => '发票标记为已发送！', + 'marked_viewed' => 'Invoice marked as viewed!', + 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => '此客户沒有邮箱！', 'draft' => '这是 DRAFT 发票，发送后将会反映在图表中。', diff --git a/resources/lang/zh-CN/messages.php b/resources/lang/zh-CN/messages.php index 96070c611..7aa929960 100644 --- a/resources/lang/zh-CN/messages.php +++ b/resources/lang/zh-CN/messages.php @@ -28,6 +28,8 @@ return [ 'warning' => [ 'deleted' => '警告：由于和 :text 相关，你不能刪除:name。', 'disabled' => '警告：由于和 :text 相关，你不能停用:name。', + 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', + 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', 'disable_code' => '警告：您无权禁用或更改货币 :name ，因为它和 :text有 关联。', 'payment_cancel' => '警告: 您已取消了您最近的 :methods 付款 ！', ], diff --git a/resources/lang/zh-CN/modules.php b/resources/lang/zh-CN/modules.php index 65573d92c..75d9e7e1b 100644 --- a/resources/lang/zh-CN/modules.php +++ b/resources/lang/zh-CN/modules.php @@ -9,7 +9,6 @@ return [ 'new' => '新增', 'top_free' => '最佳免费', 'free' => '免费', - 'search' => '搜索', 'install' => '安装', 'buy_now' => '马上购买', 'get_api_key' => '点击这里 获取您的 API 密钥。', diff --git a/resources/lang/zh-CN/passwords.php b/resources/lang/zh-CN/passwords.php index a66bca0fe..070515e35 100644 --- a/resources/lang/zh-CN/passwords.php +++ b/resources/lang/zh-CN/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => '密码重置邮件已发送！', 'token' => '密码重置令牌无效。', 'user' => "找不到该邮箱对应的用户。", + 'throttle' => 'Please wait before retrying.', ]; diff --git a/resources/lang/zh-CN/settings.php b/resources/lang/zh-CN/settings.php index 6b7100582..8969316b9 100644 --- a/resources/lang/zh-CN/settings.php +++ b/resources/lang/zh-CN/settings.php @@ -29,6 +29,12 @@ return [ 'before' => '编号之前', 'after' => '编号之后', ], + 'discount_location' => [ + 'name' => 'Discount Location', + 'item' => 'At line', + 'total' => 'At total', + 'both' => 'Both line and total', + ], ], 'invoice' => [ diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php index 5bf580892..999ff25ba 100644 --- a/resources/lang/zh-CN/validation.php +++ b/resources/lang/zh-CN/validation.php @@ -100,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => '自定信息', + 'rule-name' => '自定信息', ], - 'invalid_currency' => ':attribute code 无效.', - 'invalid_amount' => '金额 :attribute 无效。', + 'invalid_currency' => ':attribute code 无效.', + 'invalid_amount' => '金额 :attribute 无效。', + 'invalid_extension' => 'The file extension is invalid.', ], /* From dc2f572ce4846903b6eba34d45a21751e32f83d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 4 Jun 2020 14:13:40 +0300 Subject: [PATCH 004/208] ne-np --- config/language.php | 2 +- resources/lang/ne-NP/accounts.php | 14 ++ resources/lang/ne-NP/auth.php | 41 +++++ resources/lang/ne-NP/bills.php | 69 ++++++++ resources/lang/ne-NP/bulk_actions.php | 21 +++ resources/lang/ne-NP/companies.php | 14 ++ resources/lang/ne-NP/currencies.php | 18 ++ resources/lang/ne-NP/customers.php | 12 ++ resources/lang/ne-NP/dashboards.php | 11 ++ resources/lang/ne-NP/demo.php | 34 ++++ resources/lang/ne-NP/email_templates.php | 50 ++++++ resources/lang/ne-NP/errors.php | 23 +++ resources/lang/ne-NP/footer.php | 10 ++ resources/lang/ne-NP/general.php | 206 +++++++++++++++++++++++ resources/lang/ne-NP/header.php | 16 ++ resources/lang/ne-NP/import.php | 9 + resources/lang/ne-NP/install.php | 45 +++++ resources/lang/ne-NP/invoices.php | 77 +++++++++ resources/lang/ne-NP/items.php | 8 + resources/lang/ne-NP/maintenance.php | 11 ++ resources/lang/ne-NP/messages.php | 37 ++++ resources/lang/ne-NP/modules.php | 83 +++++++++ resources/lang/ne-NP/notifications.php | 10 ++ resources/lang/ne-NP/pagination.php | 10 ++ resources/lang/ne-NP/passwords.php | 23 +++ resources/lang/ne-NP/reconciliations.php | 16 ++ resources/lang/ne-NP/recurring.php | 20 +++ resources/lang/ne-NP/reports.php | 30 ++++ resources/lang/ne-NP/settings.php | 129 ++++++++++++++ resources/lang/ne-NP/taxes.php | 11 ++ resources/lang/ne-NP/transfers.php | 12 ++ resources/lang/ne-NP/updates.php | 15 ++ resources/lang/ne-NP/validation.php | 123 ++++++++++++++ resources/lang/ne-NP/widgets.php | 23 +++ 34 files changed, 1232 insertions(+), 1 deletion(-) create mode 100644 resources/lang/ne-NP/accounts.php create mode 100644 resources/lang/ne-NP/auth.php create mode 100644 resources/lang/ne-NP/bills.php create mode 100644 resources/lang/ne-NP/bulk_actions.php create mode 100644 resources/lang/ne-NP/companies.php create mode 100644 resources/lang/ne-NP/currencies.php create mode 100644 resources/lang/ne-NP/customers.php create mode 100644 resources/lang/ne-NP/dashboards.php create mode 100644 resources/lang/ne-NP/demo.php create mode 100644 resources/lang/ne-NP/email_templates.php create mode 100644 resources/lang/ne-NP/errors.php create mode 100644 resources/lang/ne-NP/footer.php create mode 100644 resources/lang/ne-NP/general.php create mode 100644 resources/lang/ne-NP/header.php create mode 100644 resources/lang/ne-NP/import.php create mode 100644 resources/lang/ne-NP/install.php create mode 100644 resources/lang/ne-NP/invoices.php create mode 100644 resources/lang/ne-NP/items.php create mode 100644 resources/lang/ne-NP/maintenance.php create mode 100644 resources/lang/ne-NP/messages.php create mode 100644 resources/lang/ne-NP/modules.php create mode 100644 resources/lang/ne-NP/notifications.php create mode 100644 resources/lang/ne-NP/pagination.php create mode 100644 resources/lang/ne-NP/passwords.php create mode 100644 resources/lang/ne-NP/reconciliations.php create mode 100644 resources/lang/ne-NP/recurring.php create mode 100644 resources/lang/ne-NP/reports.php create mode 100644 resources/lang/ne-NP/settings.php create mode 100644 resources/lang/ne-NP/taxes.php create mode 100644 resources/lang/ne-NP/transfers.php create mode 100644 resources/lang/ne-NP/updates.php create mode 100644 resources/lang/ne-NP/validation.php create mode 100644 resources/lang/ne-NP/widgets.php diff --git a/config/language.php b/config/language.php index 7b404b27a..1dc99e48f 100644 --- a/config/language.php +++ b/config/language.php @@ -122,7 +122,7 @@ return [ | This options indicates the allowed languages. | */ - 'allowed' => ['ar-SA', 'bg-BG', 'bn-BD', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-GB', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'he-IL', 'hi-IN', 'hr-HR', 'id-ID', 'is-IS', 'it-IT', 'ja-JP', 'ka-GE', 'ko-KR', 'lt-LT', 'lv-LV', 'mk-MK', 'ms-MY', 'nb-NO', 'nl-NL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'sq-AL', 'sv-SE', 'th-TH', 'tr-TR', 'uk-UA', 'ur-PK', 'uz-UZ', 'vi-VN', 'zh-CN', 'zh-TW'], + 'allowed' => ['ar-SA', 'bg-BG', 'bn-BD', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-GB', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'he-IL', 'hi-IN', 'hr-HR', 'id-ID', 'is-IS', 'it-IT', 'ja-JP', 'ka-GE', 'ko-KR', 'lt-LT', 'lv-LV', 'mk-MK', 'ms-MY', 'nb-NO', 'ne-NP', 'nl-NL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'sq-AL', 'sv-SE', 'th-TH', 'tr-TR', 'uk-UA', 'ur-PK', 'uz-UZ', 'vi-VN', 'zh-CN', 'zh-TW'], /* |-------------------------------------------------------------------------- diff --git a/resources/lang/ne-NP/accounts.php b/resources/lang/ne-NP/accounts.php new file mode 100644 index 000000000..043d6eb74 --- /dev/null +++ b/resources/lang/ne-NP/accounts.php @@ -0,0 +1,14 @@ + 'खाताको नाम', + 'number' => 'खाता नम्बर', + 'opening_balance' => 'सुरु मौज्दात', + 'current_balance' => 'चालु रकम', + 'bank_name' => 'बैंकको नाम', + 'bank_phone' => 'बैंकको फोन नं', + 'bank_address' => 'बैंकको ठेगाना', + 'default_account' => 'पूर्वनिर्धारित खाता', + +]; diff --git a/resources/lang/ne-NP/auth.php b/resources/lang/ne-NP/auth.php new file mode 100644 index 000000000..dcea5d6ab --- /dev/null +++ b/resources/lang/ne-NP/auth.php @@ -0,0 +1,41 @@ + 'प्रोफाइल', + 'logout' => 'बाहिरिनुहोस्', + 'login' => 'भित्रिनुहोस्', + 'login_to' => 'नयाँँ सत्र सुरू गर्न लग इन गर्नुहोस', + 'remember_me' => 'मलाई सम्झिरहनु', + 'forgot_password' => 'मैले मेरो पासवर्ड विर्सिएँ', + 'reset_password' => 'पुन नयाँ पासवर्ड राख्नुहोस', + 'enter_email' => 'ईमेल ठेगाना राख्नुहोस', + 'current_email' => 'हालको इमेल', + 'reset' => 'पुनः राख्नुहोस्', + 'never' => 'कहिल्यै', + 'landing_page' => 'अवतरण पृष्ठ', + + 'password' => [ + 'current' => 'प्रवेश शब्द', + 'current_confirm' => 'प्रवेश शब्दको सुनिश्चितत़ा', + 'new' => 'नयाँँ प्रवेश शब्द लिनुहोस', + 'new_confirm' => 'नयाँ प्रवेश शब्दको सुनिश्चितत़ा', + ], + + 'error' => [ + 'self_delete' => 'त्रुटि: तपाई आफैंलाई हटाउन सक्नुहुन्न !', + 'self_disable' => 'त्रुटि: आफैँ हटाउन सकिदैन!', + 'no_company' => 'त्रुटि: तपाईको खातासँग सम्बन्धित कम्पनि तोकिएको छैन । कृपया प्प्ररणाली शासकसँग सम्पर्क गर्नुहोस।', + ], + + 'failed' => 'यी प्रमाणहरू हाम्रो रेकर्डसँग मेल खादैनन्।', + 'disabled' => 'यो खाता निष्कृय गरिएको छ। कृपया, प्रणाली प्रशासकसँग सम्पर्क गर्नुहोस।', + 'throttle' => 'भित्रिने धेरै प्रयास असफल रहे। कृपया :seconds सेकेन्ड पछि पुन: प्रयास गर्नुहोस्।', + + 'notification' => [ + 'message_1' => 'तपाई यो इमेल प्राप्त गर्दै हुनुहुन्छ किनभने हामीलाई प्रवेश शब्द पुनः राख्ने प्रयोजनार्थ अनुरोध प्राप्त भएको छ।', + 'message_2' => 'यदि तपाईले प्रवेश शब्द पुनः राख्ने प्रयोजनार्थ अनुरोध नगरेको भए कुनै कार्य गर्नु पर्दैन।', + 'button' => 'प्रवेश शब्द पुन: राख्नुहोस', + ], + +]; diff --git a/resources/lang/ne-NP/bills.php b/resources/lang/ne-NP/bills.php new file mode 100644 index 000000000..755018cf0 --- /dev/null +++ b/resources/lang/ne-NP/bills.php @@ -0,0 +1,69 @@ + 'बिल नम्बर', + 'bill_date' => 'बिलको मिति', + 'total_price' => 'जम्मा रकम', + 'due_date' => 'बक्यौता मिति', + 'order_number' => 'माग सङ्ख्या', + 'bill_from' => 'बिल दिने', + + 'quantity' => 'परिमाण', + 'price' => 'मूल्य', + 'sub_total' => 'उप कुल', + 'discount' => 'छुट', + 'item_discount' => 'सिधा छुट', + 'tax_total' => 'जम्मा कर', + 'total' => 'जम्मा', + + 'item_name' => 'सामानको नामसामानहरुको नाम', + + 'show_discount' => ':discount% छुट', + 'add_discount' => 'छुट थप्नुहोस', + 'discount_desc' => 'उप कुलको', + + 'payment_due' => 'भुक्तानी बक्यौता ', + 'amount_due' => 'रकम बक्यौता', + 'paid' => 'तिरेको', + 'histories' => 'इतिहासहरू', + 'payments' => 'भुक्तानीहरू', + 'add_payment' => 'भुक्तानी थप्नुहोस', + 'mark_paid' => 'तिरिसकेको चिनो लगाउनुहोस', + 'mark_received' => 'प्राप्त भएको चिन्ह लगाउनुहोस', + 'mark_cancelled' => 'रद्ध गरिएको चिन्ह लगाउनुहोस', + 'download_pdf' => 'PDF डाउनलोड गर्नुहोस्', + 'send_mail' => 'इमेल पठाउनुहोस्', + 'create_bill' => 'बिल तयार गर्नुहोस', + 'receive_bill' => 'बिल प्राप्त गर्नुहोस', + 'make_payment' => 'तिर्नुहोस', + + 'statuses' => [ + 'draft' => 'मस्यौदा', + 'received' => 'प्राप्त भयो', + 'partial' => 'आंशिक', + 'paid' => 'तिरेको', + 'overdue' => 'बाँकी बक्यौता', + 'unpaid' => 'भुक्तानी नभएका', + 'cancelled' => 'रद्द गरिएको', + ], + + 'messages' => [ + 'marked_received' => 'बिल प्राप्त भएको चिन्ह लगाईयो !', + 'marked_paid' => 'बिल तिरेको चिन्ह लगाईयो', + 'marked_cancelled' => 'बिल रद्द भएको चिन्ह लगाईयो', + 'draft' => 'यो एउटा मस्यौदा विल हो र भुक्तानी प्राप्त भएपछी मात्र यो चार्टमा देखिने छ |', + + 'status' => [ + 'created' => ':date मा तयार ', + 'receive' => [ + 'draft' => 'अप्रेषित', + 'received' => ':date मा प्राप्त', + ], + 'paid' => [ + 'await' => 'प्रतिक्षित भुक्तानी', + ], + ], + ], + +]; diff --git a/resources/lang/ne-NP/bulk_actions.php b/resources/lang/ne-NP/bulk_actions.php new file mode 100644 index 000000000..8370118ef --- /dev/null +++ b/resources/lang/ne-NP/bulk_actions.php @@ -0,0 +1,21 @@ + 'थोक काम|थोक कामहरु', + 'selected' => 'छानिएको', + 'no_action' => 'कुनै क्रिया उपलब्ध छैन', + + 'message' => [ + 'duplicate' => 'के तपाई छानिएको रेकर्डलाई नक्कल गर्न चाहानुहुन्छ ?', + 'delete' => 'के तपाई छानिएको रेकर्डलाई हटाउन चाहानुहुन्छ?|के तपाई छानिएका रेकर्डहरूलाई हटाउन चाहानुहुन्छ?', + 'export' => 'के तपाई छानिएको रेकर्डलाई निर्यात गर्न चाहानुहुन्छ?|के तपाई छानिएको रेकर्डहरूलाई निर्यात गर्न चाहानुहुन्छ?', + 'enable' => 'के तपाई छानिएको रेकर्डलाई सक्रिय गर्न चाहानुहुन्छ?|के तपाई छानिएको रेकर्डहरूलाई सक्रिय गर्न चाहानुहुन्छ?', + 'disable' => 'के तपाई छानिएको रेकर्डलाई निस्क्रिय गर्न चाहानुहुन्छ?|के तपाई छानिएको रेकर्डहरूलाई निस्क्रिय गर्न चाहानुहुन्छ?', + 'paid' => 'के तपाई छानिएको चलानीलाई भुक्तानी गरिएकोभनि अंकित गर्न चाहानुहुन्छ?|के तपाई छानिएका चलानीहरूलाई भुक्तानी गरिएका भनि अंकित गर्न चाहानुहुन्छ?', + 'sent' => 'के तपाई छानिएको चलानीलाई पठाईएकोभनि अंकित गर्न चाहानुहुन्छ?|के तपाई छानिएका चलानीहरूलाई पठाईएका भनि अंकित गर्न चाहानुहुन्छ?', + 'received' => 'के तपाई छानिएको बिललाई भुक्तानी प्राप्तभनि अंकित गर्न चाहानुहुन्छ?|के तपाई छानिएका बिलहरूलाई भुक्तानी प्राप्त भनि अंकित गर्न चाहानुहुन्छ?', + 'cancelled' => 'के तपाई छानिएको चलानी/बिललाई रद्द गरिएकोभनि अंकित गर्न चाहानुहुन्छ?|के तपाई छानिएका चलानी/बिलहरूलाई रद्द गरिएका भनि अंकित गर्न चाहानुहुन्छ?', + ], + +]; diff --git a/resources/lang/ne-NP/companies.php b/resources/lang/ne-NP/companies.php new file mode 100644 index 000000000..1ab0c2914 --- /dev/null +++ b/resources/lang/ne-NP/companies.php @@ -0,0 +1,14 @@ + 'डोमेन', + 'logo' => 'प्रतिक चिन्ह', + + 'error' => [ + 'not_user_company' => 'Error: तपाईलाई यो कम्पनीलाई परिवर्तन गर्ने अनुमति छैन!', + 'delete_active' => 'त्रुटि: सक्रिय कम्पनीलाई हटाउन सकिदैन, कृपया पहिले अर्को कम्पनि सक्रिय गर्नुहोस्!', + 'disable_active' => 'त्रुटि: सक्रिय कम्पनीलाई निष्क्रिय सकिदैन, कृपया पहिले अर्को कम्पनि सक्रिय गर्नुहोस्!', + ], + +]; diff --git a/resources/lang/ne-NP/currencies.php b/resources/lang/ne-NP/currencies.php new file mode 100644 index 000000000..f84a665c0 --- /dev/null +++ b/resources/lang/ne-NP/currencies.php @@ -0,0 +1,18 @@ + 'सङ्केत', + 'rate' => 'दर', + 'default' => 'पुर्वनिर्धारित मुद्रा', + 'decimal_mark' => 'दशमलव चिन्ह', + 'thousands_separator' => 'हजार विभाजक', + 'precision' => 'परिशुद्धता', + 'symbol' => [ + 'symbol' => 'सङ्केत', + 'position' => 'सङ्केतको स्थान', + 'before' => 'रकमको अगाडि', + 'after' => 'रकमको पछि', + ] + +]; diff --git a/resources/lang/ne-NP/customers.php b/resources/lang/ne-NP/customers.php new file mode 100644 index 000000000..d52906c9b --- /dev/null +++ b/resources/lang/ne-NP/customers.php @@ -0,0 +1,12 @@ + 'भित्रिन सक्नुहुन्छ?', + 'user_created' => 'प्रयोगकर्ता सिर्जना गरियो।', + + 'error' => [ + 'email' => 'यो ईमेल पहिले नै लिइसकिएको छ ।', + ], + +]; diff --git a/resources/lang/ne-NP/dashboards.php b/resources/lang/ne-NP/dashboards.php new file mode 100644 index 000000000..bef565f0f --- /dev/null +++ b/resources/lang/ne-NP/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'त्रुटी: तपाईलाई यो ड्यासबोर्ड परिवर्तन गर्ने अनुमति छैन!', + 'delete_last' => 'त्रुटी: तपाईलाई यो अन्तिम ड्यासबोर्ड हटाउन सक्नुहुन्न | कृपया, पहिले एउटा नयाँ निर्माण गर्नुहोस्!', + 'disable_last' => 'त्रुटी: तपाईलाई यो अन्तिम ड्यासबोर्ड निस्क्रिय गर्न सक्नुहुन्न | कृपया, पहिले एउटा नयाँ निर्माण गर्नुहोस्!', + ], + +]; diff --git a/resources/lang/ne-NP/demo.php b/resources/lang/ne-NP/demo.php new file mode 100644 index 000000000..d0e0b05ec --- /dev/null +++ b/resources/lang/ne-NP/demo.php @@ -0,0 +1,34 @@ + [ + 'cash' => 'नगद', + ], + + 'categories' => [ + 'deposit' => 'निक्षेप', + 'sales' => 'विक्री', + ], + + 'currencies' => [ + 'usd' => 'अमेरिकी डलर', + 'eur' => 'युरो', + 'gbp' => 'ब्रिटिश पाउन्ड', + 'try' => 'टर्किश लिरा', + ], + + 'offline_payments' => [ + 'cash' => 'नगद', + 'bank' => 'बैंक ट्रान्सफर', + ], + + 'reports' => [ + 'income' => 'वर्गीकरणको आधारमा मासिक आयको सारांश', + 'expense' => 'वर्गीकरणको आधारमा मासिक खर्चको सारांश', + 'income_expense' => 'वर्गीकरणको आधारमा मासिक आय विरुद्ध मासिक व्यय', + 'tax' => 'त्रैमासिक कर सारांश', + 'profit_loss' => 'बर्गीकरणको आधारमा त्रैमासिक नाफा र नोक्सान', + ], + +]; diff --git a/resources/lang/ne-NP/email_templates.php b/resources/lang/ne-NP/email_templates.php new file mode 100644 index 000000000..4aa1b1414 --- /dev/null +++ b/resources/lang/ne-NP/email_templates.php @@ -0,0 +1,50 @@ + [ + 'subject' => 'चलानी {invoice_number} सिर्जना गरियो |', + 'body' => 'प्रिय {customer_name},

हामीले तपाईको निम्ति देहाय बमोजिमको चलानी निर्माण गरका छौँ: {invoice_number}.

तपाइँले चलानीको विवरण हेर्न र तलको लिंकबाट भुक्तानीको लागि अघि बढ्न सक्नुहुन्छ: {invoice_number}.

कुनै प्रश्न भए हामीलाई सम्पर्क गर्न स्वतन्त्र महसुस गर्नुहोस् |

शुभेच्छा सहित,
{company_name}', + ], + + 'invoice_remind_customer' => [ + 'subject' => '{invoice_number} चलानी बाँकी रहेको सूचना', + 'body' => 'प्रिय {customer_name},

यो {invoice_number} चलानीको लागि बक्यौता रहेको सूचना हो |

{invoice_due_date} मिति देखि चलानीको जम्मा {invoice_total} छ |

तपाइँले चलानीको विवरण हेर्न र तलको लिंकबाट भुक्तानीको लागि अघि बढ्न सक्नुहुन्छ: {invoice_number}.

शुभेच्छा सहित,
{company_name}', + ], + + 'invoice_remind_admin' => [ + 'subject' => '{invoice_number} चलानी बाँकी रहेको सूचना', + 'body' => 'नमस्कार,

{customer_name} ले चलानी नं {invoice_number}को बक्यौता सूचना प्राप्त गर्नुभएको छ |

मिति {invoice_due_date} बाट चलानिको रू {invoice_total} बक्यौता रहेको छ |

Yतपाइले तलको लिंकबाट पूर्ण विवरण हेर्न सक्नुहुनेछ: {invoice_number}.

शुभेच्छा सहित,
{company_name}', + ], + + 'invoice_recur_customer' => [ + 'subject' => 'आवर्ती चलानी {invoice_number} सिर्जना गरियो |', + 'body' => 'प्रिय {customer_name},

तपाईको आवर्ती वृत्तको आधारमा हामीले निम्न बमोजिमको चलानी सिर्जना गरेका छौँ: {invoice_number}.

तपाइले चलानिको विस्तृत विवरण हेर्न र भुक्तानीको लागि अगाडि बढ्न यो लिंकमा प्रयोग गर्न सक्नुहुन्छ: {invoice_number}.

कुनै प्रश्न भए हामीलाई सोध्न स्वतन्त्र अनुभव गर्नुहोस

शुभेच्छा सहित
{company_name}', + ], + + 'invoice_recur_admin' => [ + 'subject' => 'आवर्ती चलानी {invoice_number} सिर्जना गरियो |', + 'body' => 'नमस्कार,

{customer_name} को आवर्ती वृत्त {invoice_number}को आधारमा स्वत चलानी सिर्जना गरिएको छ |

तपाइले तलको लिंकबाट पूर्ण विवरण हेर्न सक्नुहुनेछ: {invoice_number}.

शुभेच्छा सहित,
{company_name}', + ], + + 'invoice_payment_customer' => [ + 'subject' => 'Payment received for {invoice_number} invoice', + 'body' => 'प्रिय {customer_name},

भुक्तानीको लागि धन्यवाद | भुक्तानीको विवरण तल दिईएको छ:

-------------------------------------------------
रकम: {transaction_total}
मिति: {transaction_paid_date}
चलानी सङ्ख्या: {invoice_number}
-------------------------------------------------

तपाइले चलानिको विवरण विस्तृत सधैँ यो लिंक प्रयोग गरी हेर्न सक्नुहुन्छ: {invoice_number}.

कुनै प्रश्न भए हामीलाई सम्पर्क गर्न तपाईं स्वतन्त्र हुनुहुन्छ |

शुभेक्षा सहित,
{company_name}', + ], + + 'invoice_payment_admin' => [ + 'subject' => 'चलानी नं {invoice_number} को भुक्तानी प्राप्त भयो |', + 'body' => 'नमस्कार,

{customer_name} ले चलानी नं {invoice_number} को भुक्तानीको अभिलेखन गर्नुभयो|

तपाईंले तलको लिंकबाट चलानीको विस्तृत विवरण हेर्न सक्नुहुन्छ: {invoice_number}.

शुभेच्छा सहित,
{company_name}', + ], + + 'bill_remind_admin' => [ + 'subject' => 'बिल नं {bill_number} पुन: स्मरण सूचना', + 'body' => 'नमस्कार,

यो {vendor_name} बाट प्राप्त बिल नं {bill_number} को पुन: स्मरण सूचना हो |

जम्मा विल रकम {bill_total} छ र यो मिति {bill_due_date} देखि बक्यौता.

तपाईंले तलको लिंकबाट विस्तृत विवरण हेर्न सक्नुहुन्छ: {bill_number}.

शुभेच्छा सहित,
{company_name}', + ], + + 'bill_recur_admin' => [ + 'subject' => '{bill_number} आवर्ती विल सिर्जना गरियो |', + 'body' => 'नमस्कार,

{vendor_name} को आवर्ती वृत्त {bill_number}को आधारमा स्वत विल सिर्जना गरिएको छ |

तपाइले तलको लिंकबाट पूर्ण विवरण हेर्न सक्नुहुनेछ: {bill_number}.

शुभेच्छा सहित,
{company_name}', + ], + +]; diff --git a/resources/lang/ne-NP/errors.php b/resources/lang/ne-NP/errors.php new file mode 100644 index 000000000..127e3f4f6 --- /dev/null +++ b/resources/lang/ne-NP/errors.php @@ -0,0 +1,23 @@ + [ + '403' => 'ओहो! पहुँच निषेध', + '404' => 'ओहो! पेज भेटिएन', + '500' => 'ओहो! कुनै त्रुटी हुन पुग्यो', + ], + + 'header' => [ + '403' => '४०३ निषेध', + '404' => '४०४ भेटिएन', + '500' => '५०० आन्तरिक सर्भर त्रुटी', + ], + + 'message' => [ + '403' => 'तपाइले यो पेजमा पहुँच राख्न सक्नुहुन्न |', + '404' => 'तपाईंले खोज्नुभएको पृष्ठ फेला पार्न सकेनौँ |', + '500' => 'हामी अहिले नै यो ठीक गर्ने काम गर्नेछौं।', + ], + +]; diff --git a/resources/lang/ne-NP/footer.php b/resources/lang/ne-NP/footer.php new file mode 100644 index 000000000..853d6d7ed --- /dev/null +++ b/resources/lang/ne-NP/footer.php @@ -0,0 +1,10 @@ + 'संस्करण', + 'powered' => 'एकाउन्टिङ्गद्वारा संचालित ', + 'link' => 'https://akaunting.com', + 'software' => 'निशुल्क लेखापालन सफ्टवेयर', + +]; diff --git a/resources/lang/ne-NP/general.php b/resources/lang/ne-NP/general.php new file mode 100644 index 000000000..23e896959 --- /dev/null +++ b/resources/lang/ne-NP/general.php @@ -0,0 +1,206 @@ + 'ड्यासबोर्ड|ड्यासबोर्डहरु', + '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' => 'आय Vs व्यय', + 'notes' => 'नोट।नोटहरू', + 'totals' => 'कुल', + 'languages' => 'भाषा।भाषाहरू', + 'updates' => 'अपडेट।अपडेटहरू', + 'numbers' => 'संख्या।संख्याहरू', + 'statuses' => 'स्ट्याटस।स्ट्याटसहरू', + 'others' => 'अन्य|अन्य', + 'contacts' => 'सम्पर्क|सम्पर्कहरु', + 'reconciliations' => 'मिलान|मिलानहरू', + 'developers' => 'विकासक|विकासकहरू', + 'schedules' => 'समय तालिका|समय तालिकाहरु', + 'groups' => 'समूह|समूहहरु', + 'charts' => 'चार्ट|चार्टहरू', + 'localisations' => 'स्थानियकरण|स्थानियकरणहरु', + 'defaults' => 'पूर्वनिर्धारित|पूर्वनिर्धारितहरु', + 'widgets' => 'विजेट|विजेटहरू', + 'templates' => 'नमुना/नमुनाहरु', + 'sales' => 'विक्री|विक्रिहरू', + 'purchases' => 'खरिद|खरिदहरू', + + 'welcome' => 'स्वागतम', + 'banking' => 'बैंकिंङ्ग', + 'general' => 'साधारण', + 'no_records' => 'रेकर्ड छैन।', + 'date' => 'मिति', + 'amount' => 'रकम', + 'enabled' => 'सक्रिय भयो', + 'disabled' => 'निष्क्रिय भयो', + 'yes' => 'हो', + 'no' => 'होइन', + 'na' => 'N/A', + 'daily' => 'दैनिक', + 'weekly' => 'साप्ताहिक', + 'monthly' => 'मासिक', + 'quarterly' => 'त्रैमासिक', + 'yearly' => 'वार्षिक', + 'add' => 'जोड्नुहोस्', + 'add_new' => 'नयाँँ थप्न', + 'add_income' => 'आय थप्नुहोस', + 'add_expense' => 'व्यय थप्नुहोस', + 'show' => 'हेर्नुहोस', + 'edit' => 'सम्पादन गर्नुहोस्', + 'delete' => 'मेटाउन', + 'send' => 'पठाउन', + 'share' => 'शेयर', + 'download' => 'डाउनलोड', + 'delete_confirm' => ' :name :type हटाउन निष्चित हुनुहुन्छ?', + 'name' => 'नाम', + 'email' => 'ईमेल', + 'tax_number' => 'कर नम्बर', + 'phone' => 'फोन', + 'address' => 'ठेगाना', + 'website' => 'वेबसाइट', + 'actions' => 'कार्यहरू', + 'description' => 'विवरण', + 'manage' => 'व्यवस्थापन', + 'code' => 'कोड', + 'alias' => 'Alias', + 'balance' => 'शेष', + 'reference' => 'Reference', + 'attachment' => 'Attachment', + 'change' => 'Change', + 'change_type' => ' :type परिवर्तन गर्नुहोस', + 'switch' => 'Switch', + 'color' => 'रंग', + 'save' => 'सुरक्षित गर्नुहोस्', + 'confirm' => 'निश्चित गर्नुहोस्', + 'cancel' => 'रद्द गर्नुहोस्', + 'loading' => 'लोडिङ्ग...', + 'from' => 'बाट', + 'to' => 'लाई', + 'print' => 'प्रिन्ट', + 'search' => 'खोज्नुहोस्', + 'search_placeholder' => 'खोज्न टाइप गर्नुहोस', + 'filter' => 'फिल्टर', + 'help' => 'सहायता', + 'all' => 'सबै', + 'all_type' => 'सबै :type', + 'upcoming' => 'आउँदा', + 'created' => 'सिर्जना भयो', + 'id' => 'आईडी', + 'more_actions' => 'थप कदमहरू', + 'duplicate' => 'नक्कल', + 'unpaid' => 'भुक्तानी नभएका', + 'paid' => 'नगदी', + 'overdue' => 'बाँकी बक्यौता', + 'partially' => 'आंशिक', + 'partially_paid' => 'आंशिक बक्यौता', + 'export' => 'निर्यात', + 'finish' => 'समापन गर्नुहोस्', + 'wizard' => 'विजार्ड', + 'skip' => 'छोड्नुहोस्', + 'enable' => 'सक्रिय गर्नुहोस', + 'disable' => 'निष्क्रिय गर्नुहोस', + 'select_all' => 'सबै छनोट गर्नुहोस्', + 'unselect_all' => 'सबै छनोटबाट हटाउनुहोस्', + 'created_date' => 'सिर्जित मिति', + 'period' => 'अवधि', + 'frequency' => 'आवृत्ति', + 'start' => 'शुरु', + 'end' => 'अन्त्य', + 'clear' => 'खालि गर्नुहोस्', + 'difference' => 'फरक', + 'footer' => 'पुच्छर', + 'start_date' => 'सुरु मिति', + 'end_date' => 'अन्तिम मिति', + 'basis' => 'आधार', + 'accrual' => 'आर्जित', + 'cash' => 'नगद', + 'group_by' => 'द्वारा सामुहिकृत गर्ने', + 'accounting' => 'लेखांकन', + 'sort' => 'मिलाउनुहोस्', + 'width' => 'चौडाई', + 'month' => 'महिना', + 'year' => 'बर्ष', + 'type_item_name' => 'एउटा सामानको नाम टाईप गर्नुहोस्', + 'no_data' => 'डाटा छैन', + 'no_matching_data' => 'मिल्ने डाटा छैन', + 'clear_cache' => 'क्यास खालि गर्नुहोस्', + 'go_to_dashboard' => 'ड्यासबोर्डमा जानुहोस्', + + 'card' => [ + 'name' => 'कार्डमा नाम', + 'number' => 'कार्ड नम्बर', + 'expiration_date' => 'अमान्य हुने मिति', + 'cvv' => 'कार्ड CVV', + ], + + 'title' => [ + 'new' => 'नयाँ :type', + 'edit' => ':type सम्पादन', + 'delete' => ':type हटाउनुहोस्', + 'create' => ':type सिर्जना गर्नुहोस्', + 'send' => ':type प्रेषण गर्नुहोस्', + 'get' => ':type प्राप्त गर्नुहोस्', + 'add' => ':type थप्नुहोस्', + 'manage' => ':type व्यवस्थित गर्नुहोस्', + ], + + 'form' => [ + 'enter' => ':field राख्नुहोस्', + 'select' => [ + 'field' => '- :field छान्नुहोस् -', + 'file' => 'फाईल छान्नुहोस्', + ], + 'add_new' => 'नयाँ :field थप्नुहोस्', + 'no_file_selected' => 'कुनै फाईल छानिएन...', + ], + + 'date_range' => [ + 'today' => 'आज', + 'yesterday' => 'हिजो', + 'last_days' => 'बितेका :day दिनहरू', + 'this_month' => 'यो महिना', + 'last_month' => 'गत महिना', + ], + + 'empty' => [ + 'documentation' => 'विस्तृत बुझ्न मा जानुहोस् |', + 'items' => 'आईटमहरू उत्पादन वा सेवाहरू हुन सक्छन्। इनभ्वाइसहरू र बिलहरू सिर्जना गर्दा मूल्य, ट्याक्स आदि देखाउन आईटमहरू प्रयोग गर्न सक्नुहुनेछ।', + 'invoices' => 'इनभ्वाइसहरू एक पटक वा पुनरावर्ती हुन सक्छ। तपाईं तिनीहरू ग्राहकहरूलाई पठाउन सक्नुहुनेछ र अनलाइन भुक्तानी स्वीकार सुरु गर्न सक्नुहुन्छ।', + 'revenues' => 'आम्दानी एक सशुल्क आय लेनदेन हो। यो एक स्वतन्त्र रेकर्ड (अर्थात निक्षेप) वा इनभ्वाइसमा संलग्न हुन सक्छ।', + 'customers' => ' यदि तपाईं चलानीहरू सिर्जना गर्न चाहानुहुन्छ भने ग्राहकहरू आवश्यक हुन्छन्। तिनीहरू पनि ग्राहक पोर्टलमा भित्रिन गर्न सक्छन् र आफ्नो ब्यालेन्स देख्न सक्छन्।', + 'bills' => 'बिलहरू एक पटक वा पुनरावर्ती हुन सक्छन्। ती उत्पादनहरू वा सेवाहरू खरीद गर्नको लागि तपाइँ विक्रेतालाई कति तिर्नु हुन्छ भनेर यसले संकेत गर्दछ।', + 'payments' => 'भुक्तानी एक तिरेको खर्चको कारोबार हो। यो एक स्वतन्त्र रेकर्ड (अर्थात् खाना रसीद) वा बिलमा संलग्न हुनसक्दछ।', + 'vendors' => 'यदि तपाईं बिलहरू सिर्जना गर्न चाहानुहुन्छ भने विक्रेताहरू आवश्यक हुन्छन् । तपाईले बाँकी रहेको ब्यालेन्स र विक्रेताद्वारा फिल्टर गरी प्रतिवेदनहरू देख्न सक्नुहुन्छ।', + 'transfers' => 'स्थानान्तरणले तपाइँलाई खाताबाट अर्कोमा पैसा सार्न अनुमति दिन्छ, चाहे उहि समान मुद्रा प्रयोग गर्छ वा गर्दैन।', + 'taxes' => 'करहरू चलानीहरू र बिलहरूमा थप शुल्कहरू लागू गर्न प्रयोग गरिन्छ। तपाईंको वित्तीय यी नियामक करहरु द्वारा प्रभावित छन्', + 'reconciliations' => 'बैंक मिलाप एउटा यस्तो प्रक्रियागत कार्य हो जुन कम्पनीको बैंक रेकर्ड पनि सहि छ भनि निश्चित गर्न गरिन्छ।', + ], + +]; diff --git a/resources/lang/ne-NP/header.php b/resources/lang/ne-NP/header.php new file mode 100644 index 000000000..b2b8bc9f6 --- /dev/null +++ b/resources/lang/ne-NP/header.php @@ -0,0 +1,16 @@ + 'भाषा परिवर्तन गर्नुहोस्', + 'last_login' => 'अन्तिम लग ईन :time', + 'notifications' => [ + 'counter' => '{0} तपाईलाई कुनै सूचना छैन|{1} तपाईलाई :count सूचनाहरू छन् |[2,*] तपाईलाई :count सूचनाहरु छन्', + 'overdue_invoices' => '{1} :count बक्यौता चलानी|[2,*] :count बक्यौता चलानीहरू', + 'upcoming_bills' => '{1} :count आगामी बिल|[2,*] :count आगामी बिलहरू', + 'view_all' => 'सबै हेर्ने' + ], + 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/support', + +]; diff --git a/resources/lang/ne-NP/import.php b/resources/lang/ne-NP/import.php new file mode 100644 index 000000000..be99d7969 --- /dev/null +++ b/resources/lang/ne-NP/import.php @@ -0,0 +1,9 @@ + 'आयात गर्नुहोस', + 'title' => 'आयात :type', + 'message' => 'अनुमति प्राप्त फाइल का प्रकार हरू: XLS, XLSX. कृपया, Sample फाइलडाउनलोड गर्नुहोस।', + +]; diff --git a/resources/lang/ne-NP/install.php b/resources/lang/ne-NP/install.php new file mode 100644 index 000000000..54c0afd50 --- /dev/null +++ b/resources/lang/ne-NP/install.php @@ -0,0 +1,45 @@ + 'अर्को', + 'refresh' => 'पुनर्ताजगी गर्नुहोस्', + + 'steps' => [ + 'requirements' => 'कृपया, आफ्नो होस्टिङ्ग प्रदायकलाई यी त्रुटिहरू सच्याउन आग्रह गर्नुहोस', + 'language' => 'चरण १/३ : भाषा छान्ने', + 'database' => 'चरण २/३ : डाटाबेस सेटअप', + 'settings' => 'चरण ३/३ : कम्पनी र प्रशासनिक विवरण', + ], + + 'language' => [ + 'select' => 'भाषा छनोट गर्नुहोस्', + ], + + 'requirements' => [ + 'enabled' => ':feature सक्रिय गर्न जरूरी छ!', + 'disabled' => ':feature निस्क्रिय जरूरी छ!', + 'extension' => ':extension एक्सटेंशन स्थापित र लोड गर्न जरूरी छ!', + 'directory' => ':directory डाईरेक्टरी लेखनयोग्य हुन जरूरी छ!', + 'executable' => 'PHP CLI को कार्यान्वयन योग्य फाइल परिभाषित गरिएको छैन/काम गरीरहेको छैन वा यसको संस्करण : php_version बराबर वा यस भन्दा माथिल्लो छैन! कृपया, तपाईंको होस्टिंग कम्पनीलाई PHP_BINARY वा PHP_PATH वातावरण चर सही रूपमा सेट गर्न भन्नुहोस्।', + ], + + 'database' => [ + 'hostname' => 'होस्टको नाम', + 'username' => 'प्रयोगकर्ता नाम', + 'password' => 'प्रवेश शब्द', + 'name' => 'डाटाबेस', + ], + + 'settings' => [ + 'company_name' => 'कम्पनीको नाम', + 'company_email' => 'कम्पनीको ईमेल', + 'admin_email' => 'प्रशासकको ईमेल', + 'admin_password' => 'प्रशासकको प्रवेश शब्द', + ], + + 'error' => [ + 'connection' => 'त्रुटि: डाटाबेसमा जोड्न सकिएन! कृपया, सम्पूर्ण विवरण ठीक छन् भनि निश्चित गर्नुहोस।', + ], + +]; diff --git a/resources/lang/ne-NP/invoices.php b/resources/lang/ne-NP/invoices.php new file mode 100644 index 000000000..4e97b3a52 --- /dev/null +++ b/resources/lang/ne-NP/invoices.php @@ -0,0 +1,77 @@ + 'चलानी नम्बर', + 'invoice_date' => 'चलानी मिति', + 'total_price' => 'जम्मा रकम', + 'due_date' => 'बक्यौता मिति', + 'order_number' => 'माग सङ्ख्या', + 'bill_to' => 'लाई बिल', + + 'quantity' => 'परिमाण', + 'price' => 'मूल्य', + 'sub_total' => 'उप कुल', + 'discount' => 'छुट', + 'item_discount' => 'सिधा छुट', + 'tax_total' => 'जम्मा कर', + 'total' => 'जम्मा', + + 'item_name' => 'सामानको नाम|सामानहरुको नाम', + + 'show_discount' => ':discount% छुट', + 'add_discount' => 'छुट थप्नुहोस', + 'discount_desc' => 'उप कुलको', + + 'payment_due' => 'भुक्तानी बक्यौता ', + 'paid' => 'तिरेको', + 'histories' => 'इतिहासहरू', + 'payments' => 'भुक्तानीहरू', + 'add_payment' => 'भुक्तानी थप्नुहोस', + 'mark_paid' => 'भुक्तानी अंकित', + 'mark_sent' => 'प्रेषण अंकित', + 'mark_viewed' => 'हेरिसकेको चिन्हित गर्नुहोस्', + 'mark_cancelled' => 'रद्ध गरिएको चिन्ह लगाउनुहोस', + 'download_pdf' => 'PDF डाउनलोड गर्नुहोस', + 'send_mail' => 'इमेल गर्नुहोस', + 'all_invoices' => 'सबै चलानीहरू हेर्न प्रवेश गर्नुहोस्', + 'create_invoice' => 'चलानी बनाउनुहोस्', + 'send_invoice' => 'चलानी पठाउनुहोस्', + 'get_paid' => 'भुक्तानी पाउनुहोस्', + 'accept_payments' => 'अनलाइन भुक्तानी स्वीकृत गर्नुहोस्', + + 'statuses' => [ + 'draft' => 'मस्यौदा', + 'sent' => 'प्रेषित', + 'viewed' => 'हेरिएको', + 'approved' => 'स्वीकृत', + 'partial' => 'आंशिक', + 'paid' => 'तिरेको', + 'overdue' => 'बक्यौता', + 'unpaid' => 'नतिरेको', + 'cancelled' => 'रद्द गरेको', + ], + + 'messages' => [ + 'email_sent' => 'चलानी ईमेल प्रेषित गरिएको छ!', + 'marked_sent' => 'चलानी प्रेषित गरि सकिएको चिन्हित गरियो!', + 'marked_paid' => 'चलानी भुक्तानी प्राप्त भैसकेको चिन्हित गरियो!', + 'marked_viewed' => 'चलानी हेरिसकेको चिन्हित गरियो!', + 'marked_cancelled' => 'चलानी रद्द गरिएको चिन्हित गरियो!', + 'email_required' => 'यो ग्राहकको ईमेल ठेगाना छैन!', + 'draft' => 'यो एउटा मस्यौदा चलानी हो र प्रेषित भएपछी मात्र यो चार्टमा देखिने छ |', + + 'status' => [ + 'created' => ':date मा सिर्जित', + 'viewed' => 'हेरिएको', + 'send' => [ + 'draft' => 'अप्रेषित', + 'sent' => ':date मा प्रेषित', + ], + 'paid' => [ + 'await' => 'प्रतिक्षित भुक्तानी', + ], + ], + ], + +]; diff --git a/resources/lang/ne-NP/items.php b/resources/lang/ne-NP/items.php new file mode 100644 index 000000000..c1bd2ee64 --- /dev/null +++ b/resources/lang/ne-NP/items.php @@ -0,0 +1,8 @@ + 'विक्री मुल्य', + 'purchase_price' => 'क्रय मुल्य', + +]; diff --git a/resources/lang/ne-NP/maintenance.php b/resources/lang/ne-NP/maintenance.php new file mode 100644 index 000000000..7e027a532 --- /dev/null +++ b/resources/lang/ne-NP/maintenance.php @@ -0,0 +1,11 @@ + 'मर्मत हुँदै', + + 'message' => 'क्षमा गर्नुहोस्, हामीले मर्मतको लागि बन्द गरेका छौँ, कृपया केहि समय पछि पुन: प्रयास गर्नुहोस् ।', + + 'last-updated' => 'यो संदेश अन्तिम पटक :timestamp मा अद्यावधिक गरिएको थियो ।', + +]; diff --git a/resources/lang/ne-NP/messages.php b/resources/lang/ne-NP/messages.php new file mode 100644 index 000000000..b6354b5dc --- /dev/null +++ b/resources/lang/ne-NP/messages.php @@ -0,0 +1,37 @@ + [ + 'added' => ':type थपियो!', + 'updated' => ':type अद्यावधिक भयो!', + 'deleted' => ':type हटाईयो!', + 'duplicated' => ':type नक्कल भयो!', + 'imported' => ':type आयात भयो!', + 'exported' => ':type निर्यात भयो!', + 'enabled' => ':type सकृय भयो!', + 'disabled' => ':type निष्कृय भयो!', + ], + + 'error' => [ + 'over_payment' => 'त्रुटी: भुक्तानी थपिएन! तपाईले प्रविष्ट गरेको रकम जम्मा :amount भन्दा बढी छ |', + 'not_user_company' => 'Error: तपाईलाई यो कम्पनी व्यवस्थापन गर्ने अनुमति छैन!', + 'customer' => 'त्रुटि: प्रयोगकर्ता सृजत भएको छैन! यो.ईमेल ठेगाना :name द्वारा प्रयोग गरिएको छ।', + 'no_file' => 'त्रुटि: कुनै फाईल छानिएको छैन!', + 'last_category' => 'त्रुटि: अन्तिम :type वर्ग हटाउन सकिदैन!', + 'change_type' => 'त्रुटी: प्रकार परिवर्तन गर्न सकिएन किनकियो सँग :text सम्बन्धित छ! ', + 'invalid_apikey' => 'त्रुटि: प्रविष्ट गरिएको API Key अमान्य छ!', + 'import_column' => 'त्रुटि: :message पाना: :sheet. लाइन नं: :line.', + 'import_sheet' => 'त्रुटि: पानाको नाम अमान्य छ. कृपया नमुना फाईल चेक गर्नुहोस।', + ], + + 'warning' => [ + 'deleted' => 'चेतावनी: तपाई लाई :name हटाउन अनुमति छैन किनभने यो :text सँग सम्बन्धित छ।', + 'disabled' => 'चेतावनी: तपाईलाई :name निष्कृय गर्न अनुमति छैन किनभने यो :text सँग सम्बन्धित छ।', + 'reconciled_tran' => 'चेतावनी: तपाईलाई कारोवार परिवर्तन/मेट्न अनुमति छैन किनकि यो मिलान गरिसकिएको छ!', + 'reconciled_doc' => 'चेतावनी: तपाईलाई :type परिवर्तन/मेट्न अनुमति छैन किनकि योसँग सम्बन्धित मिलान गरिसकिएको कारोवारहरू छन!', + 'disable_code' => 'चेतावनी: तपाईलाई : name को मुद्रा असक्षम वा परिवर्तन गर्न अनुमति छैन किनकि यससँग :text सम्बन्धित छ।', + 'payment_cancel' => 'चेतावनी: तपाइले तपाईको हालको :method भुक्तानी रद्द गर्नुभयो!', + ], + +]; diff --git a/resources/lang/ne-NP/modules.php b/resources/lang/ne-NP/modules.php new file mode 100644 index 000000000..985e5c5b4 --- /dev/null +++ b/resources/lang/ne-NP/modules.php @@ -0,0 +1,83 @@ + 'API Key', + 'my_apps' => 'मेरा अनुप्रयोगहरू', + 'pre_sale' => 'पुर्व विक्री', + 'top_paid' => 'शिर्ष सशुल्क', + 'new' => 'नयाँ', + 'top_free' => 'शिर्ष निशुल्क', + 'free' => 'फ्री', + 'install' => 'स्थापना गर्नुहोस्', + 'buy_now' => 'खरिद गर्नुहोस्', + 'get_api_key' => 'तपाईको API key प्राप्त गर्न यहाँ थिच्नुहोस् |', + 'no_apps' => 'यो वर्गमा हालसम्म कुनै अनूप्रयोगहरू छैनन्|', + 'become_developer' => 'के तपाईं विकासक हुनुहुन्छ? Here तपाईले कसरि अनुप्रयोग निर्माण गर्ने भनि सिक्न सक्नुहुन्छ र आजै देखि बिक्रि गर्न सक्नुहुन्छ!', + 'recommended_apps' => 'सिफारिस गरिएका अनुप्रयोगहरू', + + 'about' => 'बारेमा', + + 'added' => 'थपियो', + 'updated' => 'अद्यावधिक', + 'compatibility' => 'अनुकुलता', + 'documentation' => 'कागजात', + 'view' => 'हेर्नुहोस्', + 'back' => 'पछि', + + 'installed' => ':module स्थापित भयो', + 'uninstalled' => ':module हटाईयो', + //'updated' => ':module updated', + 'enabled' => ':module सक्रिय गरियो', + 'disabled' => ':module निस्क्रिय गरियो', + + 'tab' => [ + 'installation' => 'स्थापना', + 'faq' => 'बारम्बार सोधिने प्रश्नहरू', + 'changelog' => 'परिवर्तनको दैनिकी', + 'reviews' => 'समीक्षाहरू', + ], + + 'installation' => [ + 'header' => 'अनुप्रयोग स्थापना', + 'download' => ':module डाउनलोड गर्दै', + 'unzip' => ' :module का फाइलहरू निकाल्दै', + 'file_copy' => ':module फाईलहरुको नक्कल गर्दै', + 'finish' => ' :module को स्थापनालाई अन्तिम चरणमा लैजाँदै', + 'redirect' => ':module स्थापित भयो, अद्यावधिक पेजमा फर्कंदै', + 'install' => ' :module स्थापना गर्दै', + ], + + 'errors' => [ + 'download' => ' :module डाउनलोड गर्न असमर्थ', + 'zip' => ':module को जिप फाइल निर्माण असफल', + 'unzip' => ':module खोल्न असफल', + 'file_copy' => ':module का फाइलहरू कपि गर्न असफल', + 'finish' => ':module को स्थापनालाई अन्तिम चरणमा लैजान सकिएन', + ], + + 'badge' => [ + 'installed' => 'स्थापित भयो', + 'pre_sale' => 'पुर्व विक्री', + ], + + 'button' => [ + 'uninstall' => 'हटाउनुहोस्', + 'disable' => 'निष्क्रिय गर्नुहोस्', + 'enable' => 'सक्रिय गर्नुहोस्', + ], + + 'my' => [ + 'purchased' => 'खरीद गरेको', + 'installed' => 'स्थापित भयो', + ], + + 'reviews' => [ + 'button' => [ + 'add' => 'समिक्षा थप्नुहोस' + ], + + 'na' => 'प्रतिक्रिया उपलब्ध छैनन्|' + ], + +]; diff --git a/resources/lang/ne-NP/notifications.php b/resources/lang/ne-NP/notifications.php new file mode 100644 index 000000000..5e5bbb21b --- /dev/null +++ b/resources/lang/ne-NP/notifications.php @@ -0,0 +1,10 @@ + 'उफ्फ!', + 'hello' => 'नमस्कार!', + 'salutation' => 'भवदीय,
:company_name', + 'subcopy' => 'यदि तपाईलाई ":text" बटन क्लिक गर्न गाह्रो भएमा, तल दिइएको URL कपि गरेर ब्राऊजर मा पेस्ट गर्नुहोस: [:url](:url)', + +]; diff --git a/resources/lang/ne-NP/pagination.php b/resources/lang/ne-NP/pagination.php new file mode 100644 index 000000000..e0bf1c0ba --- /dev/null +++ b/resources/lang/ne-NP/pagination.php @@ -0,0 +1,10 @@ + 'अघिल्लो', + 'next' => 'अर्को', + 'showing' => 'जम्मा :total रेकर्डहरू मध्ये :first-:last', + 'page' => 'प्रति पाना', + +]; diff --git a/resources/lang/ne-NP/passwords.php b/resources/lang/ne-NP/passwords.php new file mode 100644 index 000000000..0498e3c1e --- /dev/null +++ b/resources/lang/ne-NP/passwords.php @@ -0,0 +1,23 @@ + 'पासवर्ड कम्तिमा छ वर्णको हुनु पर्छ र दाेहाेर्याइएकाे पासवर्ड संग मेल खानु पर्छ।', + 'reset' => 'पासवर्ड रिसेट भयो!', + 'sent' => 'हामीले पासवर्ड परिवर्तन गर्ने लिंक ईमेलमा पठाएका छौ!', + 'token' => 'यो पासवर्ड रिसेट गर्ने टोकन अमान्य छ।', + 'user' => "दिइएको ईमेल प्रयोगकर्ता भेटिएन।", + 'throttle' => 'पुन: प्रयास गर्नु भन्दा पहिले पर्खनुहोस्|', + +]; diff --git a/resources/lang/ne-NP/reconciliations.php b/resources/lang/ne-NP/reconciliations.php new file mode 100644 index 000000000..9485bc5d9 --- /dev/null +++ b/resources/lang/ne-NP/reconciliations.php @@ -0,0 +1,16 @@ + 'पुन: मिलाउनुहोस्', + 'reconciled' => 'पुन: मिलाईयो', + 'closing_balance' => 'अन्तिम मौज्दात', + 'unreconciled' => 'पुन: मिलान हट्यो', + 'transactions' => 'कारोवारहरु', + 'start_date' => 'सुरू मिति', + 'end_date' => 'अन्तिम मिति', + 'cleared_amount' => 'रकम खालि गरियो', + 'deposit' => 'निक्षेप', + 'withdrawal' => 'फिर्ता', + +]; diff --git a/resources/lang/ne-NP/recurring.php b/resources/lang/ne-NP/recurring.php new file mode 100644 index 000000000..f3f2f2567 --- /dev/null +++ b/resources/lang/ne-NP/recurring.php @@ -0,0 +1,20 @@ + 'पुनरावृत्त', + 'every' => 'हरेक', + 'period' => 'अवधि', + 'times' => 'समय', + 'daily' => 'दैनिक', + 'weekly' => 'पाक्षिक', + 'monthly' => 'मासिक', + 'yearly' => 'वार्षिक', + 'custom' => 'Custom', + 'days' => 'दिन(हरू)', + 'weeks' => 'हप्ता(हरू)', + 'months' => 'महिना(हरू)', + 'years' => 'वर्ष(हरू)', + 'message' => 'यो पुनः दोहोरीने :type हो र अर्को :type पुनः :dateमा स्वतः विकास हुनेछ ।', + +]; diff --git a/resources/lang/ne-NP/reports.php b/resources/lang/ne-NP/reports.php new file mode 100644 index 000000000..f96d82a9c --- /dev/null +++ b/resources/lang/ne-NP/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' => 'NET', + 'income_expense' => 'आम्दानी र खर्च', + + 'summary' => [ + 'income' => 'आय विवरण', + 'expense' => 'खर्च विवरण', + 'income_expense' => 'आय Vs व्याय', + 'tax' => 'कर विवरण', + ], + + 'charts' => [ + 'line' => 'रेखा', + 'bar' => 'बार', + 'pie' => 'पाइ', + ], + +]; diff --git a/resources/lang/ne-NP/settings.php b/resources/lang/ne-NP/settings.php new file mode 100644 index 000000000..1a4c8e074 --- /dev/null +++ b/resources/lang/ne-NP/settings.php @@ -0,0 +1,129 @@ + [ + 'description' => 'कम्पनीको नाम, इमेल, ठेगाना, कर सङ्ख्या आदि परिवर्तन गर्नुहोस्', + 'name' => 'नाम', + 'email' => 'ईमेल', + 'phone' => 'फोन', + 'address' => 'ठेगाना', + 'logo' => 'लोगो', + ], + + 'localisation' => [ + 'description' => 'आर्थिक वर्ष, समय क्षेत्र, मितिको स्वरूप, र अरु स्थानीय विवरणहरु सेट गर्नुहोस्', + 'financial_start' => 'आर्थिक वर्ष सुरु', + 'timezone' => 'समयरेखा', + 'date' => [ + 'format' => 'मितिको ढांचा', + 'separator' => 'मिति विभाजक', + 'dash' => 'ड्यास(-)', + 'dot' => 'विन्दु(.)', + 'comma' => 'अल्पविराम(,)', + 'slash' => 'Slash (/)', + 'space' => 'स्पेस( )', + ], + 'percent' => [ + 'title' => 'प्रतिशत (%) स्थिति', + 'before' => 'संख्या अघि', + 'after' => 'संख्या पछि', + ], + 'discount_location' => [ + 'name' => 'छुटको स्थान', + 'item' => 'रेखामा', + 'total' => 'जम्मामा', + 'both' => 'रेखा र जम्मा दुबैमा', + ], + ], + + 'invoice' => [ + 'description' => 'चलानीको उपसर्ग, सङ्ख्या, सर्तहरु, पुच्छर आदि अनुकुल गर्नुहोस्', + 'prefix' => 'संख्या नं', + 'digit' => 'संख्या अंक', + 'next' => 'अर्को संख्या', + 'logo' => 'लोगो', + 'custom' => 'अनुकुल', + 'item_name' => 'बस्तुको नाम', + 'item' => 'आइटमहरू', + 'product' => 'उत्पादनहरू', + 'service' => 'सेवाहरु', + 'price_name' => 'मुल्यको नाम', + 'price' => 'मूल्य', + 'rate' => 'दर', + 'quantity_name' => 'परिमाणको नाम', + 'quantity' => 'परिमाण', + 'payment_terms' => 'भुक्तानीका शर्तहरु', + 'title' => 'शिर्षक', + 'subheading' => 'उप-शिर्षक', + 'due_receipt' => 'रसिद उपरको बक्यौता', + 'due_days' => ':days मा बक्यौता हुने', + 'choose_template' => 'चलानीको नमुना छान्नुहोस्', + 'default' => 'पूर्वनिर्धारित', + 'classic' => 'परम्परागत', + 'modern' => 'आधुनिक', + ], + + 'default' => [ + 'description' => 'तपाईंको कम्पनीको पूर्वनिर्धारित खाता, मुद्रा र भाषा', + 'list_limit' => 'अभिलेखहरू प्रति पाना', + 'use_gravatar' => 'अवतार प्रयोग गर्नुहोस्', + ], + + 'email' => [ + 'description' => 'प्रेषण प्रोटोकल र इमेलको नमुना परिवर्तन गर्नुहोस्', + 'protocol' => 'प्रोटोकल', + 'php' => 'PHP मेल', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'SMTP होस्ट', + 'port' => 'SMTP पोर्ट', + 'username' => 'SMTP युजर आइडी', + 'password' => 'SMTP पासवर्ड', + 'encryption' => 'SMTP सेक्युरिटी', + 'none' => 'कुनै पनि होइन', + ], + 'sendmail' => 'मेल पठाउनुहोस', + 'sendmail_path' => 'मेल प्रेषण path', + 'log' => 'इमेल लग', + + 'templates' => [ + 'subject' => 'विषय', + 'body' => 'पाठ', + 'tags' => 'उपलब्ध ट्यागहरु: :tag_list', + 'invoice_new_customer' => 'नयाँ चलानीको नमुना(ग्राहकलाई प्रेषित)', + 'invoice_remind_customer' => 'चलानी स्मरण टेम्प्लेट (ग्राहकलाई प्रेषित)', + 'invoice_remind_admin' => 'चलानी स्मरण टेम्प्लेट (प्रशासकलाई प्रेषित)', + 'invoice_recur_customer' => 'पुनरावृत्त चलानीको नमुना (ग्राहकलाई प्रेषित)', + 'invoice_recur_admin' => 'पुनरावृत्त चलानीको नमुना (प्रशासकलाई प्रेषित)', + 'invoice_payment_customer' => 'भुक्तानी प्राप्तिको नमुना(ग्राहकलाई प्रेषित)', + 'invoice_payment_admin' => 'भुक्तानी प्राप्तिको नमुना(प्रशासकलाई प्रेषित)', + 'bill_remind_admin' => 'बिल स्मरण नमुना (प्रशासकलाई प्रेषित)', + 'bill_recur_admin' => 'पुनरावृत्त बिलको नमुना(प्रशासकलाई प्रेषित)', + ], + ], + + 'scheduling' => [ + 'name' => 'तालिकाबद्ध गर्ने', + 'description' => 'पुनरावृत्तिको लागि स्वचालित स्मारिकाहरू र आदेश', + 'send_invoice' => 'चलानी रिमाइंडर प्रेषण', + 'invoice_days' => 'बक्यौता दिनपछि प्रेषण', + 'send_bill' => 'बिल रिमाइंडर प्रेषण', + 'bill_days' => 'बक्यौता दिनअघि प्रेषण', + 'cron_command' => 'Cron कमाण्ड', + 'schedule_time' => 'संचालन हुने घण्टा', + ], + + 'categories' => [ + 'description' => 'आय, व्यय र बस्तुको लागि असिमित वर्गहरु', + ], + + 'currencies' => [ + 'description' => 'मुद्रा सिर्जना, व्यवस्थापन तथा तिनको दर राख्नुहोस्', + ], + + 'taxes' => [ + 'description' => 'मुद्दती, साधारण, मिश्रीत र चक्रिय करको दर', + ], + +]; diff --git a/resources/lang/ne-NP/taxes.php b/resources/lang/ne-NP/taxes.php new file mode 100644 index 000000000..4488d1dde --- /dev/null +++ b/resources/lang/ne-NP/taxes.php @@ -0,0 +1,11 @@ + 'दर', + 'rate_percent' => 'दर(%)', + 'normal' => 'साधारण', + 'inclusive' => 'समावेसी', + 'compound' => 'चक्रीय कर', + 'fixed' => 'मुद्दती', +]; diff --git a/resources/lang/ne-NP/transfers.php b/resources/lang/ne-NP/transfers.php new file mode 100644 index 000000000..42f79a7c5 --- /dev/null +++ b/resources/lang/ne-NP/transfers.php @@ -0,0 +1,12 @@ + 'खाताबाट', + 'to_account' => 'खातामा', + + 'messages' => [ + 'delete' => ':from बाट :to (:amount)', + ], + +]; diff --git a/resources/lang/ne-NP/updates.php b/resources/lang/ne-NP/updates.php new file mode 100644 index 000000000..2e8c95933 --- /dev/null +++ b/resources/lang/ne-NP/updates.php @@ -0,0 +1,15 @@ + 'Install गरिएको version', + 'latest_version' => 'नया version', + 'update' => 'Akaunting लाई :version version मा अपडेट गर्नुहोस', + 'changelog' => 'Changelog', + 'check' => 'परिक्षण', + 'new_core' => 'Akaunting को अपडेट गरिएको version उपलब्ध छ।', + 'latest_core' => 'बधाई छ! तपाई संग Akaunting को पछिल्लो version उपलब्ध छ। भबिष्यमा उपलब्ध सूरक्षा अपडेटहरू स्वतः लागू हुने छन।', + 'success' => 'अपडेट प्रकृया सफल भएको छ।', + 'error' => 'अपडेट प्रकृया सफल हुन सकेन, फेरी प्रयास गर्नुहोस।', + +]; diff --git a/resources/lang/ne-NP/validation.php b/resources/lang/ne-NP/validation.php new file mode 100644 index 000000000..db451fc14 --- /dev/null +++ b/resources/lang/ne-NP/validation.php @@ -0,0 +1,123 @@ + ':attribute स्वीकार गरिनु पर्छ।', + 'active_url' => ':attribute मान्य URL होइन ।', + 'after' => ':attribute :date भन्दा पछि हुनुपर्छ।', + 'after_or_equal' => ':attribute :date भन्दा पछि वा बराबर हुनुपर्छ।', + 'alpha' => ':attribute मा अक्षरहरु मात्र हुनसक्छ।', + 'alpha_dash' => ':attribute मा अक्षर, संख्या र ड्यासहरू मात्र हुनसक्छ।', + 'alpha_num' => ':attribute मा अक्षर र संख्याहरू मात्र हुनसक्छ।', + 'array' => ':attribute array हुनुपर्छ।', + '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 ठिक अथवा बेठिक हुनुपर्छ।', + 'confirmed' => ':attribute दाेहाेर्याइएकाे मिलेन।', + 'date' => ':attribute को मिति मिलेन।', + 'date_format' => ':attribute को ढाँचा :format जस्तो हुनुपर्छ।', + 'different' => ':attribute र :other फरक हुनुपर्छ।', + 'digits' => ':attribute :digits अंकको हुनुपर्छ।', + 'digits_between' => ':attribute :min देखि :max अंकको हुनुपर्छ।', + 'dimensions' => ':attribute को image dimension अमान्य छ।', + 'distinct' => ':attribute दोहोरिएको value छ।', + 'email' => ':attribute को इमेल ठेगाना मिलेन।', + 'ends_with' => ' :attribute तलका मध्ये कुनै एकसँग अन्त्य हुनुपर्छ: :values', + 'exists' => 'छानिएको :attribute अमान्य छ।', + 'file' => 'The :attribute must be a file.', + 'filled' => ':attribute दिइएको हुनुपर्छ।', + 'image' => ':attribute मा फोटो हुनुपर्छ।', + 'in' => 'छानिएको :attribute अमान्य छ।', + 'in_array' => ':attribute :other भित्र पर्दैन ।', + 'integer' => ':attribute पूर्ण संख्या हुनुपर्छ।', + 'ip' => ':attribute मा दिइएको मान्य IP ठेगाना हुनुपर्छ।', + 'json' => ':attribute मा दिइएको मान्य JSON string हुनुपर्छ।', + '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' => 'The :attribute field must be present.', + 'regex' => ':attribute को ढाँचा मिलेन।', + 'required' => ':attribute दिइएको हुनुपर्छ।', + 'required_if' => ':attribute चाहिन्छ जब :other :value हुन्छ।', + 'required_unless' => ':other :values मा नभएसम्म :attribute चाहिन्छ।', + 'required_with' => ':values भएसम्म :attribute चाहिन्छ।', + 'required_with_all' => ':values भएसम्म :attribute चाहिन्छ।', + 'required_without' => ':values नभएको बेला :attribute चाहिन्छ।', + 'required_without_all' => 'कुनैपनि :values नभएको बेला :attribute चाहिन्छ।', + 'same' => ':attribute र :other मिल्नुपर्छ।', + 'size' => [ + 'numeric' => ':attribute :size हुनुपर्छ।', + 'file' => ':attribute :size kilobytesको हुनुपर्छ।', + 'string' => ':attribute :size वर्णको हुनुपर्छ।.', + 'array' => ':attribute मा :size आइटम हुनुपर्छ।', + ], + 'string' => ':attribute string हुनुपर्छ।', + 'timezone' => ':attribute मान्य समय क्षेत्र हुनुपर्छ।', + 'unique' => 'यो :attribute पहिले नै लिई सकेको छ।', + 'uploaded' => 'The :attribute failed to upload.', + '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' => 'संदेश', + ], + 'invalid_currency' => ':attribute कोड अमान्य छ।', + 'invalid_amount' => 'रकम :attribute अमान्य छ।', + 'invalid_extension' => 'फाइलको एक्सटेन्सन अमान्य छ |', + ], + + /* + |-------------------------------------------------------------------------- + | 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' => [], + +]; diff --git a/resources/lang/ne-NP/widgets.php b/resources/lang/ne-NP/widgets.php new file mode 100644 index 000000000..dc190e552 --- /dev/null +++ b/resources/lang/ne-NP/widgets.php @@ -0,0 +1,23 @@ + 'जम्मा आय', + 'receivables' => 'प्राप्त योग्य', + 'open_invoices' => 'चलानीहरु खोल्नुहोस', + 'overdue_invoices' => 'पुरानो बक्यौता चलानी', + 'total_expenses' => 'कुल खर्च रकम', + 'payables' => 'भुक्तानी योग्य', + 'open_bills' => 'बिल खोल्नुहोस', + 'overdue_bills' => 'बक्यौता बिलहरू', + 'total_profit' => 'जम्मा लाभ', + 'open_profit' => 'लाभ खोल्नुहोस', + 'overdue_profit' => 'बक्यौता लाभ', + 'cash_flow' => 'नगद प्रवाह', + 'no_profit_loss' => 'न लाभ न नोक्सान', + 'income_by_category' => 'वर्ग अनुसार आय', + 'expenses_by_category' => 'वर्ग अनुसार खर्च', + 'account_balance' => 'खाताको रकम', + 'latest_income' => 'पछिल्ला आयहरू', + 'latest_expenses' => 'पछिल्ला खर्चहरू', +]; From e9f7b1ad8d3760e8051e13cb5ccc0ac1a086a4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Thu, 4 Jun 2020 16:34:34 +0300 Subject: [PATCH 005/208] Show dynamic component also in portal --- resources/views/partials/portal/content.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/partials/portal/content.blade.php b/resources/views/partials/portal/content.blade.php index 05a1e03c0..62a4b5181 100644 --- a/resources/views/partials/portal/content.blade.php +++ b/resources/views/partials/portal/content.blade.php @@ -6,5 +6,8 @@ @stack('content_content_end') + +
+ @stack('content_end') From 466a81cdba31b3967ae53350f2ba4b273cda38ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 4 Jun 2020 19:18:29 +0300 Subject: [PATCH 006/208] prevent duplicating document transactions --- app/Models/Banking/Transaction.php | 5 +++++ resources/views/purchases/payments/index.blade.php | 10 ++++++---- resources/views/sales/revenues/index.blade.php | 10 ++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index f82e36f86..e4f3e7a87 100644 --- a/app/Models/Banking/Transaction.php +++ b/app/Models/Banking/Transaction.php @@ -218,6 +218,11 @@ class Transaction extends Model return $query->where('reconciled', 0); } + public function onCloning($src, $child = null) + { + $this->document_id = null; + } + /** * Convert amount to double. * diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php index d9fc743cc..3174ae345 100644 --- a/resources/views/purchases/payments/index.blade.php +++ b/resources/views/purchases/payments/index.blade.php @@ -92,15 +92,17 @@ {{ trans('general.edit') }}
@endif + @if (empty($item->document_id)) @permission('create-purchases-payments') {{ trans('general.duplicate') }} +
@endpermission + @endif + @if (!$item->reconciled) @permission('delete-purchases-payments') - @if (!$item->reconciled) -
- {!! Form::deleteLink($item, 'payments.destroy') !!} - @endif + {!! Form::deleteLink($item, 'payments.destroy') !!} @endpermission + @endif diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 9fb2e7aff..d19f501e1 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -92,15 +92,17 @@ {{ trans('general.edit') }}
@endif + @if (empty($item->document_id)) @permission('create-sales-revenues') {{ trans('general.duplicate') }} +
@endpermission + @endif + @if (!$item->reconciled) @permission('delete-sales-revenues') - @if (!$item->reconciled) -
- {!! Form::deleteLink($item, 'revenues.destroy') !!} - @endif + {!! Form::deleteLink($item, 'revenues.destroy') !!} @endpermission + @endif From 11b8929b8bb4d374512375a24667b44e1bef6ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 4 Jun 2020 19:57:15 +0300 Subject: [PATCH 007/208] missing avatar styling --- public/css/custom.css | 7 +++++++ resources/views/auth/users/index.blade.php | 8 ++++---- resources/views/partials/admin/navbar.blade.php | 6 +++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index a5350ff4f..8491b2c9d 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -275,6 +275,13 @@ tbody .row { } /*--------Item Column Image Finish--------*/ +/*--------User Column Image--------*/ +.user-img { + width: 36px; + height: 36px; +} +/*--------User Column Image Finish--------*/ + /*--------Border--------*/ .border-1 { border: 1px solid #e5e5e5 !important; diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index 7267a4c65..615afd749 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -54,11 +54,11 @@ @if (setting('default.use_gravatar', '0') == '1') - {{ $item->name }} + {{ $item->name }} + @elseif ($item->picture) + {{ $item->name }} @else - @if ($item->picture) - {{ $item->name }} - @endif + {{ $item->name }} @endif {{ $item->name }} diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php index 7ff7e5e7b..81f3cffba 100644 --- a/resources/views/partials/admin/navbar.blade.php +++ b/resources/views/partials/admin/navbar.blade.php @@ -211,7 +211,11 @@
  • - User + @if ($user->picture) + {{ $user->name }} + @else + {{ $user->name }} + @endif
    @if (!empty($user->name)) From fe5329d6cd8f513643c15d7d63063383a85dd69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 4 Jun 2020 22:21:37 +0300 Subject: [PATCH 008/208] close #1456 Fixed: Amount is erased when changing account in payments --- resources/assets/js/components/AkauntingMoney.vue | 7 ++++++- resources/assets/js/mixins/global.js | 4 ++-- resources/views/banking/accounts/create.blade.php | 2 +- resources/views/banking/accounts/edit.blade.php | 2 +- resources/views/banking/reconciliations/create.blade.php | 2 +- resources/views/banking/transfers/create.blade.php | 2 +- resources/views/banking/transfers/edit.blade.php | 2 +- resources/views/modals/accounts/create.blade.php | 2 +- resources/views/modals/bills/payment.blade.php | 2 +- resources/views/modals/invoices/payment.blade.php | 2 +- resources/views/purchases/payments/create.blade.php | 2 +- resources/views/purchases/payments/edit.blade.php | 2 +- resources/views/sales/revenues/create.blade.php | 2 +- resources/views/sales/revenues/edit.blade.php | 2 +- 14 files changed, 20 insertions(+), 15 deletions(-) diff --git a/resources/assets/js/components/AkauntingMoney.vue b/resources/assets/js/components/AkauntingMoney.vue index 2b1f7d6f7..6ac8978ea 100644 --- a/resources/assets/js/components/AkauntingMoney.vue +++ b/resources/assets/js/components/AkauntingMoney.vue @@ -10,7 +10,7 @@
    - +
    @@ -126,6 +126,8 @@ export default { }, mounted() { + this.model = this.value; + this.$emit('interface', this.model); }, @@ -134,6 +136,7 @@ export default { //this.$emit('change', this.model); //this.$emit('interface', this.model); }, + input(event) { this.model = event; @@ -153,9 +156,11 @@ export default { masked: this.masked }; }, + value: function (value) { this.model = value; }, + model: function (model) { this.$emit('change', this.model); this.$emit('interface', this.model); diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index 46bdabf21..2cd91dac3 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -184,10 +184,10 @@ export default { } }) .then(response => { + this.currency = response.data; + this.form.currency_code = response.data.currency_code; this.form.currency_rate = response.data.currency_rate; - - this.currency = response.data; }) .catch(error => { }); diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php index c1db44e49..32d381d34 100644 --- a/resources/views/banking/accounts/create.blade.php +++ b/resources/views/banking/accounts/create.blade.php @@ -23,7 +23,7 @@ {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }} - {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], 0) }} + {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 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 4a0014f67..11e616c33 100644 --- a/resources/views/banking/accounts/edit.blade.php +++ b/resources/views/banking/accounts/edit.blade.php @@ -24,7 +24,7 @@ {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $account->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }} - {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], $account->opening_balance) }} + {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], $account->opening_balance) }} {{ Form::textGroup('bank_name', trans('accounts.bank_name'), 'university', []) }} diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php index 0d8c8214b..ad5089a55 100644 --- a/resources/views/banking/reconciliations/create.blade.php +++ b/resources/views/banking/reconciliations/create.blade.php @@ -20,7 +20,7 @@ {{ Form::dateGroup('ended_at', trans('reconciliations.end_date'), 'calendar', ['id' => 'ended_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request('ended_at', Date::now()->endOfMonth()->toDateString()), 'col-xl-3') }} - {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], request('closing_balance', 0.00), 'col-xl-2') }} + {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], request('closing_balance', 0.00), 'col-xl-2') }} {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount'], 'col-xl-2') }} diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php index 3f9794b3e..3a01d0f3c 100644 --- a/resources/views/banking/transfers/create.blade.php +++ b/resources/views/banking/transfers/create.blade.php @@ -21,7 +21,7 @@ {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts) }} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], 0) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0) }} {{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }} diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php index 3d697d7e7..bd98c593f 100644 --- a/resources/views/banking/transfers/edit.blade.php +++ b/resources/views/banking/transfers/edit.blade.php @@ -22,7 +22,7 @@ {{ Form::selectGroup('to_account_id', trans('transfers.to_account'), 'university', $accounts, $transfer->to_account_id) }} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], $transfer->amount) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], $transfer->amount) }} {{ Form::dateGroup('transferred_at', trans('general.date'), 'calendar', ['id' => 'transferred_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($transfer->transferred_at)->toDateString()) }} diff --git a/resources/views/modals/accounts/create.blade.php b/resources/views/modals/accounts/create.blade.php index e62522ec1..40d8ad5f4 100644 --- a/resources/views/modals/accounts/create.blade.php +++ b/resources/views/modals/accounts/create.blade.php @@ -14,7 +14,7 @@ {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'change' => 'onChangeCurrency']) }} - {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], 0.00) }} + {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00) }} {!! Form::hidden('enabled', '1', []) !!} diff --git a/resources/views/modals/bills/payment.blade.php b/resources/views/modals/bills/payment.blade.php index de8399f56..a1553b3cd 100644 --- a/resources/views/modals/bills/payment.blade.php +++ b/resources/views/modals/bills/payment.blade.php @@ -14,7 +14,7 @@ {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off', 'v-model' => 'transaction_form.paid_at', 'v-error' => 'payment.errors.get("paid_at")', 'v-error-message' => 'payment.errors.get("paid_at")'], Date::now()->toDateString()) }} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency], $bill->grand_total) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency, 'dynamic-currency' => 'currency'], $bill->grand_total) }} {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }} diff --git a/resources/views/modals/invoices/payment.blade.php b/resources/views/modals/invoices/payment.blade.php index f51a166db..a9d13d28c 100644 --- a/resources/views/modals/invoices/payment.blade.php +++ b/resources/views/modals/invoices/payment.blade.php @@ -14,7 +14,7 @@ {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off', 'v-model' => 'transaction_form.paid_at', 'v-error' => 'payment.errors.get("paid_at")', 'v-error-message' => 'payment.errors.get("paid_at")'], Date::now()->toDateString()) }} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency], $invoice->grand_total) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'v-model' => 'transaction_form.amount', 'v-error' => 'payment.errors.get("amount")', 'v-error-message' => 'payment.errors.get("amount")', 'currency' => $currency, 'dynamic-currency' => 'currency'], $invoice->grand_total) }} {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'v-model' => 'transaction_form.account_id', 'v-error' => 'payment.errors.get("account_id")', 'v-error-message' => 'payment.errors.get("account_id")', 'change' => 'onChangePaymentAccount']) }} diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php index 1c6255ba0..57fc19ec6 100644 --- a/resources/views/purchases/payments/create.blade.php +++ b/resources/views/purchases/payments/create.blade.php @@ -22,7 +22,7 @@ {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], 0.00) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0.00) }} {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }} diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php index 9d05b694c..ad19b9955 100644 --- a/resources/views/purchases/payments/edit.blade.php +++ b/resources/views/purchases/payments/edit.blade.php @@ -41,7 +41,7 @@ {!! Form::hidden('currency_code', $payment->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], $payment->amount) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $payment->amount) }} {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, $payment->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }} diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php index c841cb9e2..c1c23ab06 100644 --- a/resources/views/sales/revenues/create.blade.php +++ b/resources/views/sales/revenues/create.blade.php @@ -22,7 +22,7 @@ {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', '1', ['id' => 'currency_rate']) !!} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], 0) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], 0) }} {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }} diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php index 4d47b83cd..8d547b717 100644 --- a/resources/views/sales/revenues/edit.blade.php +++ b/resources/views/sales/revenues/edit.blade.php @@ -41,7 +41,7 @@ {!! Form::hidden('currency_code', $revenue->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!} - {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], $revenue->amount) }} + {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $revenue->amount) }} {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, $revenue->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }} From 2bd51ba6b6bd723f0add60c7f2aaf9b1092174cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 4 Jun 2020 22:58:28 +0300 Subject: [PATCH 009/208] update env for one company #1462 --- app/Http/Controllers/Settings/Email.php | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/app/Http/Controllers/Settings/Email.php b/app/Http/Controllers/Settings/Email.php index 2ccc438d9..510ad6ade 100644 --- a/app/Http/Controllers/Settings/Email.php +++ b/app/Http/Controllers/Settings/Email.php @@ -4,8 +4,10 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; use App\Http\Requests\Setting\Setting as Request; +use App\Models\Common\Company; use App\Models\Common\EmailTemplate; use App\Models\Setting\Setting; +use App\Utilities\Installer; use Illuminate\Support\Str; class Email extends Controller @@ -58,6 +60,8 @@ class Email extends Controller $fields = $request->all(); $prefix = $request->get('_prefix', 'email'); + $total_companies = Company::count(); + foreach ($fields as $key => $value) { $real_key = $prefix . '.' . $key; @@ -72,6 +76,10 @@ class Email extends Controller continue; } + if ($total_companies == 1) { + $this->oneCompany($real_key, $value); + } + setting()->set($real_key, $value); } @@ -114,4 +122,32 @@ class Email extends Controller unset($fields[$subject_key]); unset($fields[$body_key]); } + + protected function oneCompany($real_key, $value) + { + if (empty($value)) { + return; + } + + switch ($real_key) { + case 'email.protocol': + Installer::updateEnv(['MAIL_MAILER' => '"' . $value . '"']); + break; + case 'email.smtp_host': + Installer::updateEnv(['MAIL_HOST' => '"' . $value . '"']); + break; + case 'email.smtp_port': + Installer::updateEnv(['MAIL_PORT' => '"' . $value . '"']); + break; + case 'email.smtp_username': + Installer::updateEnv(['MAIL_USERNAME' => '"' . $value . '"']); + break; + case 'email.smtp_password': + Installer::updateEnv(['MAIL_PASSWORD' => '"' . $value . '"']); + break; + case 'email.smtp_encryption': + Installer::updateEnv(['MAIL_ENCRYPTION' => '"' . $value . '"']); + break; + } + } } From 0c05675ac940b8343a796ccce33f6b05272f6c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 5 Jun 2020 11:39:18 +0300 Subject: [PATCH 010/208] composer lock --- composer.lock | 1141 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 881 insertions(+), 260 deletions(-) diff --git a/composer.lock b/composer.lock index 7d9d69db1..84695e3a5 100644 --- a/composer.lock +++ b/composer.lock @@ -129,16 +129,16 @@ }, { "name": "akaunting/menu", - "version": "1.0.9", + "version": "1.0.10", "source": { "type": "git", "url": "https://github.com/akaunting/menu.git", - "reference": "3b8b703a149fee090af9468be531bb335e2d8f88" + "reference": "6895de00f0d320545b4d64f7d255fffdf690e145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/menu/zipball/3b8b703a149fee090af9468be531bb335e2d8f88", - "reference": "3b8b703a149fee090af9468be531bb335e2d8f88", + "url": "https://api.github.com/repos/akaunting/menu/zipball/6895de00f0d320545b4d64f7d255fffdf690e145", + "reference": "6895de00f0d320545b4d64f7d255fffdf690e145", "shasum": "" }, "require": { @@ -193,7 +193,7 @@ "navigation", "sidebar" ], - "time": "2020-03-07T22:36:44+00:00" + "time": "2020-06-04T21:15:59+00:00" }, { "name": "akaunting/module", @@ -1000,16 +1000,16 @@ }, { "name": "composer/composer", - "version": "1.10.6", + "version": "1.10.7", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88" + "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88", - "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88", + "url": "https://api.github.com/repos/composer/composer/zipball/956608ea4f7de9e58c53dfb019d85ae62b193c39", + "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39", "shasum": "" }, "require": { @@ -1017,7 +1017,7 @@ "composer/semver": "^1.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^1.1", - "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", + "justinrainbow/json-schema": "^5.2.10", "php": "^5.3.2 || ^7.0", "psr/log": "^1.0", "seld/jsonlint": "^1.4", @@ -1082,12 +1082,16 @@ "url": "https://packagist.com", "type": "custom" }, + { + "url": "https://github.com/composer", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-05-06T08:28:10+00:00" + "time": "2020-06-03T08:03:56+00:00" }, { "name": "composer/semver", @@ -1212,16 +1216,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7" + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7", - "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", + "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", "shasum": "" }, "require": { @@ -1252,7 +1256,21 @@ "Xdebug", "performance" ], - "time": "2020-03-01T12:26:26+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-06-04T11:16:35+00:00" }, { "name": "consoletvs/charts", @@ -1473,22 +1491,22 @@ }, { "name": "doctrine/annotations", - "version": "1.10.2", + "version": "1.10.3", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "b9d758e831c70751155c698c2f7df4665314a1cb" + "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb", - "reference": "b9d758e831c70751155c698c2f7df4665314a1cb", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d", + "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d", "shasum": "" }, "require": { "doctrine/lexer": "1.*", "ext-tokenizer": "*", - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/cache": "1.*", @@ -1538,24 +1556,24 @@ "docblock", "parser" ], - "time": "2020-04-20T09:18:32+00:00" + "time": "2020-05-25T17:24:27+00:00" }, { "name": "doctrine/cache", - "version": "1.10.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62" + "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62", - "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62", + "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3", + "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3", "shasum": "" }, "require": { - "php": "~7.1" + "php": "~7.1 || ^8.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" @@ -1620,37 +1638,46 @@ "redis", "xcache" ], - "time": "2019-11-29T15:36:20+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", + "type": "tidelift" + } + ], + "time": "2020-05-27T16:24:54+00:00" }, { "name": "doctrine/collections", - "version": "1.6.4", + "version": "1.6.5", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7" + "reference": "fc0206348e17e530d09463fef07ba8968406cd6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", - "reference": "6b1e4b2b66f6d6e49983cebfe23a21b7ccc5b0d7", + "url": "https://api.github.com/repos/doctrine/collections/zipball/fc0206348e17e530d09463fef07ba8968406cd6d", + "reference": "fc0206348e17e530d09463fef07ba8968406cd6d", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", "phpstan/phpstan-shim": "^0.9.2", "phpunit/phpunit": "^7.0", - "vimeo/psalm": "^3.2.2" + "vimeo/psalm": "^3.8.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" @@ -1690,7 +1717,21 @@ "iterators", "php" ], - "time": "2019-11-13T13:07:11+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], + "time": "2020-05-25T19:24:35+00:00" }, { "name": "doctrine/dbal", @@ -1852,20 +1893,20 @@ }, { "name": "doctrine/inflector", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7" + "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7", - "reference": "18b995743e7ec8b15fd6efc594f0fa3de4bfe6d7", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210", + "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^7.0", @@ -1939,24 +1980,24 @@ "type": "tidelift" } ], - "time": "2020-05-11T11:25:59+00:00" + "time": "2020-05-29T15:13:26+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", - "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -2001,7 +2042,21 @@ "parser", "php" ], - "time": "2019-10-30T14:39:59+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2020-05-25T17:44:05+00:00" }, { "name": "dompdf/dompdf", @@ -2500,16 +2555,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.3", + "version": "6.5.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" + "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", - "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d", + "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d", "shasum": "" }, "require": { @@ -2517,7 +2572,7 @@ "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.11" + "symfony/polyfill-intl-idn": "1.17.0" }, "require-dev": { "ext-curl": "*", @@ -2563,7 +2618,7 @@ "rest", "web service" ], - "time": "2020-04-18T10:38:46+00:00" + "time": "2020-05-25T19:35:05+00:00" }, { "name": "guzzlehttp/promises", @@ -2877,16 +2932,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.9", + "version": "5.2.10", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "44c6787311242a979fa15c704327c20e7221a0e4" + "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4", - "reference": "44c6787311242a979fa15c704327c20e7221a0e4", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", + "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", "shasum": "" }, "require": { @@ -2939,7 +2994,7 @@ "json", "schema" ], - "time": "2019-09-25T14:49:45+00:00" + "time": "2020-05-27T16:41:55+00:00" }, { "name": "kkszymanowski/traitor", @@ -3099,16 +3154,16 @@ }, { "name": "laravel/framework", - "version": "v7.12.0", + "version": "v7.14.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "c2fff1e9879494a6f853593b3c517dc9922bbb51" + "reference": "469b7719a8dca40841a74f59f2e9f30f01d3a106" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/c2fff1e9879494a6f853593b3c517dc9922bbb51", - "reference": "c2fff1e9879494a6f853593b3c517dc9922bbb51", + "url": "https://api.github.com/repos/laravel/framework/zipball/469b7719a8dca40841a74f59f2e9f30f01d3a106", + "reference": "469b7719a8dca40841a74f59f2e9f30f01d3a106", "shasum": "" }, "require": { @@ -3119,7 +3174,7 @@ "ext-mbstring": "*", "ext-openssl": "*", "league/commonmark": "^1.3", - "league/flysystem": "^1.0.8", + "league/flysystem": "^1.0.34", "monolog/monolog": "^2.0", "nesbot/carbon": "^2.17", "opis/closure": "^3.1", @@ -3145,6 +3200,9 @@ "conflict": { "tightenco/collect": "<5.5.33" }, + "provide": { + "psr/container-implementation": "1.0" + }, "replace": { "illuminate/auth": "self.version", "illuminate/broadcasting": "self.version", @@ -3248,7 +3306,7 @@ "framework", "laravel" ], - "time": "2020-05-19T17:09:00+00:00" + "time": "2020-06-02T22:34:18+00:00" }, { "name": "laravel/tinker", @@ -3856,6 +3914,73 @@ ], "time": "2020-02-28T15:47:45+00:00" }, + { + "name": "maennchen/zipstream-php", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/maennchen/ZipStream-PHP.git", + "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58", + "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58", + "shasum": "" + }, + "require": { + "myclabs/php-enum": "^1.5", + "php": ">= 7.1", + "psr/http-message": "^1.0", + "symfony/polyfill-mbstring": "^1.0" + }, + "require-dev": { + "ext-zip": "*", + "guzzlehttp/guzzle": ">= 6.3", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": ">= 7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "ZipStream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paul Duncan", + "email": "pabs@pablotron.org" + }, + { + "name": "Jonatan Männchen", + "email": "jonatan@maennchen.ch" + }, + { + "name": "Jesse Donat", + "email": "donatj@gmail.com" + }, + { + "name": "András Kolesár", + "email": "kolesar@kolesar.hu" + } + ], + "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.", + "keywords": [ + "stream", + "zip" + ], + "funding": [ + { + "url": "https://opencollective.com/zipstream", + "type": "open_collective" + } + ], + "time": "2020-05-30T13:11:16+00:00" + }, { "name": "markbaker/complex", "version": "1.4.8", @@ -4417,17 +4542,63 @@ "time": "2020-03-13T10:33:22+00:00" }, { - "name": "nesbot/carbon", - "version": "2.34.2", + "name": "myclabs/php-enum", + "version": "1.7.6", "source": { "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "3e87404329b8072295ea11d548b47a1eefe5a162" + "url": "https://github.com/myclabs/php-enum.git", + "reference": "5f36467c7a87e20fbdc51e524fd8f9d1de80187c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e87404329b8072295ea11d548b47a1eefe5a162", - "reference": "3e87404329b8072295ea11d548b47a1eefe5a162", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/5f36467c7a87e20fbdc51e524fd8f9d1de80187c", + "reference": "5f36467c7a87e20fbdc51e524fd8f9d1de80187c", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7", + "squizlabs/php_codesniffer": "1.*", + "vimeo/psalm": "^3.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } + ], + "description": "PHP Enum implementation", + "homepage": "http://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "time": "2020-02-14T08:15:52+00:00" + }, + { + "name": "nesbot/carbon", + "version": "2.35.0", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "4b9bd835261ef23d36397a46a76b496a458305e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4b9bd835261ef23d36397a46a76b496a458305e5", + "reference": "4b9bd835261ef23d36397a46a76b496a458305e5", "shasum": "" }, "require": { @@ -4497,20 +4668,20 @@ "type": "tidelift" } ], - "time": "2020-05-19T22:14:16+00:00" + "time": "2020-05-24T18:27:52+00:00" }, { "name": "nikic/php-parser", - "version": "v4.4.0", + "version": "v4.5.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120" + "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", - "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463", + "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463", "shasum": "" }, "require": { @@ -4549,20 +4720,20 @@ "parser", "php" ], - "time": "2020-04-10T16:34:50+00:00" + "time": "2020-06-03T07:24:19+00:00" }, { "name": "omnipay/common", - "version": "v3.0.3", + "version": "v3.0.4", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-common.git", - "reference": "24ea70aa6e0f76d8b85d7a35d8a6560c746f566f" + "reference": "d6a1bed63cae270da32b2171fe31f820d334d452" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/24ea70aa6e0f76d8b85d7a35d8a6560c746f566f", - "reference": "24ea70aa6e0f76d8b85d7a35d8a6560c746f566f", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/d6a1bed63cae270da32b2171fe31f820d334d452", + "reference": "d6a1bed63cae270da32b2171fe31f820d334d452", "shasum": "" }, "require": { @@ -4631,20 +4802,20 @@ "payment", "purchase" ], - "time": "2020-02-12T12:28:23+00:00" + "time": "2020-06-02T05:57:19+00:00" }, { "name": "opis/closure", - "version": "3.5.2", + "version": "3.5.3", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "2e3299cea6f485ca64d19c540f46d7896c512ace" + "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/2e3299cea6f485ca64d19c540f46d7896c512ace", - "reference": "2e3299cea6f485ca64d19c540f46d7896c512ace", + "url": "https://api.github.com/repos/opis/closure/zipball/cac47092144043d5d676e2e7cf8d0d2f83fc89ca", + "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca", "shasum": "" }, "require": { @@ -4692,7 +4863,7 @@ "serialization", "serialize" ], - "time": "2020-05-21T20:09:36+00:00" + "time": "2020-05-25T09:32:45+00:00" }, { "name": "phenx/php-font-lib", @@ -5278,16 +5449,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd" + "reference": "21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/f79611d6dc1f6b7e8e30b738fc371b392001dbfd", - "reference": "f79611d6dc1f6b7e8e30b738fc371b392001dbfd", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1", + "reference": "21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1", "shasum": "" }, "require": { @@ -5304,18 +5475,19 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", + "maennchen/zipstream-php": "^2.0", "markbaker/complex": "^1.4", "markbaker/matrix": "^1.2", - "php": "^7.1", + "php": "^7.2", "psr/simple-cache": "^1.0" }, "require-dev": { - "dompdf/dompdf": "^0.8.3", + "dompdf/dompdf": "^0.8.5", "friendsofphp/php-cs-fixer": "^2.16", "jpgraph/jpgraph": "^4.0", "mpdf/mpdf": "^8.0", "phpcompatibility/php-compatibility": "^9.3", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.5", "squizlabs/php_codesniffer": "^3.5", "tecnickcom/tcpdf": "^6.3" }, @@ -5367,7 +5539,7 @@ "xls", "xlsx" ], - "time": "2020-04-27T08:12:48+00:00" + "time": "2020-05-31T13:49:28+00:00" }, { "name": "phpoption/phpoption", @@ -5426,16 +5598,16 @@ }, { "name": "plank/laravel-mediable", - "version": "4.2.2", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/plank/laravel-mediable.git", - "reference": "06351900d67ec1021b6e1035e9b350bfabda22ac" + "reference": "7362587090d8152035d6e94d5586ac0689a84e94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/plank/laravel-mediable/zipball/06351900d67ec1021b6e1035e9b350bfabda22ac", - "reference": "06351900d67ec1021b6e1035e9b350bfabda22ac", + "url": "https://api.github.com/repos/plank/laravel-mediable/zipball/7362587090d8152035d6e94d5586ac0689a84e94", + "reference": "7362587090d8152035d6e94d5586ac0689a84e94", "shasum": "" }, "require": { @@ -5491,7 +5663,7 @@ "media", "uploader" ], - "time": "2020-05-14T02:55:04+00:00" + "time": "2020-06-03T01:51:59+00:00" }, { "name": "predis/predis", @@ -6146,16 +6318,16 @@ }, { "name": "sabberworm/php-css-parser", - "version": "8.3.0", + "version": "8.3.1", "source": { "type": "git", "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f" + "reference": "d217848e1396ef962fb1997cf3e2421acba7f796" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f", - "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796", + "reference": "d217848e1396ef962fb1997cf3e2421acba7f796", "shasum": "" }, "require": { @@ -6187,7 +6359,7 @@ "parser", "stylesheet" ], - "time": "2019-02-22T07:42:52+00:00" + "time": "2020-06-01T09:10:00+00:00" }, { "name": "santigarcor/laratrust", @@ -6562,26 +6734,29 @@ }, { "name": "symfony/console", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5fa1caadc8cdaa17bcfb25219f3b53fe294a9935" + "reference": "00bed125812716d09b163f0727ef33bb49bf3448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5fa1caadc8cdaa17bcfb25219f3b53fe294a9935", - "reference": "5fa1caadc8cdaa17bcfb25219f3b53fe294a9935", + "url": "https://api.github.com/repos/symfony/console/zipball/00bed125812716d09b163f0727ef33bb49bf3448", + "reference": "00bed125812716d09b163f0727ef33bb49bf3448", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", - "symfony/service-contracts": "^1.1|^2" + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1|^2", + "symfony/string": "^5.1" }, "conflict": { "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", "symfony/event-dispatcher": "<4.4", "symfony/lock": "<4.4", "symfony/process": "<4.4" @@ -6607,7 +6782,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -6648,29 +6823,29 @@ "type": "tidelift" } ], - "time": "2020-03-30T11:42:42+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "5f8d5271303dad260692ba73dfa21777d38e124e" + "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e", - "reference": "5f8d5271303dad260692ba73dfa21777d38e124e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/e544e24472d4c97b2d11ade7caacd446727c6bf9", + "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9", "shasum": "" }, "require": { - "php": "^7.2.5" + "php": ">=7.2.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -6715,25 +6890,26 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/debug", - "version": "v4.4.8", + "version": "v4.4.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "346636d2cae417992ecfd761979b2ab98b339a45" + "reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45", - "reference": "346636d2cae417992ecfd761979b2ab98b339a45", + "url": "https://api.github.com/repos/symfony/debug/zipball/28f92d08bb6d1fddf8158e02c194ad43870007e6", + "reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6", "shasum": "" }, "require": { - "php": "^7.1.3", - "psr/log": "~1.0" + "php": ">=7.1.3", + "psr/log": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/http-kernel": "<3.4" @@ -6785,35 +6961,97 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:54:36+00:00" + "time": "2020-05-24T08:33:35+00:00" }, { - "name": "symfony/error-handler", - "version": "v5.0.8", + "name": "symfony/deprecation-contracts", + "version": "v2.1.2", "source": { "type": "git", - "url": "https://github.com/symfony/error-handler.git", - "reference": "949ffc17c3ac3a9f8e6232220e2da33913c04ea4" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/949ffc17c3ac3a9f8e6232220e2da33913c04ea4", - "reference": "949ffc17c3ac3a9f8e6232220e2da33913c04ea4", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337", + "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "files": [ + "function.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": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-27T08:34:37+00:00" + }, + { + "name": "symfony/error-handler", + "version": "v5.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/error-handler.git", + "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896", + "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", "psr/log": "^1.0", + "symfony/polyfill-php80": "^1.15", "symfony/var-dumper": "^4.4|^5.0" }, "require-dev": { + "symfony/deprecation-contracts": "^2.1", "symfony/http-kernel": "^4.4|^5.0", "symfony/serializer": "^4.4|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -6854,25 +7092,27 @@ "type": "tidelift" } ], - "time": "2020-03-30T14:14:32+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "24f40d95385774ed5c71dbf014edd047e2f2f3dc" + "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/24f40d95385774ed5c71dbf014edd047e2f2f3dc", - "reference": "24f40d95385774ed5c71dbf014edd047e2f2f3dc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7", + "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7", "shasum": "" }, "require": { - "php": "^7.2.5", - "symfony/event-dispatcher-contracts": "^2" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/event-dispatcher-contracts": "^2", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/dependency-injection": "<4.4" @@ -6897,7 +7137,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -6938,24 +7178,24 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.0.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "af23c2584d4577d54661c434446fb8fbed6025dd" + "reference": "405952c4e90941a17e52ef7489a2bd94870bb290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/af23c2584d4577d54661c434446fb8fbed6025dd", - "reference": "af23c2584d4577d54661c434446fb8fbed6025dd", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/405952c4e90941a17e52ef7489a2bd94870bb290", + "reference": "405952c4e90941a17e52ef7489a2bd94870bb290", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "psr/event-dispatcher": "^1" }, "suggest": { @@ -6964,7 +7204,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -6996,30 +7236,44 @@ "interoperability", "standards" ], - "time": "2019-11-18T17:27:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/filesystem", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91" + "reference": "6e4320f06d5f2cce0d96530162491f4465179157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91", - "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157", + "reference": "6e4320f06d5f2cce0d96530162491f4465179157", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -7060,29 +7314,29 @@ "type": "tidelift" } ], - "time": "2020-04-12T14:40:17+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/finder", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d" + "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d", - "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d", + "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187", + "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187", "shasum": "" }, "require": { - "php": "^7.2.5" + "php": ">=7.2.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -7123,35 +7377,41 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d" + "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d", - "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa", + "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa", "shasum": "" }, "require": { - "php": "^7.2.5", - "symfony/mime": "^4.4|^5.0", - "symfony/polyfill-mbstring": "~1.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "^4.4|^5.0" + "symfony/cache": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/mime": "^4.4|^5.0" + }, + "suggest": { + "symfony/mime": "To use the file extension guesser" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -7192,30 +7452,32 @@ "type": "tidelift" } ], - "time": "2020-04-18T20:50:06+00:00" + "time": "2020-05-24T12:18:07+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "3565e51eecd06106304baba5ccb7ba89db2d7d2b" + "reference": "75ff5327a7d6ede3ccc2fac3ebca9ed776b3e85c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3565e51eecd06106304baba5ccb7ba89db2d7d2b", - "reference": "3565e51eecd06106304baba5ccb7ba89db2d7d2b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/75ff5327a7d6ede3ccc2fac3ebca9ed776b3e85c", + "reference": "75ff5327a7d6ede3ccc2fac3ebca9ed776b3e85c", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "psr/log": "~1.0", + "symfony/deprecation-contracts": "^2.1", "symfony/error-handler": "^4.4|^5.0", "symfony/event-dispatcher": "^5.0", "symfony/http-foundation": "^4.4|^5.0", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-php73": "^1.9" + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/browser-kit": "<4.4", @@ -7262,7 +7524,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -7303,26 +7565,27 @@ "type": "tidelift" } ], - "time": "2020-04-28T18:53:25+00:00" + "time": "2020-05-31T06:14:18+00:00" }, { "name": "symfony/mime", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b" + "reference": "56261f89385f9d13cf843a5101ac72131190bc91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b", - "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b", + "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91", + "reference": "56261f89385f9d13cf843a5101ac72131190bc91", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0" + "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/mailer": "<4.4" @@ -7334,7 +7597,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -7379,7 +7642,7 @@ "type": "tidelift" } ], - "time": "2020-04-17T03:29:44+00:00" + "time": "2020-05-25T12:33:44+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7526,6 +7789,80 @@ ], "time": "2020-05-12T16:47:27+00:00" }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.17.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "e094b0770f7833fdf257e6ba4775be4e258230b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e094b0770f7833fdf257e6ba4775be4e258230b2", + "reference": "e094b0770f7833fdf257e6ba4775be4e258230b2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + }, + "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 intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-12T16:47:27+00:00" + }, { "name": "symfony/polyfill-intl-idn", "version": "v1.17.0", @@ -7602,6 +7939,83 @@ ], "time": "2020-05-12T16:47:27+00:00" }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.17.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "1357b1d168eb7f68ad6a134838e46b0b159444a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/1357b1d168eb7f68ad6a134838e46b0b159444a9", + "reference": "1357b1d168eb7f68ad6a134838e46b0b159444a9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "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 for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-12T16:14:59+00:00" + }, { "name": "symfony/polyfill-mbstring", "version": "v1.17.0", @@ -7817,26 +8231,103 @@ "time": "2020-05-12T16:47:27+00:00" }, { - "name": "symfony/process", - "version": "v5.0.8", + "name": "symfony/polyfill-php80", + "version": "v1.17.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "3179f68dff5bad14d38c4114a1dab98030801fd7" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3179f68dff5bad14d38c4114a1dab98030801fd7", - "reference": "3179f68dff5bad14d38c4114a1dab98030801fd7", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd", + "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd", "shasum": "" }, "require": { - "php": "^7.2.5" + "php": ">=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-12T16:47:27+00:00" + }, + { + "name": "symfony/process", + "version": "v5.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1", + "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.15" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" } }, "autoload": { @@ -7877,24 +8368,26 @@ "type": "tidelift" } ], - "time": "2020-04-15T15:59:10+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/routing", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "9b18480a6e101f8d9ab7c483ace7c19441be5111" + "reference": "95cf30145b26c758d6d832aa2d0de3128978d556" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/9b18480a6e101f8d9ab7c483ace7c19441be5111", - "reference": "9b18480a6e101f8d9ab7c483ace7c19441be5111", + "url": "https://api.github.com/repos/symfony/routing/zipball/95cf30145b26c758d6d832aa2d0de3128978d556", + "reference": "95cf30145b26c758d6d832aa2d0de3128978d556", "shasum": "" }, "require": { - "php": "^7.2.5" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/config": "<5.0", @@ -7920,7 +8413,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -7967,24 +8460,24 @@ "type": "tidelift" } ], - "time": "2020-04-21T21:02:50+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.0.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "144c5e51266b281231e947b51223ba14acf1a749" + "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749", - "reference": "144c5e51266b281231e947b51223ba14acf1a749", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b", + "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "psr/container": "^1.0" }, "suggest": { @@ -7993,7 +8486,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -8025,25 +8518,125 @@ "interoperability", "standards" ], - "time": "2019-11-18T17:27:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T17:43:50+00:00" }, { - "name": "symfony/translation", - "version": "v5.0.8", + "name": "symfony/string", + "version": "v5.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd" + "url": "https://github.com/symfony/string.git", + "reference": "90c2a5103f07feb19069379f3abdcdbacc7753a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/c3879db7a68fe3e12b41263b05879412c87b27fd", - "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd", + "url": "https://api.github.com/repos/symfony/string/zipball/90c2a5103f07feb19069379f3abdcdbacc7753a9", + "reference": "90c2a5103f07feb19069379f3abdcdbacc7753a9", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0", + "symfony/http-client": "^4.4|^5.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "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 String component", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T17:43:50+00:00" + }, + { + "name": "symfony/translation", + "version": "v5.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2", + "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15", "symfony/translation-contracts": "^2" }, "conflict": { @@ -8075,7 +8668,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -8116,24 +8709,24 @@ "type": "tidelift" } ], - "time": "2020-04-12T16:45:47+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.0.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed" + "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed", - "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e5ca07c8f817f865f618aa072c2fe8e0e637340e", + "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e", "shasum": "" }, "require": { - "php": "^7.2.5" + "php": ">=7.2.5" }, "suggest": { "symfony/translation-implementation": "" @@ -8141,7 +8734,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -8173,25 +8766,40 @@ "interoperability", "standards" ], - "time": "2019-11-18T17:27:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.0.8", + "version": "v5.1.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "09de28632f16f81058a85fcf318397218272a07b" + "reference": "46a942903059b0b05e601f00eb64179e05578c0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/09de28632f16f81058a85fcf318397218272a07b", - "reference": "09de28632f16f81058a85fcf318397218272a07b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46a942903059b0b05e601f00eb64179e05578c0f", + "reference": "46a942903059b0b05e601f00eb64179e05578c0f", "shasum": "" }, "require": { - "php": "^7.2.5", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.2.5", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "phpunit/phpunit": "<5.4.3", @@ -8214,7 +8822,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -8262,7 +8870,7 @@ "type": "tidelift" } ], - "time": "2020-04-12T16:45:47+00:00" + "time": "2020-05-30T20:35:19+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8389,16 +8997,16 @@ }, { "name": "voku/portable-ascii", - "version": "1.4.10", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "240e93829a5f985fab0984a6e55ae5e26b78a334" + "reference": "e7f9bd5deff09a57318f9b900ab33a05acfcf4d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/240e93829a5f985fab0984a6e55ae5e26b78a334", - "reference": "240e93829a5f985fab0984a6e55ae5e26b78a334", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/e7f9bd5deff09a57318f9b900ab33a05acfcf4d3", + "reference": "e7f9bd5deff09a57318f9b900ab33a05acfcf4d3", "shasum": "" }, "require": { @@ -8413,8 +9021,7 @@ "type": "library", "autoload": { "psr-4": { - "voku\\": "src/voku/", - "voku\\tests\\": "tests/" + "voku\\": "src/voku/" } }, "notification-url": "https://packagist.org/downloads/", @@ -8452,7 +9059,7 @@ "type": "tidelift" } ], - "time": "2020-03-13T01:23:26+00:00" + "time": "2020-05-26T06:40:44+00:00" }, { "name": "webmozart/assert", @@ -8567,20 +9174,20 @@ }, { "name": "doctrine/instantiator", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", - "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", + "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^6.0", @@ -8619,7 +9226,21 @@ "constructor", "instantiate" ], - "time": "2019-10-21T16:45:58+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-05-29T17:27:14+00:00" }, { "name": "facade/flare-client-php", @@ -8683,16 +9304,16 @@ }, { "name": "facade/ignition", - "version": "2.0.4", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "749fba7bf560fe2600ea55bf8734a7c9b8c30cfd" + "reference": "5261c488a1e8a7c3ebdf6a4037c34f5ddeb33922" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/749fba7bf560fe2600ea55bf8734a7c9b8c30cfd", - "reference": "749fba7bf560fe2600ea55bf8734a7c9b8c30cfd", + "url": "https://api.github.com/repos/facade/ignition/zipball/5261c488a1e8a7c3ebdf6a4037c34f5ddeb33922", + "reference": "5261c488a1e8a7c3ebdf6a4037c34f5ddeb33922", "shasum": "" }, "require": { @@ -8750,7 +9371,7 @@ "laravel", "page" ], - "time": "2020-05-18T15:20:13+00:00" + "time": "2020-06-01T09:04:48+00:00" }, { "name": "facade/ignition-contracts", From 99f6fd8a1f6f8636d5c5e53e6b3a59549c5ff57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 5 Jun 2020 16:03:52 +0300 Subject: [PATCH 011/208] not used --- app/Jobs/Common/DeleteDashboard.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Jobs/Common/DeleteDashboard.php b/app/Jobs/Common/DeleteDashboard.php index 80a6a268e..debf4d0ff 100644 --- a/app/Jobs/Common/DeleteDashboard.php +++ b/app/Jobs/Common/DeleteDashboard.php @@ -4,7 +4,6 @@ namespace App\Jobs\Common; use App\Abstracts\Job; use App\Traits\Users; -use Artisan; class DeleteDashboard extends Job { From 90aa0f41a26d30d33b4700fa2821f9cfa7f391b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 5 Jun 2020 16:04:54 +0300 Subject: [PATCH 012/208] delete user of customer --- app/Jobs/Common/DeleteContact.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Jobs/Common/DeleteContact.php b/app/Jobs/Common/DeleteContact.php index c12b8a2e6..3c6a756b0 100644 --- a/app/Jobs/Common/DeleteContact.php +++ b/app/Jobs/Common/DeleteContact.php @@ -3,6 +3,7 @@ namespace App\Jobs\Common; use App\Abstracts\Job; +use App\Jobs\Auth\DeleteUser; use App\Traits\Contacts; class DeleteContact extends Job @@ -30,6 +31,10 @@ class DeleteContact extends Job { $this->authorize(); + if ($user = $this->contact->user) { + $this->dispatch(new DeleteUser($user)); + } + $this->contact->delete(); return true; From 4d009e11b0ca1a0fd4ddcd82924f0dd13c606dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 5 Jun 2020 16:12:19 +0300 Subject: [PATCH 013/208] close #1453 Fixed: Style problem with date field after validation --- public/css/custom.css | 4 ++++ resources/assets/js/components/AkauntingDate.vue | 2 +- resources/assets/js/components/Inputs/BaseInput.vue | 9 +++++++++ resources/views/partials/form/date_group.blade.php | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/public/css/custom.css b/public/css/custom.css index 8491b2c9d..91fb421dc 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -826,3 +826,7 @@ table .align-items-center td span.badge { .navbar-vertical .navbar-nav .nav-link:not(.active) { color: #fff !important; } + +.form-group.has-error .el-input__inner { + border-color: #ef3232 !important; +} diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue index 924e404fc..ce0710a4d 100644 --- a/resources/assets/js/components/AkauntingDate.vue +++ b/resources/assets/js/components/AkauntingDate.vue @@ -6,7 +6,7 @@ {'disabled': disabled}, formClasses ]" - :error="formError" + :footer-error="formError" :prependIcon="icon" :readonly="readonly" :disabled="disabled" diff --git a/resources/assets/js/components/Inputs/BaseInput.vue b/resources/assets/js/components/Inputs/BaseInput.vue index 4d59ec559..a8fda25d2 100644 --- a/resources/assets/js/components/Inputs/BaseInput.vue +++ b/resources/assets/js/components/Inputs/BaseInput.vue @@ -52,6 +52,11 @@ + +
    +
    +     @endpush diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index ebecd242c..90dfebf9e 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -636,39 +636,10 @@ @stack('row_footer_transaction_end') @stack('row_footer_end') + + {{ Form::hidden('invoice_id', $invoice->id, ['id' => 'invoice_id']) }} @endsection -@push('content_content_end') - - - - - -@endpush - @push('scripts_start') @endpush From 57cc191ba561ec7ee30200d4351279a7b7565736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 10 Jun 2020 02:14:10 +0300 Subject: [PATCH 038/208] bcmath for arbitrary precision --- app/Jobs/Banking/CreateDocumentTransaction.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/Jobs/Banking/CreateDocumentTransaction.php b/app/Jobs/Banking/CreateDocumentTransaction.php index 4942d18bd..69c02fe13 100644 --- a/app/Jobs/Banking/CreateDocumentTransaction.php +++ b/app/Jobs/Banking/CreateDocumentTransaction.php @@ -104,17 +104,9 @@ class CreateDocumentTransaction extends Job $total_amount = $this->model->amount - $this->model->paid; unset($this->model->reconciled); - // For amount cover integer - $multiplier = 1; + $compare = bccomp($amount, $total_amount, $this->currency->precision); - for ($i = 0; $i < $this->currency->precision; $i++) { - $multiplier *= 10; - } - - $amount_check = (int) ($amount * $multiplier); - $total_amount_check = (int) ($total_amount * $multiplier); - - if ($amount_check > $total_amount_check) { + if ($compare === 1) { $error_amount = $total_amount; if ($this->model->currency_code != $this->request['currency_code']) { @@ -139,7 +131,7 @@ class CreateDocumentTransaction extends Job throw new \Exception($message); } else { - $this->model->status = ($amount_check == $total_amount_check) ? 'paid' : 'partial'; + $this->model->status = ($compare === 0) ? 'paid' : 'partial'; } return true; From b79d9e4df72bdd0cfbf7a7dd62407f3a48781dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 10 Jun 2020 11:35:39 +0300 Subject: [PATCH 039/208] refs #1480 Invoice/Bill payment show error issue solved --- resources/assets/js/views/purchases/bills.js | 9 ++++++++- resources/assets/js/views/sales/invoices.js | 9 ++++++++- resources/views/modals/bills/payment.blade.php | 4 ++-- resources/views/modals/invoices/payment.blade.php | 4 ++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js index 5e524aad2..d6bf0b4be 100644 --- a/resources/assets/js/views/purchases/bills.js +++ b/resources/assets/js/views/purchases/bills.js @@ -336,7 +336,7 @@ const app = new Vue({ this.component = Vue.component('add-new-component', (resolve, reject) => { resolve({ - template: '
    ', + template: '
    ', mixins: [ Global @@ -352,6 +352,7 @@ const app = new Vue({ methods: { onSubmit(event) { this.form = event; + this.form.response = {}; this.loading = true; @@ -396,6 +397,12 @@ const app = new Vue({ window.location.href = response.data.redirect; } } + + if (response.data.error) { + this.form.loading = false; + + this.form.response = response.data; + } }) .catch(error => { this.form.loading = false; diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js index 5b9e2a3fe..136b97785 100644 --- a/resources/assets/js/views/sales/invoices.js +++ b/resources/assets/js/views/sales/invoices.js @@ -337,7 +337,7 @@ const app = new Vue({ this.component = Vue.component('add-new-component', (resolve, reject) => { resolve({ - template: '
    ', + template: '
    ', mixins: [ Global @@ -353,6 +353,7 @@ const app = new Vue({ methods: { onSubmit(event) { this.form = event; + this.form.response = {}; this.loading = true; @@ -397,6 +398,12 @@ const app = new Vue({ window.location.href = response.data.redirect; } } + + if (response.data.error) { + this.form.loading = false; + + this.form.response = response.data; + } }) .catch(error => { this.form.loading = false; diff --git a/resources/views/modals/bills/payment.blade.php b/resources/views/modals/bills/payment.blade.php index ec524893d..771666ad2 100644 --- a/resources/views/modals/bills/payment.blade.php +++ b/resources/views/modals/bills/payment.blade.php @@ -7,9 +7,9 @@ 'route' => ['modals.bills.bill.transactions.store', $bill->id], 'novalidate' => true ]) !!} -
    - + +
    {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }} {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $bill->grand_total) }} diff --git a/resources/views/modals/invoices/payment.blade.php b/resources/views/modals/invoices/payment.blade.php index a76c7e085..ad48752d0 100644 --- a/resources/views/modals/invoices/payment.blade.php +++ b/resources/views/modals/invoices/payment.blade.php @@ -7,9 +7,9 @@ 'route' => ['modals.invoices.invoice.transactions.store', $invoice->id], 'novalidate' => true ]) !!} -
    - + +
    {{ Form::dateGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::now()->toDateString()) }} {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency, 'dynamic-currency' => 'currency'], $invoice->grand_total) }} From 8b7ee416a657a22945811603060bab82c7a5c15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 10 Jun 2020 13:48:43 +0300 Subject: [PATCH 040/208] refs #1480 Invoice/bill amount issue solved. --- resources/views/modals/bills/payment.blade.php | 3 ++- resources/views/modals/invoices/payment.blade.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/modals/bills/payment.blade.php b/resources/views/modals/bills/payment.blade.php index 771666ad2..cf01f2f96 100644 --- a/resources/views/modals/bills/payment.blade.php +++ b/resources/views/modals/bills/payment.blade.php @@ -22,10 +22,11 @@ {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('default.payment_method'), ['required' => 'requied']) }} - {{ Form::textGroup('reference', trans('general.reference'), 'fa fa-file') }} + {{ Form::textGroup('reference', trans('general.reference'), 'fa fa-file', []) }} {!! Form::hidden('bill_id', $bill->id, ['id' => 'bill_id', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('category_id', $bill->category->id, ['id' => 'category_id', 'class' => 'form-control', 'required' => 'required']) !!} + {!! Form::hidden('amount', $bill->grand_total, ['id' => 'amount', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_code', $bill->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', $bill->currency_rate, ['id' => 'currency_rate', 'class' => 'form-control', 'required' => 'required']) !!} diff --git a/resources/views/modals/invoices/payment.blade.php b/resources/views/modals/invoices/payment.blade.php index ad48752d0..5f5110dd9 100644 --- a/resources/views/modals/invoices/payment.blade.php +++ b/resources/views/modals/invoices/payment.blade.php @@ -22,10 +22,11 @@ {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('default.payment_method'), ['required' => 'requied']) }} - {{ Form::textGroup('reference', trans('general.reference'), 'fa fa-file') }} + {{ Form::textGroup('reference', trans('general.reference'), 'fa fa-file', []) }} {!! Form::hidden('invoice_id', $invoice->id, ['id' => 'invoice_id', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('category_id', $invoice->category->id, ['id' => 'category_id', 'class' => 'form-control', 'required' => 'required']) !!} + {!! Form::hidden('amount', $invoice->grand_total, ['id' => 'amount', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_code', $invoice->currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!} {!! Form::hidden('currency_rate', $invoice->currency_rate, ['id' => 'currency_rate', 'class' => 'form-control', 'required' => 'required']) !!} From b0843151b1bc0d20bb10dd5dfa2e442f7c65d7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 10 Jun 2020 16:29:55 +0300 Subject: [PATCH 041/208] formatting --- app/Abstracts/DocumentModel.php | 6 +++++- app/Models/Banking/Transaction.php | 14 +++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php index 2bb94e137..7d76b08c3 100644 --- a/app/Abstracts/DocumentModel.php +++ b/app/Abstracts/DocumentModel.php @@ -87,11 +87,15 @@ abstract class DocumentModel extends Model return false; } + static $currencies; + $paid = 0; $reconciled = $reconciled_amount = 0; if ($this->transactions->count()) { - $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); + if (empty($currencies)) { + $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); + } foreach ($this->transactions as $item) { if ($this->currency_code == $item->currency_code) { diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index 99bc0d84b..a949878d4 100644 --- a/app/Models/Banking/Transaction.php +++ b/app/Models/Banking/Transaction.php @@ -4,12 +4,12 @@ namespace App\Models\Banking; use App\Abstracts\Model; use App\Models\Setting\Category; +use App\Models\Setting\Currency; use App\Traits\Currencies; use App\Traits\DateTime; use App\Traits\Media; use App\Traits\Recurring; use Bkwld\Cloner\Cloneable; -use Date; class Transaction extends Model { @@ -40,8 +40,6 @@ class Transaction extends Model */ public $cloneable_relations = ['recurring']; - public static $currencies; - public function account() { return $this->belongsTo('App\Models\Banking\Account')->withDefault(['name' => trans('general.na')]); @@ -254,14 +252,16 @@ class Transaction extends Model */ public function getPriceAttribute() { - if (empty($this->currencies)) { - $this->currencies = \App\Models\Setting\Currency::enabled()->pluck('rate', 'code')->toArray(); - } + static $currencies; $amount = $this->amount; // Convert amount if not same currency if ($this->account->currency_code != $this->currency_code) { + if (empty($currencies)) { + $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); + } + $default_currency = setting('default.currency', 'USD'); $default_amount = $this->amount; @@ -282,7 +282,7 @@ class Transaction extends Model $transfer_amount->default_currency_code = $this->currency_code; $transfer_amount->amount = $default_amount; $transfer_amount->currency_code = $this->account->currency_code; - $transfer_amount->currency_rate = $this->currencies[$this->account->currency_code]; + $transfer_amount->currency_rate = $currencies[$this->account->currency_code]; $amount = $transfer_amount->getAmountConvertedFromDefault(); } From 72cfdf14b2066b987c3754d85462e6135e27cf89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 10 Jun 2020 23:49:09 +0300 Subject: [PATCH 042/208] version update 2.0.13 to 2.0.14 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index 0d32c7b9a..e450421ea 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '0', - 'patch' => '13', + 'patch' => '14', 'build' => '', 'status' => 'Stable', - 'date' => '23-May-2020', + 'date' => '10-Jun-2020', - 'time' => '21:00', + 'time' => '23:00', 'zone' => 'GMT +3', From b54c9b1ecc83402e85d6406c01c3a4c4e9994420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 11 Jun 2020 23:32:13 +0300 Subject: [PATCH 043/208] refactored module commands --- app/Abstracts/Commands/Module.php | 77 +++++++++++++ app/Console/Commands/UninstallModule.php | 53 +++++++++ app/Events/Install/UpdateCacheCleared.php | 22 ++++ app/Events/Module/{Deleted.php => Copied.php} | 2 +- app/Events/Module/Uninstalled.php | 26 +++++ app/Http/Controllers/Modules/Item.php | 103 ++++-------------- app/Listeners/Module/ClearCache.php | 45 ++++++++ app/Listeners/Module/FinishInstallation.php | 27 +++++ app/Providers/Event.php | 4 + app/Traits/Modules.php | 100 +++++++++-------- app/Utilities/Updater.php | 6 +- .../module/Commands/DeleteCommand.php | 68 +----------- .../module/Commands/DisableCommand.php | 70 ++++-------- .../module/Commands/EnableCommand.php | 70 ++++-------- .../module/Commands/InstallCommand.php | 73 ++----------- .../modules/item/documentation.blade.php | 2 +- 16 files changed, 395 insertions(+), 353 deletions(-) create mode 100644 app/Abstracts/Commands/Module.php create mode 100644 app/Console/Commands/UninstallModule.php create mode 100644 app/Events/Install/UpdateCacheCleared.php rename app/Events/Module/{Deleted.php => Copied.php} (96%) create mode 100644 app/Events/Module/Uninstalled.php create mode 100644 app/Listeners/Module/ClearCache.php create mode 100644 app/Listeners/Module/FinishInstallation.php diff --git a/app/Abstracts/Commands/Module.php b/app/Abstracts/Commands/Module.php new file mode 100644 index 000000000..15676eaf7 --- /dev/null +++ b/app/Abstracts/Commands/Module.php @@ -0,0 +1,77 @@ +alias = Str::kebab($this->argument('alias')); + $this->company_id = $this->argument('company'); + $this->locale = $this->argument('locale'); + + $this->module = module($this->alias); + } + + protected function changeRuntime() + { + $this->old_company_id = session('company_id'); + + session(['company_id' => $this->company_id]); + + app()->setLocale($this->locale); + + // Disable model cache + config(['laravel-model-caching.enabled' => false]); + } + + protected function revertRuntime() + { + session()->forget('company_id'); + + if (!empty($this->old_company_id)) { + session(['company_id' => $this->old_company_id]); + } + } + + protected function getModel() + { + $this->model = Model::companyId($this->company_id)->alias($this->alias)->first(); + + return $this->model; + } + + protected function createHistory($action) + { + if (empty($this->model)) { + return; + } + + ModuleHistory::create([ + 'company_id' => $this->company_id, + 'module_id' => $this->model->id, + 'category' => $this->module->get('category'), + 'version' => $this->module->get('version'), + 'description' => trans('modules.' . $action, ['module' => $this->alias]), + ]); + } + + /** + * Get the console command arguments. + * + * @return array + */ + protected function getArguments() + { + return [ + ['alias', InputArgument::REQUIRED, 'Module alias.'], + ['company', InputArgument::REQUIRED, 'Company ID.'], + ]; + } +} diff --git a/app/Console/Commands/UninstallModule.php b/app/Console/Commands/UninstallModule.php new file mode 100644 index 000000000..bef7098a9 --- /dev/null +++ b/app/Console/Commands/UninstallModule.php @@ -0,0 +1,53 @@ +prepare(); + + if (!$this->getModel()) { + $this->info("Module [{$this->alias}] not found."); + return; + } + + $this->changeRuntime(); + + // Delete db + $this->model->delete(); + + $this->createHistory('uninstalled'); + + event(new \App\Events\Module\Uninstalled($this->alias, $this->company_id)); + + // Delete files + $this->module->delete(); + + $this->revertRuntime(); + + $this->info("Module [{$this->alias}] uninstalled."); + } +} diff --git a/app/Events/Install/UpdateCacheCleared.php b/app/Events/Install/UpdateCacheCleared.php new file mode 100644 index 000000000..ccc74b4a1 --- /dev/null +++ b/app/Events/Install/UpdateCacheCleared.php @@ -0,0 +1,22 @@ +company_id = $company_id; + } +} diff --git a/app/Events/Module/Deleted.php b/app/Events/Module/Copied.php similarity index 96% rename from app/Events/Module/Deleted.php rename to app/Events/Module/Copied.php index 02f0e4893..6764baa4d 100644 --- a/app/Events/Module/Deleted.php +++ b/app/Events/Module/Copied.php @@ -4,7 +4,7 @@ namespace App\Events\Module; use Illuminate\Queue\SerializesModels; -class Deleted +class Copied { use SerializesModels; diff --git a/app/Events/Module/Uninstalled.php b/app/Events/Module/Uninstalled.php new file mode 100644 index 000000000..776c238f9 --- /dev/null +++ b/app/Events/Module/Uninstalled.php @@ -0,0 +1,26 @@ +alias = $alias; + $this->company_id = $company_id; + } +} diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index 38c9b6519..b4a5aa14b 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -38,7 +38,7 @@ class Item extends Controller $module = $this->getModule($alias); if (empty($module)) { - return redirect('apps/home')->send(); + return redirect()->route('apps.home.index')->send(); } if ($this->moduleExists($alias) && ($model = Module::alias($alias)->first())) { @@ -169,102 +169,39 @@ class Item extends Controller { $json = $this->uninstallModule($alias); - $module = Module::alias($alias)->first(); + if ($json['success']) { + $message = trans('modules.uninstalled', ['module' => $json['data']['name']]); - $data = [ - 'company_id' => session('company_id'), - 'module_id' => $module->id, - 'category' => $json['data']['category'], - 'version' => $json['data']['version'], - 'description' => trans('modules.uninstalled', ['module' => $json['data']['name']]), - ]; + flash($message)->success(); + } - ModuleHistory::create($data); - - $module->delete(); - - $message = trans('modules.uninstalled', ['module' => $json['data']['name']]); - - flash($message)->success(); - - return redirect('apps/' . $alias)->send(); - } - - public function update($alias) - { - $json = $this->updateModule($alias); - - $module = Module::alias($alias)->first(); - - $data = [ - 'company_id' => session('company_id'), - 'module_id' => $module->id, - 'category' => $json['data']['category'], - 'version' => $json['data']['version'], - 'description' => trans_choice('modules.updated', $json['data']['name']), - ]; - - ModuleHistory::create($data); - - $message = trans('modules.updated', ['module' => $json['data']['name']]); - - flash($message)->success(); - - return redirect('apps/' . $alias)->send(); + return redirect()->route('apps.app.show', $alias)->send(); } public function enable($alias) { $json = $this->enableModule($alias); - $module = Module::alias($alias)->first(); + if ($json['success']) { + $message = trans('modules.enabled', ['module' => $json['data']['name']]); - $data = [ - 'company_id' => session('company_id'), - 'module_id' => $module->id, - 'category' => $json['data']['category'], - 'version' => $json['data']['version'], - 'description' => trans('modules.enabled', ['module' => $json['data']['name']]), - ]; + flash($message)->success(); + } - $module->enabled = 1; - - $module->save(); - - ModuleHistory::create($data); - - $message = trans('modules.enabled', ['module' => $json['data']['name']]); - - flash($message)->success(); - - return redirect('apps/' . $alias)->send(); + return redirect()->route('apps.app.show', $alias)->send(); } public function disable($alias) { $json = $this->disableModule($alias); - $module = Module::alias($alias)->first(); + if ($json['success']) { + $message = trans('modules.disabled', ['module' => $json['data']['name']]); - $data = [ - 'company_id' => session('company_id'), - 'module_id' => $module->id, - 'category' => $json['data']['category'], - 'version' => $json['data']['version'], - 'description' => trans('modules.disabled', ['module' => $json['data']['name']]), - ]; + flash($message)->success(); + } - $module->enabled = 0; - - $module->save(); - - ModuleHistory::create($data); - - $message = trans('modules.disabled', ['module' => $json['data']['name']]); - - flash($message)->success(); - - return redirect('apps/' . $alias)->send(); + return redirect()->route('apps.app.show', $alias)->send(); } public function reviews($alias, Request $request) @@ -292,11 +229,11 @@ class Item extends Controller { $documentation = $this->getDocumentation($alias); - if (empty($documentation)) { - return redirect('apps/' . $alias)->send(); - } + $back = route('apps.app.show', $alias); - $back = 'apps/' . $alias; + if (empty($documentation)) { + return redirect()->route($back)->send(); + } return view('modules.item.documentation', compact('documentation', 'back')); } diff --git a/app/Listeners/Module/ClearCache.php b/app/Listeners/Module/ClearCache.php new file mode 100644 index 000000000..372c5fd7c --- /dev/null +++ b/app/Listeners/Module/ClearCache.php @@ -0,0 +1,45 @@ +company_id); + } + + /** + * Register the listeners for the subscriber. + * + * @param \Illuminate\Events\Dispatcher $dispatcher + */ + public function subscribe($dispatcher) + { + $events = [ + 'App\Events\Install\UpdateCacheCleared', + 'App\Events\Module\Copied', + 'App\Events\Module\Enabled', + 'App\Events\Module\Disabled', + 'App\Events\Module\Uninstalled', + ]; + + foreach ($events as $event) { + $dispatcher->listen($event, 'App\Listeners\Module\ClearCache@handle'); + } + } +} diff --git a/app/Listeners/Module/FinishInstallation.php b/app/Listeners/Module/FinishInstallation.php new file mode 100644 index 000000000..f1bcbeb8b --- /dev/null +++ b/app/Listeners/Module/FinishInstallation.php @@ -0,0 +1,27 @@ +alias); + + Artisan::call('migrate', ['--force' => true]); + + $this->attachDefaultModulePermissions($module); + } +} diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 732e83143..3051a8b4f 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -73,6 +73,9 @@ class Event extends Provider 'App\Events\Menu\PortalCreated' => [ 'App\Listeners\Menu\AddPortalItems', ], + 'App\Events\Module\Installed' => [ + 'App\Listeners\Module\FinishInstallation', + ], ]; /** @@ -81,6 +84,7 @@ class Event extends Provider * @var array */ protected $subscribe = [ + 'App\Listeners\Module\ClearCache', 'App\Listeners\Report\AddDate', 'App\Listeners\Report\AddAccounts', 'App\Listeners\Report\AddCustomers', diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 001dfa177..be29a8507 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -425,17 +425,11 @@ trait Modules File::copyDirectory($temp_path, $module_path); File::deleteDirectory($temp_path); - $data = [ - 'path' => $path, - 'name' => Str::studly($module->alias), - 'alias' => $module->alias, - ]; + event(new \App\Events\Module\Copied($module->alias, session('company_id'))); $company_id = session('company_id'); $locale = app()->getLocale(); - $this->clearModulesCache(); - $command = "module:install {$module->alias} {$company_id} {$locale}"; if (true !== $result = Console::run($command)) { @@ -454,29 +448,44 @@ trait Modules 'redirect' => route('apps.app.show', $module->alias), 'error' => false, 'message' => null, - 'data' => $data, + 'data' => [ + 'path' => $path, + 'name' => module($module->alias)->getName(), + 'alias' => $module->alias, + ], ]; } public function uninstallModule($alias) { $module = module($alias); + $name = $module->getName(); + $category = $module->get('category'); + $version = $module->get('version'); - $data = [ - 'name' => $module->getName(), - 'category' => $module->get('category'), - 'version' => $module->get('version'), - ]; + $company_id = session('company_id'); + $locale = app()->getLocale(); - $module->delete(); + $command = "module:uninstall {$alias} {$company_id} {$locale}"; - $this->clearModulesCache(); + if (true !== $result = Console::run($command)) { + return [ + 'success' => false, + 'error' => true, + 'message' => $result, + 'data' => null, + ]; + } return [ 'success' => true, 'error' => false, 'message' => null, - 'data' => $data, + 'data' => [ + 'name' => $name, + 'category' => $category, + 'version' => $version, + ], ]; } @@ -484,21 +493,29 @@ trait Modules { $module = module($alias); - $data = [ - 'name' => $module->getName(), - 'category' => $module->get('category'), - 'version' => $module->get('version'), - ]; + $company_id = session('company_id'); + $locale = app()->getLocale(); - $module->enable(); + $command = "module:enable {$alias} {$company_id} {$locale}"; - $this->clearModulesCache(); + if (true !== $result = Console::run($command)) { + return [ + 'success' => false, + 'error' => true, + 'message' => $result, + 'data' => null, + ]; + } return [ 'success' => true, 'error' => false, 'message' => null, - 'data' => $data, + 'data' => [ + 'name' => $module->getName(), + 'category' => $module->get('category'), + 'version' => $module->get('version'), + ], ]; } @@ -506,21 +523,29 @@ trait Modules { $module = module($alias); - $data = [ - 'name' => $module->getName(), - 'category' => $module->get('category'), - 'version' => $module->get('version'), - ]; + $company_id = session('company_id'); + $locale = app()->getLocale(); - $module->disable(); + $command = "module:disable {$alias} {$company_id} {$locale}"; - $this->clearModulesCache($alias); + if (true !== $result = Console::run($command)) { + return [ + 'success' => false, + 'error' => true, + 'message' => $result, + 'data' => null, + ]; + } return [ 'success' => true, 'error' => false, 'message' => null, - 'data' => $data, + 'data' => [ + 'name' => $module->getName(), + 'category' => $module->get('category'), + 'version' => $module->get('version'), + ], ]; } @@ -638,15 +663,4 @@ trait Modules return $data['query']['page']; } - - public function clearModulesCache() - { - if (config('module.cache.enabled')) { - Cache::forget(config('module.cache.key')); - } - - Cache::forget('apps.notifications'); - Cache::forget('apps.suggestions'); - Cache::forget('apps.installed.' . session('company_id')); - } } diff --git a/app/Utilities/Updater.php b/app/Utilities/Updater.php index b7e20e756..e9d04f9ee 100644 --- a/app/Utilities/Updater.php +++ b/app/Utilities/Updater.php @@ -2,6 +2,7 @@ namespace App\Utilities; +use App\Events\Install\UpdateCacheCleared; use App\Events\Install\UpdateCopied; use App\Events\Install\UpdateDownloaded; use App\Events\Install\UpdateUnzipped; @@ -22,9 +23,8 @@ class Updater { Cache::forget('updates'); Cache::forget('versions'); - Cache::forget('apps.notifications'); - Cache::forget('apps.suggestions'); - Cache::forget('apps.installed.' . session('company_id')); + + event(new UpdateCacheCleared(session('company_id'))); return true; } diff --git a/overrides/akaunting/module/Commands/DeleteCommand.php b/overrides/akaunting/module/Commands/DeleteCommand.php index 64b51c517..258d0618c 100644 --- a/overrides/akaunting/module/Commands/DeleteCommand.php +++ b/overrides/akaunting/module/Commands/DeleteCommand.php @@ -2,21 +2,16 @@ namespace Akaunting\Module\Commands; -use App\Models\Module\Module; -use App\Models\Module\ModuleHistory; -use Illuminate\Console\Command; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Str; -use Symfony\Component\Console\Input\InputArgument; +use App\Console\Commands\UninstallModule; -class DeleteCommand extends Command +class DeleteCommand extends UninstallModule { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'module:delete {alias} {company_id}'; + protected $signature = 'module:delete {alias} {company} {locale=en-GB}'; /** * The console command description. @@ -24,61 +19,4 @@ class DeleteCommand extends Command * @var string */ protected $description = 'Delete the specified module.'; - - /** - * Execute the console command. - * - * @return mixed - */ - public function handle() - { - $alias = Str::kebab($this->argument('alias')); - $company_id = $this->argument('company_id'); - - $model = Module::alias($alias)->companyId($company_id)->first(); - - if (!$model) { - $this->info("Module [{$alias}] not found."); - return; - } - - $module = module($alias); - $module->delete(); - - $model->enabled = 0; - $model->save(); - - // Add history - $data = [ - 'company_id' => $company_id, - 'module_id' => $model->id, - 'category' => $module->get('category', 'payment-method'), - 'version' => $module->get('version'), - 'description' => trans('modules.deleted', ['module' => $module->get('alias')]), - ]; - - ModuleHistory::create($data); - - // Trigger event - event(new \App\Events\Module\Deleted($alias, $company_id)); - - if (config('module.cache.enabled')) { - Cache::forget(config('module.cache.key')); - } - - $this->info("Module [{$alias}] deleted."); - } - - /** - * Get the console command arguments. - * - * @return array - */ - protected function getArguments() - { - return array( - array('alias', InputArgument::REQUIRED, 'Module alias.'), - array('company_id', InputArgument::REQUIRED, 'Company ID.'), - ); - } } diff --git a/overrides/akaunting/module/Commands/DisableCommand.php b/overrides/akaunting/module/Commands/DisableCommand.php index 74280c81e..fb0ce75bf 100644 --- a/overrides/akaunting/module/Commands/DisableCommand.php +++ b/overrides/akaunting/module/Commands/DisableCommand.php @@ -2,20 +2,16 @@ namespace Akaunting\Module\Commands; -use App\Models\Module\Module; -use App\Models\Module\ModuleHistory; -use Illuminate\Console\Command; -use Illuminate\Support\Str; -use Symfony\Component\Console\Input\InputArgument; +use App\Abstracts\Commands\Module; -class DisableCommand extends Command +class DisableCommand extends Module { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'module:disable {alias} {company_id}'; + protected $signature = 'module:disable {alias} {company} {locale=en-GB}'; /** * The console command description. @@ -31,52 +27,30 @@ class DisableCommand extends Command */ public function handle() { - $alias = Str::kebab($this->argument('alias')); - $company_id = $this->argument('company_id'); + $this->prepare(); - $model = Module::alias($alias)->companyId($company_id)->first(); - - if (!$model) { - $this->info("Module [{$alias}] not found."); + if (!$this->getModel()) { + $this->info("Module [{$this->alias}] not found."); return; } - if ($model->enabled == 1) { - $model->enabled = 0; - $model->save(); - - $module = module($alias); - - // Add history - $data = [ - 'company_id' => $company_id, - 'module_id' => $model->id, - 'category' => $module->get('category', 'payment-method'), - 'version' => $module->get('version'), - 'description' => trans('modules.disabled', ['module' => $module->get('alias')]), - ]; - - ModuleHistory::create($data); - - // Trigger event - event(new \App\Events\Module\Disabled($alias, $company_id)); - - $this->info("Module [{$alias}] disabled."); - } else { - $this->comment("Module [{$alias}] is already disabled."); + if ($this->model->enabled == 0) { + $this->comment("Module [{$this->alias}] is already disabled."); + return; } - } - /** - * Get the console command arguments. - * - * @return array - */ - protected function getArguments() - { - return array( - array('alias', InputArgument::REQUIRED, 'Module alias.'), - array('company_id', InputArgument::REQUIRED, 'Company ID.'), - ); + $this->changeRuntime(); + + // Update db + $this->model->enabled = 0; + $this->model->save(); + + $this->createHistory('disabled'); + + event(new \App\Events\Module\Disabled($this->alias, $this->company_id)); + + $this->revertRuntime(); + + $this->info("Module [{$this->alias}] disabled."); } } diff --git a/overrides/akaunting/module/Commands/EnableCommand.php b/overrides/akaunting/module/Commands/EnableCommand.php index 72d0fe080..6474d07cb 100644 --- a/overrides/akaunting/module/Commands/EnableCommand.php +++ b/overrides/akaunting/module/Commands/EnableCommand.php @@ -2,20 +2,16 @@ namespace Akaunting\Module\Commands; -use App\Models\Module\Module; -use App\Models\Module\ModuleHistory; -use Illuminate\Console\Command; -use Illuminate\Support\Str; -use Symfony\Component\Console\Input\InputArgument; +use App\Abstracts\Commands\Module; -class EnableCommand extends Command +class EnableCommand extends Module { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'module:enable {alias} {company_id}'; + protected $signature = 'module:enable {alias} {company} {locale=en-GB}'; /** * The console command description. @@ -31,52 +27,30 @@ class EnableCommand extends Command */ public function handle() { - $alias = Str::kebab($this->argument('alias')); - $company_id = $this->argument('company_id'); + $this->prepare(); - $model = Module::alias($alias)->companyId($company_id)->first(); - - if (!$model) { - $this->info("Module [{$alias}] not found."); + if (!$this->getModel()) { + $this->info("Module [{$this->alias}] not found."); return; } - if ($model->enabled == 0) { - $model->enabled = 1; - $model->save(); - - $module = module($alias); - - // Add history - $data = [ - 'company_id' => $company_id, - 'module_id' => $model->id, - 'category' => $module->get('category', 'payment-method'), - 'version' => $module->get('version'), - 'description' => trans('modules.enabled', ['module' => $module->get('alias')]), - ]; - - ModuleHistory::create($data); - - // Trigger event - event(new \App\Events\Module\Enabled($alias, $company_id)); - - $this->info("Module [{$alias}] enabled."); - } else { - $this->comment("Module [{$alias}] is already enabled."); + if ($this->model->enabled == 1) { + $this->comment("Module [{$this->alias}] is already enabled."); + return; } - } - /** - * Get the console command arguments. - * - * @return array - */ - protected function getArguments() - { - return array( - array('alias', InputArgument::REQUIRED, 'Module alias.'), - array('company_id', InputArgument::REQUIRED, 'Company ID.'), - ); + $this->changeRuntime(); + + // Update db + $this->model->enabled = 1; + $this->model->save(); + + $this->createHistory('enabled'); + + event(new \App\Events\Module\Enabled($this->alias, $this->company_id)); + + $this->revertRuntime(); + + $this->info("Module [{$this->alias}] enabled."); } } diff --git a/overrides/akaunting/module/Commands/InstallCommand.php b/overrides/akaunting/module/Commands/InstallCommand.php index 870f3a5b5..539eaec2a 100644 --- a/overrides/akaunting/module/Commands/InstallCommand.php +++ b/overrides/akaunting/module/Commands/InstallCommand.php @@ -2,18 +2,11 @@ namespace Akaunting\Module\Commands; -use App\Models\Module\Module; -use App\Models\Module\ModuleHistory; -use App\Traits\Permissions; -use Illuminate\Console\Command; -use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Str; -use Symfony\Component\Console\Input\InputArgument; +use App\Abstracts\Commands\Module; +use App\Models\Module\Module as Model; -class InstallCommand extends Command +class InstallCommand extends Module { - use Permissions; - /** * The name and signature of the console command. * @@ -35,65 +28,23 @@ class InstallCommand extends Command */ public function handle() { - $alias = Str::kebab($this->argument('alias')); - $company_id = $this->argument('company'); - $locale = $this->argument('locale'); + $this->prepare(); - $old_company_id = session('company_id'); + $this->changeRuntime(); - session(['company_id' => $company_id]); - - app()->setLocale($locale); - - $module = module($alias); - - $model = Module::create([ - 'company_id' => $company_id, - 'alias' => $alias, + // Create db + $this->model = Model::create([ + 'company_id' => $this->company_id, + 'alias' => $this->alias, 'enabled' => '1', ]); - ModuleHistory::create([ - 'company_id' => $company_id, - 'module_id' => $model->id, - 'category' => $module->get('category', 'payment-method'), - 'version' => $module->get('version'), - 'description' => trans('modules.installed', ['module' => $alias]), - ]); + $this->createHistory('installed'); - if (config('module.cache.enabled')) { - Cache::forget(config('module.cache.key')); - } + event(new \App\Events\Module\Installed($this->alias, $this->company_id)); - // Disable model cache during installation - config(['laravel-model-caching.enabled' => false]); - - // Update database - $this->call('migrate', ['--force' => true]); - - event(new \App\Events\Module\Installed($alias, $company_id)); - - $this->attachDefaultModulePermissions($module); - - session()->forget('company_id'); - - if (!empty($old_company_id)) { - session(['company_id' => $old_company_id]); - } + $this->revertRuntime(); $this->info('Module installed!'); } - - /** - * Get the console command arguments. - * - * @return array - */ - protected function getArguments() - { - return array( - array('alias', InputArgument::REQUIRED, 'Module alias.'), - array('company_id', InputArgument::REQUIRED, 'Company ID.'), - ); - } } diff --git a/resources/views/modules/item/documentation.blade.php b/resources/views/modules/item/documentation.blade.php index 61b5ee508..8b6060259 100644 --- a/resources/views/modules/item/documentation.blade.php +++ b/resources/views/modules/item/documentation.blade.php @@ -22,7 +22,7 @@
    -  {{ trans('modules.back') }} +  {{ trans('modules.back') }}
    From 3357a2d0588ace1bc0ce01d0deb62922ef094afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 11 Jun 2020 23:40:24 +0300 Subject: [PATCH 044/208] formatting --- app/Console/Commands/UninstallModule.php | 3 ++- overrides/akaunting/module/Commands/DisableCommand.php | 3 ++- overrides/akaunting/module/Commands/EnableCommand.php | 3 ++- overrides/akaunting/module/Commands/InstallCommand.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/UninstallModule.php b/app/Console/Commands/UninstallModule.php index bef7098a9..fa4a29d4a 100644 --- a/app/Console/Commands/UninstallModule.php +++ b/app/Console/Commands/UninstallModule.php @@ -3,6 +3,7 @@ namespace App\Console\Commands; use App\Abstracts\Commands\Module; +use App\Events\Module\Uninstalled; class UninstallModule extends Module { @@ -41,7 +42,7 @@ class UninstallModule extends Module $this->createHistory('uninstalled'); - event(new \App\Events\Module\Uninstalled($this->alias, $this->company_id)); + event(new Uninstalled($this->alias, $this->company_id)); // Delete files $this->module->delete(); diff --git a/overrides/akaunting/module/Commands/DisableCommand.php b/overrides/akaunting/module/Commands/DisableCommand.php index fb0ce75bf..45c26717b 100644 --- a/overrides/akaunting/module/Commands/DisableCommand.php +++ b/overrides/akaunting/module/Commands/DisableCommand.php @@ -3,6 +3,7 @@ namespace Akaunting\Module\Commands; use App\Abstracts\Commands\Module; +use App\Events\Module\Disabled; class DisableCommand extends Module { @@ -47,7 +48,7 @@ class DisableCommand extends Module $this->createHistory('disabled'); - event(new \App\Events\Module\Disabled($this->alias, $this->company_id)); + event(new Disabled($this->alias, $this->company_id)); $this->revertRuntime(); diff --git a/overrides/akaunting/module/Commands/EnableCommand.php b/overrides/akaunting/module/Commands/EnableCommand.php index 6474d07cb..bd4ef6a2e 100644 --- a/overrides/akaunting/module/Commands/EnableCommand.php +++ b/overrides/akaunting/module/Commands/EnableCommand.php @@ -3,6 +3,7 @@ namespace Akaunting\Module\Commands; use App\Abstracts\Commands\Module; +use App\Events\Module\Enabled; class EnableCommand extends Module { @@ -47,7 +48,7 @@ class EnableCommand extends Module $this->createHistory('enabled'); - event(new \App\Events\Module\Enabled($this->alias, $this->company_id)); + event(new Enabled($this->alias, $this->company_id)); $this->revertRuntime(); diff --git a/overrides/akaunting/module/Commands/InstallCommand.php b/overrides/akaunting/module/Commands/InstallCommand.php index 539eaec2a..ae068710e 100644 --- a/overrides/akaunting/module/Commands/InstallCommand.php +++ b/overrides/akaunting/module/Commands/InstallCommand.php @@ -3,6 +3,7 @@ namespace Akaunting\Module\Commands; use App\Abstracts\Commands\Module; +use App\Events\Module\Installed; use App\Models\Module\Module as Model; class InstallCommand extends Module @@ -41,7 +42,7 @@ class InstallCommand extends Module $this->createHistory('installed'); - event(new \App\Events\Module\Installed($this->alias, $this->company_id)); + event(new Installed($this->alias, $this->company_id)); $this->revertRuntime(); From 23de00f508a8ecf68d5a51e51a2839fac10003f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 12 Jun 2020 11:51:37 +0300 Subject: [PATCH 045/208] formatting --- app/Abstracts/Commands/Module.php | 4 ++-- app/Console/Commands/UninstallModule.php | 4 ++-- overrides/akaunting/module/Commands/DisableCommand.php | 4 ++-- overrides/akaunting/module/Commands/EnableCommand.php | 4 ++-- overrides/akaunting/module/Commands/InstallCommand.php | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Abstracts/Commands/Module.php b/app/Abstracts/Commands/Module.php index 15676eaf7..d995f505e 100644 --- a/app/Abstracts/Commands/Module.php +++ b/app/Abstracts/Commands/Module.php @@ -3,7 +3,7 @@ namespace App\Abstracts\Commands; use App\Models\Module\Module as Model; -use App\Models\Module\ModuleHistory; +use App\Models\Module\ModuleHistory as ModelHistory; use Illuminate\Console\Command; use Illuminate\Support\Str; use Symfony\Component\Console\Input\InputArgument; @@ -53,7 +53,7 @@ abstract class Module extends Command return; } - ModuleHistory::create([ + ModelHistory::create([ 'company_id' => $this->company_id, 'module_id' => $this->model->id, 'category' => $this->module->get('category'), diff --git a/app/Console/Commands/UninstallModule.php b/app/Console/Commands/UninstallModule.php index fa4a29d4a..2d2993d27 100644 --- a/app/Console/Commands/UninstallModule.php +++ b/app/Console/Commands/UninstallModule.php @@ -2,10 +2,10 @@ namespace App\Console\Commands; -use App\Abstracts\Commands\Module; +use App\Abstracts\Commands\Module as Command; use App\Events\Module\Uninstalled; -class UninstallModule extends Module +class UninstallModule extends Command { /** * The name and signature of the console command. diff --git a/overrides/akaunting/module/Commands/DisableCommand.php b/overrides/akaunting/module/Commands/DisableCommand.php index 45c26717b..310449a39 100644 --- a/overrides/akaunting/module/Commands/DisableCommand.php +++ b/overrides/akaunting/module/Commands/DisableCommand.php @@ -2,10 +2,10 @@ namespace Akaunting\Module\Commands; -use App\Abstracts\Commands\Module; +use App\Abstracts\Commands\Module as Command; use App\Events\Module\Disabled; -class DisableCommand extends Module +class DisableCommand extends Command { /** * The name and signature of the console command. diff --git a/overrides/akaunting/module/Commands/EnableCommand.php b/overrides/akaunting/module/Commands/EnableCommand.php index bd4ef6a2e..51b787d9a 100644 --- a/overrides/akaunting/module/Commands/EnableCommand.php +++ b/overrides/akaunting/module/Commands/EnableCommand.php @@ -2,10 +2,10 @@ namespace Akaunting\Module\Commands; -use App\Abstracts\Commands\Module; +use App\Abstracts\Commands\Module as Command; use App\Events\Module\Enabled; -class EnableCommand extends Module +class EnableCommand extends Command { /** * The name and signature of the console command. diff --git a/overrides/akaunting/module/Commands/InstallCommand.php b/overrides/akaunting/module/Commands/InstallCommand.php index ae068710e..1dec3c368 100644 --- a/overrides/akaunting/module/Commands/InstallCommand.php +++ b/overrides/akaunting/module/Commands/InstallCommand.php @@ -2,11 +2,11 @@ namespace Akaunting\Module\Commands; -use App\Abstracts\Commands\Module; +use App\Abstracts\Commands\Module as Command; use App\Events\Module\Installed; use App\Models\Module\Module as Model; -class InstallCommand extends Module +class InstallCommand extends Command { /** * The name and signature of the console command. From 64d065785e117e88cec8d1e99c8f8b3620d91f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 12 Jun 2020 11:57:18 +0300 Subject: [PATCH 046/208] added alias to message --- overrides/akaunting/module/Commands/InstallCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/akaunting/module/Commands/InstallCommand.php b/overrides/akaunting/module/Commands/InstallCommand.php index 1dec3c368..b5bf6318c 100644 --- a/overrides/akaunting/module/Commands/InstallCommand.php +++ b/overrides/akaunting/module/Commands/InstallCommand.php @@ -46,6 +46,6 @@ class InstallCommand extends Command $this->revertRuntime(); - $this->info('Module installed!'); + $this->info("Module [{$this->alias}] installed!"); } } From 6d6bf1f393a1038d29a468ad37cba978ab54133e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 12 Jun 2020 13:38:58 +0300 Subject: [PATCH 047/208] added setting funciton for reports --- app/Abstracts/Report.php | 25 +++++++++++++++---------- app/Reports/ExpenseSummary.php | 2 +- app/Reports/IncomeExpenseSummary.php | 2 +- app/Reports/IncomeSummary.php | 2 +- app/Reports/ProfitLoss.php | 2 +- app/Reports/TaxSummary.php | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index b98450aef..dce1ea98f 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -142,17 +142,17 @@ abstract class Report { $chart = new Chartjs(); - if (empty($this->model->settings->chart)) { + if (!$type = $this->getSetting('chart')) { return $chart; } - $config = $this->chart[$this->model->settings->chart]; + $config = $this->chart[$type]; $default_options = $this->getLineChartOptions(); $options = array_merge($default_options, (array) $config['options']); - $chart->type($this->model->settings->chart) + $chart->type($type) ->width((int) $config['width']) ->height((int) $config['height']) ->options($options) @@ -199,13 +199,13 @@ abstract class Report public function setColumnWidth() { - if (empty($this->model->settings->period)) { + if (!$period = $this->getSetting('period')) { return; } $width = ''; - switch ($this->model->settings->period) { + switch ($period) { case 'quarterly': $width = 'col-sm-2'; break; @@ -253,16 +253,16 @@ abstract class Report public function setDates() { - if (empty($this->model->settings->period)) { + if (!$period = $this->getSetting('period')) { return; } - $function = 'sub' . ucfirst(str_replace('ly', '', $this->model->settings->period)); + $function = 'sub' . ucfirst(str_replace('ly', '', $period)); $start = $this->getFinancialStart()->copy()->$function(); for ($j = 1; $j <= 12; $j++) { - switch ($this->model->settings->period) { + switch ($period) { case 'yearly': $start->addYear(); @@ -332,7 +332,7 @@ abstract class Report $date = $this->getFormattedDate(Date::parse($item->$date_field)); - $id_field = $this->model->settings->group . '_id'; + $id_field = $this->getSetting('group') . '_id'; if ( !isset($this->row_values[$table][$item->$id_field]) @@ -374,7 +374,7 @@ abstract class Report public function getFormattedDate($date) { - switch ($this->model->settings->period) { + switch ($this->getSetting('period')) { case 'yearly': $i = $date->copy()->format($this->getYearlyDateFormat()); break; @@ -411,6 +411,11 @@ abstract class Report return $print_url; } + public function getSetting($name, $default = '') + { + return $this->model->settings->$name ?? $default; + } + public function getFields() { return [ diff --git a/app/Reports/ExpenseSummary.php b/app/Reports/ExpenseSummary.php index 593aafb60..38301c77b 100644 --- a/app/Reports/ExpenseSummary.php +++ b/app/Reports/ExpenseSummary.php @@ -32,7 +32,7 @@ class ExpenseSummary extends Report { $transactions = $this->applyFilters(Transaction::with('recurring')->expense()->isNotTransfer(), ['date_field' => 'paid_at']); - switch ($this->model->settings->basis) { + switch ($this->getSetting('basis')) { case 'cash': // Payments $payments = $transactions->get(); diff --git a/app/Reports/IncomeExpenseSummary.php b/app/Reports/IncomeExpenseSummary.php index 1cc9a0dd3..0de9e6eb3 100644 --- a/app/Reports/IncomeExpenseSummary.php +++ b/app/Reports/IncomeExpenseSummary.php @@ -19,7 +19,7 @@ class IncomeExpenseSummary extends Report $income_transactions = $this->applyFilters(Transaction::with('recurring')->income()->isNotTransfer(), ['date_field' => 'paid_at']); $expense_transactions = $this->applyFilters(Transaction::with('recurring')->expense()->isNotTransfer(), ['date_field' => 'paid_at']); - switch ($this->model->settings->basis) { + switch ($this->getSetting('basis')) { case 'cash': // Revenues $revenues = $income_transactions->get(); diff --git a/app/Reports/IncomeSummary.php b/app/Reports/IncomeSummary.php index b2cd467f4..b08927ace 100644 --- a/app/Reports/IncomeSummary.php +++ b/app/Reports/IncomeSummary.php @@ -32,7 +32,7 @@ class IncomeSummary extends Report { $transactions = $this->applyFilters(Transaction::with('recurring')->income()->isNotTransfer(), ['date_field' => 'paid_at']); - switch ($this->model->settings->basis) { + switch ($this->getSetting('basis')) { case 'cash': // Revenues $revenues = $transactions->get(); diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index 9d12c5a47..d225abab2 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -38,7 +38,7 @@ class ProfitLoss extends Report $income_transactions = $this->applyFilters(Transaction::with('recurring')->income()->isNotTransfer(), ['date_field' => 'paid_at']); $expense_transactions = $this->applyFilters(Transaction::with('recurring')->expense()->isNotTransfer(), ['date_field' => 'paid_at']); - switch ($this->model->settings->basis) { + switch ($this->getSetting('basis')) { case 'cash': // Revenues $revenues = $income_transactions->get(); diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 7dc576e0e..f6ccd3a48 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -39,7 +39,7 @@ class TaxSummary extends Report public function setData() { - switch ($this->model->settings->basis) { + switch ($this->getSetting('basis')) { case 'cash': // Invoice Payments $invoices = $this->applyFilters(Transaction::with('recurring', 'invoice', 'invoice.totals')->income()->isDocument()->isNotTransfer(), ['date_field' => 'paid_at'])->get(); From e9c4749b381c0b2173e1e0976175f5e41bbf8dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 12 Jun 2020 16:28:27 +0300 Subject: [PATCH 048/208] gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 95724539b..09039e51b 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,7 @@ fabric.properties /storage/*.key /vendor /.idea +/.history /.vscode /.vagrant Homestead.json From 060ffcd70ad7efb0c572ff6452b10ca2a3a1b32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 12 Jun 2020 16:47:53 +0300 Subject: [PATCH 049/208] close #1481 Fixed: Not showing report fields --- resources/views/partials/form/date_group.blade.php | 6 +++--- resources/views/partials/form/date_time_group.blade.php | 6 +++--- resources/views/partials/form/money_group.blade.php | 2 +- .../partials/form/multi_select_add_new_group.blade.php | 6 +++--- resources/views/partials/form/multi_select_group.blade.php | 6 +++--- .../views/partials/form/select_add_new_group.blade.php | 4 ++-- resources/views/partials/form/select_group.blade.php | 2 +- .../partials/form/select_group_add_new_group.blade.php | 6 +++--- resources/views/partials/form/select_group_group.blade.php | 6 +++--- resources/views/partials/form/select_remote_group.blade.php | 6 +++--- resources/views/partials/form/time_group.blade.php | 6 +++--- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php index 4ce430b92..d6091de60 100644 --- a/resources/views/partials/form/date_group.blade.php +++ b/resources/views/partials/form/date_group.blade.php @@ -42,11 +42,11 @@ }" @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (isset($attributes['required'])) diff --git a/resources/views/partials/form/date_time_group.blade.php b/resources/views/partials/form/date_time_group.blade.php index 4e8d71273..558db83f5 100644 --- a/resources/views/partials/form/date_time_group.blade.php +++ b/resources/views/partials/form/date_time_group.blade.php @@ -45,11 +45,11 @@ }" @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (isset($attributes['readonly'])) diff --git a/resources/views/partials/form/money_group.blade.php b/resources/views/partials/form/money_group.blade.php index 60342e0f0..c74e36438 100644 --- a/resources/views/partials/form/money_group.blade.php +++ b/resources/views/partials/form/money_group.blade.php @@ -56,7 +56,7 @@ @if (!empty($attributes['v-model'])) @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="form.errors.clear("{{ 'form.' . $attributes['data-field'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif diff --git a/resources/views/partials/form/multi_select_add_new_group.blade.php b/resources/views/partials/form/multi_select_add_new_group.blade.php index 8fc4b4ef4..d726e66ee 100644 --- a/resources/views/partials/form/multi_select_add_new_group.blade.php +++ b/resources/views/partials/form/multi_select_add_new_group.blade.php @@ -52,11 +52,11 @@ @endif @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (!empty($attributes['change'])) diff --git a/resources/views/partials/form/multi_select_group.blade.php b/resources/views/partials/form/multi_select_group.blade.php index 60c913a60..70d85fc79 100644 --- a/resources/views/partials/form/multi_select_group.blade.php +++ b/resources/views/partials/form/multi_select_group.blade.php @@ -30,11 +30,11 @@ @endif @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (!empty($attributes['change'])) diff --git a/resources/views/partials/form/select_add_new_group.blade.php b/resources/views/partials/form/select_add_new_group.blade.php index 8251743ec..189ea9c32 100644 --- a/resources/views/partials/form/select_add_new_group.blade.php +++ b/resources/views/partials/form/select_add_new_group.blade.php @@ -46,9 +46,9 @@ ])}}" @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else @interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');" @endif diff --git a/resources/views/partials/form/select_group.blade.php b/resources/views/partials/form/select_group.blade.php index bc6a8d7f4..2a5a71331 100644 --- a/resources/views/partials/form/select_group.blade.php +++ b/resources/views/partials/form/select_group.blade.php @@ -26,7 +26,7 @@ @if (!empty($attributes['v-model'])) @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="form.errors.clear("{{ 'form.' . $attributes['data-field'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;" @endif diff --git a/resources/views/partials/form/select_group_add_new_group.blade.php b/resources/views/partials/form/select_group_add_new_group.blade.php index 9227a2596..2831a5817 100644 --- a/resources/views/partials/form/select_group_add_new_group.blade.php +++ b/resources/views/partials/form/select_group_add_new_group.blade.php @@ -48,11 +48,11 @@ :group="true" @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event; form.errors.clear('{{ $name }}');" @endif @if (!empty($attributes['change'])) diff --git a/resources/views/partials/form/select_group_group.blade.php b/resources/views/partials/form/select_group_group.blade.php index 524ea79c4..1540e0b73 100644 --- a/resources/views/partials/form/select_group_group.blade.php +++ b/resources/views/partials/form/select_group_group.blade.php @@ -26,11 +26,11 @@ :group="true" @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (!empty($attributes['change'])) diff --git a/resources/views/partials/form/select_remote_group.blade.php b/resources/views/partials/form/select_remote_group.blade.php index ccc8dae82..e7070acd9 100644 --- a/resources/views/partials/form/select_remote_group.blade.php +++ b/resources/views/partials/form/select_remote_group.blade.php @@ -24,11 +24,11 @@ @endif @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (!empty($attributes['change'])) diff --git a/resources/views/partials/form/time_group.blade.php b/resources/views/partials/form/time_group.blade.php index d4adaf532..c60ca26f8 100644 --- a/resources/views/partials/form/time_group.blade.php +++ b/resources/views/partials/form/time_group.blade.php @@ -33,11 +33,11 @@ }" @if (!empty($attributes['v-model'])) - @interface="{{ $attributes['v-model'] . ' = $event' }}" + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" @elseif (!empty($attributes['data-field'])) - @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.{{ $name }} = $event" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event" @endif @if (isset($attributes['readonly'])) From 6ca0ec5522bfa25833227e2b423d8a53c17cb632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 12 Jun 2020 17:32:00 +0300 Subject: [PATCH 050/208] check module status before showing widget --- app/Http/Controllers/Common/Dashboards.php | 7 +++++++ app/Utilities/Widgets.php | 22 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index c3f245197..39fdae997 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -10,6 +10,7 @@ use App\Jobs\Common\UpdateDashboard; use App\Models\Common\Company; use App\Models\Common\Dashboard; use App\Models\Common\Widget; +use App\Models\Module\Module; use App\Traits\DateTime; use App\Traits\Users; use App\Utilities\Widgets; @@ -68,6 +69,12 @@ class Dashboards extends Controller } $widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) { + if ($alias = Widgets::getModuleAlias($widget->class)) { + if (!Module::alias($alias)->enabled()->first()) { + return false; + } + } + return Widgets::canRead($widget->class); }); diff --git a/app/Utilities/Widgets.php b/app/Utilities/Widgets.php index 2038e114f..aaad77430 100644 --- a/app/Utilities/Widgets.php +++ b/app/Utilities/Widgets.php @@ -100,8 +100,8 @@ class Widgets $prefix = 'read-'; // Add module - if (strtolower($arr[0]) == 'modules') { - $prefix .= Str::kebab($arr[1]) . '-'; + if ($alias = Widgets::getModuleAlias($class)) { + $prefix .= $alias . '-'; } $prefix .= 'widgets-'; @@ -117,4 +117,22 @@ class Widgets { return (new $class())->getDefaultName(); } + + public static function isModule($class) + { + $arr = explode('\\', $class); + + return (strtolower($arr[0]) == 'modules'); + } + + public static function getModuleAlias($class) + { + if (!static::isModule($class)) { + return false; + } + + $arr = explode('\\', $class); + + return Str::kebab($arr[1]); + } } From e1743e1f8ffa21fd2895c14fb8839dd064bdda79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 13 Jun 2020 00:13:39 +0300 Subject: [PATCH 051/208] improved widget/report permissions --- app/Http/Controllers/Common/Dashboards.php | 9 +---- app/Http/Controllers/Common/Reports.php | 10 +++--- app/Utilities/Reports.php | 40 ++++++++++++++++++++-- app/Utilities/Widgets.php | 24 +++++++++++-- 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index 39fdae997..93f20c636 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -10,7 +10,6 @@ use App\Jobs\Common\UpdateDashboard; use App\Models\Common\Company; use App\Models\Common\Dashboard; use App\Models\Common\Widget; -use App\Models\Module\Module; use App\Traits\DateTime; use App\Traits\Users; use App\Utilities\Widgets; @@ -69,13 +68,7 @@ class Dashboards extends Controller } $widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) { - if ($alias = Widgets::getModuleAlias($widget->class)) { - if (!Module::alias($alias)->enabled()->first()) { - return false; - } - } - - return Widgets::canRead($widget->class); + return Widgets::canShow($widget->class); }); $financial_start = $this->getFinancialStart()->format('Y-m-d'); diff --git a/app/Http/Controllers/Common/Reports.php b/app/Http/Controllers/Common/Reports.php index bfb075f36..93a5fcbf5 100644 --- a/app/Http/Controllers/Common/Reports.php +++ b/app/Http/Controllers/Common/Reports.php @@ -25,7 +25,7 @@ class Reports extends Controller $reports = Report::orderBy('name')->get(); foreach ($reports as $report) { - if (!Utility::canRead($report->class)) { + if (!Utility::canShow($report->class)) { continue; } @@ -56,7 +56,7 @@ class Reports extends Controller */ public function show(Report $report) { - if (!Utility::canRead($report->class)) { + if (!Utility::canShow($report->class)) { abort(403); } @@ -203,7 +203,7 @@ class Reports extends Controller */ public function print(Report $report) { - if (!Utility::canRead($report->class)) { + if (!Utility::canShow($report->class)) { abort(403); } @@ -218,7 +218,7 @@ class Reports extends Controller */ public function export(Report $report) { - if (!Utility::canRead($report->class)) { + if (!Utility::canShow($report->class)) { abort(403); } @@ -263,7 +263,7 @@ class Reports extends Controller public function clear() { Report::all()->each(function ($report) { - if (!Utility::canRead($report->class)) { + if (!Utility::canShow($report->class)) { return; } diff --git a/app/Utilities/Reports.php b/app/Utilities/Reports.php index 8e6b26727..62bb8ba82 100644 --- a/app/Utilities/Reports.php +++ b/app/Utilities/Reports.php @@ -56,6 +56,11 @@ class Reports return new $class($model, $load_data); } + public static function canShow($class) + { + return (static::isModuleEnabled($class) && static::canRead($class)); + } + public static function canRead($class) { return user()->can(static::getPermission($class)); @@ -68,8 +73,8 @@ class Reports $prefix = 'read-'; // Add module - if (strtolower($arr[0]) == 'modules') { - $prefix .= Str::kebab($arr[1]) . '-'; + if ($alias = static::getModuleAlias($arr)) { + $prefix .= $alias . '-'; } $prefix .= 'reports-'; @@ -85,4 +90,35 @@ class Reports { return (new $class())->getDefaultName(); } + + public static function isModuleEnabled($class) + { + if (!$alias = static::getModuleAlias($class)) { + return true; + } + + if (Module::alias($alias)->enabled()->first()) { + return true; + } + + return false; + } + + public static function isModule($class) + { + $arr = is_array($class) ? $class : explode('\\', $class); + + return (strtolower($arr[0]) == 'modules'); + } + + public static function getModuleAlias($class) + { + if (!static::isModule($class)) { + return false; + } + + $arr = is_array($class) ? $class : explode('\\', $class); + + return Str::kebab($arr[1]); + } } diff --git a/app/Utilities/Widgets.php b/app/Utilities/Widgets.php index aaad77430..2a858626b 100644 --- a/app/Utilities/Widgets.php +++ b/app/Utilities/Widgets.php @@ -88,6 +88,11 @@ class Widgets return $class->show(...$arguments); } + public static function canShow($class) + { + return (static::isModuleEnabled($class) && static::canRead($class)); + } + public static function canRead($class) { return user()->can(static::getPermission($class)); @@ -100,7 +105,7 @@ class Widgets $prefix = 'read-'; // Add module - if ($alias = Widgets::getModuleAlias($class)) { + if ($alias = static::getModuleAlias($arr)) { $prefix .= $alias . '-'; } @@ -118,9 +123,22 @@ class Widgets return (new $class())->getDefaultName(); } + public static function isModuleEnabled($class) + { + if (!$alias = static::getModuleAlias($class)) { + return true; + } + + if (Module::alias($alias)->enabled()->first()) { + return true; + } + + return false; + } + public static function isModule($class) { - $arr = explode('\\', $class); + $arr = is_array($class) ? $class : explode('\\', $class); return (strtolower($arr[0]) == 'modules'); } @@ -131,7 +149,7 @@ class Widgets return false; } - $arr = explode('\\', $class); + $arr = is_array($class) ? $class : explode('\\', $class); return Str::kebab($arr[1]); } From 1934b93353d1189466c0ac84548de9dbc03bd5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 13 Jun 2020 14:23:09 +0300 Subject: [PATCH 052/208] version update 2.0.14 to 2.0.15 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index e450421ea..33d204bdb 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '0', - 'patch' => '14', + 'patch' => '15', 'build' => '', 'status' => 'Stable', - 'date' => '10-Jun-2020', + 'date' => '13-Jun-2020', - 'time' => '23:00', + 'time' => '10:00', 'zone' => 'GMT +3', From 776bf183e6090d6e7a71e1706a258ed3cbc90c9a Mon Sep 17 00:00:00 2001 From: Billy Bouman Date: Sun, 14 Jun 2020 13:51:20 +0200 Subject: [PATCH 053/208] Added direct access prevention for Apache 2.4 --- .htaccess | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 8e48aefdb..d6cc946a1 100644 --- a/.htaccess +++ b/.htaccess @@ -13,8 +13,15 @@ # Prevent Direct Access to Protected Files - Order deny,allow - Deny from all + # Apache 2.2 syntax + + Order deny,allow + Deny from all + + # Apache 2.4 syntax + + Require all denied + # Prevent Direct Access To Protected Folders From 3902bcd18de8ce0ab3bc03de4f1c794238c4f5c3 Mon Sep 17 00:00:00 2001 From: Shahal Tharique Date: Sun, 14 Jun 2020 23:51:52 +0530 Subject: [PATCH 054/208] Added support for db prefix in command line installer --- app/Console/Commands/Install.php | 8 ++++++-- app/Utilities/Installer.php | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php index 8e759f50b..46207a9a0 100644 --- a/app/Console/Commands/Install.php +++ b/app/Console/Commands/Install.php @@ -15,6 +15,7 @@ class Install extends Command const OPT_DB_NAME = 'db-name'; const OPT_DB_USERNAME = 'db-username'; const OPT_DB_PASSWORD = 'db-password'; + const OPT_DB_PREFIX = 'db-prefix'; const OPT_COMPANY_NAME = 'company-name'; const OPT_COMPANY_EMAIL = 'company-email'; const OPT_ADMIN_EMAIL = 'admin-email'; @@ -33,6 +34,7 @@ class Install extends Command {--db-name= : Name of the database} {--db-username=root : Username to use to access the database} {--db-password= : Password to use to access the database} + {--db-prefix= : Table name prefix} {--company-name=My Company : Name of the company} {--company-email=my@company.com : Email of the company} {--admin-email= : Admin user email} @@ -102,10 +104,11 @@ class Install extends Command 'OPT_DB_NAME', 'OPT_DB_USERNAME', 'OPT_DB_PASSWORD', + 'OPT_DB_PREFIX', 'OPT_COMPANY_NAME', 'OPT_COMPANY_EMAIL', 'OPT_ADMIN_EMAIL', - 'OPT_ADMIN_PASSWORD', + 'OPT_ADMIN_PASSWORD' ]; foreach ($contants as $const) { @@ -177,10 +180,11 @@ class Install extends Command $this->db_name = $this->option(self::OPT_DB_NAME); $this->db_username = $this->option(self::OPT_DB_USERNAME); $this->db_password = $this->option(self::OPT_DB_PASSWORD); + $this->db_prefix = $this->option(self::OPT_DB_PREFIX); $this->line('Connecting to database ' . $this->db_name . '@' . $this->db_host . ':' . $this->db_port); - if (!Installer::createDbTables($this->db_host, $this->db_port, $this->db_name, $this->db_username, $this->db_password)) { + if (!Installer::createDbTables($this->db_host, $this->db_port, $this->db_name, $this->db_username, $this->db_password, $this->db_prefix)) { $this->error('Error: Could not connect to the database! Please, make sure the details are correct.'); return false; diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index cd44b82c6..d0d8ef7fd 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -141,14 +141,14 @@ class Installer ]); } - public static function createDbTables($host, $port, $database, $username, $password) + public static function createDbTables($host, $port, $database, $username, $password, $prefix = null) { if (!static::isDbValid($host, $port, $database, $username, $password)) { return false; } // Set database details - static::saveDbVariables($host, $port, $database, $username, $password); + static::saveDbVariables($host, $port, $database, $username, $password, $prefix); // Try to increase the maximum execution time set_time_limit(300); // 5 minutes @@ -199,9 +199,11 @@ class Installer return true; } - public static function saveDbVariables($host, $port, $database, $username, $password) + public static function saveDbVariables($host, $port, $database, $username, $password, $prefix = null) { - $prefix = strtolower(Str::random(3) . '_'); + if (is_null($prefix)){ + $prefix = strtolower(Str::random(3) . '_'); + } // Update .env file static::updateEnv([ From df03edcfff7817a6bdff1be499e7f89fce30a9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 15 Jun 2020 14:30:04 +0300 Subject: [PATCH 055/208] changed dashboard assignment --- app/Http/Controllers/Auth/Login.php | 2 -- app/Http/Controllers/Common/Dashboards.php | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Auth/Login.php b/app/Http/Controllers/Auth/Login.php index d9a188986..9b45ec5f4 100644 --- a/app/Http/Controllers/Auth/Login.php +++ b/app/Http/Controllers/Auth/Login.php @@ -89,8 +89,6 @@ class Login extends Controller return response()->json($response); } - session(['dashboard_id' => $user->dashboards()->enabled()->pluck('id')->first()]); - $response = [ 'status' => null, 'success' => true, diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index 93f20c636..b27a9e4fa 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -51,12 +51,10 @@ class Dashboards extends Controller { $dashboard_id = $dashboard_id ?? session('dashboard_id'); - if (empty($dashboard_id)) { - $dashboard_id = user()->dashboards()->enabled()->pluck('id')->first(); - } - if (!empty($dashboard_id)) { $dashboard = Dashboard::find($dashboard_id); + } else { + $dashboard = user()->dashboards()->enabled()->first(); } if (empty($dashboard)) { @@ -67,6 +65,8 @@ class Dashboards extends Controller ])); } + session(['dashboard_id' => $dashboard->id]); + $widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) { return Widgets::canShow($widget->class); }); From 03e87467c1e8d3f1618abdd0bcbbebae29b81ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 15 Jun 2020 18:56:16 +0300 Subject: [PATCH 056/208] empty check --- resources/views/partials/admin/navbar.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php index c0ca922ef..cfb762792 100644 --- a/resources/views/partials/admin/navbar.blade.php +++ b/resources/views/partials/admin/navbar.blade.php @@ -227,7 +227,7 @@
  • - @if ($user->picture) + @if (!empty($user->picture)) {{ $user->name }} @else {{ $user->name }} From 9c8a7a7af49c13c9171a0a151a605f8b7d45421c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 11:14:04 +0300 Subject: [PATCH 057/208] fixed wizard enable/disable --- app/Http/Middleware/RedirectIfWizardNotCompleted.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Middleware/RedirectIfWizardNotCompleted.php b/app/Http/Middleware/RedirectIfWizardNotCompleted.php index 210f17e15..351842557 100644 --- a/app/Http/Middleware/RedirectIfWizardNotCompleted.php +++ b/app/Http/Middleware/RedirectIfWizardNotCompleted.php @@ -22,7 +22,7 @@ class RedirectIfWizardNotCompleted } // Check url - if (Str::startsWith($request->getPathInfo(), '/wizard')) { + if (Str::startsWith($request->getPathInfo(), '/wizard') || Str::startsWith($request->getPathInfo(), '/settings')) { return $next($request); } From e85b79b357f328f3515e98c851979fe88feed93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 13:44:31 +0300 Subject: [PATCH 058/208] fixed account create test --- tests/Feature/Banking/AccountsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/Banking/AccountsTest.php b/tests/Feature/Banking/AccountsTest.php index 67c2cc965..34ae53172 100644 --- a/tests/Feature/Banking/AccountsTest.php +++ b/tests/Feature/Banking/AccountsTest.php @@ -27,7 +27,7 @@ class AccountsTest extends FeatureTestCase public function testItShouldCreateAccount() { $this->loginAs() - ->post(route('accounts.index'), $this->getRequest()) + ->post(route('accounts.store'), $this->getRequest()) ->assertStatus(200); $this->assertFlashLevel('success'); From 6cf90cb5cdb7280d9daa8e5427d921f801660463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 13:45:17 +0300 Subject: [PATCH 059/208] tests for offline payments and paypal standard --- .../Http/Controllers/Settings.php | 83 +++---------- .../Jobs/CreatePaymentMethod.php | 49 ++++++++ .../Jobs/DeletePaymentMethod.php | 53 +++++++++ .../Jobs/UpdatePaymentMethod.php | 61 ++++++++++ .../Tests/Feature/SettingsTest.php | 109 ++++++++++++++++++ .../Tests/Feature/SettingsTest.php | 45 ++++++++ 6 files changed, 333 insertions(+), 67 deletions(-) create mode 100644 modules/OfflinePayments/Jobs/CreatePaymentMethod.php create mode 100644 modules/OfflinePayments/Jobs/DeletePaymentMethod.php create mode 100644 modules/OfflinePayments/Jobs/UpdatePaymentMethod.php create mode 100644 modules/OfflinePayments/Tests/Feature/SettingsTest.php create mode 100644 modules/PaypalStandard/Tests/Feature/SettingsTest.php diff --git a/modules/OfflinePayments/Http/Controllers/Settings.php b/modules/OfflinePayments/Http/Controllers/Settings.php index 9113d78bd..321c8f74e 100644 --- a/modules/OfflinePayments/Http/Controllers/Settings.php +++ b/modules/OfflinePayments/Http/Controllers/Settings.php @@ -3,11 +3,13 @@ namespace Modules\OfflinePayments\Http\Controllers; use App\Abstracts\Http\Controller; -use App\Utilities\Modules; use Illuminate\Http\Response; use Modules\OfflinePayments\Http\Requests\Setting as Request; use Modules\OfflinePayments\Http\Requests\SettingGet as GRequest; use Modules\OfflinePayments\Http\Requests\SettingDelete as DRequest; +use Modules\OfflinePayments\Jobs\CreatePaymentMethod; +use Modules\OfflinePayments\Jobs\DeletePaymentMethod; +use Modules\OfflinePayments\Jobs\UpdatePaymentMethod; class Settings extends Controller { @@ -32,56 +34,24 @@ class Settings extends Controller */ public function update(Request $request) { - $methods = json_decode(setting('offline-payments.methods'), true); + if (!empty($request->get('update_code'))) { + $payment_method = $this->dispatch(new UpdatePaymentMethod($request)); - if (!empty($request->get('update_code', null))) { - foreach ($methods as $key => $method) { - if ($method['code'] != $request->get('update_code')) { - continue; - } - - $method = explode('.', $request->get('update_code')); - - $methods[$key] = [ - 'code' => 'offline-payments.' . $request->get('code') . '.' . $method[2], - 'name' => $request->get('name'), - 'customer' => $request->get('customer'), - 'order' => $request->get('order'), - 'description' => $request->get('description'), - ]; - } - - $message = trans('messages.success.updated', ['type' => $request['name']]); + $message = trans('messages.success.updated', ['type' => $payment_method['name']]); } else { - $methods[] = [ - 'code' => 'offline-payments.' . $request->get('code') . '.' . (count($methods) + 1), - 'name' => $request->get('name'), - 'customer' => $request->get('customer'), - 'order' => $request->get('order'), - 'description' => $request->get('description'), - ]; + $payment_method = $this->dispatch(new CreatePaymentMethod($request)); - $message = trans('messages.success.added', ['type' => $request->get('name')]); + $message = trans('messages.success.added', ['type' => $payment_method['name']]); } - setting()->set('offline-payments.methods', json_encode($methods)); - - setting()->save(); - - Modules::clearPaymentMethodsCache(); - - $response = [ - 'status' => null, - 'success' => true, - 'error' => false, - 'message' => $message, - 'data' => null, - 'redirect' => route('offline-payments.settings.edit'), - ]; - flash($message)->success(); - return response()->json($response); + return response()->json([ + 'success' => true, + 'error' => false, + 'message' => $message, + 'redirect' => route('offline-payments.settings.edit'), + ]); } /** @@ -132,31 +102,10 @@ class Settings extends Controller */ public function destroy(DRequest $request) { - $code = $request->get('code'); + $payment_method = $this->dispatch(new DeletePaymentMethod($request)); - $methods = json_decode(setting('offline-payments.methods'), true); + $message = trans('messages.success.deleted', ['type' => $payment_method['name']]); - $remove = false; - - foreach ($methods as $key => $method) { - if ($method['code'] != $code) { - continue; - } - - $remove = $methods[$key]; - unset($methods[$key]); - } - - // Set Api Token - setting()->set('offline-payments.methods', json_encode($methods)); - - setting()->save(); - - Modules::clearPaymentMethodsCache(); - - $message = trans('messages.success.deleted', ['type' => $remove['name']]); - - // because it show notification. //flash($message)->success(); return response()->json([ diff --git a/modules/OfflinePayments/Jobs/CreatePaymentMethod.php b/modules/OfflinePayments/Jobs/CreatePaymentMethod.php new file mode 100644 index 000000000..1ac6c223b --- /dev/null +++ b/modules/OfflinePayments/Jobs/CreatePaymentMethod.php @@ -0,0 +1,49 @@ +request = $this->getRequestInstance($request); + } + + /** + * Execute the job. + * + * @return array + */ + public function handle() + { + $methods = json_decode(setting('offline-payments.methods'), true); + + $payment_method = [ + 'code' => 'offline-payments.' . $this->request->get('code') . '.' . (count($methods) + 1), + 'name' => $this->request->get('name'), + 'customer' => $this->request->get('customer'), + 'order' => $this->request->get('order'), + 'description' => $this->request->get('description'), + ]; + + $methods[] = $payment_method; + + setting()->set('offline-payments.methods', json_encode($methods)); + + setting()->save(); + + Modules::clearPaymentMethodsCache(); + + return $payment_method; + } +} diff --git a/modules/OfflinePayments/Jobs/DeletePaymentMethod.php b/modules/OfflinePayments/Jobs/DeletePaymentMethod.php new file mode 100644 index 000000000..e616c62da --- /dev/null +++ b/modules/OfflinePayments/Jobs/DeletePaymentMethod.php @@ -0,0 +1,53 @@ +request = $this->getRequestInstance($request); + } + + /** + * Execute the job. + * + * @return array + */ + public function handle() + { + $methods = json_decode(setting('offline-payments.methods'), true); + + $payment_method = []; + + $code = $this->request->get('code'); + + foreach ($methods as $key => $method) { + if ($method['code'] != $code) { + continue; + } + + $payment_method = $methods[$key]; + + unset($methods[$key]); + } + + setting()->set('offline-payments.methods', json_encode($methods)); + + setting()->save(); + + Modules::clearPaymentMethodsCache(); + + return $payment_method; + } +} diff --git a/modules/OfflinePayments/Jobs/UpdatePaymentMethod.php b/modules/OfflinePayments/Jobs/UpdatePaymentMethod.php new file mode 100644 index 000000000..c13c2e5cc --- /dev/null +++ b/modules/OfflinePayments/Jobs/UpdatePaymentMethod.php @@ -0,0 +1,61 @@ +request = $this->getRequestInstance($request); + } + + /** + * Execute the job. + * + * @return array + */ + public function handle() + { + $methods = json_decode(setting('offline-payments.methods'), true); + + $payment_method = []; + + $code = $this->request->get('update_code'); + + foreach ($methods as $key => $method) { + if ($method['code'] != $code) { + continue; + } + + $method = explode('.', $code); + + $payment_method = [ + 'code' => 'offline-payments.' . $this->request->get('code') . '.' . $method[2], + 'name' => $this->request->get('name'), + 'customer' => $this->request->get('customer'), + 'order' => $this->request->get('order'), + 'description' => $this->request->get('description'), + ]; + + $methods[$key] = $payment_method; + } + + setting()->set('offline-payments.methods', json_encode($methods)); + + setting()->save(); + + Modules::clearPaymentMethodsCache(); + + return $payment_method; + } +} diff --git a/modules/OfflinePayments/Tests/Feature/SettingsTest.php b/modules/OfflinePayments/Tests/Feature/SettingsTest.php new file mode 100644 index 000000000..156ffce02 --- /dev/null +++ b/modules/OfflinePayments/Tests/Feature/SettingsTest.php @@ -0,0 +1,109 @@ +loginAs() + ->get(route('settings.index')) + ->assertStatus(200) + ->assertSeeText(trans('offline-payments::general.description')); + } + + public function testItShouldSeeOfflinePaymentsSettingsListPage() + { + $this->loginAs() + ->get(route('offline-payments.settings.edit')) + ->assertStatus(200) + ->assertSeeText(trans('offline-payments::general.payment_gateways')); + } + + public function testItShouldSeeOfflinePaymentsSettingsCreatePage() + { + $this->loginAs() + ->get(route('offline-payments.settings.edit')) + ->assertStatus(200) + ->assertSeeText(trans('offline-payments::general.add_new')); + } + + public function testItShouldCreateOfflinePaymentsSettings() + { + $request = $this->getRequest(); + + $message = trans('messages.success.added', ['type' => $request['name']]); + + $this->loginAs() + ->post(route('offline-payments.settings.update'), $request) + ->assertStatus(200) + ->assertJson([ + 'success' => true, + 'message' => $message, + ]); + } + + public function testItShouldSeeOfflinePaymentsSettingsUpdatePage() + { + $payment_method = $this->dispatch(new CreatePaymentMethod($this->getRequest())); + + $this->loginAs() + ->post(route('offline-payments.settings.get', ['code' => $payment_method['code']])) + ->assertStatus(200) + ->assertJson([ + 'success' => true, + 'data' => [ + 'name' => $payment_method['name'], + ], + ]); + } + + public function testItShouldUpdateOfflinePaymentsSettings() + { + $request = $this->getRequest(); + + $payment_method = $this->dispatch(new CreatePaymentMethod($request)); + + $request['name'] = $this->faker->text(10); + $request['update_code'] = $payment_method['code']; + + $message = trans('messages.success.updated', ['type' => $request['name']]); + + $this->loginAs() + ->post(route('offline-payments.settings.update'), $request) + ->assertStatus(200) + ->assertJson([ + 'success' => true, + 'message' => $message, + ]); + } + + public function testItShouldDeleteAccount() + { + $payment_method = $this->dispatch(new CreatePaymentMethod($this->getRequest())); + + $message = trans('messages.success.deleted', ['type' => $payment_method['name']]); + + $this->loginAs() + ->delete(route('offline-payments.settings.delete', ['code' => $payment_method['code']])) + ->assertStatus(200) + ->assertJson([ + 'success' => true, + 'message' => $message, + ]); + } + + public function getRequest() + { + return [ + 'name' => $this->faker->text(10), + 'code' => 'offline-payments.cash.99', + 'customer' => 1, + 'order' => 1, + 'description' => $this->faker->paragraph, + ]; + } +} diff --git a/modules/PaypalStandard/Tests/Feature/SettingsTest.php b/modules/PaypalStandard/Tests/Feature/SettingsTest.php new file mode 100644 index 000000000..368f11bf0 --- /dev/null +++ b/modules/PaypalStandard/Tests/Feature/SettingsTest.php @@ -0,0 +1,45 @@ +loginAs() + ->get(route('settings.index')) + ->assertStatus(200) + ->assertSeeText(trans('paypal-standard::general.description')); + } + + public function testItShouldSeePaypalStandardSettingsUpdatePage() + { + $this->loginAs() + ->get(route('settings.module.edit', ['alias' => 'paypal-standard'])) + ->assertStatus(200); + } + + public function testItShouldUpdatePaypalStandardSettings() + { + $this->loginAs() + ->patch(route('settings.module.edit', ['alias' => 'paypal-standard']), $this->getRequest()) + ->assertStatus(200); + + $this->assertFlashLevel('success'); + } + + public function getRequest() + { + return [ + 'name' => $this->faker->name, + 'email' => $this->faker->safeEmail, + 'mode' => 'sandbox', + 'transaction' => 'sale', + 'customer' => 1, + 'debug' => 1, + 'order' => 1, + ]; + } +} From 85d77117483f8471d86f19753f394a693afc19e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 14:02:02 +0300 Subject: [PATCH 060/208] formatting --- app/Utilities/Installer.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index d0d8ef7fd..36d067e37 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -201,9 +201,7 @@ class Installer public static function saveDbVariables($host, $port, $database, $username, $password, $prefix = null) { - if (is_null($prefix)){ - $prefix = strtolower(Str::random(3) . '_'); - } + $prefix = !is_null($prefix) ? $prefix : strtolower(Str::random(3) . '_'); // Update .env file static::updateEnv([ From b478508b599518210e6dfb380178a58e72fd80e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 14:56:32 +0300 Subject: [PATCH 061/208] fixed rollback --- database/migrations/2017_09_14_000000_core_v1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2017_09_14_000000_core_v1.php b/database/migrations/2017_09_14_000000_core_v1.php index fd45d6176..316bb6745 100644 --- a/database/migrations/2017_09_14_000000_core_v1.php +++ b/database/migrations/2017_09_14_000000_core_v1.php @@ -568,8 +568,8 @@ class CoreV1 extends Migration Schema::drop('items'); Schema::drop('jobs'); Schema::drop('failed_jobs'); - Schema::drop('media'); Schema::drop('mediables'); + Schema::drop('media'); Schema::drop('modules'); Schema::drop('module_histories'); Schema::drop('notifications'); From 1b8aa23371b98eea4cc0121eb377985c4d630aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 14:56:55 +0300 Subject: [PATCH 062/208] fixed #1487 --- resources/views/wizard/currencies/index.blade.php | 4 ++-- resources/views/wizard/finish/index.blade.php | 2 +- resources/views/wizard/taxes/index.blade.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php index e77eb2508..02fcace59 100644 --- a/resources/views/wizard/currencies/index.blade.php +++ b/resources/views/wizard/currencies/index.blade.php @@ -125,13 +125,13 @@
    - {{ trans('modules.back') }} + {{ trans('pagination.previous') }}
    - {{ trans('general.skip') }} + {{ trans('pagination.next') }}
    diff --git a/resources/views/wizard/finish/index.blade.php b/resources/views/wizard/finish/index.blade.php index 2baa55f5c..9a6767650 100644 --- a/resources/views/wizard/finish/index.blade.php +++ b/resources/views/wizard/finish/index.blade.php @@ -52,7 +52,7 @@
    - {{ trans('modules.back') }} + {{ trans('pagination.previous') }}
    diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php index d048285fe..846b99998 100644 --- a/resources/views/wizard/taxes/index.blade.php +++ b/resources/views/wizard/taxes/index.blade.php @@ -108,13 +108,13 @@
    - {{ trans('modules.back') }} + {{ trans('pagination.previous') }}
    - {{ trans('general.skip') }} + {{ trans('pagination.next') }}
    From 43d1dea4a4eefb6b23303b7ab2e2bc818f35b799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 17 Jun 2020 16:07:47 +0300 Subject: [PATCH 063/208] added install:refresh command --- app/Console/Commands/Install.php | 19 ++++---- app/Console/Commands/InstallRefresh.php | 58 +++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 app/Console/Commands/InstallRefresh.php diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php index 46207a9a0..5e3602ea8 100644 --- a/app/Console/Commands/Install.php +++ b/app/Console/Commands/Install.php @@ -57,7 +57,7 @@ class Install extends Command public function handle() { if (($missing_options = $this->getMissingOptions()) && $this->option(self::OPT_NO_INTERACTION)) { - $this->line('❌ Some options are missing and --no-interaction is present. Please run the following command for more informations :'); + $this->line('❌ Some options are missing and --no-interaction is present. Please run the following command for more information :'); $this->line('❌ php artisan help install'); $this->line('❌ Missing options are : ' . implode(', ', $missing_options)); @@ -111,6 +111,8 @@ class Install extends Command 'OPT_ADMIN_PASSWORD' ]; + $allowed_empty = ['db_password', 'db_prefix']; + foreach ($contants as $const) { $option = constant("self::$const"); @@ -118,14 +120,15 @@ class Install extends Command $this->$property = $this->option($option); - if (empty($this->$property)) { - // Allow empty password - if ($property == 'db_password') { - continue; - } - - $missing_options[] = $option; + if (!empty($this->$property)) { + continue; } + + if (in_array($property, $allowed_empty)) { + continue; + } + + $missing_options[] = $option; } return $missing_options; diff --git a/app/Console/Commands/InstallRefresh.php b/app/Console/Commands/InstallRefresh.php new file mode 100644 index 000000000..fc2928ac7 --- /dev/null +++ b/app/Console/Commands/InstallRefresh.php @@ -0,0 +1,58 @@ +info('Resetting migrations'); + $this->callSilent('migrate:reset', [ + '--force' => true, + ]); + + $this->info('Installing Akaunting'); + $this->callSilent('install', [ + '--db-host' => env('DB_HOST'), + '--db-port' => env('DB_PORT'), + '--db-name' => env('DB_DATABASE'), + '--db-username' => env('DB_USERNAME'), + '--db-password' => env('DB_PASSWORD'), + '--db-prefix' => env('DB_PREFIX'), + '--company-name' => $company->name, + '--company-email' => $company->email, + '--admin-email' => $user->email, + '--admin-password' => $this->option('admin-password'), + '--locale' => $company->locale, + '--no-interaction' => true, + ]); + + $this->info('Installation refreshed'); + } +} From fc3f9ff6ccfbb5f9dee9fbde6c4c25746d39968f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 17 Jun 2020 23:07:31 +0300 Subject: [PATCH 064/208] Apps cache key changes --- app/Traits/Modules.php | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index be29a8507..f3083528b 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -36,7 +36,7 @@ trait Modules // Get All Modules public function getModules($data = []) { - $key = 'apps.items.page.' . $this->getPageNumber($data); + $key = 'apps.app.' . $this->getDataKey($data); $items = Cache::get($key); @@ -61,7 +61,7 @@ trait Modules public function getDocumentation($alias) { - $key = 'apps.docs.' . $alias; + $key = 'apps.' . $alias . '.docs.' . $this->getDataKey($data); $documentation = Cache::get($key); @@ -78,7 +78,7 @@ trait Modules public function getModuleReviews($alias, $data = []) { - $key = 'apps.' . $alias . '.reviews.page.'. $this->getPageNumber($data); + $key = 'apps.' . $alias . '.reviews.' . $this->getDataKey($data); $reviews = Cache::get($key); @@ -95,7 +95,7 @@ trait Modules public function getCategories($data = []) { - $key = 'apps.categories.page.' . $this->getPageNumber($data); + $key = 'apps.categories.' . $this->getDataKey($data); $categories = Cache::get($key); @@ -112,7 +112,7 @@ trait Modules public function getModulesByCategory($alias, $data = []) { - $key = 'apps.categories.' . $alias . '.page.' . $this->getPageNumber($data); + $key = 'apps.categories.' . $alias . '.' . $this->getDataKey($data); $category = Cache::get($key); @@ -129,7 +129,7 @@ trait Modules public function getVendors($data = []) { - $key = 'apps.vendors.page.' . $this->getPageNumber($data); + $key = 'apps.vendors.' . $this->getDataKey($data); $vendors = Cache::get($key); @@ -146,7 +146,7 @@ trait Modules public function getModulesByVendor($alias, $data = []) { - $key = 'apps.vendors.' . $alias . '.page.' . $this->getPageNumber($data); + $key = 'apps.vendors.' . $alias . '.' . $this->getDataKey($data); $vendor = Cache::get($key); @@ -195,7 +195,7 @@ trait Modules public function getPreSaleModules($data = []) { - $key = 'apps.pre_sale.page.' . $this->getPageNumber($data); + $key = 'apps.pre_sale.' . $this->getDataKey($data); $pre_sale = Cache::get($key); @@ -212,7 +212,7 @@ trait Modules public function getPaidModules($data = []) { - $key = 'apps.paid.page.' . $this->getPageNumber($data); + $key = 'apps.paid.' . $this->getDataKey($data); $paid = Cache::get($key); @@ -229,7 +229,7 @@ trait Modules public function getNewModules($data = []) { - $key = 'apps.new.page.' . $this->getPageNumber($data); + $key = 'apps.new.' . $this->getDataKey($data); $new = Cache::get($key); @@ -246,7 +246,7 @@ trait Modules public function getFreeModules($data = []) { - $key = 'apps.free.page.' . $this->getPageNumber($data); + $key = 'apps.free.' . $this->getDataKey($data); $free = Cache::get($key); @@ -263,7 +263,7 @@ trait Modules public function getFeaturedModules($data = []) { - $key = 'apps.featured.page.' . $this->getPageNumber($data); + $key = 'apps.featured.' . $this->getDataKey($data); $featured = Cache::get($key); @@ -663,4 +663,21 @@ trait Modules return $data['query']['page']; } + + public function getDataKey($data = []) + { + $result = 'language.' . app()->getLocale() . '.page.' . $this->getPageNumber($data); + + if (isset($data['query']['page'])) { + unset($data['query']['page']); + } + + if (isset($data['query'])){ + foreach($data['query'] as $key => $value) { + $result .= '.' . $key . '.' . $value; + } + } + + return $result; + } } From 0140a248d67523ede0197d76b105c5860579a653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 18 Jun 2020 17:33:55 +0300 Subject: [PATCH 065/208] sort language --- app/Traits/Modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index f3083528b..5a81573fd 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -666,7 +666,7 @@ trait Modules public function getDataKey($data = []) { - $result = 'language.' . app()->getLocale() . '.page.' . $this->getPageNumber($data); + $result = 'language.' . language()->getShortCode() . '.page.' . $this->getPageNumber($data); if (isset($data['query']['page'])) { unset($data['query']['page']); From 306ab0af08f9e081caf29b1fd7ab49ce29a204b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 20 Jun 2020 11:55:28 +0300 Subject: [PATCH 066/208] object check --- resources/views/auth/users/index.blade.php | 2 +- resources/views/partials/admin/navbar.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/auth/users/index.blade.php b/resources/views/auth/users/index.blade.php index 615afd749..d3f785b66 100644 --- a/resources/views/auth/users/index.blade.php +++ b/resources/views/auth/users/index.blade.php @@ -55,7 +55,7 @@ @if (setting('default.use_gravatar', '0') == '1') {{ $item->name }} - @elseif ($item->picture) + @elseif (is_object($item->picture)) {{ $item->name }} @else {{ $item->name }} diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php index cfb762792..e3192d2ba 100644 --- a/resources/views/partials/admin/navbar.blade.php +++ b/resources/views/partials/admin/navbar.blade.php @@ -227,7 +227,7 @@
  • - @if (!empty($user->picture)) + @if (is_object($user->picture)) {{ $user->name }} @else {{ $user->name }} From 15a0fdca5eb47ec09577b14421a06afd32538018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 20 Jun 2020 12:15:39 +0300 Subject: [PATCH 067/208] make sure is int --- app/Models/Setting/Category.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php index 3ad11959b..d180f41a0 100644 --- a/app/Models/Setting/Category.php +++ b/app/Models/Setting/Category.php @@ -125,6 +125,6 @@ class Category extends Model */ public function scopeTransfer($query) { - return $query->where($this->table . '.type', '=', 'other')->pluck('id')->first(); + return (int) $query->other()->pluck('id')->first(); } } From 4a2babce94731df7a468d8b7680843631704b142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 20 Jun 2020 12:59:47 +0300 Subject: [PATCH 068/208] pluck enabled dashboards --- app/Http/Controllers/Common/Companies.php | 2 +- app/Http/Controllers/Common/Dashboards.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php index 96ca00d8b..02e13fcdd 100644 --- a/app/Http/Controllers/Common/Companies.php +++ b/app/Http/Controllers/Common/Companies.php @@ -213,7 +213,7 @@ class Companies extends Controller $old_company_id = session('company_id'); session(['company_id' => $company->id]); - session(['dashboard_id' => $company->dashboards()->pluck('id')->first()]); + session(['dashboard_id' => user()->dashboards()->enabled()->pluck('id')->first()]); Overrider::load('settings'); diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index b27a9e4fa..7a23b2b52 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -215,7 +215,7 @@ class Dashboards extends Controller flash($message)->success(); - session(['dashboard_id' => user()->dashboards()->pluck('id')->first()]); + session(['dashboard_id' => user()->dashboards()->enabled()->pluck('id')->first()]); } else { $message = $response['message']; From 395ae5dee1f7153cf08246151ae0810b79dfee7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 21 Jun 2020 01:27:20 +0300 Subject: [PATCH 069/208] added db asserts --- tests/Feature/Auth/PermissionsTest.php | 18 ++++++-- tests/Feature/Auth/RolesTest.php | 25 +++++++++-- tests/Feature/Auth/UsersTest.php | 41 ++++++++++++++++--- tests/Feature/Banking/AccountsTest.php | 18 ++++++-- tests/Feature/Banking/ReconciliationsTest.php | 16 +++++--- tests/Feature/Common/DashboardsTest.php | 29 ++++++++++--- tests/Feature/Common/ItemsTest.php | 18 ++++++-- 7 files changed, 137 insertions(+), 28 deletions(-) diff --git a/tests/Feature/Auth/PermissionsTest.php b/tests/Feature/Auth/PermissionsTest.php index c55779b46..58f5ed146 100644 --- a/tests/Feature/Auth/PermissionsTest.php +++ b/tests/Feature/Auth/PermissionsTest.php @@ -26,16 +26,22 @@ class PermissionsTest extends FeatureTestCase public function testItShouldCreatePermission() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('permissions.store'), $this->getRequest()) + ->post(route('permissions.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('permissions', $request); } public function testItShouldSeePermissionUpdatePage() { - $permission = $this->dispatch(new CreatePermission($this->getRequest())); + $request = $this->getRequest(); + + $permission = $this->dispatch(new CreatePermission($request)); $this->loginAs() ->get(route('permissions.edit', $permission->id)) @@ -57,11 +63,15 @@ class PermissionsTest extends FeatureTestCase ->assertSee($request['display_name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('permissions', $request); } public function testItShouldDeletePermission() { - $permission = $this->dispatch(new CreatePermission($this->getRequest())); + $request = $this->getRequest(); + + $permission = $this->dispatch(new CreatePermission($request)); $this->loginAs() ->delete(route('permissions.destroy', $permission->id)) @@ -69,6 +79,8 @@ class PermissionsTest extends FeatureTestCase $this->assertFlashLevel('success'); + $this->assertDatabaseMissing('permissions', $request); + } public function getRequest() diff --git a/tests/Feature/Auth/RolesTest.php b/tests/Feature/Auth/RolesTest.php index a8888b3ec..f585d78bc 100644 --- a/tests/Feature/Auth/RolesTest.php +++ b/tests/Feature/Auth/RolesTest.php @@ -26,16 +26,22 @@ class RolesTest extends FeatureTestCase public function testItShouldCreateRole() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('roles.store'), $this->getRequest()) + ->post(route('roles.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('roles', $this->getAssertRequest($request)); } public function testItShouldSeeRoleUpdatePage() { - $role = $this->dispatch(new CreateRole($this->getRequest())); + $request = $this->getRequest(); + + $role = $this->dispatch(new CreateRole($request)); $this->loginAs() ->get(route('roles.edit', $role->id)) @@ -57,21 +63,34 @@ class RolesTest extends FeatureTestCase ->assertSee($request['display_name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('roles', $this->getAssertRequest($request)); } public function testItShouldDeleteRole() { - $role = $this->dispatch(new CreateRole($this->getRequest())); + $request = $this->getRequest(); + + $role = $this->dispatch(new CreateRole($request)); $this->loginAs() ->delete(route('roles.destroy', $role->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseMissing('roles', $this->getAssertRequest($request)); } public function getRequest() { return factory(Role::class)->states('permissions')->raw(); } + + public function getAssertRequest($request) + { + unset($request['permissions']); + + return $request; + } } diff --git a/tests/Feature/Auth/UsersTest.php b/tests/Feature/Auth/UsersTest.php index d251d2c66..f383844e3 100644 --- a/tests/Feature/Auth/UsersTest.php +++ b/tests/Feature/Auth/UsersTest.php @@ -26,16 +26,22 @@ class UsersTest extends FeatureTestCase public function testItShouldCreateUser() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('users.store'), $this->getRequest()) + ->post(route('users.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('users', $this->getAssertRequest($request)); } public function testItShouldSeeUserUpdatePage() { - $user = $this->dispatch(new CreateUser($this->getRequest())); + $request = $this->getRequest(); + + $user = $this->dispatch(new CreateUser($request)); $this->loginAs() ->get(route('users.edit', $user->id)) @@ -57,17 +63,23 @@ class UsersTest extends FeatureTestCase ->assertSee($request['email']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('users', $this->getAssertRequest($request)); } public function testItShouldDeleteUser() { - $user = $this->dispatch(new CreateUser($this->getRequest())); + $request = $this->getRequest(); + + $user = $this->dispatch(new CreateUser($request)); $this->loginAs() ->delete(route('users.destroy', $user->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('users', $this->getAssertRequest($request)); } public function testItShouldSeeLoginPage() @@ -79,7 +91,9 @@ class UsersTest extends FeatureTestCase public function testItShouldLoginUser() { - $user = $this->dispatch(new CreateUser($this->getRequest())); + $request = $this->getRequest(); + + $user = $this->dispatch(new CreateUser($request)); $this->post(route('login'), ['email' => $user->email, 'password' => $user->password]) ->assertStatus(200); @@ -89,7 +103,9 @@ class UsersTest extends FeatureTestCase public function testItShouldNotLoginUser() { - $user = $this->dispatch(new CreateUser($this->getRequest())); + $request = $this->getRequest(); + + $user = $this->dispatch(new CreateUser($request)); $this->post(route('login'), ['email' => $user->email, 'password' => $this->faker->password()]) ->assertStatus(200); @@ -99,7 +115,9 @@ class UsersTest extends FeatureTestCase public function testItShouldLogoutUser() { - $user = $this->dispatch(new CreateUser($this->getRequest())); + $request = $this->getRequest(); + + $user = $this->dispatch(new CreateUser($request)); $this->loginAs() ->get(route('logout', $user->id)) @@ -113,4 +131,15 @@ class UsersTest extends FeatureTestCase { return factory(User::class)->states('enabled')->raw(); } + + public function getAssertRequest($request) + { + unset($request['password']); + unset($request['password_confirmation']); + unset($request['remember_token']); + unset($request['roles']); + unset($request['companies']); + + return $request; + } } diff --git a/tests/Feature/Banking/AccountsTest.php b/tests/Feature/Banking/AccountsTest.php index 34ae53172..19264786d 100644 --- a/tests/Feature/Banking/AccountsTest.php +++ b/tests/Feature/Banking/AccountsTest.php @@ -26,16 +26,22 @@ class AccountsTest extends FeatureTestCase public function testItShouldCreateAccount() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('accounts.store'), $this->getRequest()) + ->post(route('accounts.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('accounts', $request); } public function testItShouldSeeAccountUpdatePage() { - $account = $this->dispatch(new CreateAccount($this->getRequest())); + $request = $this->getRequest(); + + $account = $this->dispatch(new CreateAccount($request)); $this->loginAs() ->get(route('accounts.edit', $account->id)) @@ -57,17 +63,23 @@ class AccountsTest extends FeatureTestCase ->assertSee($request['name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('accounts', $request); } public function testItShouldDeleteAccount() { - $account = $this->dispatch(new CreateAccount($this->getRequest())); + $request = $this->getRequest(); + + $account = $this->dispatch(new CreateAccount($request)); $this->loginAs() ->delete(route('accounts.destroy', $account->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('accounts', $request); } public function getRequest() diff --git a/tests/Feature/Banking/ReconciliationsTest.php b/tests/Feature/Banking/ReconciliationsTest.php index ae94d55bd..254d020ea 100644 --- a/tests/Feature/Banking/ReconciliationsTest.php +++ b/tests/Feature/Banking/ReconciliationsTest.php @@ -25,8 +25,10 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldCreateReconciliation() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('reconciliations.store'), $this->getReconciliationRequest()) + ->post(route('reconciliations.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); @@ -34,7 +36,9 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldSeeReconciliationUpdatePage() { - $reconciliation = $this->dispatch(new CreateReconciliation($this->getReconciliationRequest())); + $request = $this->getRequest(); + + $reconciliation = $this->dispatch(new CreateReconciliation($request)); $this->loginAs() ->get(route('reconciliations.edit', $reconciliation->id)) @@ -44,7 +48,7 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldUpdateReconciliation() { - $request = $this->getReconciliationRequest(); + $request = $this->getRequest(); $reconciliation= $this->dispatch(new CreateReconciliation($request)); @@ -59,7 +63,9 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldDeleteReconciliation() { - $reconciliation = $this->dispatch(new CreateReconciliation($this->getReconciliationRequest())); + $request = $this->getRequest(); + + $reconciliation = $this->dispatch(new CreateReconciliation($request)); $this->loginAs() ->delete(route('reconciliations.destroy', $reconciliation->id)) @@ -68,7 +74,7 @@ class ReconciliationsTest extends FeatureTestCase $this->assertFlashLevel('success'); } - private function getReconciliationRequest() + private function getRequest() { return [ 'company_id' => $this->company->id, diff --git a/tests/Feature/Common/DashboardsTest.php b/tests/Feature/Common/DashboardsTest.php index b8d1166af..142682358 100644 --- a/tests/Feature/Common/DashboardsTest.php +++ b/tests/Feature/Common/DashboardsTest.php @@ -34,16 +34,22 @@ class DashboardsTest extends FeatureTestCase public function testItShouldCreateDashboard() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('dashboards.store'), $this->getRequest()) + ->post(route('dashboards.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('dashboards', $this->getAssertRequest($request)); } public function testItShouldSeeDashboardUpdatePage() { - $dashboard = $this->dispatch(new CreateDashboard($this->getRequest())); + $request = $this->getRequest(); + + $dashboard = $this->dispatch(new CreateDashboard($request)); $this->loginAs() ->get(route('dashboards.edit', $dashboard->id)) @@ -65,22 +71,35 @@ class DashboardsTest extends FeatureTestCase ->assertSee($request['name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('dashboards', $this->getAssertRequest($request)); } public function testItShouldDeleteDashboard() { - $dashboard_1 = $this->dispatch(new CreateDashboard($this->getRequest())); - $dashboard_2 = $this->dispatch(new CreateDashboard($this->getRequest())); + $request = $this->getRequest(); + + $tmp = $this->dispatch(new CreateDashboard($this->getRequest())); + $dashboard = $this->dispatch(new CreateDashboard($request)); $this->loginAs() - ->delete(route('dashboards.destroy', $dashboard_2->id)) + ->delete(route('dashboards.destroy', $dashboard->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('dashboards', $this->getAssertRequest($request)); } public function getRequest() { return factory(Dashboard::class)->states('enabled', 'users')->raw(); } + + public function getAssertRequest($request) + { + unset($request['users']); + + return $request; + } } diff --git a/tests/Feature/Common/ItemsTest.php b/tests/Feature/Common/ItemsTest.php index 7d12566ff..221278962 100644 --- a/tests/Feature/Common/ItemsTest.php +++ b/tests/Feature/Common/ItemsTest.php @@ -26,16 +26,22 @@ class ItemsTest extends FeatureTestCase public function testItShouldCreateItem() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('items.store'), $this->getRequest()) + ->post(route('items.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('items', $request); } public function testItShouldSeeItemUpdatePage() { - $item = $this->dispatch(new CreateItem($this->getRequest())); + $request = $this->getRequest(); + + $item = $this->dispatch(new CreateItem($request)); $this->loginAs() ->get(route('items.edit', $item->id)) @@ -57,17 +63,23 @@ class ItemsTest extends FeatureTestCase ->assertSee($request['name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('items', $request); } public function testItShouldDeleteItem() { - $item = $this->dispatch(new CreateItem($this->getRequest())); + $request = $this->getRequest(); + + $item = $this->dispatch(new CreateItem($request)); $this->loginAs() ->delete(route('items.destroy', $item->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('items', $request); } public function getRequest() From b80d6060c7c6ea90d15376fee008e9f209f1c060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 21 Jun 2020 01:34:44 +0300 Subject: [PATCH 070/208] styling --- tests/Feature/Auth/PermissionsTest.php | 13 ++++++------- tests/Feature/Auth/RolesTest.php | 12 ++++++------ tests/Feature/Auth/UsersTest.php | 18 +++++++++--------- tests/Feature/Banking/AccountsTest.php | 10 +++++----- tests/Feature/Banking/ReconciliationsTest.php | 6 +++--- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/tests/Feature/Auth/PermissionsTest.php b/tests/Feature/Auth/PermissionsTest.php index 58f5ed146..ad7f7a334 100644 --- a/tests/Feature/Auth/PermissionsTest.php +++ b/tests/Feature/Auth/PermissionsTest.php @@ -26,7 +26,7 @@ class PermissionsTest extends FeatureTestCase public function testItShouldCreatePermission() { - $request = $this->getRequest(); + $request = $this->getRequest(); $this->loginAs() ->post(route('permissions.store'), $request) @@ -34,12 +34,12 @@ class PermissionsTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('permissions', $request); + $this->assertDatabaseHas('permissions', $request); } public function testItShouldSeePermissionUpdatePage() { - $request = $this->getRequest(); + $request = $this->getRequest(); $permission = $this->dispatch(new CreatePermission($request)); @@ -64,12 +64,12 @@ class PermissionsTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('permissions', $request); + $this->assertDatabaseHas('permissions', $request); } public function testItShouldDeletePermission() { - $request = $this->getRequest(); + $request = $this->getRequest(); $permission = $this->dispatch(new CreatePermission($request)); @@ -79,8 +79,7 @@ class PermissionsTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseMissing('permissions', $request); - + $this->assertDatabaseMissing('permissions', $request); } public function getRequest() diff --git a/tests/Feature/Auth/RolesTest.php b/tests/Feature/Auth/RolesTest.php index f585d78bc..3e79070bf 100644 --- a/tests/Feature/Auth/RolesTest.php +++ b/tests/Feature/Auth/RolesTest.php @@ -26,7 +26,7 @@ class RolesTest extends FeatureTestCase public function testItShouldCreateRole() { - $request = $this->getRequest(); + $request = $this->getRequest(); $this->loginAs() ->post(route('roles.store'), $request) @@ -34,12 +34,12 @@ class RolesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('roles', $this->getAssertRequest($request)); + $this->assertDatabaseHas('roles', $this->getAssertRequest($request)); } public function testItShouldSeeRoleUpdatePage() { - $request = $this->getRequest(); + $request = $this->getRequest(); $role = $this->dispatch(new CreateRole($request)); @@ -64,12 +64,12 @@ class RolesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('roles', $this->getAssertRequest($request)); + $this->assertDatabaseHas('roles', $this->getAssertRequest($request)); } public function testItShouldDeleteRole() { - $request = $this->getRequest(); + $request = $this->getRequest(); $role = $this->dispatch(new CreateRole($request)); @@ -79,7 +79,7 @@ class RolesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseMissing('roles', $this->getAssertRequest($request)); + $this->assertDatabaseMissing('roles', $this->getAssertRequest($request)); } public function getRequest() diff --git a/tests/Feature/Auth/UsersTest.php b/tests/Feature/Auth/UsersTest.php index f383844e3..d66343ffa 100644 --- a/tests/Feature/Auth/UsersTest.php +++ b/tests/Feature/Auth/UsersTest.php @@ -26,7 +26,7 @@ class UsersTest extends FeatureTestCase public function testItShouldCreateUser() { - $request = $this->getRequest(); + $request = $this->getRequest(); $this->loginAs() ->post(route('users.store'), $request) @@ -34,12 +34,12 @@ class UsersTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('users', $this->getAssertRequest($request)); + $this->assertDatabaseHas('users', $this->getAssertRequest($request)); } public function testItShouldSeeUserUpdatePage() { - $request = $this->getRequest(); + $request = $this->getRequest(); $user = $this->dispatch(new CreateUser($request)); @@ -64,12 +64,12 @@ class UsersTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('users', $this->getAssertRequest($request)); + $this->assertDatabaseHas('users', $this->getAssertRequest($request)); } public function testItShouldDeleteUser() { - $request = $this->getRequest(); + $request = $this->getRequest(); $user = $this->dispatch(new CreateUser($request)); @@ -79,7 +79,7 @@ class UsersTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertSoftDeleted('users', $this->getAssertRequest($request)); + $this->assertSoftDeleted('users', $this->getAssertRequest($request)); } public function testItShouldSeeLoginPage() @@ -91,7 +91,7 @@ class UsersTest extends FeatureTestCase public function testItShouldLoginUser() { - $request = $this->getRequest(); + $request = $this->getRequest(); $user = $this->dispatch(new CreateUser($request)); @@ -103,7 +103,7 @@ class UsersTest extends FeatureTestCase public function testItShouldNotLoginUser() { - $request = $this->getRequest(); + $request = $this->getRequest(); $user = $this->dispatch(new CreateUser($request)); @@ -115,7 +115,7 @@ class UsersTest extends FeatureTestCase public function testItShouldLogoutUser() { - $request = $this->getRequest(); + $request = $this->getRequest(); $user = $this->dispatch(new CreateUser($request)); diff --git a/tests/Feature/Banking/AccountsTest.php b/tests/Feature/Banking/AccountsTest.php index 19264786d..9892f879b 100644 --- a/tests/Feature/Banking/AccountsTest.php +++ b/tests/Feature/Banking/AccountsTest.php @@ -26,7 +26,7 @@ class AccountsTest extends FeatureTestCase public function testItShouldCreateAccount() { - $request = $this->getRequest(); + $request = $this->getRequest(); $this->loginAs() ->post(route('accounts.store'), $request) @@ -34,12 +34,12 @@ class AccountsTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('accounts', $request); + $this->assertDatabaseHas('accounts', $request); } public function testItShouldSeeAccountUpdatePage() { - $request = $this->getRequest(); + $request = $this->getRequest(); $account = $this->dispatch(new CreateAccount($request)); @@ -64,7 +64,7 @@ class AccountsTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('accounts', $request); + $this->assertDatabaseHas('accounts', $request); } public function testItShouldDeleteAccount() @@ -79,7 +79,7 @@ class AccountsTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertSoftDeleted('accounts', $request); + $this->assertSoftDeleted('accounts', $request); } public function getRequest() diff --git a/tests/Feature/Banking/ReconciliationsTest.php b/tests/Feature/Banking/ReconciliationsTest.php index 254d020ea..cbb45cdda 100644 --- a/tests/Feature/Banking/ReconciliationsTest.php +++ b/tests/Feature/Banking/ReconciliationsTest.php @@ -25,7 +25,7 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldCreateReconciliation() { - $request = $this->getRequest(); + $request = $this->getRequest(); $this->loginAs() ->post(route('reconciliations.store'), $request) @@ -36,7 +36,7 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldSeeReconciliationUpdatePage() { - $request = $this->getRequest(); + $request = $this->getRequest(); $reconciliation = $this->dispatch(new CreateReconciliation($request)); @@ -63,7 +63,7 @@ class ReconciliationsTest extends FeatureTestCase public function testItShouldDeleteReconciliation() { - $request = $this->getRequest(); + $request = $this->getRequest(); $reconciliation = $this->dispatch(new CreateReconciliation($request)); From 3aaf14d3d51350dfe4fee88199b5f524692e2e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 21 Jun 2020 18:00:31 +0300 Subject: [PATCH 071/208] removed extra brackets --- app/Abstracts/Http/Controller.php | 6 +++--- app/Http/Controllers/Api/Common/Contacts.php | 6 +++--- app/Http/Controllers/Common/Dashboards.php | 6 +++--- app/Http/Controllers/Modals/Accounts.php | 6 +++--- app/Http/Controllers/Modals/BillTransactions.php | 6 +++--- app/Http/Controllers/Modals/Categories.php | 6 +++--- app/Http/Controllers/Modals/Currencies.php | 6 +++--- app/Http/Controllers/Modals/Customers.php | 6 +++--- app/Http/Controllers/Modals/InvoiceTemplates.php | 6 +++--- app/Http/Controllers/Modals/InvoiceTransactions.php | 6 +++--- app/Http/Controllers/Modals/Items.php | 6 +++--- app/Http/Controllers/Modals/Taxes.php | 6 +++--- app/Http/Controllers/Modals/Vendors.php | 6 +++--- app/Http/Controllers/Modules/Item.php | 6 +++--- app/Http/Controllers/Settings/Email.php | 6 +++--- app/Http/Controllers/Settings/Modules.php | 6 +++--- app/Http/Controllers/Wizard/Companies.php | 6 +++--- app/Http/Controllers/Wizard/Currencies.php | 6 +++--- app/Http/Controllers/Wizard/Finish.php | 2 +- app/Http/Controllers/Wizard/Taxes.php | 6 +++--- 20 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php index 2a4bf8bef..1a3a2c2f2 100644 --- a/app/Abstracts/Http/Controller.php +++ b/app/Abstracts/Http/Controller.php @@ -64,9 +64,9 @@ abstract class Controller extends BaseController } // Add CRUD permission check - $this->middleware('permission:create-' . $controller)->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-' . $controller)->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-' . $controller)->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-' . $controller)->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-' . $controller)->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-' . $controller)->only('update', 'enable', 'disable'); $this->middleware('permission:delete-' . $controller)->only('destroy'); } diff --git a/app/Http/Controllers/Api/Common/Contacts.php b/app/Http/Controllers/Api/Common/Contacts.php index 9d92d40d4..2b98dc227 100644 --- a/app/Http/Controllers/Api/Common/Contacts.php +++ b/app/Http/Controllers/Api/Common/Contacts.php @@ -21,9 +21,9 @@ class Contacts extends ApiController public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-sales-customers')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-sales-customers')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-sales-customers')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-sales-customers')->only('destroy'); } diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index 7a23b2b52..53afd6784 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -24,9 +24,9 @@ class Dashboards extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-common-dashboards')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-common-dashboards')->only(['show']); - $this->middleware('permission:update-common-dashboards')->only(['index', 'edit', 'export', 'update', 'enable', 'disable', 'share']); + $this->middleware('permission:create-common-dashboards')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-common-dashboards')->only('show'); + $this->middleware('permission:update-common-dashboards')->only('index', 'edit', 'export', 'update', 'enable', 'disable', 'share'); $this->middleware('permission:delete-common-dashboards')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Accounts.php b/app/Http/Controllers/Modals/Accounts.php index 477c00c21..4b0162feb 100644 --- a/app/Http/Controllers/Modals/Accounts.php +++ b/app/Http/Controllers/Modals/Accounts.php @@ -16,9 +16,9 @@ class Accounts extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-banking-accounts')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-banking-accounts')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-banking-accounts')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-banking-accounts')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-banking-accounts')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-banking-accounts')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-banking-accounts')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/BillTransactions.php b/app/Http/Controllers/Modals/BillTransactions.php index cded8de72..726495a53 100644 --- a/app/Http/Controllers/Modals/BillTransactions.php +++ b/app/Http/Controllers/Modals/BillTransactions.php @@ -22,9 +22,9 @@ class BillTransactions extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-purchases-bills')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-purchases-bills')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-purchases-bills')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-purchases-bills')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-purchases-bills')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-purchases-bills')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-purchases-bills')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Categories.php b/app/Http/Controllers/Modals/Categories.php index 304bd010f..fa4559fb2 100644 --- a/app/Http/Controllers/Modals/Categories.php +++ b/app/Http/Controllers/Modals/Categories.php @@ -15,9 +15,9 @@ class Categories extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-settings-categories')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-settings-categories')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-settings-categories')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-categories')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-settings-categories')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-settings-categories')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-categories')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Currencies.php b/app/Http/Controllers/Modals/Currencies.php index 617752733..c3f255b8d 100644 --- a/app/Http/Controllers/Modals/Currencies.php +++ b/app/Http/Controllers/Modals/Currencies.php @@ -16,9 +16,9 @@ class Currencies extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-settings-currencies')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-settings-currencies')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-settings-currencies')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-currencies')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-settings-currencies')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-settings-currencies')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-currencies')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Customers.php b/app/Http/Controllers/Modals/Customers.php index 61b18144b..03bd100e0 100644 --- a/app/Http/Controllers/Modals/Customers.php +++ b/app/Http/Controllers/Modals/Customers.php @@ -15,9 +15,9 @@ class Customers extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-sales-customers')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-sales-customers')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-sales-customers')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-sales-customers')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/InvoiceTemplates.php b/app/Http/Controllers/Modals/InvoiceTemplates.php index 087a275d6..d7e47c138 100644 --- a/app/Http/Controllers/Modals/InvoiceTemplates.php +++ b/app/Http/Controllers/Modals/InvoiceTemplates.php @@ -12,9 +12,9 @@ class InvoiceTemplates extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-settings-settings')->only(['create', 'store']); - $this->middleware('permission:read-settings-settings')->only(['index', 'edit']); - $this->middleware('permission:update-settings-settings')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-settings')->only('create', 'store'); + $this->middleware('permission:read-settings-settings')->only('index', 'edit'); + $this->middleware('permission:update-settings-settings')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-settings')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/InvoiceTransactions.php b/app/Http/Controllers/Modals/InvoiceTransactions.php index e19a65e54..450393e75 100644 --- a/app/Http/Controllers/Modals/InvoiceTransactions.php +++ b/app/Http/Controllers/Modals/InvoiceTransactions.php @@ -22,9 +22,9 @@ class InvoiceTransactions extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-sales-invoices')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-sales-invoices')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-sales-invoices')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-sales-invoices')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-sales-invoices')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-sales-invoices')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-sales-invoices')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Items.php b/app/Http/Controllers/Modals/Items.php index 176d8a743..a60b4f318 100644 --- a/app/Http/Controllers/Modals/Items.php +++ b/app/Http/Controllers/Modals/Items.php @@ -17,9 +17,9 @@ class Items extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-common-items')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-common-items')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-common-items')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-common-items')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-common-items')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-common-items')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-common-items')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Taxes.php b/app/Http/Controllers/Modals/Taxes.php index d7558e015..661d212cc 100644 --- a/app/Http/Controllers/Modals/Taxes.php +++ b/app/Http/Controllers/Modals/Taxes.php @@ -14,9 +14,9 @@ class Taxes extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-settings-taxes')->only(['create', 'store']); - $this->middleware('permission:read-settings-taxes')->only(['index', 'edit']); - $this->middleware('permission:update-settings-taxes')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-taxes')->only('create', 'store'); + $this->middleware('permission:read-settings-taxes')->only('index', 'edit'); + $this->middleware('permission:update-settings-taxes')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-taxes')->only('destroy'); } diff --git a/app/Http/Controllers/Modals/Vendors.php b/app/Http/Controllers/Modals/Vendors.php index 5a6b4d303..742183c4f 100644 --- a/app/Http/Controllers/Modals/Vendors.php +++ b/app/Http/Controllers/Modals/Vendors.php @@ -15,9 +15,9 @@ class Vendors extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-purchases-vendors')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-purchases-vendors')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-purchases-vendors')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-purchases-vendors')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-purchases-vendors')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-purchases-vendors')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-purchases-vendors')->only('destroy'); } diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index b4a5aa14b..46e8dbc65 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -18,9 +18,9 @@ class Item extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-modules-item')->only(['install']); - $this->middleware('permission:update-modules-item')->only(['update', 'enable', 'disable']); - $this->middleware('permission:delete-modules-item')->only(['uninstall']); + $this->middleware('permission:create-modules-item')->only('install'); + $this->middleware('permission:update-modules-item')->only('update', 'enable', 'disable'); + $this->middleware('permission:delete-modules-item')->only('uninstall'); } /** diff --git a/app/Http/Controllers/Settings/Email.php b/app/Http/Controllers/Settings/Email.php index 510ad6ade..8b92b4b00 100644 --- a/app/Http/Controllers/Settings/Email.php +++ b/app/Http/Controllers/Settings/Email.php @@ -25,9 +25,9 @@ class Email extends Controller } // Add CRUD permission check - $this->middleware('permission:create-settings-settings')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-settings-email')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-settings-settings')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-settings')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-settings-email')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-settings-settings')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-settings')->only('destroy'); } diff --git a/app/Http/Controllers/Settings/Modules.php b/app/Http/Controllers/Settings/Modules.php index 51d5caf70..5f4825e67 100644 --- a/app/Http/Controllers/Settings/Modules.php +++ b/app/Http/Controllers/Settings/Modules.php @@ -17,9 +17,9 @@ class Modules extends Controller $alias = request()->segment(1); // Add CRUD permission check - $this->middleware('permission:create-' . $alias . '-settings')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-' . $alias . '-settings')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-' . $alias . '-settings')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-' . $alias . '-settings')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-' . $alias . '-settings')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-' . $alias . '-settings')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-' . $alias . '-settings')->only('destroy'); } diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php index 4d519fa8c..e712499a9 100644 --- a/app/Http/Controllers/Wizard/Companies.php +++ b/app/Http/Controllers/Wizard/Companies.php @@ -18,9 +18,9 @@ class Companies extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-common-companies')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-common-companies')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-common-companies')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-common-companies')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-common-companies')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-common-companies')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-common-companies')->only('destroy'); } diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php index 50eb9f72e..ab35a8d1d 100644 --- a/app/Http/Controllers/Wizard/Currencies.php +++ b/app/Http/Controllers/Wizard/Currencies.php @@ -18,9 +18,9 @@ class Currencies extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-settings-currencies')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-settings-currencies')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-settings-currencies')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-currencies')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-settings-currencies')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-settings-currencies')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-currencies')->only('destroy'); } diff --git a/app/Http/Controllers/Wizard/Finish.php b/app/Http/Controllers/Wizard/Finish.php index 4844f2adb..393bf48f3 100644 --- a/app/Http/Controllers/Wizard/Finish.php +++ b/app/Http/Controllers/Wizard/Finish.php @@ -15,7 +15,7 @@ class Finish extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:read-admin-panel')->only(['index', 'show', 'edit', 'export']); + $this->middleware('permission:read-admin-panel')->only('index', 'show', 'edit', 'export'); } /** diff --git a/app/Http/Controllers/Wizard/Taxes.php b/app/Http/Controllers/Wizard/Taxes.php index cf643794c..64fa6dc2e 100644 --- a/app/Http/Controllers/Wizard/Taxes.php +++ b/app/Http/Controllers/Wizard/Taxes.php @@ -17,9 +17,9 @@ class Taxes extends Controller public function __construct() { // Add CRUD permission check - $this->middleware('permission:create-settings-taxes')->only(['create', 'store', 'duplicate', 'import']); - $this->middleware('permission:read-settings-taxes')->only(['index', 'show', 'edit', 'export']); - $this->middleware('permission:update-settings-taxes')->only(['update', 'enable', 'disable']); + $this->middleware('permission:create-settings-taxes')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-settings-taxes')->only('index', 'show', 'edit', 'export'); + $this->middleware('permission:update-settings-taxes')->only('update', 'enable', 'disable'); $this->middleware('permission:delete-settings-taxes')->only('destroy'); } From 6fb39b52b9cf2ff1052de8a69b6f6761cc3b2c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 21 Jun 2020 18:48:05 +0300 Subject: [PATCH 072/208] fixed profile permissions --- app/Http/Controllers/Auth/Users.php | 19 +++++++++++++++++++ resources/views/auth/users/edit.blade.php | 2 +- .../views/partials/admin/navbar.blade.php | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index f68cb3603..df594b495 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -16,6 +16,17 @@ class Users extends Controller { use Uploads; + public function __construct() + { + $this->middleware('permission:create-auth-users')->only('create', 'store', 'duplicate', 'import'); + $this->middleware('permission:read-auth-users')->only('index', 'show', 'export'); + $this->middleware('permission:update-auth-users')->only('enable', 'disable'); + $this->middleware('permission:delete-auth-users')->only('destroy'); + + $this->middleware('permission:read-auth-users|read-auth-profile')->only('edit'); + $this->middleware('permission:update-auth-users|update-auth-profile')->only('update'); + } + /** * Display a listing of the resource. * @@ -101,6 +112,10 @@ class Users extends Controller */ public function edit(User $user) { + if (user()->cannot('read-auth-users') && ($user->id != user()->id)) { + abort(403); + } + $routes = [ 'dashboard' => trans_choice('general.dashboards', 1), 'items.index' => trans_choice('general.items', 2), @@ -148,6 +163,10 @@ class Users extends Controller */ public function update(User $user, Request $request) { + if (user()->cannot('update-auth-users') && ($user->id != user()->id)) { + abort(403); + } + $response = $this->ajaxDispatch(new UpdateUser($user, $request)); if ($response['success']) { diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index 1141d4cfd..71f024014 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -60,7 +60,7 @@
    - @permission('update-auth-users') + @permission(['update-auth-users', 'update-auth-profile'])
    {{ Form::saveButtons('users.index') }} diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php index e3192d2ba..dfe84cbe6 100644 --- a/resources/views/partials/admin/navbar.blade.php +++ b/resources/views/partials/admin/navbar.blade.php @@ -251,7 +251,7 @@ @stack('navbar_profile_edit') - @permission('update-auth-users') + @permission(['read-auth-users', 'read-auth-profile']) {{ trans('auth.profile') }} From 1e2ca0c35c347277bc1240d88de3dc9a03801b08 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Mon, 22 Jun 2020 16:33:20 +0300 Subject: [PATCH 073/208] BulkActions.php is fixed for better detection module specific actions --- app/Http/Controllers/Common/BulkActions.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Common/BulkActions.php b/app/Http/Controllers/Common/BulkActions.php index 7077768d1..3fc1c41dc 100644 --- a/app/Http/Controllers/Common/BulkActions.php +++ b/app/Http/Controllers/Common/BulkActions.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Common; +use Illuminate\Support\Str; use App\Abstracts\Http\Controller; use App\Http\Requests\Common\BulkAction as Request; @@ -34,7 +35,10 @@ BulkActions extends Controller $module = module($group); if ($module instanceof \Akaunting\Module\Module) { - $bulk_actions = app('Modules\\' . $module->getStudlyName() . '\BulkActions\\' . ucfirst($type)); + $tmp = explode('.', $type); + $file_name = !empty($tmp[1]) ? Str::studly($tmp[0]) . '\\' . Str::studly($tmp[1]) : Str::studly($tmp[0]); + + $bulk_actions = app('Modules\\' . $module->getStudlyName() . '\BulkActions\\' . $file_name); } else { $bulk_actions = app('App\BulkActions\\' . ucfirst($group) . '\\' . ucfirst($type)); } From 7d31c33796cf16791be2c1986da6c7f50f3de1cb Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Mon, 22 Jun 2020 17:59:33 +0300 Subject: [PATCH 074/208] use part is reordered --- app/Http/Controllers/Common/BulkActions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Common/BulkActions.php b/app/Http/Controllers/Common/BulkActions.php index 3fc1c41dc..e84694553 100644 --- a/app/Http/Controllers/Common/BulkActions.php +++ b/app/Http/Controllers/Common/BulkActions.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Common; -use Illuminate\Support\Str; use App\Abstracts\Http\Controller; use App\Http\Requests\Common\BulkAction as Request; +use Illuminate\Support\Str; class From 46cd0ab7329c9d1786caa2b42ed9b2db611e65b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 24 Jun 2020 12:09:03 +0300 Subject: [PATCH 075/208] increased menu order to ease the life of modules --- app/Listeners/Menu/AddAdminItems.php | 38 +++++++++++++-------------- app/Listeners/Menu/AddPortalItems.php | 6 ++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/Listeners/Menu/AddAdminItems.php b/app/Listeners/Menu/AddAdminItems.php index c17c4bb38..9a4eb7ac8 100644 --- a/app/Listeners/Menu/AddAdminItems.php +++ b/app/Listeners/Menu/AddAdminItems.php @@ -32,7 +32,7 @@ class AddAdminItems $sub->url('/', $dashboard->name, $key, $attr); } } - }, 1, [ + }, 100, [ 'url' => '/', 'title' => trans_choice('general.dashboards', 2), 'icon' => 'fa fa-tachometer-alt', @@ -42,31 +42,31 @@ class AddAdminItems 'url' => '/', 'title' => trans_choice('general.dashboards', 1), 'icon' => 'fa fa-tachometer-alt', - 'order' => 1, + 'order' => 100, ]); } } // Items if ($user->can('read-common-items')) { - $menu->route('items.index', trans_choice('general.items', 2), [], 2, ['icon' => 'fa fa-cube']); + $menu->route('items.index', trans_choice('general.items', 2), [], 200, ['icon' => 'fa fa-cube']); } // Sales if ($user->can(['read-sales-invoices', 'read-sales-revenues', 'read-sales-customers'])) { $menu->dropdown(trim(trans_choice('general.sales', 2)), function ($sub) use ($user, $attr) { if ($user->can('read-sales-invoices')) { - $sub->route('invoices.index', trans_choice('general.invoices', 2), [], 1, $attr); + $sub->route('invoices.index', trans_choice('general.invoices', 2), [], 310, $attr); } if ($user->can('read-sales-revenues')) { - $sub->route('revenues.index', trans_choice('general.revenues', 2), [], 2, $attr); + $sub->route('revenues.index', trans_choice('general.revenues', 2), [], 320, $attr); } if ($user->can('read-sales-customers')) { - $sub->route('customers.index', trans_choice('general.customers', 2), [], 3, $attr); + $sub->route('customers.index', trans_choice('general.customers', 2), [], 330, $attr); } - }, 3, [ + }, 300, [ 'title' => trans_choice('general.sales', 2), 'icon' => 'fa fa-money-bill', ]); @@ -76,17 +76,17 @@ class AddAdminItems if ($user->can(['read-purchases-bills', 'read-purchases-payments', 'read-purchases-vendors'])) { $menu->dropdown(trim(trans_choice('general.purchases', 2)), function ($sub) use ($user, $attr) { if ($user->can('read-purchases-bills')) { - $sub->route('bills.index', trans_choice('general.bills', 2), [], 1, $attr); + $sub->route('bills.index', trans_choice('general.bills', 2), [], 410, $attr); } if ($user->can('read-purchases-payments')) { - $sub->route('payments.index', trans_choice('general.payments', 2), [], 2, $attr); + $sub->route('payments.index', trans_choice('general.payments', 2), [], 420, $attr); } if ($user->can('read-purchases-vendors')) { - $sub->route('vendors.index', trans_choice('general.vendors', 2), [], 3, $attr); + $sub->route('vendors.index', trans_choice('general.vendors', 2), [], 430, $attr); } - }, 4, [ + }, 400, [ 'title' => trans_choice('general.purchases', 2), 'icon' => 'fa fa-shopping-cart', ]); @@ -96,21 +96,21 @@ class AddAdminItems if ($user->can(['read-banking-accounts', 'read-banking-transfers', 'read-banking-transactions', 'read-banking-reconciliations'])) { $menu->dropdown(trim(trans('general.banking')), function ($sub) use ($user, $attr) { if ($user->can('read-banking-accounts')) { - $sub->route('accounts.index', trans_choice('general.accounts', 2), [], 1, $attr); + $sub->route('accounts.index', trans_choice('general.accounts', 2), [], 510, $attr); } if ($user->can('read-banking-transfers')) { - $sub->route('transfers.index', trans_choice('general.transfers', 2), [], 2, $attr); + $sub->route('transfers.index', trans_choice('general.transfers', 2), [], 520, $attr); } if ($user->can('read-banking-transactions')) { - $sub->route('transactions.index', trans_choice('general.transactions', 2), [], 3, $attr); + $sub->route('transactions.index', trans_choice('general.transactions', 2), [], 530, $attr); } if ($user->can('read-banking-reconciliations')) { - $sub->route('reconciliations.index', trans_choice('general.reconciliations', 2), [], 4, $attr); + $sub->route('reconciliations.index', trans_choice('general.reconciliations', 2), [], 540, $attr); } - }, 5, [ + }, 500, [ 'title' => trans('general.banking'), 'icon' => 'fa fa-briefcase', ]); @@ -118,17 +118,17 @@ class AddAdminItems // Reports if ($user->can('read-common-reports')) { - $menu->route('reports.index', trans_choice('general.reports', 2), [], 6, ['icon' => 'fa fa-chart-pie']); + $menu->route('reports.index', trans_choice('general.reports', 2), [], 600, ['icon' => 'fa fa-chart-pie']); } // Settings if ($user->can('read-settings-settings')) { - $menu->route('settings.index', trans_choice('general.settings', 2), [], 7, ['icon' => 'fa fa-cog']); + $menu->route('settings.index', trans_choice('general.settings', 2), [], 700, ['icon' => 'fa fa-cog']); } // Apps if ($user->can('read-modules-home')) { - $menu->route('apps.home.index', trans_choice('general.modules', 2), [], 8, ['icon' => 'fa fa-rocket']); + $menu->route('apps.home.index', trans_choice('general.modules', 2), [], 800, ['icon' => 'fa fa-rocket']); } } } diff --git a/app/Listeners/Menu/AddPortalItems.php b/app/Listeners/Menu/AddPortalItems.php index 608e22910..ec1bb4bab 100644 --- a/app/Listeners/Menu/AddPortalItems.php +++ b/app/Listeners/Menu/AddPortalItems.php @@ -16,10 +16,10 @@ class AddPortalItems { $menu = $event->menu; - $menu->route('portal.dashboard', trans_choice('general.dashboards', 1), [], 1, ['icon' => 'fa fa-tachometer-alt']); + $menu->route('portal.dashboard', trans_choice('general.dashboards', 1), [], 100, ['icon' => 'fa fa-tachometer-alt']); - $menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 2, ['icon' => 'fa fa-file-signature']); + $menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 200, ['icon' => 'fa fa-file-signature']); - $menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 3, ['icon' => 'fa fa-money-bill']); + $menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 300, ['icon' => 'fa fa-money-bill']); } } From aa3e2e80b82e4105534f1d38df580d5498081b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 24 Jun 2020 12:18:38 +0300 Subject: [PATCH 076/208] missing permission check in portal --- app/Listeners/Menu/AddPortalItems.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Listeners/Menu/AddPortalItems.php b/app/Listeners/Menu/AddPortalItems.php index ec1bb4bab..fde49928c 100644 --- a/app/Listeners/Menu/AddPortalItems.php +++ b/app/Listeners/Menu/AddPortalItems.php @@ -14,12 +14,17 @@ class AddPortalItems */ public function handle(Event $event) { + $user = user(); $menu = $event->menu; $menu->route('portal.dashboard', trans_choice('general.dashboards', 1), [], 100, ['icon' => 'fa fa-tachometer-alt']); - $menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 200, ['icon' => 'fa fa-file-signature']); + if ($user->can('read-portal-invoices')) { + $menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 200, ['icon' => 'fa fa-file-signature']); + } - $menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 300, ['icon' => 'fa fa-money-bill']); + if ($user->can('read-portal-payments')) { + $menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 300, ['icon' => 'fa fa-money-bill']); + } } } From 08b68052daf5cefb82a6f63f2677c4b0d6fa8b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 24 Jun 2020 12:39:01 +0300 Subject: [PATCH 077/208] re-ordered menu items --- app/Listeners/Menu/AddAdminItems.php | 38 +++++++++++++-------------- app/Listeners/Menu/AddPortalItems.php | 6 ++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/Listeners/Menu/AddAdminItems.php b/app/Listeners/Menu/AddAdminItems.php index 9a4eb7ac8..5549c38ca 100644 --- a/app/Listeners/Menu/AddAdminItems.php +++ b/app/Listeners/Menu/AddAdminItems.php @@ -32,7 +32,7 @@ class AddAdminItems $sub->url('/', $dashboard->name, $key, $attr); } } - }, 100, [ + }, 10, [ 'url' => '/', 'title' => trans_choice('general.dashboards', 2), 'icon' => 'fa fa-tachometer-alt', @@ -42,31 +42,31 @@ class AddAdminItems 'url' => '/', 'title' => trans_choice('general.dashboards', 1), 'icon' => 'fa fa-tachometer-alt', - 'order' => 100, + 'order' => 10, ]); } } // Items if ($user->can('read-common-items')) { - $menu->route('items.index', trans_choice('general.items', 2), [], 200, ['icon' => 'fa fa-cube']); + $menu->route('items.index', trans_choice('general.items', 2), [], 20, ['icon' => 'fa fa-cube']); } // Sales if ($user->can(['read-sales-invoices', 'read-sales-revenues', 'read-sales-customers'])) { $menu->dropdown(trim(trans_choice('general.sales', 2)), function ($sub) use ($user, $attr) { if ($user->can('read-sales-invoices')) { - $sub->route('invoices.index', trans_choice('general.invoices', 2), [], 310, $attr); + $sub->route('invoices.index', trans_choice('general.invoices', 2), [], 10, $attr); } if ($user->can('read-sales-revenues')) { - $sub->route('revenues.index', trans_choice('general.revenues', 2), [], 320, $attr); + $sub->route('revenues.index', trans_choice('general.revenues', 2), [], 20, $attr); } if ($user->can('read-sales-customers')) { - $sub->route('customers.index', trans_choice('general.customers', 2), [], 330, $attr); + $sub->route('customers.index', trans_choice('general.customers', 2), [], 30, $attr); } - }, 300, [ + }, 30, [ 'title' => trans_choice('general.sales', 2), 'icon' => 'fa fa-money-bill', ]); @@ -76,17 +76,17 @@ class AddAdminItems if ($user->can(['read-purchases-bills', 'read-purchases-payments', 'read-purchases-vendors'])) { $menu->dropdown(trim(trans_choice('general.purchases', 2)), function ($sub) use ($user, $attr) { if ($user->can('read-purchases-bills')) { - $sub->route('bills.index', trans_choice('general.bills', 2), [], 410, $attr); + $sub->route('bills.index', trans_choice('general.bills', 2), [], 10, $attr); } if ($user->can('read-purchases-payments')) { - $sub->route('payments.index', trans_choice('general.payments', 2), [], 420, $attr); + $sub->route('payments.index', trans_choice('general.payments', 2), [], 20, $attr); } if ($user->can('read-purchases-vendors')) { - $sub->route('vendors.index', trans_choice('general.vendors', 2), [], 430, $attr); + $sub->route('vendors.index', trans_choice('general.vendors', 2), [], 30, $attr); } - }, 400, [ + }, 40, [ 'title' => trans_choice('general.purchases', 2), 'icon' => 'fa fa-shopping-cart', ]); @@ -96,21 +96,21 @@ class AddAdminItems if ($user->can(['read-banking-accounts', 'read-banking-transfers', 'read-banking-transactions', 'read-banking-reconciliations'])) { $menu->dropdown(trim(trans('general.banking')), function ($sub) use ($user, $attr) { if ($user->can('read-banking-accounts')) { - $sub->route('accounts.index', trans_choice('general.accounts', 2), [], 510, $attr); + $sub->route('accounts.index', trans_choice('general.accounts', 2), [], 10, $attr); } if ($user->can('read-banking-transfers')) { - $sub->route('transfers.index', trans_choice('general.transfers', 2), [], 520, $attr); + $sub->route('transfers.index', trans_choice('general.transfers', 2), [], 20, $attr); } if ($user->can('read-banking-transactions')) { - $sub->route('transactions.index', trans_choice('general.transactions', 2), [], 530, $attr); + $sub->route('transactions.index', trans_choice('general.transactions', 2), [], 30, $attr); } if ($user->can('read-banking-reconciliations')) { - $sub->route('reconciliations.index', trans_choice('general.reconciliations', 2), [], 540, $attr); + $sub->route('reconciliations.index', trans_choice('general.reconciliations', 2), [], 40, $attr); } - }, 500, [ + }, 50, [ 'title' => trans('general.banking'), 'icon' => 'fa fa-briefcase', ]); @@ -118,17 +118,17 @@ class AddAdminItems // Reports if ($user->can('read-common-reports')) { - $menu->route('reports.index', trans_choice('general.reports', 2), [], 600, ['icon' => 'fa fa-chart-pie']); + $menu->route('reports.index', trans_choice('general.reports', 2), [], 60, ['icon' => 'fa fa-chart-pie']); } // Settings if ($user->can('read-settings-settings')) { - $menu->route('settings.index', trans_choice('general.settings', 2), [], 700, ['icon' => 'fa fa-cog']); + $menu->route('settings.index', trans_choice('general.settings', 2), [], 70, ['icon' => 'fa fa-cog']); } // Apps if ($user->can('read-modules-home')) { - $menu->route('apps.home.index', trans_choice('general.modules', 2), [], 800, ['icon' => 'fa fa-rocket']); + $menu->route('apps.home.index', trans_choice('general.modules', 2), [], 80, ['icon' => 'fa fa-rocket']); } } } diff --git a/app/Listeners/Menu/AddPortalItems.php b/app/Listeners/Menu/AddPortalItems.php index fde49928c..9a931d086 100644 --- a/app/Listeners/Menu/AddPortalItems.php +++ b/app/Listeners/Menu/AddPortalItems.php @@ -17,14 +17,14 @@ class AddPortalItems $user = user(); $menu = $event->menu; - $menu->route('portal.dashboard', trans_choice('general.dashboards', 1), [], 100, ['icon' => 'fa fa-tachometer-alt']); + $menu->route('portal.dashboard', trans_choice('general.dashboards', 1), [], 10, ['icon' => 'fa fa-tachometer-alt']); if ($user->can('read-portal-invoices')) { - $menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 200, ['icon' => 'fa fa-file-signature']); + $menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 20, ['icon' => 'fa fa-file-signature']); } if ($user->can('read-portal-payments')) { - $menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 300, ['icon' => 'fa fa-money-bill']); + $menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 30, ['icon' => 'fa fa-money-bill']); } } } From 867fe99a4f4068b69ddd8f986a66976e63833cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Wed, 24 Jun 2020 17:07:22 +0300 Subject: [PATCH 078/208] User companies input change multi select groups --- app/Http/Controllers/Auth/Users.php | 4 ++-- app/Models/Auth/User.php | 25 +++++++++++++++++++++ resources/views/auth/users/create.blade.php | 11 ++++++++- resources/views/auth/users/edit.blade.php | 11 ++++++++- 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index df594b495..39663b7f9 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -70,7 +70,7 @@ class Users extends Controller return $r->hasPermission('read-client-portal'); }); - $companies = user()->companies()->get()->sortBy('name'); + $companies = user()->companies()->get()->sortBy('name')->pluck('name', 'id'); return view('auth.users.create', compact('roles', 'companies', 'routes')); } @@ -148,7 +148,7 @@ class Users extends Controller }); } - $companies = user()->companies()->get()->sortBy('name'); + $companies = user()->companies()->get()->sortBy('name')->pluck('name', 'id'); return view('auth.users.edit', compact('user', 'companies', 'roles', 'routes')); } diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 1051d5c7b..99f55e43c 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -50,6 +50,15 @@ class User extends Authenticatable */ public $sortable = ['name', 'email', 'enabled']; + public static function boot() + { + parent::boot(); + + static::retrieved(function($model) { + $model->setCompanyIds(); + }); + } + public function companies() { return $this->morphToMany('App\Models\Common\Company', 'user', 'user_companies', 'user_id', 'company_id'); @@ -169,4 +178,20 @@ class User extends Authenticatable { return $query->where('enabled', 1); } + + /** + * Convert tax to Array. + * + * @return void + */ + public function setCompanyIds() + { + $company_ids = []; + + foreach ($this->companies as $company) { + $company_ids[] = (string) $company->id; + } + + $this->setAttribute('company_ids', $company_ids); + } } diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php index 89f323af5..85949333b 100644 --- a/resources/views/auth/users/create.blade.php +++ b/resources/views/auth/users/create.blade.php @@ -48,7 +48,7 @@ @endif @permission('read-common-companies') - {{ Form::checkboxGroup('companies', trans_choice('general.companies', 2), $companies, 'name') }} + {{ Form::multiSelectGroup('companies', trans_choice('general.companies', 2), 'user', $companies) }} @endpermission @permission('read-auth-roles') @@ -68,6 +68,15 @@
    @endsection +@push('stylesheet') + +@endpush + @push('scripts_start') @endpush diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index 71f024014..a46d7f0c1 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -49,7 +49,7 @@ @endif @permission('read-common-companies') - {{ Form::checkboxGroup('companies', trans_choice('general.companies', 2), $companies, 'name') }} + {{ Form::multiSelectGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required'], 'col-md-6') }} @endpermission @permission('read-auth-roles') @@ -71,6 +71,15 @@
    @endsection +@push('stylesheet') + +@endpush + @push('scripts_start') @endpush From a72b422e158f7b21fc8eed236afa855ea71dad3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= Date: Thu, 25 Jun 2020 00:48:15 +0300 Subject: [PATCH 079/208] user update fixed --- app/Models/Auth/User.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 99f55e43c..759dc6367 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -57,6 +57,10 @@ class User extends Authenticatable static::retrieved(function($model) { $model->setCompanyIds(); }); + + static::saving(function($model) { + $model->unsetCompanyIds(); + }); } public function companies() @@ -194,4 +198,9 @@ class User extends Authenticatable $this->setAttribute('company_ids', $company_ids); } + + public function unsetCompanyIds() + { + $this->offsetUnset('company_ids'); + } } From f8bc753849a275d8d7b389fcf906640135fd6c4d Mon Sep 17 00:00:00 2001 From: Chistel Brown Date: Thu, 25 Jun 2020 09:46:10 +0100 Subject: [PATCH 080/208] allow using own already selected checkbox values --- app/Providers/Form.php | 2 +- resources/views/partials/form/checkbox_group.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Providers/Form.php b/app/Providers/Form.php index 245d23c0f..82f739a2d 100644 --- a/app/Providers/Form.php +++ b/app/Providers/Form.php @@ -88,7 +88,7 @@ class Form extends Provider ]); Facade::component('checkboxGroup', 'partials.form.checkbox_group', [ - 'name', 'text', 'items' => [], 'value' => 'name', 'id' => 'id', 'attributes' => ['required' => 'required'], 'col' => 'col-md-12', + 'name', 'text', 'items' => [], 'value' => 'name', 'id' => 'id', 'selected'=>[], 'attributes' => ['required' => 'required'], 'col' => 'col-md-12', ]); Facade::component('fileGroup', 'partials.form.file_group', [ diff --git a/resources/views/partials/form/checkbox_group.blade.php b/resources/views/partials/form/checkbox_group.blade.php index 028ee1e39..fed6c679e 100644 --- a/resources/views/partials/form/checkbox_group.blade.php +++ b/resources/views/partials/form/checkbox_group.blade.php @@ -11,7 +11,7 @@ @foreach($items as $item)
    - {{ Form::checkbox($name, $item->$id, null, [ + {{ Form::checkbox($name, $item->$id, (is_array($selected) && count($selected) ? (in_array($item->$id, $selected) ? true : false) : null), [ 'id' => 'checkbox-' . $name . '-' . $item->$id, 'class' => 'custom-control-input', 'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name), From f20f5c9def42b2000a014fc5b63b6fcf3d3d9316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 26 Jun 2020 00:22:16 +0300 Subject: [PATCH 081/208] fixed invoice with discount redirect --- app/Abstracts/DocumentModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php index 7d76b08c3..8dd017c67 100644 --- a/app/Abstracts/DocumentModel.php +++ b/app/Abstracts/DocumentModel.php @@ -65,10 +65,10 @@ abstract class DocumentModel extends Model { $percent = 0; - $discount = $this->totals->where('code', 'discount')->pluck('amount')->first(); + $discount = $this->totals->where('code', 'discount')->makeHidden('title')->pluck('amount')->first(); if ($discount) { - $sub_total = $this->totals->where('code', 'sub_total')->pluck('amount')->first(); + $sub_total = $this->totals->where('code', 'sub_total')->makeHidden('title')->pluck('amount')->first(); $percent = number_format((($discount * 100) / $sub_total), 0); } From acdc9da2c8250154e49c5b577bbd333bfca20ec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 26 Jun 2020 13:40:19 +0300 Subject: [PATCH 082/208] added db transaction to jobs --- app/Jobs/Auth/CreatePermission.php | 8 +- app/Jobs/Auth/CreateRole.php | 14 +- app/Jobs/Auth/CreateUser.php | 53 ++++---- app/Jobs/Auth/DeletePermission.php | 4 +- app/Jobs/Auth/DeleteRole.php | 6 +- app/Jobs/Auth/DeleteUser.php | 6 +- app/Jobs/Auth/UpdatePermission.php | 4 +- app/Jobs/Auth/UpdateRole.php | 10 +- app/Jobs/Auth/UpdateUser.php | 28 ++-- app/Jobs/Banking/CreateAccount.php | 18 ++- .../Banking/CreateDocumentTransaction.php | 26 ++-- app/Jobs/Banking/CreateReconciliation.php | 48 +++---- app/Jobs/Banking/CreateTransaction.php | 22 ++-- app/Jobs/Banking/CreateTransfer.php | 124 +++++++++--------- app/Jobs/Banking/DeleteAccount.php | 4 +- app/Jobs/Banking/DeleteReconciliation.php | 16 ++- app/Jobs/Banking/DeleteTransaction.php | 6 +- app/Jobs/Banking/DeleteTransfer.php | 8 +- app/Jobs/Banking/UpdateAccount.php | 14 +- app/Jobs/Banking/UpdateReconciliation.php | 32 ++--- app/Jobs/Banking/UpdateTransaction.php | 18 +-- app/Jobs/Banking/UpdateTransfer.php | 124 +++++++++--------- app/Jobs/Common/CreateCompany.php | 18 +-- app/Jobs/Common/CreateContact.php | 14 +- app/Jobs/Common/CreateDashboard.php | 14 +- app/Jobs/Common/CreateItem.php | 18 ++- app/Jobs/Common/CreateReport.php | 8 +- app/Jobs/Common/DeleteCompany.php | 16 ++- app/Jobs/Common/DeleteContact.php | 10 +- app/Jobs/Common/DeleteDashboard.php | 6 +- app/Jobs/Common/DeleteItem.php | 4 +- app/Jobs/Common/DeleteReport.php | 4 +- app/Jobs/Common/UpdateCompany.php | 72 +++++----- app/Jobs/Common/UpdateContact.php | 10 +- app/Jobs/Common/UpdateDashboard.php | 10 +- app/Jobs/Common/UpdateItem.php | 14 +- app/Jobs/Common/UpdateReport.php | 4 +- app/Jobs/Purchase/CancelBill.php | 12 +- app/Jobs/Purchase/CreateBill.php | 24 ++-- app/Jobs/Purchase/DeleteBill.php | 15 ++- app/Jobs/Purchase/DuplicateBill.php | 19 ++- app/Jobs/Purchase/UpdateBill.php | 28 ++-- app/Jobs/Sale/CancelInvoice.php | 12 +- app/Jobs/Sale/CreateInvoice.php | 24 ++-- app/Jobs/Sale/DeleteInvoice.php | 15 ++- app/Jobs/Sale/DuplicateInvoice.php | 10 +- app/Jobs/Sale/UpdateInvoice.php | 28 ++-- app/Jobs/Setting/CreateCategory.php | 8 +- app/Jobs/Setting/CreateCurrency.php | 18 ++- app/Jobs/Setting/CreateTax.php | 8 +- app/Jobs/Setting/DeleteCategory.php | 4 +- app/Jobs/Setting/DeleteCurrency.php | 4 +- app/Jobs/Setting/DeleteTax.php | 4 +- app/Jobs/Setting/UpdateCategory.php | 4 +- app/Jobs/Setting/UpdateCurrency.php | 14 +- app/Jobs/Setting/UpdateTax.php | 4 +- app/Traits/Jobs.php | 5 +- 57 files changed, 606 insertions(+), 469 deletions(-) diff --git a/app/Jobs/Auth/CreatePermission.php b/app/Jobs/Auth/CreatePermission.php index d25030879..82f5612cd 100644 --- a/app/Jobs/Auth/CreatePermission.php +++ b/app/Jobs/Auth/CreatePermission.php @@ -7,6 +7,8 @@ use App\Models\Auth\Permission; class CreatePermission extends Job { + protected $permission; + protected $request; /** @@ -26,8 +28,10 @@ class CreatePermission extends Job */ public function handle() { - $permission = Permission::create($this->request->all()); + \DB::transaction(function () { + $this->permission = Permission::create($this->request->all()); + }); - return $permission; + return $this->permission; } } diff --git a/app/Jobs/Auth/CreateRole.php b/app/Jobs/Auth/CreateRole.php index 6ec20d1b9..576f376ed 100644 --- a/app/Jobs/Auth/CreateRole.php +++ b/app/Jobs/Auth/CreateRole.php @@ -7,6 +7,8 @@ use App\Models\Auth\Role; class CreateRole extends Job { + protected $role; + protected $request; /** @@ -26,12 +28,14 @@ class CreateRole extends Job */ public function handle() { - $role = Role::create($this->request->input()); + \DB::transaction(function () { + $this->role = Role::create($this->request->input()); - if ($this->request->has('permissions')) { - $role->permissions()->attach($this->request->get('permissions')); - } + if ($this->request->has('permissions')) { + $this->role->permissions()->attach($this->request->get('permissions')); + } + }); - return $role; + return $this->role; } } diff --git a/app/Jobs/Auth/CreateUser.php b/app/Jobs/Auth/CreateUser.php index 7d2edd902..a9149b053 100644 --- a/app/Jobs/Auth/CreateUser.php +++ b/app/Jobs/Auth/CreateUser.php @@ -8,6 +8,8 @@ use Artisan; class CreateUser extends Job { + protected $user; + protected $request; /** @@ -27,41 +29,44 @@ class CreateUser extends Job */ public function handle() { - $user = User::create($this->request->input()); + \DB::transaction(function () { + $this->user = User::create($this->request->input()); - // Upload picture - if ($this->request->file('picture')) { - $media = $this->getMedia($this->request->file('picture'), 'users'); + // Upload picture + if ($this->request->file('picture')) { + $media = $this->getMedia($this->request->file('picture'), 'users'); - $user->attachMedia($media, 'picture'); - } + $this->user->attachMedia($media, 'picture'); + } - if ($this->request->has('dashboards')) { - $user->dashboards()->attach($this->request->get('dashboards')); - } + if ($this->request->has('dashboards')) { + $this->user->dashboards()->attach($this->request->get('dashboards')); + } - if ($this->request->has('permissions')) { - $user->permissions()->attach($this->request->get('permissions')); - } + if ($this->request->has('permissions')) { + $this->user->permissions()->attach($this->request->get('permissions')); + } - if ($this->request->has('roles')) { - $user->roles()->attach($this->request->get('roles')); - } + if ($this->request->has('roles')) { + $this->user->roles()->attach($this->request->get('roles')); + } - if ($this->request->has('companies')) { - $user->companies()->attach($this->request->get('companies')); - } + if ($this->request->has('companies')) { + $this->user->companies()->attach($this->request->get('companies')); + } - // Add User Dashboard - if (!empty($user->companies)) { - foreach ($user->companies as $company) { + if (empty($this->user->companies)) { + return; + } + + foreach ($this->user->companies as $company) { Artisan::call('user:seed', [ - 'user' => $user->id, + 'user' => $this->user->id, 'company' => $company->id, ]); } - } + }); - return $user; + return $this->user; } } diff --git a/app/Jobs/Auth/DeletePermission.php b/app/Jobs/Auth/DeletePermission.php index af007048f..a9939a77d 100644 --- a/app/Jobs/Auth/DeletePermission.php +++ b/app/Jobs/Auth/DeletePermission.php @@ -25,7 +25,9 @@ class DeletePermission extends Job */ public function handle() { - $this->permission->delete(); + \DB::transaction(function () { + $this->permission->delete(); + }); return true; } diff --git a/app/Jobs/Auth/DeleteRole.php b/app/Jobs/Auth/DeleteRole.php index 25018e2e3..c7298075a 100644 --- a/app/Jobs/Auth/DeleteRole.php +++ b/app/Jobs/Auth/DeleteRole.php @@ -25,9 +25,11 @@ class DeleteRole extends Job */ public function handle() { - $this->role->delete(); + \DB::transaction(function () { + $this->role->delete(); - $this->role->flushCache(); + $this->role->flushCache(); + }); return true; } diff --git a/app/Jobs/Auth/DeleteUser.php b/app/Jobs/Auth/DeleteUser.php index f34a0d707..384b2f6da 100644 --- a/app/Jobs/Auth/DeleteUser.php +++ b/app/Jobs/Auth/DeleteUser.php @@ -27,9 +27,11 @@ class DeleteUser extends Job { $this->authorize(); - $this->user->delete(); + \DB::transaction(function () { + $this->user->delete(); - $this->user->flushCache(); + $this->user->flushCache(); + }); return true; } diff --git a/app/Jobs/Auth/UpdatePermission.php b/app/Jobs/Auth/UpdatePermission.php index 632631e1f..5f6acbd6e 100644 --- a/app/Jobs/Auth/UpdatePermission.php +++ b/app/Jobs/Auth/UpdatePermission.php @@ -30,7 +30,9 @@ class UpdatePermission extends Job */ public function handle() { - $this->permission->update($this->request->all()); + \DB::transaction(function () { + $this->permission->update($this->request->all()); + }); return $this->permission; } diff --git a/app/Jobs/Auth/UpdateRole.php b/app/Jobs/Auth/UpdateRole.php index 665201253..16ce9184c 100644 --- a/app/Jobs/Auth/UpdateRole.php +++ b/app/Jobs/Auth/UpdateRole.php @@ -30,11 +30,13 @@ class UpdateRole extends Job */ public function handle() { - $this->role->update($this->request->all()); + \DB::transaction(function () { + $this->role->update($this->request->all()); - if ($this->request->has('permissions')) { - $this->role->permissions()->sync($this->request->get('permissions')); - } + if ($this->request->has('permissions')) { + $this->role->permissions()->sync($this->request->get('permissions')); + } + }); return $this->role; } diff --git a/app/Jobs/Auth/UpdateUser.php b/app/Jobs/Auth/UpdateUser.php index 3a1cd66e3..15c66c0ca 100644 --- a/app/Jobs/Auth/UpdateUser.php +++ b/app/Jobs/Auth/UpdateUser.php @@ -38,24 +38,24 @@ class UpdateUser extends Job unset($this->request['password_confirmation']); } - $this->user->update($this->request->input()); + \DB::transaction(function () { + $this->user->update($this->request->input()); - // Upload picture - if ($this->request->file('picture')) { - $media = $this->getMedia($this->request->file('picture'), 'users'); + // Upload picture + if ($this->request->file('picture')) { + $media = $this->getMedia($this->request->file('picture'), 'users'); - $this->user->attachMedia($media, 'picture'); - } + $this->user->attachMedia($media, 'picture'); + } - // Sync roles - if ($this->request->has('roles')) { - $this->user->roles()->sync($this->request->get('roles')); - } + if ($this->request->has('roles')) { + $this->user->roles()->sync($this->request->get('roles')); + } - // Sync companies - if ($this->request->has('companies')) { - $this->user->companies()->sync($this->request->get('companies')); - } + if ($this->request->has('companies')) { + $this->user->companies()->sync($this->request->get('companies')); + } + }); return $this->user; } diff --git a/app/Jobs/Banking/CreateAccount.php b/app/Jobs/Banking/CreateAccount.php index 67202a5c4..15414c879 100644 --- a/app/Jobs/Banking/CreateAccount.php +++ b/app/Jobs/Banking/CreateAccount.php @@ -7,6 +7,8 @@ use App\Models\Banking\Account; class CreateAccount extends Job { + protected $account; + protected $request; /** @@ -26,14 +28,16 @@ class CreateAccount extends Job */ public function handle() { - $account = Account::create($this->request->all()); + \DB::transaction(function () { + $this->account = Account::create($this->request->all()); - // Set default account - if ($this->request['default_account']) { - setting()->set('default.account', $account->id); - setting()->save(); - } + // Set default account + if ($this->request['default_account']) { + setting()->set('default.account', $this->account->id); + setting()->save(); + } + }); - return $account; + return $this->account; } } diff --git a/app/Jobs/Banking/CreateDocumentTransaction.php b/app/Jobs/Banking/CreateDocumentTransaction.php index 69c02fe13..93aca01e2 100644 --- a/app/Jobs/Banking/CreateDocumentTransaction.php +++ b/app/Jobs/Banking/CreateDocumentTransaction.php @@ -17,6 +17,8 @@ class CreateDocumentTransaction extends Job protected $request; + protected $transaction; + /** * Create a new job instance. * @@ -40,20 +42,22 @@ class CreateDocumentTransaction extends Job $this->checkAmount(); - $transaction = $this->dispatch(new CreateTransaction($this->request)); + \DB::transaction(function () { + $this->transaction = $this->dispatch(new CreateTransaction($this->request)); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'transactions'); + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'transactions'); - $transaction->attachMedia($media, 'attachment'); - } + $this->transaction->attachMedia($media, 'attachment'); + } - $this->model->save(); + $this->model->save(); - $this->createHistory($transaction); + $this->createHistory(); + }); - return $transaction; + return $this->transaction; } protected function prepareRequest() @@ -137,9 +141,9 @@ class CreateDocumentTransaction extends Job return true; } - protected function createHistory($transaction) + protected function createHistory() { - $history_desc = money((double) $transaction->amount, (string) $transaction->currency_code, true)->format() . ' ' . trans_choice('general.payments', 1); + $history_desc = money((double) $this->transaction->amount, (string) $this->transaction->currency_code, true)->format() . ' ' . trans_choice('general.payments', 1); if ($this->model instanceof Invoice) { $this->dispatch(new CreateInvoiceHistory($this->model, 0, $history_desc)); diff --git a/app/Jobs/Banking/CreateReconciliation.php b/app/Jobs/Banking/CreateReconciliation.php index bf54d7711..af20953cd 100644 --- a/app/Jobs/Banking/CreateReconciliation.php +++ b/app/Jobs/Banking/CreateReconciliation.php @@ -8,6 +8,8 @@ use App\Models\Banking\Transaction; class CreateReconciliation extends Job { + protected $reconciliation; + protected $request; /** @@ -27,32 +29,34 @@ class CreateReconciliation extends Job */ public function handle() { - $reconcile = $this->request->get('reconcile'); - $transactions = $this->request->get('transactions'); + \DB::transaction(function () { + $reconcile = $this->request->get('reconcile'); + $transactions = $this->request->get('transactions'); - $reconciliation = Reconciliation::create([ - 'company_id' => $this->request['company_id'], - 'account_id' => $this->request->get('account_id'), - 'started_at' => $this->request->get('started_at'), - 'ended_at' => $this->request->get('ended_at'), - 'closing_balance' => $this->request->get('closing_balance'), - 'reconciled' => $reconcile ? 1 : 0, - ]); + $this->reconciliation = Reconciliation::create([ + 'company_id' => $this->request['company_id'], + 'account_id' => $this->request->get('account_id'), + 'started_at' => $this->request->get('started_at'), + 'ended_at' => $this->request->get('ended_at'), + 'closing_balance' => $this->request->get('closing_balance'), + 'reconciled' => $reconcile ? 1 : 0, + ]); - if ($transactions) { - foreach ($transactions as $key => $value) { - if (empty($value)) { - continue; + if ($transactions) { + foreach ($transactions as $key => $value) { + if (empty($value)) { + continue; + } + + $t = explode('_', $key); + + $transaction = Transaction::find($t[1]); + $transaction->reconciled = 1; + $transaction->save(); } - - $t = explode('_', $key); - - $transaction = Transaction::find($t[1]); - $transaction->reconciled = 1; - $transaction->save(); } - } + }); - return $reconciliation; + return $this->reconciliation; } } diff --git a/app/Jobs/Banking/CreateTransaction.php b/app/Jobs/Banking/CreateTransaction.php index 37ff1f4e3..40e2a485d 100644 --- a/app/Jobs/Banking/CreateTransaction.php +++ b/app/Jobs/Banking/CreateTransaction.php @@ -9,10 +9,10 @@ use App\Models\Banking\Transaction; class CreateTransaction extends Job { - protected $request; - protected $transaction; + protected $request; + /** * Create a new job instance. * @@ -32,17 +32,19 @@ class CreateTransaction extends Job { event(new TransactionCreating($this->request)); - $this->transaction = Transaction::create($this->request->all()); + \DB::transaction(function () { + $this->transaction = Transaction::create($this->request->all()); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'transactions'); + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'transactions'); - $this->transaction->attachMedia($media, 'attachment'); - } + $this->transaction->attachMedia($media, 'attachment'); + } - // Recurring - $this->transaction->createRecurring(); + // Recurring + $this->transaction->createRecurring(); + }); event(new TransactionCreated($this->transaction)); diff --git a/app/Jobs/Banking/CreateTransfer.php b/app/Jobs/Banking/CreateTransfer.php index 1daaac4a6..38b115199 100644 --- a/app/Jobs/Banking/CreateTransfer.php +++ b/app/Jobs/Banking/CreateTransfer.php @@ -11,6 +11,8 @@ use App\Models\Setting\Currency; class CreateTransfer extends Job { + protected $transfer; + protected $request; /** @@ -30,76 +32,78 @@ class CreateTransfer extends Job */ public function handle() { - $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); + \DB::transaction(function () { + $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); - $expense_currency_code = Account::where('id', $this->request->get('from_account_id'))->pluck('currency_code')->first(); - $income_currency_code = Account::where('id', $this->request->get('to_account_id'))->pluck('currency_code')->first(); + $expense_currency_code = Account::where('id', $this->request->get('from_account_id'))->pluck('currency_code')->first(); + $income_currency_code = Account::where('id', $this->request->get('to_account_id'))->pluck('currency_code')->first(); - $expense_transaction = Transaction::create([ - 'company_id' => $this->request['company_id'], - 'type' => 'expense', - 'account_id' => $this->request->get('from_account_id'), - 'paid_at' => $this->request->get('transferred_at'), - 'currency_code' => $expense_currency_code, - 'currency_rate' => $currencies[$expense_currency_code], - 'amount' => $this->request->get('amount'), - 'contact_id' => 0, - 'description' => $this->request->get('description'), - 'category_id' => Category::transfer(), // Transfer Category ID - 'payment_method' => $this->request->get('payment_method'), - 'reference' => $this->request->get('reference'), - ]); + $expense_transaction = Transaction::create([ + 'company_id' => $this->request['company_id'], + 'type' => 'expense', + 'account_id' => $this->request->get('from_account_id'), + 'paid_at' => $this->request->get('transferred_at'), + 'currency_code' => $expense_currency_code, + 'currency_rate' => $currencies[$expense_currency_code], + 'amount' => $this->request->get('amount'), + 'contact_id' => 0, + 'description' => $this->request->get('description'), + 'category_id' => Category::transfer(), // Transfer Category ID + 'payment_method' => $this->request->get('payment_method'), + 'reference' => $this->request->get('reference'), + ]); - // Convert amount if not same currency - if ($expense_currency_code != $income_currency_code) { - $default_currency = setting('default.currency', 'USD'); + // Convert amount if not same currency + if ($expense_currency_code != $income_currency_code) { + $default_currency = setting('default.currency', 'USD'); - $default_amount = $this->request->get('amount'); + $default_amount = $this->request->get('amount'); - if ($default_currency != $expense_currency_code) { - $default_amount_model = new Transfer(); + if ($default_currency != $expense_currency_code) { + $default_amount_model = new Transfer(); - $default_amount_model->default_currency_code = $default_currency; - $default_amount_model->amount = $this->request->get('amount'); - $default_amount_model->currency_code = $expense_currency_code; - $default_amount_model->currency_rate = $currencies[$expense_currency_code]; + $default_amount_model->default_currency_code = $default_currency; + $default_amount_model->amount = $this->request->get('amount'); + $default_amount_model->currency_code = $expense_currency_code; + $default_amount_model->currency_rate = $currencies[$expense_currency_code]; - $default_amount = $default_amount_model->getAmountConvertedToDefault(); + $default_amount = $default_amount_model->getAmountConvertedToDefault(); + } + + $transfer_amount = new Transfer(); + + $transfer_amount->default_currency_code = $expense_currency_code; + $transfer_amount->amount = $default_amount; + $transfer_amount->currency_code = $income_currency_code; + $transfer_amount->currency_rate = $currencies[$income_currency_code]; + + $amount = $transfer_amount->getAmountConvertedFromDefault(); + } else { + $amount = $this->request->get('amount'); } - $transfer_amount = new Transfer(); + $income_transaction = Transaction::create([ + 'company_id' => $this->request['company_id'], + 'type' => 'income', + 'account_id' => $this->request->get('to_account_id'), + 'paid_at' => $this->request->get('transferred_at'), + 'currency_code' => $income_currency_code, + 'currency_rate' => $currencies[$income_currency_code], + 'amount' => $amount, + 'contact_id' => 0, + 'description' => $this->request->get('description'), + 'category_id' => Category::transfer(), // Transfer Category ID + 'payment_method' => $this->request->get('payment_method'), + 'reference' => $this->request->get('reference'), + ]); - $transfer_amount->default_currency_code = $expense_currency_code; - $transfer_amount->amount = $default_amount; - $transfer_amount->currency_code = $income_currency_code; - $transfer_amount->currency_rate = $currencies[$income_currency_code]; + $this->transfer = Transfer::create([ + 'company_id' => $this->request['company_id'], + 'expense_transaction_id' => $expense_transaction->id, + 'income_transaction_id' => $income_transaction->id, + ]); + }); - $amount = $transfer_amount->getAmountConvertedFromDefault(); - } else { - $amount = $this->request->get('amount'); - } - - $income_transaction = Transaction::create([ - 'company_id' => $this->request['company_id'], - 'type' => 'income', - 'account_id' => $this->request->get('to_account_id'), - 'paid_at' => $this->request->get('transferred_at'), - 'currency_code' => $income_currency_code, - 'currency_rate' => $currencies[$income_currency_code], - 'amount' => $amount, - 'contact_id' => 0, - 'description' => $this->request->get('description'), - 'category_id' => Category::transfer(), // Transfer Category ID - 'payment_method' => $this->request->get('payment_method'), - 'reference' => $this->request->get('reference'), - ]); - - $transfer = Transfer::create([ - 'company_id' => $this->request['company_id'], - 'expense_transaction_id' => $expense_transaction->id, - 'income_transaction_id' => $income_transaction->id, - ]); - - return $transfer; + return $this->transfer; } } diff --git a/app/Jobs/Banking/DeleteAccount.php b/app/Jobs/Banking/DeleteAccount.php index 5e0d123a4..be9e67027 100644 --- a/app/Jobs/Banking/DeleteAccount.php +++ b/app/Jobs/Banking/DeleteAccount.php @@ -27,7 +27,9 @@ class DeleteAccount extends Job { $this->authorize(); - $this->account->delete(); + \DB::transaction(function () { + $this->account->delete(); + }); return true; } diff --git a/app/Jobs/Banking/DeleteReconciliation.php b/app/Jobs/Banking/DeleteReconciliation.php index 33f51561d..ca5ae50e0 100644 --- a/app/Jobs/Banking/DeleteReconciliation.php +++ b/app/Jobs/Banking/DeleteReconciliation.php @@ -26,14 +26,16 @@ class DeleteReconciliation extends Job */ public function handle() { - $this->reconciliation->delete(); + \DB::transaction(function () { + $this->reconciliation->delete(); - Transaction::where('account_id', $this->reconciliation->account_id) - ->reconciled() - ->whereBetween('paid_at', [$this->reconciliation->started_at, $this->reconciliation->ended_at])->each(function ($transaction) { - $transaction->reconciled = 0; - $transaction->save(); - }); + Transaction::where('account_id', $this->reconciliation->account_id) + ->reconciled() + ->whereBetween('paid_at', [$this->reconciliation->started_at, $this->reconciliation->ended_at])->each(function ($transaction) { + $transaction->reconciled = 0; + $transaction->save(); + }); + }); return true; } diff --git a/app/Jobs/Banking/DeleteTransaction.php b/app/Jobs/Banking/DeleteTransaction.php index 1b7895d13..69a36ab51 100644 --- a/app/Jobs/Banking/DeleteTransaction.php +++ b/app/Jobs/Banking/DeleteTransaction.php @@ -28,8 +28,10 @@ class DeleteTransaction extends Job { $this->authorize(); - $this->transaction->recurring()->delete(); - $this->transaction->delete(); + \DB::transaction(function () { + $this->transaction->recurring()->delete(); + $this->transaction->delete(); + }); return true; } diff --git a/app/Jobs/Banking/DeleteTransfer.php b/app/Jobs/Banking/DeleteTransfer.php index 69e6fce57..6bbd58ac5 100644 --- a/app/Jobs/Banking/DeleteTransfer.php +++ b/app/Jobs/Banking/DeleteTransfer.php @@ -25,9 +25,11 @@ class DeleteTransfer extends Job */ public function handle() { - $this->transfer->expense_transaction->delete(); - $this->transfer->income_transaction->delete(); - $this->transfer->delete(); + \DB::transaction(function () { + $this->transfer->expense_transaction->delete(); + $this->transfer->income_transaction->delete(); + $this->transfer->delete(); + }); return true; } diff --git a/app/Jobs/Banking/UpdateAccount.php b/app/Jobs/Banking/UpdateAccount.php index a8ab00a0b..8854ba1ea 100644 --- a/app/Jobs/Banking/UpdateAccount.php +++ b/app/Jobs/Banking/UpdateAccount.php @@ -32,13 +32,15 @@ class UpdateAccount extends Job { $this->authorize(); - $this->account->update($this->request->all()); + \DB::transaction(function () { + $this->account->update($this->request->all()); - // Set default account - if ($this->request['default_account']) { - setting()->set('default.account', $this->account->id); - setting()->save(); - } + // Set default account + if ($this->request['default_account']) { + setting()->set('default.account', $this->account->id); + setting()->save(); + } + }); return $this->account; } diff --git a/app/Jobs/Banking/UpdateReconciliation.php b/app/Jobs/Banking/UpdateReconciliation.php index b7fa2f413..344dc83dd 100644 --- a/app/Jobs/Banking/UpdateReconciliation.php +++ b/app/Jobs/Banking/UpdateReconciliation.php @@ -31,25 +31,27 @@ class UpdateReconciliation extends Job */ public function handle() { - $reconcile = $this->request->get('reconcile'); - $transactions = $this->request->get('transactions'); + \DB::transaction(function () { + $reconcile = $this->request->get('reconcile'); + $transactions = $this->request->get('transactions'); - $this->reconciliation->reconciled = $reconcile ? 1 : 0; - $this->reconciliation->save(); + $this->reconciliation->reconciled = $reconcile ? 1 : 0; + $this->reconciliation->save(); - if ($transactions) { - foreach ($transactions as $key => $value) { - if (empty($value)) { - continue; + if ($transactions) { + foreach ($transactions as $key => $value) { + if (empty($value)) { + continue; + } + + $t = explode('_', $key); + + $transaction = Transaction::find($t[1]); + $transaction->reconciled = 1; + $transaction->save(); } - - $t = explode('_', $key); - - $transaction = Transaction::find($t[1]); - $transaction->reconciled = 1; - $transaction->save(); } - } + }); return $this->reconciliation; } diff --git a/app/Jobs/Banking/UpdateTransaction.php b/app/Jobs/Banking/UpdateTransaction.php index 131a16320..b444e57fd 100644 --- a/app/Jobs/Banking/UpdateTransaction.php +++ b/app/Jobs/Banking/UpdateTransaction.php @@ -32,17 +32,19 @@ class UpdateTransaction extends Job { $this->authorize(); - $this->transaction->update($this->request->all()); + \DB::transaction(function () { + $this->transaction->update($this->request->all()); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'transactions'); + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'transactions'); - $this->transaction->attachMedia($media, 'attachment'); - } + $this->transaction->attachMedia($media, 'attachment'); + } - // Recurring - $this->transaction->updateRecurring(); + // Recurring + $this->transaction->updateRecurring(); + }); return $this->transaction; } diff --git a/app/Jobs/Banking/UpdateTransfer.php b/app/Jobs/Banking/UpdateTransfer.php index 4437936e2..d9193a778 100644 --- a/app/Jobs/Banking/UpdateTransfer.php +++ b/app/Jobs/Banking/UpdateTransfer.php @@ -34,78 +34,80 @@ class UpdateTransfer extends Job */ public function handle() { - $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); + \DB::transaction(function () { + $currencies = Currency::enabled()->pluck('rate', 'code')->toArray(); - $expense_currency_code = Account::where('id', $this->request->get('from_account_id'))->pluck('currency_code')->first(); - $income_currency_code = Account::where('id', $this->request->get('to_account_id'))->pluck('currency_code')->first(); + $expense_currency_code = Account::where('id', $this->request->get('from_account_id'))->pluck('currency_code')->first(); + $income_currency_code = Account::where('id', $this->request->get('to_account_id'))->pluck('currency_code')->first(); - $expense_transaction = Transaction::findOrFail($this->transfer->expense_transaction_id); - $income_transaction = Transaction::findOrFail($this->transfer->income_transaction_id); + $expense_transaction = Transaction::findOrFail($this->transfer->expense_transaction_id); + $income_transaction = Transaction::findOrFail($this->transfer->income_transaction_id); - $expense_transaction->update([ - 'company_id' => $this->request['company_id'], - 'type' => 'expense', - 'account_id' => $this->request->get('from_account_id'), - 'paid_at' => $this->request->get('transferred_at'), - 'currency_code' => $expense_currency_code, - 'currency_rate' => $currencies[$expense_currency_code], - 'amount' => $this->request->get('amount'), - 'contact_id' => 0, - 'description' => $this->request->get('description'), - 'category_id' => Category::transfer(), // Transfer Category ID - 'payment_method' => $this->request->get('payment_method'), - 'reference' => $this->request->get('reference'), - ]); + $expense_transaction->update([ + 'company_id' => $this->request['company_id'], + 'type' => 'expense', + 'account_id' => $this->request->get('from_account_id'), + 'paid_at' => $this->request->get('transferred_at'), + 'currency_code' => $expense_currency_code, + 'currency_rate' => $currencies[$expense_currency_code], + 'amount' => $this->request->get('amount'), + 'contact_id' => 0, + 'description' => $this->request->get('description'), + 'category_id' => Category::transfer(), // Transfer Category ID + 'payment_method' => $this->request->get('payment_method'), + 'reference' => $this->request->get('reference'), + ]); - // Convert amount if not same currency - if ($expense_currency_code != $income_currency_code) { - $default_currency = setting('default.currency', 'USD'); + // Convert amount if not same currency + if ($expense_currency_code != $income_currency_code) { + $default_currency = setting('default.currency', 'USD'); - $default_amount = $this->request->get('amount'); + $default_amount = $this->request->get('amount'); - if ($default_currency != $expense_currency_code) { - $default_amount_model = new Transfer(); + if ($default_currency != $expense_currency_code) { + $default_amount_model = new Transfer(); - $default_amount_model->default_currency_code = $default_currency; - $default_amount_model->amount = $this->request->get('amount'); - $default_amount_model->currency_code = $expense_currency_code; - $default_amount_model->currency_rate = $currencies[$expense_currency_code]; + $default_amount_model->default_currency_code = $default_currency; + $default_amount_model->amount = $this->request->get('amount'); + $default_amount_model->currency_code = $expense_currency_code; + $default_amount_model->currency_rate = $currencies[$expense_currency_code]; - $default_amount = $default_amount_model->getAmountConvertedToDefault(); + $default_amount = $default_amount_model->getAmountConvertedToDefault(); + } + + $transfer_amount = new Transfer(); + + $transfer_amount->default_currency_code = $expense_currency_code; + $transfer_amount->amount = $default_amount; + $transfer_amount->currency_code = $income_currency_code; + $transfer_amount->currency_rate = $currencies[$income_currency_code]; + + $amount = $transfer_amount->getAmountConvertedFromDefault(); + } else { + $amount = $this->request->get('amount'); } - $transfer_amount = new Transfer(); + $income_transaction->update([ + 'company_id' => $this->request['company_id'], + 'type' => 'income', + 'account_id' => $this->request->get('to_account_id'), + 'paid_at' => $this->request->get('transferred_at'), + 'currency_code' => $income_currency_code, + 'currency_rate' => $currencies[$income_currency_code], + 'amount' => $amount, + 'contact_id' => 0, + 'description' => $this->request->get('description'), + 'category_id' => Category::transfer(), // Transfer Category ID + 'payment_method' => $this->request->get('payment_method'), + 'reference' => $this->request->get('reference'), + ]); - $transfer_amount->default_currency_code = $expense_currency_code; - $transfer_amount->amount = $default_amount; - $transfer_amount->currency_code = $income_currency_code; - $transfer_amount->currency_rate = $currencies[$income_currency_code]; - - $amount = $transfer_amount->getAmountConvertedFromDefault(); - } else { - $amount = $this->request->get('amount'); - } - - $income_transaction->update([ - 'company_id' => $this->request['company_id'], - 'type' => 'income', - 'account_id' => $this->request->get('to_account_id'), - 'paid_at' => $this->request->get('transferred_at'), - 'currency_code' => $income_currency_code, - 'currency_rate' => $currencies[$income_currency_code], - 'amount' => $amount, - 'contact_id' => 0, - 'description' => $this->request->get('description'), - 'category_id' => Category::transfer(), // Transfer Category ID - 'payment_method' => $this->request->get('payment_method'), - 'reference' => $this->request->get('reference'), - ]); - - $this->transfer->update([ - 'company_id' => $this->request['company_id'], - 'expense_transaction_id' => $expense_transaction->id, - 'income_transaction_id' => $income_transaction->id, - ]); + $this->transfer->update([ + 'company_id' => $this->request['company_id'], + 'expense_transaction_id' => $expense_transaction->id, + 'income_transaction_id' => $income_transaction->id, + ]); + }); return $this->transfer; } diff --git a/app/Jobs/Common/CreateCompany.php b/app/Jobs/Common/CreateCompany.php index e85bbb7d3..339a05692 100644 --- a/app/Jobs/Common/CreateCompany.php +++ b/app/Jobs/Common/CreateCompany.php @@ -8,10 +8,10 @@ use Artisan; class CreateCompany extends Job { - protected $request; - protected $company; + protected $request; + /** * Create a new job instance. * @@ -29,15 +29,17 @@ class CreateCompany extends Job */ public function handle() { - $this->company = Company::create($this->request->all()); + \DB::transaction(function () { + $this->company = Company::create($this->request->all()); - // Clear settings - setting()->setExtraColumns(['company_id' => $this->company->id]); - setting()->forgetAll(); + // Clear settings + setting()->setExtraColumns(['company_id' => $this->company->id]); + setting()->forgetAll(); - $this->callSeeds(); + $this->callSeeds(); - $this->updateSettings(); + $this->updateSettings(); + }); return $this->company; } diff --git a/app/Jobs/Common/CreateContact.php b/app/Jobs/Common/CreateContact.php index 2cf3710bc..9f14e88d5 100644 --- a/app/Jobs/Common/CreateContact.php +++ b/app/Jobs/Common/CreateContact.php @@ -9,6 +9,8 @@ use App\Models\Common\Contact; class CreateContact extends Job { + protected $contact; + protected $request; /** @@ -28,13 +30,15 @@ class CreateContact extends Job */ public function handle() { - if ($this->request->get('create_user', 'false') === 'true') { - $this->createUser(); - } + \DB::transaction(function () { + if ($this->request->get('create_user', 'false') === 'true') { + $this->createUser(); + } - $contact = Contact::create($this->request->all()); + $this->contact = Contact::create($this->request->all()); + }); - return $contact; + return $this->contact; } public function createUser() diff --git a/app/Jobs/Common/CreateDashboard.php b/app/Jobs/Common/CreateDashboard.php index a610d508b..99b196af2 100644 --- a/app/Jobs/Common/CreateDashboard.php +++ b/app/Jobs/Common/CreateDashboard.php @@ -9,6 +9,8 @@ use App\Utilities\Widgets; class CreateDashboard extends Job { + protected $dashboard; + protected $request; /** @@ -30,13 +32,15 @@ class CreateDashboard extends Job { $this->request['enabled'] = $this->request['enabled'] ?? 1; - $this->dashboard = Dashboard::create($this->request->only(['company_id', 'name', 'enabled'])); + \DB::transaction(function () { + $this->dashboard = Dashboard::create($this->request->only(['company_id', 'name', 'enabled'])); - $this->attachToUser(); + $this->attachToUser(); - if ($this->request->has('with_widgets')) { - $this->createWidgets(); - } + if ($this->request->has('with_widgets')) { + $this->createWidgets(); + } + }); return $this->dashboard; } diff --git a/app/Jobs/Common/CreateItem.php b/app/Jobs/Common/CreateItem.php index 76d850bad..121ac4995 100644 --- a/app/Jobs/Common/CreateItem.php +++ b/app/Jobs/Common/CreateItem.php @@ -7,6 +7,8 @@ use App\Models\Common\Item; class CreateItem extends Job { + protected $item; + protected $request; /** @@ -26,15 +28,17 @@ class CreateItem extends Job */ public function handle() { - $item = Item::create($this->request->all()); + \DB::transaction(function () { + $this->item = Item::create($this->request->all()); - // Upload picture - if ($this->request->file('picture')) { - $media = $this->getMedia($this->request->file('picture'), 'items'); + // Upload picture + if ($this->request->file('picture')) { + $media = $this->getMedia($this->request->file('picture'), 'items'); - $item->attachMedia($media, 'picture'); - } + $this->item->attachMedia($media, 'picture'); + } + }); - return $item; + return $this->item; } } diff --git a/app/Jobs/Common/CreateReport.php b/app/Jobs/Common/CreateReport.php index cd697f4ae..d02038297 100644 --- a/app/Jobs/Common/CreateReport.php +++ b/app/Jobs/Common/CreateReport.php @@ -7,6 +7,8 @@ use App\Models\Common\Report; class CreateReport extends Job { + protected $report; + protected $request; /** @@ -26,8 +28,10 @@ class CreateReport extends Job */ public function handle() { - $report = Report::create($this->request->all()); + \DB::transaction(function () { + $this->report = Report::create($this->request->all()); + }); - return $report; + return $this->report; } } diff --git a/app/Jobs/Common/DeleteCompany.php b/app/Jobs/Common/DeleteCompany.php index cd23f9b9b..3996900c4 100644 --- a/app/Jobs/Common/DeleteCompany.php +++ b/app/Jobs/Common/DeleteCompany.php @@ -31,14 +31,16 @@ class DeleteCompany extends Job { $this->authorize(); - $this->deleteRelationships($this->company, [ - 'accounts', 'bills', 'bill_histories', 'bill_items', 'bill_item_taxes', 'bill_totals', 'categories', - 'contacts', 'currencies', 'dashboards', 'email_templates', 'invoices', 'invoice_histories', 'invoice_items', - 'invoice_item_taxes', 'invoice_totals', 'items', 'modules', 'module_histories', 'reconciliations', - 'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets', - ]); + \DB::transaction(function () { + $this->deleteRelationships($this->company, [ + 'accounts', 'bills', 'bill_histories', 'bill_items', 'bill_item_taxes', 'bill_totals', 'categories', + 'contacts', 'currencies', 'dashboards', 'email_templates', 'invoices', 'invoice_histories', 'invoice_items', + 'invoice_item_taxes', 'invoice_totals', 'items', 'modules', 'module_histories', 'reconciliations', + 'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets', + ]); - $this->company->delete(); + $this->company->delete(); + }); return true; } diff --git a/app/Jobs/Common/DeleteContact.php b/app/Jobs/Common/DeleteContact.php index 6b7e96489..ba7bc19f7 100644 --- a/app/Jobs/Common/DeleteContact.php +++ b/app/Jobs/Common/DeleteContact.php @@ -31,11 +31,13 @@ class DeleteContact extends Job { $this->authorize(); - if ($user = $this->contact->user) { - $this->dispatch(new DeleteUser($user)); - } + \DB::transaction(function () { + if ($user = $this->contact->user) { + $this->dispatch(new DeleteUser($user)); + } - $this->contact->delete(); + $this->contact->delete(); + }); return true; } diff --git a/app/Jobs/Common/DeleteDashboard.php b/app/Jobs/Common/DeleteDashboard.php index debf4d0ff..73fe976a6 100644 --- a/app/Jobs/Common/DeleteDashboard.php +++ b/app/Jobs/Common/DeleteDashboard.php @@ -30,9 +30,11 @@ class DeleteDashboard extends Job { $this->authorize(); - $this->deleteRelationships($this->dashboard, ['widgets']); + \DB::transaction(function () { + $this->deleteRelationships($this->dashboard, ['widgets']); - $this->dashboard->delete(); + $this->dashboard->delete(); + }); return true; } diff --git a/app/Jobs/Common/DeleteItem.php b/app/Jobs/Common/DeleteItem.php index 6f9cfeace..8b194adc1 100644 --- a/app/Jobs/Common/DeleteItem.php +++ b/app/Jobs/Common/DeleteItem.php @@ -27,7 +27,9 @@ class DeleteItem extends Job { $this->authorize(); - $this->item->delete(); + \DB::transaction(function () { + $this->item->delete(); + }); return true; } diff --git a/app/Jobs/Common/DeleteReport.php b/app/Jobs/Common/DeleteReport.php index 7af2e789c..303b04f9d 100644 --- a/app/Jobs/Common/DeleteReport.php +++ b/app/Jobs/Common/DeleteReport.php @@ -25,7 +25,9 @@ class DeleteReport extends Job */ public function handle() { - $this->report->delete(); + \DB::transaction(function () { + $this->report->delete(); + }); return true; } diff --git a/app/Jobs/Common/UpdateCompany.php b/app/Jobs/Common/UpdateCompany.php index 0e214d83c..06301c110 100644 --- a/app/Jobs/Common/UpdateCompany.php +++ b/app/Jobs/Common/UpdateCompany.php @@ -35,45 +35,47 @@ class UpdateCompany extends Job { $this->authorize(); - $this->company->update($this->request->all()); + \DB::transaction(function () { + $this->company->update($this->request->all()); - // Clear current and load given company settings - setting()->setExtraColumns(['company_id' => $this->company->id]); - setting()->forgetAll(); - setting()->load(true); + // Clear current and load given company settings + setting()->setExtraColumns(['company_id' => $this->company->id]); + setting()->forgetAll(); + setting()->load(true); - if ($this->request->has('name')) { - setting()->set('company.name', $this->request->get('name')); - } - - if ($this->request->has('email')) { - setting()->set('company.email', $this->request->get('email')); - } - - if ($this->request->has('address')) { - setting()->set('company.address', $this->request->get('address')); - } - - if ($this->request->has('currency')) { - setting()->set('default.currency', $this->request->get('currency')); - } - - if ($this->request->has('locale')) { - setting()->set('default.locale', $this->request->get('locale')); - } - - if ($this->request->file('logo')) { - $company_logo = $this->getMedia($this->request->file('logo'), 'settings', $this->company->id); - - if ($company_logo) { - $this->company->attachMedia($company_logo, 'company_logo'); - - setting()->set('company.logo', $company_logo->id); + if ($this->request->has('name')) { + setting()->set('company.name', $this->request->get('name')); } - } - setting()->save(); - setting()->forgetAll(); + if ($this->request->has('email')) { + setting()->set('company.email', $this->request->get('email')); + } + + if ($this->request->has('address')) { + setting()->set('company.address', $this->request->get('address')); + } + + if ($this->request->has('currency')) { + setting()->set('default.currency', $this->request->get('currency')); + } + + if ($this->request->has('locale')) { + setting()->set('default.locale', $this->request->get('locale')); + } + + if ($this->request->file('logo')) { + $company_logo = $this->getMedia($this->request->file('logo'), 'settings', $this->company->id); + + if ($company_logo) { + $this->company->attachMedia($company_logo, 'company_logo'); + + setting()->set('company.logo', $company_logo->id); + } + } + + setting()->save(); + setting()->forgetAll(); + }); return $this->company; } diff --git a/app/Jobs/Common/UpdateContact.php b/app/Jobs/Common/UpdateContact.php index 504228e7d..9c8c9531c 100644 --- a/app/Jobs/Common/UpdateContact.php +++ b/app/Jobs/Common/UpdateContact.php @@ -33,11 +33,13 @@ class UpdateContact extends Job { $this->authorize(); - if ($this->request->get('create_user', 'false') === 'true') { - $this->createUser(); - } + \DB::transaction(function () { + if ($this->request->get('create_user', 'false') === 'true') { + $this->createUser(); + } - $this->contact->update($this->request->all()); + $this->contact->update($this->request->all()); + }); return $this->contact; } diff --git a/app/Jobs/Common/UpdateDashboard.php b/app/Jobs/Common/UpdateDashboard.php index 729a47034..736c3763a 100644 --- a/app/Jobs/Common/UpdateDashboard.php +++ b/app/Jobs/Common/UpdateDashboard.php @@ -35,11 +35,13 @@ class UpdateDashboard extends Job { $this->authorize(); - $this->dashboard->update($this->request->all()); + \DB::transaction(function () { + $this->dashboard->update($this->request->all()); - if ($this->request->has('users')) { - $this->dashboard->users()->sync($this->request->get('users')); - } + if ($this->request->has('users')) { + $this->dashboard->users()->sync($this->request->get('users')); + } + }); return $this->dashboard; } diff --git a/app/Jobs/Common/UpdateItem.php b/app/Jobs/Common/UpdateItem.php index ed4e0bc66..1ebc52a53 100644 --- a/app/Jobs/Common/UpdateItem.php +++ b/app/Jobs/Common/UpdateItem.php @@ -30,14 +30,16 @@ class UpdateItem extends Job */ public function handle() { - $this->item->update($this->request->all()); + \DB::transaction(function () { + $this->item->update($this->request->all()); - // Upload picture - if ($this->request->file('picture')) { - $media = $this->getMedia($this->request->file('picture'), 'items'); + // Upload picture + if ($this->request->file('picture')) { + $media = $this->getMedia($this->request->file('picture'), 'items'); - $this->item->attachMedia($media, 'picture'); - } + $this->item->attachMedia($media, 'picture'); + } + }); return $this->item; } diff --git a/app/Jobs/Common/UpdateReport.php b/app/Jobs/Common/UpdateReport.php index 4f5eb3733..20cae5f0a 100644 --- a/app/Jobs/Common/UpdateReport.php +++ b/app/Jobs/Common/UpdateReport.php @@ -30,7 +30,9 @@ class UpdateReport extends Job */ public function handle() { - $this->report->update($this->request->all()); + \DB::transaction(function () { + $this->report->update($this->request->all()); + }); return $this->report; } diff --git a/app/Jobs/Purchase/CancelBill.php b/app/Jobs/Purchase/CancelBill.php index 11d7350a2..b86438364 100644 --- a/app/Jobs/Purchase/CancelBill.php +++ b/app/Jobs/Purchase/CancelBill.php @@ -26,12 +26,14 @@ class CancelBill extends Job */ public function handle() { - $this->deleteRelationships($this->bill, [ - 'transactions', 'recurring' - ]); + \DB::transaction(function () { + $this->deleteRelationships($this->bill, [ + 'transactions', 'recurring' + ]); - $this->bill->status = 'cancelled'; - $this->bill->save(); + $this->bill->status = 'cancelled'; + $this->bill->save(); + }); return $this->bill; } diff --git a/app/Jobs/Purchase/CreateBill.php b/app/Jobs/Purchase/CreateBill.php index a75356ab8..12093253c 100644 --- a/app/Jobs/Purchase/CreateBill.php +++ b/app/Jobs/Purchase/CreateBill.php @@ -14,10 +14,10 @@ class CreateBill extends Job { use Currencies, DateTime; - protected $request; - protected $bill; + protected $request; + /** * Create a new job instance. * @@ -41,20 +41,22 @@ class CreateBill extends Job event(new BillCreating($this->request)); - $this->bill = Bill::create($this->request->all()); + \DB::transaction(function () { + $this->bill = Bill::create($this->request->all()); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'bills'); + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'bills'); - $this->bill->attachMedia($media, 'attachment'); - } + $this->bill->attachMedia($media, 'attachment'); + } - $this->createItemsAndTotals(); + $this->createItemsAndTotals(); - $this->bill->update($this->request->input()); + $this->bill->update($this->request->input()); - $this->bill->createRecurring(); + $this->bill->createRecurring(); + }); event(new BillCreated($this->bill)); diff --git a/app/Jobs/Purchase/DeleteBill.php b/app/Jobs/Purchase/DeleteBill.php index 0bc472922..d80b80c86 100644 --- a/app/Jobs/Purchase/DeleteBill.php +++ b/app/Jobs/Purchase/DeleteBill.php @@ -3,7 +3,6 @@ namespace App\Jobs\Purchase; use App\Abstracts\Job; -use App\Models\Purchase\Bill; use App\Observers\Transaction; class DeleteBill extends Job @@ -29,15 +28,17 @@ class DeleteBill extends Job { $this->authorize(); - Transaction::mute(); + \DB::transaction(function () { + Transaction::mute(); - $this->deleteRelationships($this->bill, [ - 'items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals' - ]); + $this->deleteRelationships($this->bill, [ + 'items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals' + ]); - $this->bill->delete(); + $this->bill->delete(); - Transaction::unmute(); + Transaction::unmute(); + }); return true; } diff --git a/app/Jobs/Purchase/DuplicateBill.php b/app/Jobs/Purchase/DuplicateBill.php index de49f19e7..e04eefdf5 100644 --- a/app/Jobs/Purchase/DuplicateBill.php +++ b/app/Jobs/Purchase/DuplicateBill.php @@ -3,13 +3,15 @@ namespace App\Jobs\Purchase; use App\Abstracts\Job; +use App\Events\Purchase\BillCreated; use App\Models\Purchase\Bill; -use App\Models\Purchase\BillHistory; class DuplicateBill extends Job { protected $bill; + protected $clone; + /** * Create a new job instance. * @@ -27,17 +29,12 @@ class DuplicateBill extends Job */ public function handle() { - $clone = $this->bill->duplicate(); + \DB::transaction(function () { + $this->clone = $this->bill->duplicate(); + }); - // Add bill history - BillHistory::create([ - 'company_id' => session('company_id'), - 'bill_id' => $clone->id, - 'status' => 'draft', - 'notify' => 0, - 'description' => trans('messages.success.added', ['type' => $clone->bill_number]), - ]); + event(new BillCreated($this->clone)); - return $clone; + return $this->clone; } } diff --git a/app/Jobs/Purchase/UpdateBill.php b/app/Jobs/Purchase/UpdateBill.php index fbee067b2..5d4563ea1 100644 --- a/app/Jobs/Purchase/UpdateBill.php +++ b/app/Jobs/Purchase/UpdateBill.php @@ -43,26 +43,28 @@ class UpdateBill extends Job event(new BillUpdating($this->bill, $this->request)); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'bills'); + \DB::transaction(function () { + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'bills'); - $this->bill->attachMedia($media, 'attachment'); - } + $this->bill->attachMedia($media, 'attachment'); + } - $this->createItemsAndTotals(); + $this->createItemsAndTotals(); - $bill_paid = $this->bill->paid; + $bill_paid = $this->bill->paid; - unset($this->bill->reconciled); + unset($this->bill->reconciled); - if (($bill_paid) && $this->request['amount'] > $bill_paid) { - $this->request['status'] = 'partial'; - } + if (($bill_paid) && $this->request['amount'] > $bill_paid) { + $this->request['status'] = 'partial'; + } - $this->bill->update($this->request->input()); + $this->bill->update($this->request->input()); - $this->bill->updateRecurring(); + $this->bill->updateRecurring(); + }); event(new BillUpdated($this->bill)); diff --git a/app/Jobs/Sale/CancelInvoice.php b/app/Jobs/Sale/CancelInvoice.php index de9215994..9240539e6 100644 --- a/app/Jobs/Sale/CancelInvoice.php +++ b/app/Jobs/Sale/CancelInvoice.php @@ -26,12 +26,14 @@ class CancelInvoice extends Job */ public function handle() { - $this->deleteRelationships($this->invoice, [ - 'transactions', 'recurring' - ]); + \DB::transaction(function () { + $this->deleteRelationships($this->invoice, [ + 'transactions', 'recurring' + ]); - $this->invoice->status = 'cancelled'; - $this->invoice->save(); + $this->invoice->status = 'cancelled'; + $this->invoice->save(); + }); return $this->invoice; } diff --git a/app/Jobs/Sale/CreateInvoice.php b/app/Jobs/Sale/CreateInvoice.php index c22608fc5..2bf832e9f 100644 --- a/app/Jobs/Sale/CreateInvoice.php +++ b/app/Jobs/Sale/CreateInvoice.php @@ -14,10 +14,10 @@ class CreateInvoice extends Job { use Currencies, DateTime; - protected $request; - protected $invoice; + protected $request; + /** * Create a new job instance. * @@ -41,20 +41,22 @@ class CreateInvoice extends Job event(new InvoiceCreating($this->request)); - $this->invoice = Invoice::create($this->request->all()); + \DB::transaction(function () { + $this->invoice = Invoice::create($this->request->all()); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'invoices'); + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'invoices'); - $this->invoice->attachMedia($media, 'attachment'); - } + $this->invoice->attachMedia($media, 'attachment'); + } - $this->createItemsAndTotals(); + $this->createItemsAndTotals(); - $this->invoice->update($this->request->all()); + $this->invoice->update($this->request->all()); - $this->invoice->createRecurring(); + $this->invoice->createRecurring(); + }); event(new InvoiceCreated($this->invoice)); diff --git a/app/Jobs/Sale/DeleteInvoice.php b/app/Jobs/Sale/DeleteInvoice.php index 1a6acfd05..693e79e2c 100644 --- a/app/Jobs/Sale/DeleteInvoice.php +++ b/app/Jobs/Sale/DeleteInvoice.php @@ -3,7 +3,6 @@ namespace App\Jobs\Sale; use App\Abstracts\Job; -use App\Models\Sale\Invoice; use App\Observers\Transaction; class DeleteInvoice extends Job @@ -29,15 +28,17 @@ class DeleteInvoice extends Job { $this->authorize(); - Transaction::mute(); + \DB::transaction(function () { + Transaction::mute(); - $this->deleteRelationships($this->invoice, [ - 'items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals' - ]); + $this->deleteRelationships($this->invoice, [ + 'items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals' + ]); - $this->invoice->delete(); + $this->invoice->delete(); - Transaction::unmute(); + Transaction::unmute(); + }); return true; } diff --git a/app/Jobs/Sale/DuplicateInvoice.php b/app/Jobs/Sale/DuplicateInvoice.php index cf401a11a..510a34e07 100644 --- a/app/Jobs/Sale/DuplicateInvoice.php +++ b/app/Jobs/Sale/DuplicateInvoice.php @@ -10,6 +10,8 @@ class DuplicateInvoice extends Job { protected $invoice; + protected $clone; + /** * Create a new job instance. * @@ -27,10 +29,12 @@ class DuplicateInvoice extends Job */ public function handle() { - $clone = $this->invoice->duplicate(); + \DB::transaction(function () { + $this->clone = $this->invoice->duplicate(); + }); - event(new InvoiceCreated($clone)); + event(new InvoiceCreated($this->clone)); - return $clone; + return $this->clone; } } diff --git a/app/Jobs/Sale/UpdateInvoice.php b/app/Jobs/Sale/UpdateInvoice.php index 86c52d051..34f147fd6 100644 --- a/app/Jobs/Sale/UpdateInvoice.php +++ b/app/Jobs/Sale/UpdateInvoice.php @@ -43,26 +43,28 @@ class UpdateInvoice extends Job event(new InvoiceUpdating($this->invoice, $this->request)); - // Upload attachment - if ($this->request->file('attachment')) { - $media = $this->getMedia($this->request->file('attachment'), 'invoices'); + \DB::transaction(function () { + // Upload attachment + if ($this->request->file('attachment')) { + $media = $this->getMedia($this->request->file('attachment'), 'invoices'); - $this->invoice->attachMedia($media, 'attachment'); - } + $this->invoice->attachMedia($media, 'attachment'); + } - $this->createItemsAndTotals(); + $this->createItemsAndTotals(); - $invoice_paid = $this->invoice->paid; + $invoice_paid = $this->invoice->paid; - unset($this->invoice->reconciled); + unset($this->invoice->reconciled); - if (($invoice_paid) && $this->request['amount'] > $invoice_paid) { - $this->request['status'] = 'partial'; - } + if (($invoice_paid) && $this->request['amount'] > $invoice_paid) { + $this->request['status'] = 'partial'; + } - $this->invoice->update($this->request->all()); + $this->invoice->update($this->request->all()); - $this->invoice->updateRecurring(); + $this->invoice->updateRecurring(); + }); event(new InvoiceUpdated($this->invoice, $this->request)); diff --git a/app/Jobs/Setting/CreateCategory.php b/app/Jobs/Setting/CreateCategory.php index 1a1bac422..58d13d0cc 100644 --- a/app/Jobs/Setting/CreateCategory.php +++ b/app/Jobs/Setting/CreateCategory.php @@ -7,6 +7,8 @@ use App\Models\Setting\Category; class CreateCategory extends Job { + protected $category; + protected $request; /** @@ -26,8 +28,10 @@ class CreateCategory extends Job */ public function handle() { - $category = Category::create($this->request->all()); + \DB::transaction(function () { + $this->category = Category::create($this->request->all()); + }); - return $category; + return $this->category; } } diff --git a/app/Jobs/Setting/CreateCurrency.php b/app/Jobs/Setting/CreateCurrency.php index 7b6e219bd..15db00ee6 100644 --- a/app/Jobs/Setting/CreateCurrency.php +++ b/app/Jobs/Setting/CreateCurrency.php @@ -7,6 +7,8 @@ use App\Models\Setting\Currency; class CreateCurrency extends Job { + protected $currency; + protected $request; /** @@ -31,14 +33,16 @@ class CreateCurrency extends Job $this->request['rate'] = '1'; } - $currency = Currency::create($this->request->all()); + \DB::transaction(function () { + $this->currency = Currency::create($this->request->all()); - // Update default currency setting - if ($this->request->get('default_currency')) { - setting()->set('default.currency', $this->request->get('code')); - setting()->save(); - } + // Update default currency setting + if ($this->request->get('default_currency')) { + setting()->set('default.currency', $this->request->get('code')); + setting()->save(); + } + }); - return $currency; + return $this->currency; } } diff --git a/app/Jobs/Setting/CreateTax.php b/app/Jobs/Setting/CreateTax.php index 9c1a7c5e7..3084813e0 100644 --- a/app/Jobs/Setting/CreateTax.php +++ b/app/Jobs/Setting/CreateTax.php @@ -7,6 +7,8 @@ use App\Models\Setting\Tax; class CreateTax extends Job { + protected $tax; + protected $request; /** @@ -26,8 +28,10 @@ class CreateTax extends Job */ public function handle() { - $tax = Tax::create($this->request->all()); + \DB::transaction(function () { + $this->tax = Tax::create($this->request->all()); + }); - return $tax; + return $this->tax; } } diff --git a/app/Jobs/Setting/DeleteCategory.php b/app/Jobs/Setting/DeleteCategory.php index 82b3906f6..68a55e5f7 100644 --- a/app/Jobs/Setting/DeleteCategory.php +++ b/app/Jobs/Setting/DeleteCategory.php @@ -28,7 +28,9 @@ class DeleteCategory extends Job { $this->authorize(); - $this->category->delete(); + \DB::transaction(function () { + $this->category->delete(); + }); return true; } diff --git a/app/Jobs/Setting/DeleteCurrency.php b/app/Jobs/Setting/DeleteCurrency.php index 7ea36011f..9ff5e844f 100644 --- a/app/Jobs/Setting/DeleteCurrency.php +++ b/app/Jobs/Setting/DeleteCurrency.php @@ -27,7 +27,9 @@ class DeleteCurrency extends Job { $this->authorize(); - $this->currency->delete(); + \DB::transaction(function () { + $this->currency->delete(); + }); return true; } diff --git a/app/Jobs/Setting/DeleteTax.php b/app/Jobs/Setting/DeleteTax.php index 4f7fb8a45..21bf97ef3 100644 --- a/app/Jobs/Setting/DeleteTax.php +++ b/app/Jobs/Setting/DeleteTax.php @@ -27,7 +27,9 @@ class DeleteTax extends Job { $this->authorize(); - $this->tax->delete(); + \DB::transaction(function () { + $this->tax->delete(); + }); return true; } diff --git a/app/Jobs/Setting/UpdateCategory.php b/app/Jobs/Setting/UpdateCategory.php index a537f5a74..e5c3b8839 100644 --- a/app/Jobs/Setting/UpdateCategory.php +++ b/app/Jobs/Setting/UpdateCategory.php @@ -32,7 +32,9 @@ class UpdateCategory extends Job { $this->authorize(); - $this->category->update($this->request->all()); + \DB::transaction(function () { + $this->category->update($this->request->all()); + }); return $this->category; } diff --git a/app/Jobs/Setting/UpdateCurrency.php b/app/Jobs/Setting/UpdateCurrency.php index b11410436..808215aae 100644 --- a/app/Jobs/Setting/UpdateCurrency.php +++ b/app/Jobs/Setting/UpdateCurrency.php @@ -37,13 +37,15 @@ class UpdateCurrency extends Job $this->request['rate'] = '1'; } - $this->currency->update($this->request->all()); + \DB::transaction(function () { + $this->currency->update($this->request->all()); - // Update default currency setting - if ($this->request->get('default_currency')) { - setting()->set('default.currency', $this->request->get('code')); - setting()->save(); - } + // Update default currency setting + if ($this->request->get('default_currency')) { + setting()->set('default.currency', $this->request->get('code')); + setting()->save(); + } + }); return $this->currency; } diff --git a/app/Jobs/Setting/UpdateTax.php b/app/Jobs/Setting/UpdateTax.php index dd49f2362..ff2644e01 100644 --- a/app/Jobs/Setting/UpdateTax.php +++ b/app/Jobs/Setting/UpdateTax.php @@ -32,7 +32,9 @@ class UpdateTax extends Job { $this->authorize(); - $this->tax->update($this->request->all()); + \DB::transaction(function () { + $this->tax->update($this->request->all()); + }); return $this->tax; } diff --git a/app/Traits/Jobs.php b/app/Traits/Jobs.php index c8fcb1a20..731467584 100644 --- a/app/Traits/Jobs.php +++ b/app/Traits/Jobs.php @@ -2,6 +2,9 @@ namespace App\Traits; +use Exception; +use Throwable; + trait Jobs { /** @@ -48,7 +51,7 @@ trait Jobs 'data' => $data, 'message' => '', ]; - } catch(\Exception $e) { + } catch (Exception | Throwable $e) { $response = [ 'success' => false, 'error' => true, From efd1ea584e7544aafd8977272e4d1f8a51a308e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 27 Jun 2020 12:25:44 +0300 Subject: [PATCH 083/208] added account to payment methods --- app/Abstracts/Http/PaymentController.php | 3 ++- app/Http/Controllers/Settings/Modules.php | 7 +++++- modules/PaypalStandard/module.json | 24 ++++++++++++------- .../views/settings/modules/edit.blade.php | 4 ++++ 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/app/Abstracts/Http/PaymentController.php b/app/Abstracts/Http/PaymentController.php index 73249847f..12dc9f5a3 100644 --- a/app/Abstracts/Http/PaymentController.php +++ b/app/Abstracts/Http/PaymentController.php @@ -34,7 +34,7 @@ abstract class PaymentController extends BaseController $this->logger = $this->getLogger(); $this->user = user(); - + $this->module = module($this->alias); return $next($request); @@ -160,6 +160,7 @@ abstract class PaymentController extends BaseController public function dispatchPaidEvent($invoice, $request) { $request['company_id'] = $invoice->company_id; + $request['account_id'] = setting($this->alias . '.account_id', setting('default.account')); $request['amount'] = $invoice->amount; $request['payment_method'] = $this->alias; $request['reference'] = $this->getReference($invoice); diff --git a/app/Http/Controllers/Settings/Modules.php b/app/Http/Controllers/Settings/Modules.php index 5f4825e67..c6001e951 100644 --- a/app/Http/Controllers/Settings/Modules.php +++ b/app/Http/Controllers/Settings/Modules.php @@ -3,6 +3,8 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; +use App\Models\Banking\Account; +use App\Models\Setting\Category; use App\Models\Setting\Setting; use App\Utilities\Modules as Utility; use App\Http\Requests\Setting\Module as Request; @@ -30,6 +32,9 @@ class Modules extends Controller */ public function edit($alias) { + $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); + $categories = Category::income()->enabled()->orderBy('name')->pluck('name', 'id'); + $setting = Setting::prefix($alias)->get()->transform(function ($s) use ($alias) { $s->key = str_replace($alias . '.', '', $s->key); return $s; @@ -37,7 +42,7 @@ class Modules extends Controller $module = module($alias); - return view('settings.modules.edit', compact('setting', 'module')); + return view('settings.modules.edit', compact('setting', 'module', 'accounts', 'categories')); } /** diff --git a/modules/PaypalStandard/module.json b/modules/PaypalStandard/module.json index a4a262a9e..f486a9657 100644 --- a/modules/PaypalStandard/module.json +++ b/modules/PaypalStandard/module.json @@ -64,6 +64,22 @@ }, "rules": "required|string" }, + { + "type": "accountSelectGroup", + "name": "account_id", + "attributes": { + "required": "required" + }, + "rules": "required" + }, + { + "type": "textGroup", + "name": "order", + "title": "paypal-standard::general.form.order", + "icon": "sort", + "attributes": {}, + "rules": "nullable|integer" + }, { "type": "radioGroup", "name": "customer", @@ -81,14 +97,6 @@ "disable": "general.no", "attributes": {}, "rules": "required|integer" - }, - { - "type": "textGroup", - "name": "order", - "title": "paypal-standard::general.form.order", - "icon": "sort", - "attributes": {}, - "rules": "nullable|integer" } ] } diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php index 58e91fd7b..667ab081a 100644 --- a/resources/views/settings/modules/edit.blade.php +++ b/resources/views/settings/modules/edit.blade.php @@ -33,6 +33,10 @@ {{ Form::$type($field['name'], trans($field['title']), $field['items'], $field['value'], $field['id'], $field['attributes']) }} @elseif ($type == 'fileGroup') {{ Form::$type($field['name'], trans($field['title']), $field['attributes']) }} + @elseif ($type == 'accountSelectGroup') + {{ Form::selectGroup($field['name'], trans_choice('general.accounts', 1), 'university', $accounts, setting($module->getAlias() . '.' . $field['name']), $field['attributes']) }} + @elseif ($type == 'categorySelectGroup') + {{ Form::selectGroup($field['name'], trans_choice('general.categories', 1), 'folder', $categories, setting($module->getAlias() . '.' . $field['name']), $field['attributes']) }} @endif @endforeach From 1f5901d3c73935fd11e76c15852841c18a4bf919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 28 Jun 2020 00:24:03 +0300 Subject: [PATCH 084/208] added php version control to console --- artisan | 46 ++++++++++-------------------------------- bootstrap/app.php | 2 +- bootstrap/autoload.php | 25 ++++++++++------------- index.php | 13 +++--------- 4 files changed, 26 insertions(+), 60 deletions(-) diff --git a/artisan b/artisan index df630d0d6..d8c80fa7a 100644 --- a/artisan +++ b/artisan @@ -1,33 +1,20 @@ #!/usr/bin/env php make(Illuminate\Contracts\Console\Kernel::class); $status = $kernel->handle( @@ -35,17 +22,6 @@ $status = $kernel->handle( new Symfony\Component\Console\Output\ConsoleOutput ); -/* -|-------------------------------------------------------------------------- -| Shutdown The Application -|-------------------------------------------------------------------------- -| -| Once Artisan has finished running. We will fire off the shutdown events -| so that any final work may be done by the application before we shut -| down the process. This is the last thing to happen to the request. -| -*/ - $kernel->terminate($input, $status); exit($status); diff --git a/bootstrap/app.php b/bootstrap/app.php index f2801adf6..037e17df0 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -12,7 +12,7 @@ */ $app = new Illuminate\Foundation\Application( - realpath(__DIR__.'/../') + $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__) ); /* diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 629983380..e99ead36e 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -1,20 +1,17 @@ make(Illuminate\Contracts\Http\Kernel::class); From 2d1c4ab1f7cb0cb1f2028860d286af4e1583a3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 28 Jun 2020 09:39:20 +0300 Subject: [PATCH 085/208] removed php executable finder --- app/Utilities/Console.php | 22 +- app/Utilities/Installer.php | 2 +- bootstrap/autoload.php | 2 +- composer.json | 2 + overrides/Illuminate/Console/Application.php | 318 +++++++++++++++++++ resources/lang/en-GB/install.php | 1 + 6 files changed, 325 insertions(+), 22 deletions(-) create mode 100644 overrides/Illuminate/Console/Application.php diff --git a/app/Utilities/Console.php b/app/Utilities/Console.php index 642489e48..1ed13c947 100644 --- a/app/Utilities/Console.php +++ b/app/Utilities/Console.php @@ -2,15 +2,14 @@ namespace App\Utilities; -use Illuminate\Support\ProcessUtils; -use Symfony\Component\Process\PhpExecutableFinder; +use Illuminate\Console\Application; use Symfony\Component\Process\Process; class Console { public static function run($string, $all_output = false, $timeout = 0) { - $command = static::formatCommandString($string); + $command = Application::formatCommandString($string); logger('Console command:: ' . $command); @@ -29,21 +28,4 @@ class Console return $output; } - - public static function getPhpBinary() - { - $bin = ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false)); - - return !empty($bin) ? $bin : 'php'; - } - - public static function getArtisanBinary() - { - return defined('ARTISAN_BINARY') ? ProcessUtils::escapeArgument(ARTISAN_BINARY) : 'artisan'; - } - - public static function formatCommandString($string) - { - return sprintf('%s %s %s', static::getPhpBinary(), static::getArtisanBinary(), $string); - } } diff --git a/app/Utilities/Installer.php b/app/Utilities/Installer.php index 36d067e37..60c78426c 100644 --- a/app/Utilities/Installer.php +++ b/app/Utilities/Installer.php @@ -117,7 +117,7 @@ class Installer } if (Console::run('help') !== true) { - $requirements[] = trans('install.requirements.executable', ['php_version' => AKAUNTING_PHP]); + $requirements[] = trans('install.error.php_version', ['php_version' => AKAUNTING_PHP]); } return $requirements; diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index e99ead36e..8c7d3df97 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -5,7 +5,7 @@ define('AKAUNTING_PHP', '7.2.5'); // Check PHP version if (version_compare(PHP_VERSION, AKAUNTING_PHP, '<')) { - die('ERROR: Your host needs to use PHP ' . AKAUNTING_PHP . ' or higher to run Akaunting'); + die('Error: Ask your hosting provider to use PHP ' . AKAUNTING_PHP . ' or higher for both HTTP and CLI.'); } define('LARAVEL_START', microtime(true)); diff --git a/composer.json b/composer.json index 2ce957c87..6ed5a9f02 100644 --- a/composer.json +++ b/composer.json @@ -74,6 +74,7 @@ "App\\": "app/", "Modules\\": "modules/", "Akaunting\\Module\\Commands\\": "overrides/akaunting/module/Commands/", + "Illuminate\\Console\\": "overrides/Illuminate/Console/", "Illuminate\\Translation\\": "overrides/Illuminate/Translation/" }, "exclude-from-classmap": [ @@ -81,6 +82,7 @@ "vendor/akaunting/module/src/Commands/DisableCommand.php", "vendor/akaunting/module/src/Commands/EnableCommand.php", "vendor/akaunting/module/src/Commands/InstallCommand.php", + "vendor/laravel/framework/src/Illuminate/Console/Application.php", "vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php" ], "files": [ diff --git a/overrides/Illuminate/Console/Application.php b/overrides/Illuminate/Console/Application.php new file mode 100644 index 000000000..fdf2f4cc3 --- /dev/null +++ b/overrides/Illuminate/Console/Application.php @@ -0,0 +1,318 @@ +laravel = $laravel; + $this->events = $events; + $this->setAutoExit(false); + $this->setCatchExceptions(false); + + $this->events->dispatch(new ArtisanStarting($this)); + + $this->bootstrap(); + } + + /** + * {@inheritdoc} + */ + public function run(InputInterface $input = null, OutputInterface $output = null) + { + $commandName = $this->getCommandName( + $input = $input ?: new ArgvInput + ); + + $this->events->dispatch( + new CommandStarting( + $commandName, $input, $output = $output ?: new ConsoleOutput + ) + ); + + $exitCode = parent::run($input, $output); + + $this->events->dispatch( + new CommandFinished($commandName, $input, $output, $exitCode) + ); + + return $exitCode; + } + + /** + * Determine the proper PHP executable. + * + * @return string + */ + public static function phpBinary() + { + // Not working on shared hosting due to "open_basedir" restriction applied by cPanel/Plesk + //return ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false)); + return 'php'; + } + + /** + * Determine the proper Artisan executable. + * + * @return string + */ + public static function artisanBinary() + { + return defined('ARTISAN_BINARY') ? ProcessUtils::escapeArgument(ARTISAN_BINARY) : 'artisan'; + } + + /** + * Format the given command as a fully-qualified executable command. + * + * @param string $string + * @return string + */ + public static function formatCommandString($string) + { + return sprintf('%s %s %s', static::phpBinary(), static::artisanBinary(), $string); + } + + /** + * Register a console "starting" bootstrapper. + * + * @param \Closure $callback + * @return void + */ + public static function starting(Closure $callback) + { + static::$bootstrappers[] = $callback; + } + + /** + * Bootstrap the console application. + * + * @return void + */ + protected function bootstrap() + { + foreach (static::$bootstrappers as $bootstrapper) { + $bootstrapper($this); + } + } + + /** + * Clear the console application bootstrappers. + * + * @return void + */ + public static function forgetBootstrappers() + { + static::$bootstrappers = []; + } + + /** + * Run an Artisan console command by name. + * + * @param string $command + * @param array $parameters + * @param \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer + * @return int + * + * @throws \Symfony\Component\Console\Exception\CommandNotFoundException + */ + public function call($command, array $parameters = [], $outputBuffer = null) + { + [$command, $input] = $this->parseCommand($command, $parameters); + + if (! $this->has($command)) { + throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $command)); + } + + return $this->run( + $input, $this->lastOutput = $outputBuffer ?: new BufferedOutput + ); + } + + /** + * Parse the incoming Artisan command and its input. + * + * @param string $command + * @param array $parameters + * @return array + */ + protected function parseCommand($command, $parameters) + { + if (is_subclass_of($command, SymfonyCommand::class)) { + $callingClass = true; + + $command = $this->laravel->make($command)->getName(); + } + + if (! isset($callingClass) && empty($parameters)) { + $command = $this->getCommandName($input = new StringInput($command)); + } else { + array_unshift($parameters, $command); + + $input = new ArrayInput($parameters); + } + + return [$command, $input ?? null]; + } + + /** + * Get the output for the last run command. + * + * @return string + */ + public function output() + { + return $this->lastOutput && method_exists($this->lastOutput, 'fetch') + ? $this->lastOutput->fetch() + : ''; + } + + /** + * Add a command to the console. + * + * @param \Symfony\Component\Console\Command\Command $command + * @return \Symfony\Component\Console\Command\Command + */ + public function add(SymfonyCommand $command) + { + if ($command instanceof Command) { + $command->setLaravel($this->laravel); + } + + return $this->addToParent($command); + } + + /** + * Add the command to the parent instance. + * + * @param \Symfony\Component\Console\Command\Command $command + * @return \Symfony\Component\Console\Command\Command + */ + protected function addToParent(SymfonyCommand $command) + { + return parent::add($command); + } + + /** + * Add a command, resolving through the application. + * + * @param string $command + * @return \Symfony\Component\Console\Command\Command + */ + public function resolve($command) + { + return $this->add($this->laravel->make($command)); + } + + /** + * Resolve an array of commands through the application. + * + * @param array|mixed $commands + * @return $this + */ + public function resolveCommands($commands) + { + $commands = is_array($commands) ? $commands : func_get_args(); + + foreach ($commands as $command) { + $this->resolve($command); + } + + return $this; + } + + /** + * Get the default input definition for the application. + * + * This is used to add the --env option to every available command. + * + * @return \Symfony\Component\Console\Input\InputDefinition + */ + protected function getDefaultInputDefinition() + { + return tap(parent::getDefaultInputDefinition(), function ($definition) { + $definition->addOption($this->getEnvironmentOption()); + }); + } + + /** + * Get the global environment option for the definition. + * + * @return \Symfony\Component\Console\Input\InputOption + */ + protected function getEnvironmentOption() + { + $message = 'The environment the command should run under'; + + return new InputOption('--env', null, InputOption::VALUE_OPTIONAL, $message); + } + + /** + * Get the Laravel application instance. + * + * @return \Illuminate\Contracts\Foundation\Application + */ + public function getLaravel() + { + return $this->laravel; + } +} diff --git a/resources/lang/en-GB/install.php b/resources/lang/en-GB/install.php index c6263be39..3d933a042 100644 --- a/resources/lang/en-GB/install.php +++ b/resources/lang/en-GB/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Error: Ask your hosting provider to use PHP :php_version or higher for both HTTP and CLI.', 'connection' => 'Error: Could not connect to the database! Please, make sure the details are correct.', ], From a555c976d784d8b674f7a4a8a6ce7d59b5ed44c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 28 Jun 2020 20:18:26 +0300 Subject: [PATCH 086/208] added seeds to stub --- app/Console/Stubs/Modules/listeners/install.stub | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Console/Stubs/Modules/listeners/install.stub b/app/Console/Stubs/Modules/listeners/install.stub index a762c4e8f..4210e4b10 100644 --- a/app/Console/Stubs/Modules/listeners/install.stub +++ b/app/Console/Stubs/Modules/listeners/install.stub @@ -4,6 +4,7 @@ namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners; use App\Events\Module\Installed as Event; use App\Traits\Permissions; +use Artisan; class FinishInstallation { @@ -24,6 +25,8 @@ class FinishInstallation } $this->updatePermissions(); + + //$this->callSeeds(); } protected function updatePermissions() @@ -33,4 +36,12 @@ class FinishInstallation $this->alias . '-main' => 'c,r,u,d', ]); } + + protected function callSeeds() + { + Artisan::call('company:seed', [ + 'company' => session('company_id'), + '--class' => 'Modules\$STUDLY_NAME$\Database\Seeds\$STUDLY_NAME$DatabaseSeeder', + ]); + } } From 42f558833a2f447f123d842c144a39eeb6b09c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 29 Jun 2020 14:29:18 +0300 Subject: [PATCH 087/208] fixed #1503 --- app/Jobs/Setting/UpdateCategory.php | 2 +- app/Jobs/Setting/UpdateTax.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Setting/UpdateCategory.php b/app/Jobs/Setting/UpdateCategory.php index e5c3b8839..360df3aed 100644 --- a/app/Jobs/Setting/UpdateCategory.php +++ b/app/Jobs/Setting/UpdateCategory.php @@ -50,7 +50,7 @@ class UpdateCategory extends Job return; } - if ($this->category->type != $this->request->get('type')) { + if ($this->request->has('type') && ($this->request->get('type') != $this->category->type)) { $message = trans('messages.error.change_type', ['text' => implode(', ', $relationships)]); throw new \Exception($message); diff --git a/app/Jobs/Setting/UpdateTax.php b/app/Jobs/Setting/UpdateTax.php index ff2644e01..95081fb2f 100644 --- a/app/Jobs/Setting/UpdateTax.php +++ b/app/Jobs/Setting/UpdateTax.php @@ -50,7 +50,7 @@ class UpdateTax extends Job return; } - if ($this->tax->type != $this->request->get('type')) { + if ($this->request->has('type') && ($this->request->get('type') != $this->tax->type)) { $message = trans('messages.error.type', ['text' => implode(', ', $relationships)]); throw new \Exception($message); From 2576fd118c400ab58f514524c76edaf19ea7c0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 29 Jun 2020 17:11:50 +0300 Subject: [PATCH 088/208] updated translations --- resources/lang/da-DK/accounts.php | 4 +- resources/lang/da-DK/auth.php | 8 +- resources/lang/da-DK/bills.php | 18 ++--- resources/lang/da-DK/install.php | 2 +- resources/lang/da-DK/messages.php | 4 +- resources/lang/da-DK/modules.php | 1 - resources/lang/da-DK/widgets.php | 34 ++++----- resources/lang/es-MX/install.php | 8 +- resources/lang/es-MX/modules.php | 1 - resources/lang/fr-FR/auth.php | 6 +- resources/lang/fr-FR/bills.php | 81 +++++++++++--------- resources/lang/fr-FR/bulk_actions.php | 22 +++--- resources/lang/fr-FR/companies.php | 5 +- resources/lang/fr-FR/customers.php | 8 +- resources/lang/fr-FR/dashboard.php | 24 ------ resources/lang/fr-FR/dashboards.php | 6 +- resources/lang/fr-FR/demo.php | 14 ++-- resources/lang/fr-FR/email_templates.php | 36 ++++----- resources/lang/fr-FR/errors.php | 18 ++--- resources/lang/fr-FR/general.php | 66 +++++++++++++++- resources/lang/fr-FR/header.php | 2 +- resources/lang/fr-FR/install.php | 1 + resources/lang/fr-FR/invoices.php | 97 +++++++++++++----------- resources/lang/fr-FR/items.php | 10 --- resources/lang/fr-FR/maintenance.php | 6 +- resources/lang/fr-FR/messages.php | 10 ++- resources/lang/fr-FR/modules.php | 53 +++++++------ resources/lang/fr-FR/pagination.php | 7 +- resources/lang/fr-FR/passwords.php | 1 + resources/lang/fr-FR/reconciliations.php | 4 +- resources/lang/fr-FR/reports.php | 10 +-- resources/lang/fr-FR/settings.php | 85 ++++++++++++++------- resources/lang/fr-FR/taxes.php | 5 +- resources/lang/fr-FR/validation.php | 34 +++++---- resources/lang/fr-FR/widgets.php | 36 ++++----- resources/lang/id-ID/install.php | 2 +- resources/lang/id-ID/invoices.php | 2 +- resources/lang/id-ID/modules.php | 1 - resources/lang/id-ID/passwords.php | 2 +- resources/lang/lt-LT/accounts.php | 4 +- resources/lang/lt-LT/footer.php | 2 +- resources/lang/lt-LT/general.php | 14 ++-- resources/lang/lt-LT/messages.php | 2 +- resources/lang/lt-LT/modules.php | 1 - resources/lang/lt-LT/settings.php | 2 +- resources/lang/pt-PT/auth.php | 18 ++--- resources/lang/pt-PT/bills.php | 20 ++--- resources/lang/pt-PT/bulk_actions.php | 18 ++--- resources/lang/pt-PT/companies.php | 4 +- resources/lang/pt-PT/customers.php | 2 +- resources/lang/pt-PT/email_templates.php | 16 ++-- resources/lang/pt-PT/errors.php | 18 ++--- resources/lang/pt-PT/general.php | 64 ++++++++-------- resources/lang/pt-PT/import.php | 2 +- resources/lang/pt-PT/install.php | 8 +- resources/lang/pt-PT/invoices.php | 32 ++++---- resources/lang/pt-PT/maintenance.php | 4 +- resources/lang/pt-PT/messages.php | 22 +++--- resources/lang/pt-PT/modules.php | 34 ++++----- resources/lang/pt-PT/notifications.php | 2 +- resources/lang/pt-PT/pagination.php | 8 +- resources/lang/pt-PT/passwords.php | 8 +- resources/lang/pt-PT/settings.php | 60 +++++++-------- resources/lang/pt-PT/validation.php | 4 +- resources/lang/pt-PT/widgets.php | 8 +- resources/lang/zh-TW/auth.php | 6 +- resources/lang/zh-TW/bills.php | 79 ++++++++++--------- resources/lang/zh-TW/companies.php | 7 +- resources/lang/zh-TW/customers.php | 8 +- resources/lang/zh-TW/dashboard.php | 24 ------ resources/lang/zh-TW/demo.php | 38 +++++++--- resources/lang/zh-TW/general.php | 70 +++++++++++++++-- resources/lang/zh-TW/header.php | 2 +- resources/lang/zh-TW/install.php | 1 + resources/lang/zh-TW/invoices.php | 97 +++++++++++++----------- resources/lang/zh-TW/items.php | 10 --- resources/lang/zh-TW/messages.php | 10 ++- resources/lang/zh-TW/modules.php | 53 +++++++------ resources/lang/zh-TW/pagination.php | 7 +- resources/lang/zh-TW/passwords.php | 1 + resources/lang/zh-TW/reconciliations.php | 4 +- resources/lang/zh-TW/reports.php | 10 +-- resources/lang/zh-TW/settings.php | 87 +++++++++++++-------- resources/lang/zh-TW/taxes.php | 5 +- resources/lang/zh-TW/validation.php | 36 ++++----- 85 files changed, 933 insertions(+), 733 deletions(-) delete mode 100644 resources/lang/fr-FR/dashboard.php delete mode 100644 resources/lang/zh-TW/dashboard.php diff --git a/resources/lang/da-DK/accounts.php b/resources/lang/da-DK/accounts.php index a017370b6..b73c9e53c 100644 --- a/resources/lang/da-DK/accounts.php +++ b/resources/lang/da-DK/accounts.php @@ -4,11 +4,11 @@ return [ 'account_name' => 'Kontonavn', 'number' => 'Nummer', - 'opening_balance' => 'Primo', + 'opening_balance' => 'Åbningsbalance', 'current_balance' => 'Nuværende saldo', 'bank_name' => 'Banknavn', 'bank_phone' => 'Telefon bank', 'bank_address' => 'Bank adresse', - 'default_account' => 'Standard konto', + 'default_account' => 'Standardkonto', ]; diff --git a/resources/lang/da-DK/auth.php b/resources/lang/da-DK/auth.php index f870e7d0d..c68d84876 100644 --- a/resources/lang/da-DK/auth.php +++ b/resources/lang/da-DK/auth.php @@ -10,10 +10,10 @@ return [ 'forgot_password' => 'Jeg har glemt min adgangskode', 'reset_password' => 'Nulstil adgangskode', 'enter_email' => 'Indtast din mailadresse', - 'current_email' => 'Nuværende E-mail', + 'current_email' => 'Nuværende e-mail', 'reset' => 'Nulstil', 'never' => 'Aldrig', - 'landing_page' => 'Landingsside', + 'landing_page' => 'Startside', 'password' => [ 'current' => 'Adgangskode', @@ -24,13 +24,13 @@ return [ 'error' => [ 'self_delete' => 'Fejl: Du kan ikke slette dig selv!', - 'self_disable' => 'Fejl: Du kan ikke disable dig selv!', + 'self_disable' => 'Fejl: Du kan ikke deaktivere dig selv!', 'no_company' => 'Error: Ingen virksomhed er tilknyttet din konto. Kontakt systemadministratoren.', ], 'failed' => 'Disse legitimationsoplysninger passer ikke med de gemte.', 'disabled' => 'Denne konto er deaktiveret. Kontakt systemadministratoren.', - 'throttle' => 'For mange login forsøg. Prøv igen om :seconds sekunder.', + 'throttle' => 'For mange loginforsøg. Prøv igen om :seconds sekunder.', 'notification' => [ 'message_1' => 'Du modtager denne e-mail, fordi vi modtog en anmodning om nulstilling af password.', diff --git a/resources/lang/da-DK/bills.php b/resources/lang/da-DK/bills.php index 992c54215..bf9081654 100644 --- a/resources/lang/da-DK/bills.php +++ b/resources/lang/da-DK/bills.php @@ -3,7 +3,7 @@ return [ 'bill_number' => 'Fakturanummer', - 'bill_date' => 'Faktura dato', + 'bill_date' => 'Fakturadato', 'total_price' => 'Total pris', 'due_date' => 'Forfaldsdato', 'order_number' => 'Ordrenummer', @@ -19,9 +19,9 @@ return [ 'item_name' => 'Varenavn|Varenavne', - 'show_discount' => ':discount% Rabat', + 'show_discount' => ':discount% rabat', 'add_discount' => 'Tilføj rabat', - 'discount_desc' => 'subtotal', + 'discount_desc' => 'af subtotal', 'payment_due' => 'Betalingsfrist', 'amount_due' => 'Forfaldent beløb', @@ -29,13 +29,13 @@ return [ 'histories' => 'Historik', 'payments' => 'Betalinger', 'add_payment' => 'Tilføj betaling', - 'mark_paid' => 'Marker Betalt', + 'mark_paid' => 'Marker som betalt', 'mark_received' => 'Modtagelse godkendt', - 'mark_cancelled' => 'Marker Annuller', + 'mark_cancelled' => 'Marker som annulleret', 'download_pdf' => 'Download PDF', - 'send_mail' => 'Send E-mail', - 'create_bill' => 'Opret regning', - 'receive_bill' => 'Modtag regning', + 'send_mail' => 'Send e-mail', + 'create_bill' => 'Opret faktura', + 'receive_bill' => 'Modtag faktura', 'make_payment' => 'Opret betaling', 'statuses' => [ @@ -45,7 +45,7 @@ return [ 'paid' => 'Betalt', 'overdue' => 'Overskredet', 'unpaid' => 'Ubetalt', - 'cancelled' => 'Annuleret', + 'cancelled' => 'Annulleret', ], 'messages' => [ diff --git a/resources/lang/da-DK/install.php b/resources/lang/da-DK/install.php index 493161e36..0b5e468dc 100644 --- a/resources/lang/da-DK/install.php +++ b/resources/lang/da-DK/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature skal være deaktiveret!', 'extension' => ':extension udvidelse skal være indlæst!', 'directory' => ':directory folderen skal være skrivbar!', - 'executable' => 'PHP CLI eksekverbar file virker ikke! Venligst forespørg anmod din host om at sætte PHP_BINARY eller PHP_PATH miljøvariablen korrekt.', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ diff --git a/resources/lang/da-DK/messages.php b/resources/lang/da-DK/messages.php index 27de48d20..b2b0c0d42 100644 --- a/resources/lang/da-DK/messages.php +++ b/resources/lang/da-DK/messages.php @@ -28,8 +28,8 @@ return [ '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.', - 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', - 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', + 'reconciled_tran' => 'Advarsel: Du kan ikke ændre eller slette denne transaktion, da den er afstemt.', + 'reconciled_doc' => 'Advarsel: Du kan ikke ændre eller slette :type, da den er afstemt.', 'disable_code' => 'Advarsel: Du må ikke deaktivere eller ændre valutaen i :name , fordi den er :text relateret.', 'payment_cancel' => 'Advarsel: Du har annulleret den seneste :method betaling!', ], diff --git a/resources/lang/da-DK/modules.php b/resources/lang/da-DK/modules.php index cedfff9d0..f9a50e27e 100644 --- a/resources/lang/da-DK/modules.php +++ b/resources/lang/da-DK/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Ny', 'top_free' => 'Top gratis', 'free' => 'GRATIS', - 'search' => 'Søg', 'install' => 'Installer', 'buy_now' => 'Køb nu', 'get_api_key' => 'Klik her for at få din API nøgle.', diff --git a/resources/lang/da-DK/widgets.php b/resources/lang/da-DK/widgets.php index 4811e903d..cbd19e55b 100644 --- a/resources/lang/da-DK/widgets.php +++ b/resources/lang/da-DK/widgets.php @@ -2,22 +2,22 @@ return [ - 'total_income' => 'Total Indkomst', - 'receivables' => 'Receivables', + 'total_income' => 'Samlet indtægt', + 'receivables' => 'Tilgodehavender', 'open_invoices' => 'Åbne fakturaer', - 'overdue_invoices' => 'Overskredne fakturaer', - 'total_expenses' => 'Total Udgifter', - 'payables' => 'Betalingsparate', - 'open_bills' => 'Åbne Regninger', - 'overdue_bills' => 'Overskredne Regninger', - 'total_profit' => 'Total Indtjening', - 'open_profit' => 'Open Profit', - 'overdue_profit' => 'Overdue Profit', - 'cash_flow' => 'Cash Flow', - 'no_profit_loss' => 'No Profit Loss', - 'income_by_category' => 'Indkomst efter Kategori', - 'expenses_by_category' => 'Udgifter efter Kategori', - 'account_balance' => 'Konto Balance', - 'latest_income' => 'Senest Indtægt', - 'latest_expenses' => 'Seneste Udgifter', + 'overdue_invoices' => 'Forfaldne fakturaer', + 'total_expenses' => 'Samlede udgifter', + 'payables' => 'Udeståender til betaling', + 'open_bills' => 'Åbne regninger', + 'overdue_bills' => 'Forfaldne regninger', + 'total_profit' => 'Samlet resultat', + 'open_profit' => 'Åbne indtægter', + 'overdue_profit' => 'Forfaldne indtægter', + 'cash_flow' => 'Pengestrøm', + 'no_profit_loss' => 'Intet resultat', + 'income_by_category' => 'Indkomst efter kategori', + 'expenses_by_category' => 'Udgifter efter kategori', + 'account_balance' => 'Kontobalance', + 'latest_income' => 'Seneste indtægter', + 'latest_expenses' => 'Seneste udgifter', ]; diff --git a/resources/lang/es-MX/install.php b/resources/lang/es-MX/install.php index 51d38b5a8..24998fab2 100644 --- a/resources/lang/es-MX/install.php +++ b/resources/lang/es-MX/install.php @@ -13,7 +13,7 @@ return [ ], 'language' => [ - 'select' => 'Seleccionar el Idioma', + 'select' => 'Seleccione el idioma', ], 'requirements' => [ @@ -21,7 +21,7 @@ return [ 'disabled' => '¡:feature debe estar deshabilitado!', 'extension' => 'La extensión :extension necesita ser instalada y cargada!', 'directory' => '¡El directorio :directorio necesita tener permiso de escritura!', - 'executable' => 'El archivo ejecutable CLI de PHP no funciona! Por favor, pida a su compañía de hosting que configure correctamente la variable de entorno PHP_BINARY o PHP_PATH.', + 'executable' => '¡El archivo ejecutable PHP CLI no está definido/funcionando o su versión no es :php_version o superior! Por favor, pida a su compañía de hosting que configure correctamente la variable de entorno PHP_BINARY o PHP_PATH.', ], 'database' => [ @@ -33,8 +33,8 @@ return [ 'settings' => [ 'company_name' => 'Nombre de la Empresa', - 'company_email' => 'Dirección de Correo Electrónico de la Empresa', - 'admin_email' => 'Dirección de Correo Electrónico del Administrador', + 'company_email' => 'Correo electrónico de la Empresa', + 'admin_email' => 'Correo electrónico del Administrador', 'admin_password' => 'Contraseña del Administrador', ], diff --git a/resources/lang/es-MX/modules.php b/resources/lang/es-MX/modules.php index 770f31c67..af2a4d5b2 100644 --- a/resources/lang/es-MX/modules.php +++ b/resources/lang/es-MX/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nuevo', 'top_free' => 'Top Gratis', 'free' => 'GRATIS', - 'search' => 'Buscar', 'install' => 'Instalar', 'buy_now' => 'Comprar Ahora', 'get_api_key' => 'Haga clic aquí para obtener su clave API.', diff --git a/resources/lang/fr-FR/auth.php b/resources/lang/fr-FR/auth.php index 330a72fe7..a4b6ff1a1 100644 --- a/resources/lang/fr-FR/auth.php +++ b/resources/lang/fr-FR/auth.php @@ -13,16 +13,18 @@ return [ 'current_email' => 'E-mail actuel', 'reset' => 'Réinitialiser', 'never' => 'jamais', - + 'landing_page' => 'Page d\'accueil', + 'password' => [ 'current' => 'Mot de passe', 'current_confirm' => 'Confirmation de mot de passe', 'new' => 'Nouveau mot de passe', 'new_confirm' => 'Confirmation du nouveau mot de passe', ], - + 'error' => [ 'self_delete' => 'Erreur : Vous ne pouvez pas vous supprimer vous-même !', + 'self_disable' => 'Erreur : Vous ne pouvez pas vous supprimer vous-même !', 'no_company' => 'Erreur : Aucune entreprise associée à votre compte. Veuillez contacter votre administrateur système.', ], diff --git a/resources/lang/fr-FR/bills.php b/resources/lang/fr-FR/bills.php index bc3c78c7a..23e977a84 100644 --- a/resources/lang/fr-FR/bills.php +++ b/resources/lang/fr-FR/bills.php @@ -2,55 +2,66 @@ return [ - 'bill_number' => 'Numéro de facture', - 'bill_date' => 'Date de facture', - 'total_price' => 'Prix total', - 'due_date' => 'Date d\'échéance', - 'order_number' => 'Numéro de commande', - 'bill_from' => 'Facture de', + 'bill_number' => 'Numéro de facture', + 'bill_date' => 'Date de facture', + 'total_price' => 'Prix total', + 'due_date' => 'Date d\'échéance', + 'order_number' => 'Numéro de commande', + 'bill_from' => 'Facture de', - 'quantity' => 'Quantité', - 'price' => 'Prix', - 'sub_total' => 'Sous-total', - 'discount' => 'Remise', - 'tax_total' => 'Taxe totale', - 'total' => 'Total', + 'quantity' => 'Quantité', + 'price' => 'Prix', + 'sub_total' => 'Sous-total', + 'discount' => 'Remise', + 'item_discount' => 'Remise sur la ligne', + 'tax_total' => 'Taxe totale', + 'total' => 'Total', - 'item_name' => 'Nom de marchandise|Noms des marchandises', + 'item_name' => 'Nom de marchandise|Noms des marchandises', - 'show_discount' => ':discount % de remise', - 'add_discount' => 'Ajouter une remise', - 'discount_desc' => 'du sous-total', + '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é', - 'histories' => 'Historiques', - 'payments' => 'Paiements', - 'add_payment' => 'Ajouter un paiement', - 'mark_received' => 'Marqué comme reçu', - 'download_pdf' => 'Télécharger en PDF', - 'send_mail' => 'Envoyer un Email', + 'payment_due' => 'Paiement dû', + 'amount_due' => 'Montant dû', + 'paid' => 'Payé', + 'histories' => 'Historiques', + 'payments' => 'Paiements', + 'add_payment' => 'Ajouter un paiement', + 'mark_paid' => 'Marquer comme payée', + 'mark_received' => 'Marqué comme reçu', + 'mark_cancelled' => 'Marquer comme annulé', + 'download_pdf' => 'Télécharger en PDF', + 'send_mail' => 'Envoyer un Email', + 'create_bill' => 'Créer une facture', + 'receive_bill' => 'Recevoir une facture', + 'make_payment' => 'Faire un paiement', 'statuses' => [ - 'draft' => 'Brouillon', - 'received' => 'Reçu', - 'partial' => 'Partiel', - 'paid' => 'Payé', + 'draft' => 'Brouillon', + 'received' => 'Reçu', + 'partial' => 'Partiel', + 'paid' => 'Payé', + 'overdue' => 'En retard', + 'unpaid' => 'Impayé', + 'cancelled' => 'Annulé', ], 'messages' => [ - 'received' => 'Facture marquée comme reçue avec succès !', - 'draft' => 'Ceci est une facture BROUILLON et sera comptabilisée dans les graphiques une fois reçue.', + 'marked_received' => 'Facture marquée comme reçue !', + 'marked_paid' => 'Facture marquée comme payée !', + 'marked_cancelled' => 'Facture marquée comme annulée !', + 'draft' => 'Ceci est une facture BROUILLON et sera comptabilisée dans les graphiques une fois reçue.', 'status' => [ - 'created' => 'Créée le :date', - 'receive' => [ + 'created' => 'Créée le :date', + 'receive' => [ 'draft' => 'Pas envoyée', 'received' => 'Reçue le :date', ], - 'paid' => [ - 'await' => 'En attente du paiement', + 'paid' => [ + 'await' => 'Paiement attendu', ], ], ], diff --git a/resources/lang/fr-FR/bulk_actions.php b/resources/lang/fr-FR/bulk_actions.php index 3873e45fb..ac02395d4 100644 --- a/resources/lang/fr-FR/bulk_actions.php +++ b/resources/lang/fr-FR/bulk_actions.php @@ -2,18 +2,20 @@ return [ - 'bulk_actions' => 'Bulk Action|Bulk Actions', - 'selected' => 'selected', + 'bulk_actions' => 'Action en masse|Actions en masse', + 'selected' => 'sélectionné', + 'no_action' => 'Aucune action disponible', 'message' => [ - 'duplicate' => 'Are you sure you want to duplicate selected record?', - 'delete' => 'Are you sure you want to delete selected record?|Are you sure you want to delete selected records?', - 'export' => 'Are you sure you want to export selected record?|Are you sure you want to export selected records?', - 'enable' => 'Are you sure you want to enable selected record?|Are you sure you want to enable selected records?', - 'disable' => 'Are you sure you want to disable selected record?|Are you sure you want to disable selected records?', - 'paid' => 'Are you sure you want to mark selected invoice as paid?|Are you sure you want to mark selected invoices as paid?', - 'sent' => 'Are you sure you want to mark selected invoice as sent?|Are you sure you want to mark selected invoices as sent?', - 'received' => 'Are you sure you want to mark selected bill as received?|Are you sure you want to mark selected bills as received?', + 'duplicate' => 'Êtes-vous sûr de vouloir dupliquer l\'entrée sélectionnée?', + 'delete' => 'Êtes-vous sûr de vouloir supprimer l\'enregistrement sélectionné ? | Êtes-vous sûr de vouloir supprimer les enregistrements sélectionnés ?', + 'export' => 'Êtes-vous sûr de vouloir exporter l\'enregistrement sélectionné ?|Êtes-vous sûr de vouloir exporter les enregistrements sélectionnés ?', + 'enable' => 'Êtes-vous sûr de vouloir activer l\'enregistrement sélectionné ?|Êtes-vous sûr de vouloir activer les enregistrements sélectionnés ?', + 'disable' => 'Êtes-vous sûr de vouloir désactiver l\'enregistrement sélectionné ?|Êtes-vous sûr de vouloir désactiver les enregistrements sélectionnés ?', + 'paid' => 'Êtes-vous sûr de vouloir marquer la facture sélectionnée comme payée? Êtes-vous sûr de vouloir marquer les factures sélectionnées comme payées?', + 'sent' => 'Êtes-vous sûr de vouloir marquer la facture sélectionnée comme envoyée? Êtes-vous sûr de vouloir marquer les factures sélectionnées comme envoyées?', + 'received' => 'Êtes-vous sûr de vouloir marquer la facture sélectionnée comme reçue? Êtes-vous sûr de vouloir marquer les factures sélectionnées comme reçues?', + 'cancelled' => 'Êtes-vous sûr de vouloir annuler la facture sélectionnée ? | Êtes-vous sûr de vouloir annuler les factures sélectionnées ?', ], ]; diff --git a/resources/lang/fr-FR/companies.php b/resources/lang/fr-FR/companies.php index 5078b5f35..63e902964 100644 --- a/resources/lang/fr-FR/companies.php +++ b/resources/lang/fr-FR/companies.php @@ -4,10 +4,11 @@ return [ 'domain' => 'Domaine', 'logo' => 'Logo', - 'manage' => 'Gérer des entreprises', - 'all' => 'Toutes les entreprises', + 'error' => [ + 'not_user_company' => 'Erreur: Vous n\'êtes pas autorisé à changer cette société !', 'delete_active' => 'Erreur : Vous ne pouvez pas supprimer une entreprise active. Veuillez changez d\'entreprise avant de supprimer !', + 'disable_active' => 'Erreur : Vous ne pouvez pas désactiver une entreprise active. Veuillez changez d\'entreprise avant de supprimer !', ], ]; diff --git a/resources/lang/fr-FR/customers.php b/resources/lang/fr-FR/customers.php index 0d30bdd3d..c874d38f4 100644 --- a/resources/lang/fr-FR/customers.php +++ b/resources/lang/fr-FR/customers.php @@ -2,15 +2,11 @@ return [ - 'allow_login' => 'Permettre la connexion ?', + 'can_login' => 'Connexion possible ?', 'user_created' => 'Utilisateur créé', 'error' => [ - 'email' => 'Cet email est déjà pris.' + 'email' => 'Cet email est déjà pris.', ], - 'notification' => [ - 'message' => ':customer a effectué un paiement de :amount pour la facture numéro :invoice_number.', - 'button' => 'Voir', - ], ]; diff --git a/resources/lang/fr-FR/dashboard.php b/resources/lang/fr-FR/dashboard.php deleted file mode 100644 index f321da89e..000000000 --- a/resources/lang/fr-FR/dashboard.php +++ /dev/null @@ -1,24 +0,0 @@ - 'Revenu total', - 'receivables' => 'Recevables', - 'open_invoices' => 'Factures ouvertes', - 'overdue_invoices' => 'Factures impayées', - 'total_expenses' => 'Total des dépenses', - 'payables' => 'Exigeables', - 'open_bills' => 'Factures ouvertes', - 'overdue_bills' => 'Factures impayées', - 'total_profit' => 'Bénéfice total', - 'open_profit' => 'Bénéfice ouvert', - 'overdue_profit' => 'Bénéfice impayé', - 'cash_flow' => 'Trésorerie', - 'no_profit_loss' => 'Aucune perte de Profit', - 'incomes_by_category' => 'Revenus par catégorie', - 'expenses_by_category' => 'Dépenses par catégorie', - 'account_balance' => 'Solde du compte', - 'latest_incomes' => 'Dernières revenus', - 'latest_expenses' => 'Dernières dépenses', - -]; diff --git a/resources/lang/fr-FR/dashboards.php b/resources/lang/fr-FR/dashboards.php index cdee3cb28..f39932102 100644 --- a/resources/lang/fr-FR/dashboards.php +++ b/resources/lang/fr-FR/dashboards.php @@ -3,9 +3,9 @@ return [ 'error' => [ - 'not_user_dashboard' => 'Error: You are not allowed to change this dashboard!', - 'delete_last' => 'Error: Can not delete the last dashboard. Please, create a new one first!', - 'disable_last' => 'Error: Can not disable the last dashboard. Please, create a new one first!', + 'not_user_dashboard' => 'Erreur: vous n\'êtes pas autorisé à modifier ce tableau de bord', + 'delete_last' => 'Erreur: Vous ne pouvez pas supprimer le dernier tableau de bord. Merci d\'en créer un nouveau d\'abord!', + 'disable_last' => 'Erreur: vous ne pouvez pas désactiver le dernier tableau de bord. Merci d\'en créer un nouveau d\'abord!', ], ]; diff --git a/resources/lang/fr-FR/demo.php b/resources/lang/fr-FR/demo.php index df068904a..2078e0f63 100644 --- a/resources/lang/fr-FR/demo.php +++ b/resources/lang/fr-FR/demo.php @@ -19,16 +19,16 @@ return [ ], 'offline_payments' => [ - 'cash' => 'Cash', - 'bank' => 'Bank Transfer', + 'cash' => 'Espèces', + 'bank' => 'Virement bancaire', ], 'reports' => [ - 'income' => 'Monthly income summary by category.', - 'expense' => 'Monthly expense summary by category.', - 'income_expense' => 'Monthly income vs expense by category.', - 'tax' => 'Quarterly tax summary.', - 'profit_loss' => 'Quarterly profit & loss by category.', + 'income' => 'Résumé mensuel des revenus par catégorie.', + 'expense' => 'Résumé des dépenses mensuelles par catégorie.', + 'income_expense' => 'Revenus mensuels vs charges par catégorie.', + 'tax' => 'Résumé trimestriel des impôts.', + 'profit_loss' => 'Gains et pertes trimestriels par catégorie.', ], ]; diff --git a/resources/lang/fr-FR/email_templates.php b/resources/lang/fr-FR/email_templates.php index 59e874483..a7008dbc0 100644 --- a/resources/lang/fr-FR/email_templates.php +++ b/resources/lang/fr-FR/email_templates.php @@ -3,48 +3,48 @@ return [ 'invoice_new_customer' => [ - 'subject' => '{invoice_number} invoice created', - 'body' => 'Dear {customer_name},

    We have prepared the following invoice for you: {invoice_number}.

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

    Feel free to contact us for any question.

    Best Regards,
    {company_name}', + 'subject' => '{invoice_number} facture créée', + 'body' => 'Cher {customer_name},

    Nous avons préparé la facture suivante pour vous : {invoice_number}.

    Vous pouvez consulter les détails de la facture et procéder au paiement à partir du lien suivant : {invoice_number}.

    N\'hésitez pas à nous contacter pour toute question.

    Cordialement,
    {company_name}', ], 'invoice_remind_customer' => [ - 'subject' => '{invoice_number} invoice overdue notice', - 'body' => 'Dear {customer_name},

    This is an overdue notice for {invoice_number} invoice.

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

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

    Best Regards,
    {company_name}', + 'subject' => '{invoice_number} avis de retard de facture', + 'body' => 'Cher/chère {customer_name},

    Ceci est une notification en retard pour la facture {invoice_number} .

    Le total de la facture est de {invoice_total} et était dû le {invoice_due_date}.

    Vous pouvez voir les détails de la facture et procéder au paiement à partir du lien suivant : {invoice_number}.

    Cordialement,
    {company_name}', ], 'invoice_remind_admin' => [ - 'subject' => '{invoice_number} invoice overdue notice', - 'body' => 'Hello,

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

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

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

    Best Regards,
    {company_name}', + 'subject' => '{invoice_number} avis de retard de facture', + 'body' => 'Cher/chère {customer_name},

    Ceci est une notification en retard pour la facture {invoice_number} .

    Le total de la facture est de {invoice_total} et était dû le {invoice_due_date}.

    Vous pouvez voir les détails de la facture et procéder au paiement à partir du lien suivant : {invoice_number}.

    Cordialement,
    {company_name}', ], 'invoice_recur_customer' => [ - 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Dear {customer_name},

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

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

    Feel free to contact us for any question.

    Best Regards,
    {company_name}', + 'subject' => '{invoice_number} facture récurrente créée', + 'body' => 'Cher {customer_name},

    Selon votre plan de facturation, nous avons préparé la facture suivante pour vous : {invoice_number}.

    Vous pouvez consulter les détails de la facture et procéder au paiement à partir du lien suivant : {invoice_number}.

    N\'hésitez pas à nous contacter pour toute question.

    Cordialement,
    {company_name}', ], 'invoice_recur_admin' => [ - 'subject' => '{invoice_number} recurring invoice created', - 'body' => 'Hello,

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

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

    Best Regards,
    {company_name}', + 'subject' => '{bill_number} facture récurrente créée', + 'body' => 'Bonjour,

    Selon la facturation planifiée de {customer_name} , {invoice_number} la facture a été automatiquement créée.

    Vous pouvez voir les détails de la facture à partir du lien suivant : {invoice_number}.

    Cordialement,
    {company_name}', ], 'invoice_payment_customer' => [ - 'subject' => 'Payment received for {invoice_number} invoice', - 'body' => 'Dear {customer_name},

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

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

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

    Feel free to contact us for any question.

    Best Regards,
    {company_name}', + 'subject' => 'Paiement reçu pour la facture {invoice_number}', + 'body' => 'Cher {customer_name},

    Merci pour votre paiement. Vous Trouverez les détails de paiement ci-dessous :

    -------------------------------------------------
    Montant : {transaction_total}
    Date : {transaction_paid_date}
    Numéro de facture : {invoice_number}
    -------------------------------------------------

    Vous pouvez toujours consulter les détails de la facture à partir du lien suivant : {invoice_number}.

    N\'hésitez pas à nous contacter pour toute question.

    Cordialement,
    {company_name}', ], 'invoice_payment_admin' => [ - 'subject' => 'Payment received for {invoice_number} invoice', - 'body' => 'Hello,

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

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

    Best Regards,
    {company_name}', + 'subject' => 'Paiement reçu pour la facture {invoice_number}', + 'body' => 'Bonjour,

    {customer_name} a enregistré un paiement pour la facture {invoice_number} .

    Vous pouvez voir les détails de la facture à partir du lien suivant : {invoice_number}.

    Cordialement,
    {company_name}', ], 'bill_remind_admin' => [ - 'subject' => '{bill_number} bill reminding notice', - 'body' => 'Hello,

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

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

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

    Best Regards,
    {company_name}', + 'subject' => '{bill_number} avis de rappel de facture', + 'body' => 'Bonjour,

    Ceci est un rappel pour la facture {bill_number} à {vendor_name}.

    Le total de la facture est de {bill_total} et est dû le {bill_due_date}.

    Vous pouvez voir les détails de la facture à partir du lien suivant : {bill_number}.

    Cordialement,
    {company_name}', ], 'bill_recur_admin' => [ - 'subject' => '{bill_number} recurring bill created', - 'body' => 'Hello,

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

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

    Best Regards,
    {company_name}', + 'subject' => '{bill_number} facture récurrente créée', + 'body' => 'Bonjour,

    Sur la base du plan de facturation planifié de {vendor_name} , la facture {bill_number} a été automatiquement créée.

    Vous pouvez voir les détails de la facture à partir du lien suivant : {bill_number}.

    Cordialement,
    {company_name}', ], ]; diff --git a/resources/lang/fr-FR/errors.php b/resources/lang/fr-FR/errors.php index c72a47530..667d6b08e 100644 --- a/resources/lang/fr-FR/errors.php +++ b/resources/lang/fr-FR/errors.php @@ -3,21 +3,21 @@ return [ 'title' => [ - '403' => 'Oops! Forbidden Access', - '404' => 'Oops! Page not found', - '500' => 'Oops! Something went wrong', + '403' => 'Oups! Accès interdit', + '404' => 'Oups ! Page introuvable', + '500' => 'Oups ! Quelque chose s\'est mal passé', ], 'header' => [ - '403' => '403 Forbidden', - '404' => '404 Not Found', - '500' => '500 Internal Server Error', + '403' => '403 Interdit', + '404' => '404 introuvable', + '500' => 'Erreur de serveur interne 500', ], 'message' => [ - '403' => 'You can not access this page.', - '404' => 'We could not find the page you were looking for.', - '500' => 'We will work on fixing that right away.', + '403' => 'Vous ne pouvez pas accéder à cette page.', + '404' => 'Nous n\'avons pas trouvé la page que vous cherchiez.', + '500' => 'Nous travaillerons à la réparation de ce problème immédiatement.', ], ]; diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php index cd7f14bc1..db44f9a48 100644 --- a/resources/lang/fr-FR/general.php +++ b/resources/lang/fr-FR/general.php @@ -2,6 +2,7 @@ return [ + 'dashboards' => 'Tableau de bord|Tableaux de bord', 'items' => 'Marchandise|Marchandises', 'incomes' => 'Revenu|Revenus', 'invoices' => 'Facture|Factures', @@ -40,10 +41,18 @@ return [ 'others' => 'Autre|Autres', 'contacts' => 'Contact|Contacts', 'reconciliations' => 'Conciliation|Conciliations', - 'deposits' => 'Crédit|Crédits', - 'withdrawals' => 'Débit|Débits', + 'developers' => 'Développeur|Développeurs', + 'schedules' => 'Planification|Planifications', + 'groups' => 'Groupe|Groupes', + 'charts' => 'Graphique|Graphiques', + 'localisations' => 'Localisation|Localisations', + 'defaults' => 'Défaut|Défauts', + 'widgets' => 'Widget|Widgets', + 'templates' => 'Modèle\Modèles', + 'sales' => 'Vente\Ventes', + 'purchases' => 'Achat\Achats', - 'dashboard' => 'Tableau de bord', + 'welcome' => 'Bienvenue', 'banking' => 'Banque', 'general' => 'Général', 'no_records' => 'Aucune donnée.', @@ -55,15 +64,19 @@ return [ 'no' => 'Non', 'na' => 'N/A', 'daily' => 'Quotidien', + 'weekly' => 'Hebdomadaire', 'monthly' => 'Mensuel', 'quarterly' => 'Trimestriel', 'yearly' => 'Annuel', 'add' => 'Ajouter', 'add_new' => 'Ajouter un nouveau', + 'add_income' => 'Ajouter une recette', + 'add_expense' => 'Ajouter une dépense', 'show' => 'Afficher', 'edit' => 'Editer', 'delete' => 'Supprimer', 'send' => 'Envoyer', + 'share' => 'Partager', 'download' => 'Télécharger', 'delete_confirm' => 'Valider la suppression de :name :type ?', 'name' => 'Nom', @@ -81,9 +94,11 @@ return [ 'reference' => 'Référence', 'attachment' => 'Fichier joint', 'change' => 'Changer', + 'change_type' => 'Changer :type', 'switch' => 'Changer', 'color' => 'Couleur', 'save' => 'Enregistrer', + 'confirm' => 'Confirmer', 'cancel' => 'Annuler', 'loading' => 'Chargement...', 'from' => 'De', @@ -113,20 +128,47 @@ return [ 'disable' => 'Désactiver', 'select_all' => 'Tout sélectionner', 'unselect_all' => 'Tout désélectionner', - 'go_to' => 'Aller à :name', 'created_date' => 'Date de création', 'period' => 'Période', + 'frequency' => 'Fréquence', 'start' => 'Début', 'end' => 'Fin', 'clear' => 'Effacer', 'difference' => 'Différence', + 'footer' => 'Pied de page', + 'start_date' => 'Date de début', + 'end_date' => 'Date de fin', + 'basis' => 'Base', + 'accrual' => 'Cumul', + 'cash' => 'Liquidités', + 'group_by' => 'Regrouper par', + 'accounting' => 'Comptabilité', + 'sort' => 'Tri', + 'width' => 'Largeur', + 'month' => 'Mois', + 'year' => 'Année ', + 'type_item_name' => 'Tapez un nom d\'élément', + 'no_data' => 'Aucune donnée', + 'no_matching_data' => 'Aucune donnée correspondante', + 'clear_cache' => 'Vider le cache', + 'go_to_dashboard' => 'Aller au tableau de bord', + + 'card' => [ + 'name' => 'Nom sur la carte', + 'number' => 'Numéro de carte', + 'expiration_date' => 'Date d\'expiration', + 'cvv' => 'CVV de la carte', + ], 'title' => [ 'new' => 'Nouveau :type', 'edit' => 'Modifier :type', + 'delete' => 'Supprimer :type', 'create' => 'Créer :type', 'send' => 'Envoyer :type', 'get' => 'Voir :type', + 'add' => 'Ajouter :type', + 'manage' => 'Gérer :type', ], 'form' => [ @@ -135,6 +177,7 @@ return [ 'field' => '- Selectionner :field -', 'file' => 'Selectionner un fichier', ], + 'add_new' => 'Ajouter un nouveau :field', 'no_file_selected' => 'Aucun fichier sélectionné...', ], @@ -145,4 +188,19 @@ return [ 'this_month' => 'Ce mois-ci', 'last_month' => 'Le mois dernier', ], + + 'empty' => [ + 'documentation' => 'Consultez la documentation pour plus de détails.', + 'items' => 'Les articles peuvent être des produits ou des services. Vous pouvez utiliser des articles lors de la création de factures d\'achat ou de vente pour avoir le prix, la TVA etc remplis.', + 'invoices' => 'Les factures de vente peuvent être ponctuelles ou récurrentes. Vous pouvez les envoyer aux clients et commencer à accepter les paiements en ligne.', + 'revenues' => 'Un recette est une entrée d\'argent. Elle peut être un enregistrement indépendant (dépôt par ex.) ou rattachée à une facture.', + 'customers' => 'Les clients sont requis si vous voulez créer des factures. Ils peuvent également se connecter au Portail Client et voir leur solde.', + 'bills' => 'Les factures d\'achat peuvent être ponctuelles ou récurrentes. Elles indiquent ce que vous devez à vos fournisseurs pour les produits ou services que vous achetez.', + 'payments' => 'Un paiement est un transaction de dépense. Il peut s\'agir d\'un enregistrement indépendant (ex. facture de restaurant) ou rattaché à une facture d\'achat.', + 'vendors' => 'Les fournisseurs sont requis si vous voulez créer des factures d\'achat. Vous pouvez voir le solde que vous devez et filtrer les rapports par fournisseur.', + 'transfers' => 'Les transferts vous permettent de transférer de l\'argent d\'un compte à un autre, qu\'ils utilisent la même devise ou non.', + 'taxes' => 'La TVA est ajoutée aux factures d\'achat et de vente. Cette taxe est réglementaire.', + 'reconciliations' => 'Le rapprochement bancaire est un processus destiné à s\'assurer que les données bancaires de votre entreprise sont également correctes.', + ], + ]; diff --git a/resources/lang/fr-FR/header.php b/resources/lang/fr-FR/header.php index acd8350ab..0da392838 100644 --- a/resources/lang/fr-FR/header.php +++ b/resources/lang/fr-FR/header.php @@ -8,9 +8,9 @@ return [ 'counter' => '{0} Vous n’avez aucune notification|{1} Vous avez :count notification|[2, *] Vous avez :count notifications', 'overdue_invoices' => '{1} :nombre de factures impayées|[2,*] :nombre de factures impayées', 'upcoming_bills' => '{1} :nombre de factures à venir|[2,*] :nombre de factures à venir', - 'items_stock' => '{1} :count élément épuisé|[2,*] :count éléments épuisés', 'view_all' => 'Afficher tout' ], 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/docs', ]; diff --git a/resources/lang/fr-FR/install.php b/resources/lang/fr-FR/install.php index 989aa97a5..86cdc5523 100644 --- a/resources/lang/fr-FR/install.php +++ b/resources/lang/fr-FR/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature doit être désactivée !', 'extension' => 'L\'extension :extension doit être installée et chargée !', 'directory' => ':directory doit être accessible en écriture !', + 'executable' => 'Le fichier exécutable PHP CLI n\'est pas défini, ou sa version n\'est pas :php_version ou supérieure! Veuillez demander à votre hébergeur de définir correctement la variable d\'environnement PHP_BINARY ou PHP_PATH.', ], 'database' => [ diff --git a/resources/lang/fr-FR/invoices.php b/resources/lang/fr-FR/invoices.php index bc2eebd45..c92d03016 100644 --- a/resources/lang/fr-FR/invoices.php +++ b/resources/lang/fr-FR/invoices.php @@ -2,67 +2,76 @@ return [ - 'invoice_number' => 'Numéro de facture', - 'invoice_date' => 'Date de facturation', - 'total_price' => 'Prix total', - 'due_date' => 'Date d\'échéance', - 'order_number' => 'Numéro de commande', - 'bill_to' => 'Facture de', + 'invoice_number' => 'Numéro de facture', + 'invoice_date' => 'Date de facturation', + 'total_price' => 'Prix total', + 'due_date' => 'Date d\'échéance', + 'order_number' => 'Numéro de commande', + 'bill_to' => 'Facture de', - 'quantity' => 'Quantité', - 'price' => 'Prix', - 'sub_total' => 'Sous-total', - 'discount' => 'Remise', - 'tax_total' => 'Taxe totale', - 'total' => 'Total', + 'quantity' => 'Quantité', + 'price' => 'Prix', + 'sub_total' => 'Sous-total', + 'discount' => 'Remise', + 'item_discount' => 'Remise sur la ligne', + 'tax_total' => 'Taxe totale', + 'total' => 'Total', - 'item_name' => 'Nom de marchandise|Noms des marchandises', + 'item_name' => 'Nom de marchandise|Noms des marchandises', - 'show_discount' => ':discount % de remise', - 'add_discount' => 'Ajouter une remise', - 'discount_desc' => 'du sous-total', + 'show_discount' => ':discount % de remise', + 'add_discount' => 'Ajouter une remise', + 'discount_desc' => 'du sous-total', - 'payment_due' => 'Paiement dû', - 'paid' => 'Payé', - 'histories' => 'Historiques', - 'payments' => 'Paiements', - 'add_payment' => 'Ajouter un paiement', - 'mark_paid' => 'Marquer comme payée', - 'mark_sent' => 'Marquer comme envoyée', - 'download_pdf' => 'Télécharger en PDF', - 'send_mail' => 'Envoyer un Email', - 'all_invoices' => 'Connectez-vous pour voir toutes les factures', + 'payment_due' => 'Paiement dû', + 'paid' => 'Payé', + 'histories' => 'Historiques', + 'payments' => 'Paiements', + 'add_payment' => 'Ajouter un paiement', + 'mark_paid' => 'Marquer comme payée', + 'mark_sent' => 'Marquer comme envoyée', + 'mark_viewed' => 'Marquer comme vu', + 'mark_cancelled' => 'Marquer comme annulé', + 'download_pdf' => 'Télécharger en PDF', + 'send_mail' => 'Envoyer un Email', + 'all_invoices' => 'Connectez-vous pour voir toutes les factures', + 'create_invoice' => 'Créer une facture', + 'send_invoice' => 'Envoyer une facture', + 'get_paid' => 'Être payé', + 'accept_payments' => 'Accepter les paiements en ligne', 'statuses' => [ - 'draft' => 'Brouillon', - 'sent' => 'Envoyé', - 'viewed' => 'Vu', - 'approved' => 'Approuvé', - 'partial' => 'Partiel', - 'paid' => 'Payé', + 'draft' => 'Brouillon', + 'sent' => 'Envoyée', + 'viewed' => 'Vu', + 'approved' => 'Approuvée', + 'partial' => 'Partiel', + 'paid' => 'Payé', + 'overdue' => 'En retard', + 'unpaid' => 'Non payé', + 'cancelled' => 'Annulé', ], 'messages' => [ - 'email_sent' => 'La facture a été envoyé avec succès !', - 'marked_sent' => 'Facture marquée comme envoyée avec succès !', - 'email_required' => 'Ce client ne possède pas d\'email !', - 'draft' => 'Ceci est une facture BROUILLON et sera comptabilisé dans les graphiques après reception.', + 'email_sent' => 'L\'e-mail de facture a été envoyé !', + 'marked_sent' => 'Facture marquée comme envoyée !', + 'marked_paid' => 'Facture marquée comme payée !', + 'marked_viewed' => 'Facture marquée comme vue !', + 'marked_cancelled' => 'Facture marquée comme annulée !', + 'email_required' => 'Ce client ne possède pas d\'email !', + 'draft' => 'Ceci est une facture BROUILLON et sera comptabilisé dans les graphiques après reception.', 'status' => [ - 'created' => 'Créée le :date', - 'send' => [ + 'created' => 'Créée le :date', + 'viewed' => 'Vu', + 'send' => [ 'draft' => 'Pas envoyée', 'sent' => 'Envoyée le :date', ], - 'paid' => [ + 'paid' => [ 'await' => 'En attente du paiement', ], ], ], - 'notification' => [ - 'message' => 'Vous recevez cet email car une facture d\'un montant de :amount pour le client :customer arrive à échéance.', - 'button' => 'Payer maintenant', - ], - ]; diff --git a/resources/lang/fr-FR/items.php b/resources/lang/fr-FR/items.php index d8faa2fa0..789f1f07f 100644 --- a/resources/lang/fr-FR/items.php +++ b/resources/lang/fr-FR/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'Quantité|Quantités', 'sales_price' => 'Prix de vente', 'purchase_price' => 'Prix d\'achat', - 'sku' => 'Référence (SKU)', - - 'notification' => [ - 'message' => [ - 'reminder' => 'Vous recevez cet email car seulement :quantity de :name reste.', - 'out_of_stock' => 'Vous recevez cet email parce que le stock de :name est presque épuisé.', - ], - 'button' => 'Voir Maintenant', - ], ]; diff --git a/resources/lang/fr-FR/maintenance.php b/resources/lang/fr-FR/maintenance.php index 514800dcd..331f12367 100644 --- a/resources/lang/fr-FR/maintenance.php +++ b/resources/lang/fr-FR/maintenance.php @@ -2,10 +2,10 @@ return [ - 'title' => 'Under Maintenance', + 'title' => 'En Maintenance', - 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', + 'message' => 'Désolé, nous sommes en maintenance. Veuillez réessayer plus tard!', - 'last-updated' => 'This message was last updated :timestamp.', + 'last-updated' => 'Ce message a été mis à jour pour la dernière fois :timestamp.', ]; diff --git a/resources/lang/fr-FR/messages.php b/resources/lang/fr-FR/messages.php index dcb9907a4..d96c3aee0 100644 --- a/resources/lang/fr-FR/messages.php +++ b/resources/lang/fr-FR/messages.php @@ -8,22 +8,30 @@ return [ 'deleted' => ':type supprimé !', 'duplicated' => ':type dupliqué !', 'imported' => ':type importé !', + 'exported' => ':type exporté !', 'enabled' => ':type activé !', 'disabled' => ':type désactivé !', ], + 'error' => [ 'over_payment' => 'Erreur: Le paiement n\'a pas été enregistré! Le total entré dépasse le total :amount', 'not_user_company' => 'Erreur : Vous n’êtes pas autorisé à gérer cette société !', '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_apikey' => 'Erreur : le token est invalide !', + 'change_type' => 'Erreur: Impossible de changer le type car il est lié à :text !', + 'invalid_apikey' => 'Erreur: La clé API saisie n\'est pas valide !', 'import_column' => 'Erreur : :message Nom de la feuille : :sheet. Numéro de ligne : :line.', 'import_sheet' => 'Erreur : Le nom de la feuille n\'est pas valide. Veuillez télécharger le modèle de fichier.', ], + 'warning' => [ 'deleted' => 'Avertissement : Vous n’êtes pas autorisé à supprimer :name parce qu’il est associé à :texte.', 'disabled' => 'Avertissement : Vous n’êtes pas autorisé à désactiver :name parce qu’il est associé à :texte.', + 'reconciled_tran' => 'AVERTISSEMENT : Vous n\'êtes pas autorisé à modifier/supprimer une transaction car elle est réconciliée !', + 'reconciled_doc' => 'AVERTISSEMENT : Vous n\'êtes pas autorisé à changer/supprimer :type car il a réconcilié les transactions !', + 'disable_code' => 'Attention : vous n’êtes pas autorisé à désactiver ou modifier la monnaie de :name car elle a un lien avec :text.', + 'payment_cancel' => 'AVERTISSEMENT : Vous avez annulé votre paiement récent de :method !', ], ]; diff --git a/resources/lang/fr-FR/modules.php b/resources/lang/fr-FR/modules.php index 3dc578240..bb0e976af 100644 --- a/resources/lang/fr-FR/modules.php +++ b/resources/lang/fr-FR/modules.php @@ -2,20 +2,19 @@ return [ - 'title' => 'Jeton de l\'API', - 'api_token' => 'Jeton', + 'api_key' => 'Clé API', 'my_apps' => 'Mes applications', + 'pre_sale' => 'Pré-vente', 'top_paid' => 'Top payant', '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.', + 'get_api_key' => 'Cliquez ici pour obtenir votre clé API. +', 'no_apps' => 'Il n’y a pas encore d\'application dans cette catégorie.', - 'developer' => 'Vous êtes développeur ? ici vous pouvez apprendre à créer une application et commencer à la vendre  !', - + 'become_developer' => 'Vous êtes développeur? Ici , vous pouvez apprendre à créer une application et à commencer à vendre dès aujourd\'hui!', 'recommended_apps' => 'Applications recommandées', 'about' => 'A propos', @@ -23,6 +22,9 @@ return [ 'added' => 'Ajouté', 'updated' => 'Mis à jour', 'compatibility' => 'Compatibilité', + 'documentation' => 'Documentation', + 'view' => 'Vue', + 'back' => 'Précédent', 'installed' => ':module installé', 'uninstalled' => ':module désinstallé', @@ -34,30 +36,31 @@ return [ 'installation' => 'Installation', 'faq' => 'FAQ', 'changelog' => 'Historique des modifications', - 'reviews' => 'Notes', + 'reviews' => 'Notes', ], 'installation' => [ 'header' => 'Installation d\'une application', - 'download' => 'Téléchargement du :module.', - 'unzip' => 'Extraction des fichiers :module.', + 'download' => 'Téléchargement de :module', + 'unzip' => 'Extraction des fichiers :module', 'file_copy' => 'Copie des fichiers de :module.', - 'migrate' => 'Application des mises à jours de :module.', - 'finish' => 'La mise à jour a été installée correctement. Vous allez être redirigé vers le centre de mise à jour.', - 'install' => 'Installation des fichiers du module :module.', + 'finish' => 'Finalisation de l\'installation de :module', + 'redirect' => ':module installé, redirection vers la page des mises à jour', + 'install' => 'Installation de :module', ], 'errors' => [ - 'download' => 'Le module :module ne peut pas être téléchargé !', - 'upload' => 'Le module téléchargé :module ne peut pas être enregistré !', - 'unzip' => 'Le module :module ne peut pas être décompressé !', - 'file_copy' => 'Le module :module ne peut pas être copié !', - 'migrate' => 'La migration du module :module est cassée !', - 'migrate core' => 'Le module :module est déjà à sa dernière version et ne peut pas être mis à jour.', + 'download' => 'Impossible de télécharger :module', + 'zip' => 'Impossible de créer le fichier zip du :module +', + 'unzip' => 'Impossible de décompresser :module', + 'file_copy' => 'Impossible de copier les fichiers :module', + 'finish' => 'Impossible de finaliser l\'installation de :module', ], 'badge' => [ - 'installed' => 'Installées', + 'installed' => 'Installées', + 'pre_sale' => 'Pré-vente', ], 'button' => [ @@ -67,14 +70,16 @@ return [ ], 'my' => [ - 'purchased' => 'Achetées', - 'installed' => 'Installées', + 'purchased' => 'Achetées', + 'installed' => 'Installées', ], 'reviews' => [ 'button' => [ - 'add' => 'Ajouter une note' + 'add' => 'Ajouter une note' ], - 'na' => 'Aucune note.' - ] + + 'na' => 'Aucune note.' + ], + ]; diff --git a/resources/lang/fr-FR/pagination.php b/resources/lang/fr-FR/pagination.php index 7c081a1b5..c872a8835 100644 --- a/resources/lang/fr-FR/pagination.php +++ b/resources/lang/fr-FR/pagination.php @@ -2,8 +2,9 @@ return [ - 'previous' => '« Précédent', - 'next' => 'Suivant »', - 'showing' => 'Affichage de :first à :last sur :total :type', + 'previous' => 'Précédent', + 'next' => 'Suivant', + 'showing' => ':first-:last sur :total enregistrements.', + 'page' => 'par page.', ]; diff --git a/resources/lang/fr-FR/passwords.php b/resources/lang/fr-FR/passwords.php index df7f8cc05..5fa84f36a 100644 --- a/resources/lang/fr-FR/passwords.php +++ b/resources/lang/fr-FR/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => 'Nous avons envoyé par courrier électronique votre lien de réinitialisation de mot de passe !', 'token' => 'Ce jeton de réinitialisation de mot de passe n’est pas valide.', 'user' => "Nous ne pouvons pas trouver un utilisateur avec cette adresse email.", + 'throttle' => 'Veuillez patienter avant de réessayer.', ]; diff --git a/resources/lang/fr-FR/reconciliations.php b/resources/lang/fr-FR/reconciliations.php index 3ae17c775..fedd36669 100644 --- a/resources/lang/fr-FR/reconciliations.php +++ b/resources/lang/fr-FR/reconciliations.php @@ -6,9 +6,11 @@ return [ 'reconciled' => 'Réconcilié', 'closing_balance' => 'Solde de clôture', 'unreconciled' => 'Pas réconcilié', - 'list_transactions' => 'Lister les transactions', + 'transactions' => 'Transactions', 'start_date' => 'Date de début', 'end_date' => 'Date de fin', 'cleared_amount' => 'Montant traité', + 'deposit' => 'Dépôts', + 'withdrawal' => 'Retrait', ]; diff --git a/resources/lang/fr-FR/reports.php b/resources/lang/fr-FR/reports.php index 94614d483..6d08f7c8b 100644 --- a/resources/lang/fr-FR/reports.php +++ b/resources/lang/fr-FR/reports.php @@ -12,6 +12,7 @@ return [ 'net_profit' => 'Bénéfices net', 'total_expenses' => 'Total des dépenses', 'net' => 'NET', + 'income_expense' => 'Recettes & Dépenses', 'summary' => [ 'income' => 'Sommaire des revenus', @@ -20,11 +21,10 @@ return [ 'tax' => 'Résumé des taxes', ], - 'quarter' => [ - '1' => 'Jan-Mar', - '2' => 'Avr-Jui', - '3' => 'Jui-Sep', - '4' => 'Oct-Déc', + 'charts' => [ + 'line' => 'Ligne', + 'bar' => 'Pile', + 'pie' => 'Camembert', ], ]; diff --git a/resources/lang/fr-FR/settings.php b/resources/lang/fr-FR/settings.php index 51bd7fc08..4c7f8b357 100644 --- a/resources/lang/fr-FR/settings.php +++ b/resources/lang/fr-FR/settings.php @@ -3,14 +3,18 @@ return [ 'company' => [ + 'description' => 'Changer le nom de la société, l\'email, l\'adresse, le numéro de taxe, etc', 'name' => 'Nom', 'email' => 'Email', 'phone' => 'Téléphone', 'address' => 'Adresse', 'logo' => 'Logo', ], + 'localisation' => [ - 'tab' => 'Localisation', + 'description' => 'Définir l\'année fiscale, le fuseau horaire, le format de la date et plus de locaux', + 'financial_start' => 'Date de démarrage de la comptabilité', + 'timezone' => 'Fuseau horaire', 'date' => [ 'format' => 'Format de date', 'separator' => 'Séparateur de date', @@ -20,15 +24,21 @@ return [ 'slash' => 'Slash (/)', 'space' => 'Espace ( )', ], - 'timezone' => 'Fuseau horaire', 'percent' => [ 'title' => 'Position du signe "pourcentage" (%)', 'before' => 'Avant le nombre', 'after' => 'Après le nombre', ], + 'discount_location' => [ + 'name' => 'Emplacement de remise', + 'item' => 'A la ligne', + 'total' => 'Au total', + 'both' => 'Ligne et total', + ], ], + 'invoice' => [ - 'tab' => 'Facture', + 'description' => 'Personnaliser le préfixe de la facture, le numéro , les termes, le pied de page, etc', 'prefix' => 'Préfixe de numérotation', 'digit' => 'Nombre de chiffres', 'next' => 'Numéro suivant', @@ -43,16 +53,25 @@ return [ 'rate' => 'Tarif', 'quantity_name' => 'Nom de la quantité', 'quantity' => 'Quantité', + 'payment_terms' => 'Conditions de paiement', + 'title' => 'Titre', + 'subheading' => 'Sous-titre', + 'due_receipt' => 'Échéance après réception', + 'due_days' => 'Échéance dans :jours', + 'choose_template' => 'Choisi un modèle de facture', + 'default' => 'Défaut', + 'classic' => 'Classique', + 'modern' => 'Moderne', ], + 'default' => [ - 'tab' => 'Par défaut', - 'account' => 'Compte par défaut', - 'currency' => 'Devise par défaut', - 'tax' => 'Taux d’imposition par défaut', - 'payment' => 'Mode de paiement par défaut', - 'language' => 'Langue par défaut', + 'description' => 'Compte par défaut, devise, langue de votre entreprise', + 'list_limit' => 'Résultats par page', + 'use_gravatar' => 'Utiliser Gravatar', ], + 'email' => [ + 'description' => 'Modifier les modèles de protocole d\'envoi et les modèles d\'e-mail', 'protocol' => 'Protocole', 'php' => 'PHP Mail', 'smtp' => [ @@ -67,36 +86,44 @@ return [ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Chemin d’accès de sendmail', 'log' => 'Journal des Emails', + + 'templates' => [ + 'subject' => 'Sujet', + 'body' => 'Corps', + 'tags' => 'Mots-clés disponibles : :tag_list', + 'invoice_new_customer' => 'Nouveau modèle de facture (envoyé au client)', + 'invoice_remind_customer' => 'Modèle de rappel de facture (envoyé au client)', + 'invoice_remind_admin' => 'Modèle de rappel de facture (envoyé à l\'administrateur)', + 'invoice_recur_customer' => 'Modèle de facture récurrente (envoyé au client)', + 'invoice_recur_admin' => 'Modèle de facture récurrente (envoyé à l\'administrateur)', + 'invoice_payment_customer' => 'Modèle de paiement reçu (envoyé au client)', + 'invoice_payment_admin' => 'Modèle de paiement reçu (envoyé à l\'administrateur)', + 'bill_remind_admin' => 'Modèle de rappel de facture (envoyé à l\'administrateur)', + 'bill_recur_admin' => 'Modèle de facture récurrente (envoyé à l\'administrateur)', + ], ], + 'scheduling' => [ - 'tab' => 'Planification', + 'name' => 'Planification', + 'description' => 'Rappels et commandes automatiques pour les récurrents', 'send_invoice' => 'Envoyer un rappel de facture', 'invoice_days' => 'Envoyer après les jours d\'échéance', 'send_bill' => 'Envoyer rappel de facture', 'bill_days' => 'Envoyer avant les jours d\'échéance', 'cron_command' => 'Commande Cron', 'schedule_time' => 'Heure de fonctionnement', - 'send_item_reminder'=> 'Envoyer un rappel pour l\'élément', - 'item_stocks' => 'Envoyer lorsque l\'élément approche la rupture de stock', ], - 'appearance' => [ - 'tab' => 'Apparence', - 'theme' => 'Thème', - 'light' => 'Clair', - 'dark' => 'Foncé', - 'list_limit' => 'Résultats par page', - 'use_gravatar' => 'Utilisez Gravatar', + + 'categories' => [ + 'description' => 'Catégories illimitées pour les revenus, charges et articles', ], - 'system' => [ - 'tab' => 'Système', - 'session' => [ - 'lifetime' => 'Durée de vie de session (Minutes)', - 'handler' => 'Gestionnaire de session', - 'file' => 'Fichier', - 'database' => 'Base de données', - ], - 'file_size' => 'Taille de fichier maximale (MB)', - 'file_types' => 'Types de fichier autorisés', + + 'currencies' => [ + 'description' => 'Créez et gérez des devises et définissez leurs taux', + ], + + 'taxes' => [ + 'description' => 'Taux d\'imposition fixes, normaux, inclusifs et composés', ], ]; diff --git a/resources/lang/fr-FR/taxes.php b/resources/lang/fr-FR/taxes.php index 757d0175f..8f94d2172 100644 --- a/resources/lang/fr-FR/taxes.php +++ b/resources/lang/fr-FR/taxes.php @@ -4,5 +4,8 @@ return [ 'rate' => 'Taux', 'rate_percent' => 'Taux (%)', - + 'normal' => 'Normal', + 'inclusive' => 'Inclus', + 'compound' => 'Composé', + 'fixed' => 'Fixé', ]; diff --git a/resources/lang/fr-FR/validation.php b/resources/lang/fr-FR/validation.php index b864a4dbc..6e9643f65 100644 --- a/resources/lang/fr-FR/validation.php +++ b/resources/lang/fr-FR/validation.php @@ -33,19 +33,20 @@ return [ 'confirmed' => 'La confirmation du ":attribute" ne concordent pas.', 'date' => ':attribute n\'est pas une date valide.', 'date_format' => ':attribute ne respecte pas le format :format.', - 'different' => ':attribute et :other doivent être différents.', + 'different' => 'Les champs :attribute et :other doivent être différents.', 'digits' => ':attribute doit contenir :digits chiffres.', 'digits_between' => ':attribute doit contenir entre :min et :max chiffres.', 'dimensions' => ':attribut possède des dimensions d\'image non valide.', 'distinct' => ':champ a une valeur dupliquée.', - 'email' => ':attribute doit être une adresse email valide.', + 'email' => 'Le champ :attribute doit être une adresse email valide.', + 'ends_with' => 'Le champ :attribute doit se terminer par une des valeurs suivantes : :values', 'exists' => ':attribute selectionné est invalide.', - 'file' => ':attribut doit être un fichier.', - 'filled' => ':champ d’attribut doit avoir une valeur.', - 'image' => ':attribute doit être une image.', + 'file' => 'Le champ :attribute doit être un fichier.', + 'filled' => 'Le champ :attribute doit avoir une valeur.', + 'image' => 'Le champ :attribute doit être une image.', 'in' => ':attribute est invalide.', 'in_array' => 'Le champ :attribute n’existe pas dans :other.', - 'integer' => ':attribute doit être un nombre entier.', + 'integer' => 'Le champ :attribute doit être un entier.', 'ip' => ':attribute doit être une adresse IP valide.', 'json' => ':attribute doit respecté le format JSON.', 'max' => [ @@ -65,8 +66,8 @@ return [ 'not_in' => ':attribute est invalide.', 'numeric' => ':attribute doit être un nombre.', 'present' => 'Le champ :attribute doit être présent.', - 'regex' => 'Le format de :attribute est invalide.', - 'required' => 'Le champ :attribute est nécessaire.', + 'regex' => 'Le format du champ :attribute est invalide.', + 'required' => 'Le champ :attribute est obligatoire.', 'required_if' => 'Le champ :attribute est nécessaire quand :other vaut :value.', 'required_unless' => 'Le champ :attribute est nécessaire sauf si :other se trouve dans :values.', 'required_with' => 'Le champ :attribute est nécessaire quand :values est présent.', @@ -77,14 +78,14 @@ return [ 'size' => [ 'numeric' => ':attribute doit faire :size.', 'file' => ':attribute doit faire :size kilo-octets.', - 'string' => ':attribute doit faire :size caractères.', + 'string' => 'Le texte de :attribute doit contenir :size caractères.', 'array' => ':attribut doit contenir :size marchandises.', ], - 'string' => ':attribute doit être une chaîne de caractères.', + 'string' => 'Le champ :attribute doit être une chaîne de caractères.', 'timezone' => ':attribute doit être une zone valide.', - 'unique' => ':attribute est déjà pris.', - 'uploaded' => ':attribut n’a pas pu être envoyer.', - 'url' => 'Le format de :attribute est invalide.', + 'unique' => 'La valeur du champ :attribute est déjà utilisée.', + 'uploaded' => 'Le fichier du champ :attribute n\'a pu être téléversé.', + 'url' => 'Le format de l\'URL de :attribute n\'est pas valide.', /* |-------------------------------------------------------------------------- @@ -99,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'Un message spécifique sera affiché si le paramètre \'Utiliser message spécifique\' est implémenté pour le champ \'Message hors-ligne\'', + 'rule-name' => 'Un message spécifique sera affiché si le paramètre \'Utiliser message spécifique\' est implémenté pour le champ \'Message hors-ligne\'', ], - 'invalid_currency' => 'Le code de :attribute est invalide.', - 'invalid_amount' => 'Le montant :amount n\'est pas valide.', + 'invalid_currency' => 'Le code de :attribute est invalide.', + 'invalid_amount' => 'Le montant :amount n\'est pas valide.', + 'invalid_extension' => 'L\'extension de fichier n\'est pas valide.', ], /* diff --git a/resources/lang/fr-FR/widgets.php b/resources/lang/fr-FR/widgets.php index f9fe1fce6..2aa9c2317 100644 --- a/resources/lang/fr-FR/widgets.php +++ b/resources/lang/fr-FR/widgets.php @@ -2,22 +2,22 @@ return [ - 'total_income' => 'Total Income', - 'receivables' => 'Receivables', - 'open_invoices' => 'Open Invoices', - 'overdue_invoices' => 'Overdue Invoices', - 'total_expenses' => 'Total Expenses', - 'payables' => 'Payables', - 'open_bills' => 'Open Bills', - 'overdue_bills' => 'Overdue Bills', - 'total_profit' => 'Total Profit', - 'open_profit' => 'Open Profit', - 'overdue_profit' => 'Overdue Profit', - 'cash_flow' => 'Cash Flow', - 'no_profit_loss' => 'No Profit Loss', - 'income_by_category' => 'Income By Category', - 'expenses_by_category' => 'Expenses By Category', - 'account_balance' => 'Account Balance', - 'latest_income' => 'Latest Income', - 'latest_expenses' => 'Latest Expenses', + 'total_income' => 'Recettes totales', + 'receivables' => 'A percevoir', + 'open_invoices' => 'Factures de vente en cours', + 'overdue_invoices' => 'Factures de vente échues', + 'total_expenses' => 'Dépenses totales', + 'payables' => 'A payer', + 'open_bills' => 'Factures d\'achat en cours', + 'overdue_bills' => 'Factures d\'achat échues', + 'total_profit' => 'Bénéfice total', + 'open_profit' => 'Bénéfice en cours', + 'overdue_profit' => 'Bénéfice échu', + 'cash_flow' => 'Trésorerie', + 'no_profit_loss' => 'Perte nette', + 'income_by_category' => 'Revenus par catégorie', + 'expenses_by_category' => 'Dépenses par catégorie', + 'account_balance' => 'Solde du compte', + 'latest_income' => 'Dernière recette', + 'latest_expenses' => 'Dernière dépense', ]; diff --git a/resources/lang/id-ID/install.php b/resources/lang/id-ID/install.php index a5bab95b1..be9ca5d66 100644 --- a/resources/lang/id-ID/install.php +++ b/resources/lang/id-ID/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature perlu dinonaktifkan!', 'extension' => ': ekstensi ekstensi perlu diinstal dan dimuat!', 'directory' => ':directory direktori perlu ditulis!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', + 'executable' => 'Berkas PHP CLI belum didefinisikan/bekerja atau bukan versi :php_version ke atas. Mohon tanyakan ke penyedia hosting untuk mengatur variabel PHP_BINARY atau PHP_PATH dengan benar.', ], 'database' => [ diff --git a/resources/lang/id-ID/invoices.php b/resources/lang/id-ID/invoices.php index 9c2ff55c2..8236f6ea7 100644 --- a/resources/lang/id-ID/invoices.php +++ b/resources/lang/id-ID/invoices.php @@ -25,7 +25,7 @@ return [ 'payment_due' => 'Tanggal Pembayaran', 'paid' => 'Dibayar', - 'histories' => 'Sejarah', + 'histories' => 'Riwayat', 'payments' => 'Pembayaran', 'add_payment' => 'Tambahkan Pembayaran', 'mark_paid' => 'Ditandai Dibayar', diff --git a/resources/lang/id-ID/modules.php b/resources/lang/id-ID/modules.php index ca9036b47..91f8f70e9 100644 --- a/resources/lang/id-ID/modules.php +++ b/resources/lang/id-ID/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Baru', 'top_free' => 'Gratis Teratas', 'free' => 'GRATIS', - 'search' => 'Cari', 'install' => 'Pasang', 'buy_now' => 'Beli Sekarang', 'get_api_key' => 'Klik disini untuk mendapatkan Kunci API.', diff --git a/resources/lang/id-ID/passwords.php b/resources/lang/id-ID/passwords.php index 049fc45d9..4c68d250f 100644 --- a/resources/lang/id-ID/passwords.php +++ b/resources/lang/id-ID/passwords.php @@ -18,6 +18,6 @@ return [ 'sent' => 'Kami sudah mengirim email yang berisi tautan untuk mereset kata sandi Anda!', 'token' => 'Kata sandi token pengaturan ulang tidak sah.', 'user' => "Kami tidak dapat menemukan pengguna dengan alamat surel tersebut.", - 'throttle' => 'Please wait before retrying.', + 'throttle' => 'Harap tunggu sebelum mencoba lagi.', ]; diff --git a/resources/lang/lt-LT/accounts.php b/resources/lang/lt-LT/accounts.php index 8bc8a610d..49c971b22 100644 --- a/resources/lang/lt-LT/accounts.php +++ b/resources/lang/lt-LT/accounts.php @@ -2,13 +2,13 @@ return [ - 'account_name' => 'Įmonės pavadinimas', + 'account_name' => 'Sąskaitos pavadinimas', 'number' => 'Numeris', 'opening_balance' => 'Pradinis likutis', 'current_balance' => 'Likutis', 'bank_name' => 'Banko pavadinimas', 'bank_phone' => 'Banko telefonas', 'bank_address' => 'Banko adresas', - 'default_account' => 'Numatytoji įmonė', + 'default_account' => 'Pagrindinė sąskaita', ]; diff --git a/resources/lang/lt-LT/footer.php b/resources/lang/lt-LT/footer.php index 259e84c86..4b77a93a3 100644 --- a/resources/lang/lt-LT/footer.php +++ b/resources/lang/lt-LT/footer.php @@ -5,6 +5,6 @@ return [ 'version' => 'Versija', 'powered' => 'Sukurta Akaunting', 'link' => 'https://akaunting.com', - 'software' => 'Nemokama apskaitos programa', + 'software' => 'Laisva apskaitos programa', ]; diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php index 221056cc8..7f3cba806 100644 --- a/resources/lang/lt-LT/general.php +++ b/resources/lang/lt-LT/general.php @@ -3,16 +3,16 @@ return [ 'dashboards' => 'Pagrindinis|Pagrindinis', - 'items' => 'Prekės', + 'items' => 'Prekės|Paslaugos', 'incomes' => 'Pajamos', 'invoices' => 'Sąskaitos', 'revenues' => 'Pajamos', 'customers' => 'Klientai', 'expenses' => 'Išlaidos', - 'bills' => 'Sąskaitos', + 'bills' => 'Pirkimų sąskaitos', 'payments' => 'Mokėjimai', 'vendors' => 'Tiekėjai', - 'accounts' => 'Vartotojai', + 'accounts' => 'Sąskaita|Sąskaitos', 'transfers' => 'Pervedimai', 'transactions' => 'Transakcijos', 'reports' => 'Ataskaitos', @@ -20,7 +20,7 @@ return [ 'categories' => 'Kategorijos', 'currencies' => 'Valiutos', 'tax_rates' => 'Mokesčių tarifai', - 'users' => 'Vartotojai', + 'users' => 'Naudotojas|Naudotojai', 'roles' => 'Rolės', 'permissions' => 'Teisės', 'modules' => 'Programėlės', @@ -81,7 +81,7 @@ return [ 'delete_confirm' => 'Ar tikrai norite ištrinti?', 'name' => 'Vardas', 'email' => 'El. paštas', - 'tax_number' => 'PVM kodas', + 'tax_number' => 'PVM mokėtojo kodas', 'phone' => 'Telefonas', 'address' => 'Adresas', 'website' => 'Interneto svetainė', @@ -97,7 +97,7 @@ return [ 'change_type' => 'Pakeisti :type', 'switch' => 'Perjungti', 'color' => 'Spalva', - 'save' => 'Išsaugoti', + 'save' => 'Įrašyti', 'confirm' => 'Patvirtinti', 'cancel' => 'Atšaukti', 'loading' => 'Kraunama...', @@ -139,7 +139,7 @@ return [ 'start_date' => 'Pradžios Data', 'end_date' => 'Pabaigos Data', 'basis' => 'Basis', - 'accrual' => 'Accrual', + 'accrual' => 'Kaupimas', 'cash' => 'Grynieji pinigai', 'group_by' => 'Grupuoti pagal', 'accounting' => 'Buhalterija', diff --git a/resources/lang/lt-LT/messages.php b/resources/lang/lt-LT/messages.php index 9a3d48a47..5a94fd849 100644 --- a/resources/lang/lt-LT/messages.php +++ b/resources/lang/lt-LT/messages.php @@ -3,7 +3,7 @@ return [ 'success' => [ - 'added' => ':type pridėtas!', + 'added' => ':type pridėta!', 'updated' => ':type atnaujintas!', 'deleted' => ':type ištrintas!', 'duplicated' => ':type duplikuotas!', diff --git a/resources/lang/lt-LT/modules.php b/resources/lang/lt-LT/modules.php index e7b4f3ad3..1570702a0 100644 --- a/resources/lang/lt-LT/modules.php +++ b/resources/lang/lt-LT/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nauji', 'top_free' => 'Geriausios nemokamos', 'free' => 'NEMOKAMOS', - 'search' => 'Paieška', 'install' => 'Įrašyti', 'buy_now' => 'Pirkti dabar', 'get_api_key' => 'Norėdami gauti API Raktą spauskite čia.', diff --git a/resources/lang/lt-LT/settings.php b/resources/lang/lt-LT/settings.php index 2db080738..679def36e 100644 --- a/resources/lang/lt-LT/settings.php +++ b/resources/lang/lt-LT/settings.php @@ -65,7 +65,7 @@ return [ ], 'default' => [ - 'description' => 'Numatytoji sąskaita, valuta, kalba', + 'description' => 'Numatytoji įmonės sąskaita, valiuta, kalba', 'list_limit' => 'Įrašų puslapyje', 'use_gravatar' => 'Naudoti Gravatar', ], diff --git a/resources/lang/pt-PT/auth.php b/resources/lang/pt-PT/auth.php index ae643c3c8..b3e5be73f 100644 --- a/resources/lang/pt-PT/auth.php +++ b/resources/lang/pt-PT/auth.php @@ -7,8 +7,8 @@ return [ 'login' => 'Entrar', 'login_to' => 'Entre para iniciar sessão', 'remember_me' => 'Lembrar-me', - 'forgot_password' => 'Esqueci-me da senha', - 'reset_password' => 'Redefinir Senha', + 'forgot_password' => 'Esqueci-me da palavra-passe', + 'reset_password' => 'Redefinir palavra-passe', 'enter_email' => 'Insira o seu e-mail', 'current_email' => 'E-mail atual', 'reset' => 'Redefinir', @@ -16,10 +16,10 @@ return [ 'landing_page' => 'Página de Entrada', 'password' => [ - 'current' => 'Senha', - 'current_confirm' => 'Confirmação da Senha', - 'new' => 'Nova senha', - 'new_confirm' => 'Confirmação da Nova Senha', + 'current' => 'Palavra-passe', + 'current_confirm' => 'Confirmação da Palavra-passe', + 'new' => 'Nova Palavra-passe', + 'new_confirm' => 'Confirmação da Nova Palavra-passe', ], 'error' => [ @@ -33,9 +33,9 @@ return [ 'throttle' => 'O limite de tentativas para entrar na sua conta foi atingido. Por favor tente novamente dentro de :seconds segundos.', 'notification' => [ - 'message_1' => 'Recebeu este e-mail porque foi-nos feito uma solicitação de redefinição de senha para a sua conta.', - 'message_2' => 'Se não solicitou uma redefinição de senha, nenhuma ação adicional é necessária.', - 'button' => 'Redefinir Senha', + 'message_1' => 'Recebeu este e-mail porque foi-nos feito uma solicitação de redefinição de palavra-passe para a sua conta.', + 'message_2' => 'Se não solicitou uma redefinição de palavra-passe, nenhuma ação adicional é necessária.', + 'button' => 'Redefinir Palavra-passe', ], ]; diff --git a/resources/lang/pt-PT/bills.php b/resources/lang/pt-PT/bills.php index 5cc9076c6..351a724da 100644 --- a/resources/lang/pt-PT/bills.php +++ b/resources/lang/pt-PT/bills.php @@ -28,10 +28,10 @@ return [ 'paid' => 'Pago', 'histories' => 'Histórico', 'payments' => 'Pagamentos', - 'add_payment' => 'Pagar Conta', - 'mark_paid' => 'Mark Paid', + 'add_payment' => 'Adicionar Pagamento', + 'mark_paid' => 'Marcar como Paga', 'mark_received' => 'Marcar como Recebida', - 'mark_cancelled' => 'Mark Cancelled', + 'mark_cancelled' => 'Marcar como Cancelada', 'download_pdf' => 'Transferir em PDF', 'send_mail' => 'Enviar e-mail', 'create_bill' => 'Criar Conta', @@ -45,20 +45,20 @@ return [ 'paid' => 'Paga', 'overdue' => 'Vencida', 'unpaid' => 'Por Pagar', - 'cancelled' => 'Cancelled', + 'cancelled' => 'Cancelada', ], 'messages' => [ - 'marked_received' => 'Bill marked as received!', - 'marked_paid' => 'Bill marked as paid!', - 'marked_cancelled' => 'Bill marked as cancelled!', + 'marked_received' => 'Conta marcada como recebida!', + 'marked_paid' => 'Conta marcada como paga!', + 'marked_cancelled' => 'Conta marcada como cancelada!', 'draft' => 'Isto é um RASCUNHO da conta e será refletida nos gráficos depois de recebida.', 'status' => [ - 'created' => 'Criado em :date', + 'created' => 'Criada em :date', 'receive' => [ - 'draft' => 'Não enviado', - 'received' => 'Recebido em :date', + 'draft' => 'Não enviada', + 'received' => 'Recebida em :date', ], 'paid' => [ 'await' => 'Aguarda pagamento', diff --git a/resources/lang/pt-PT/bulk_actions.php b/resources/lang/pt-PT/bulk_actions.php index f2338881d..5cd90cfca 100644 --- a/resources/lang/pt-PT/bulk_actions.php +++ b/resources/lang/pt-PT/bulk_actions.php @@ -4,18 +4,18 @@ return [ 'bulk_actions' => 'Ação em massa|Ações em massa', 'selected' => 'selecionado', - 'no_action' => 'No action available', + 'no_action' => 'Nenhuma ação disponível', 'message' => [ 'duplicate' => 'Tem a certeza de que pretende duplicar o(s) registo(s) selecionado(s)?', - 'delete' => 'Are you sure you want to delete selected record?|Are you sure you want to delete selected records?', - 'export' => 'Are you sure you want to export selected record?|Are you sure you want to export selected records?', - 'enable' => 'Are you sure you want to enable selected record?|Are you sure you want to enable selected records?', - 'disable' => 'Are you sure you want to disable selected record?|Are you sure you want to disable selected records?', - 'paid' => 'Are you sure you want to mark selected invoice as paid?|Are you sure you want to mark selected invoices as paid?', - 'sent' => 'Are you sure you want to mark selected invoice as sent?|Are you sure you want to mark selected invoices as sent?', - 'received' => 'Are you sure you want to mark selected bill as received?|Are you sure you want to mark selected bills as received?', - 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', + 'delete' => 'Tem a certeza de que pretende eliminar o registo selecionado?|Tem a certeza de que pretende eliminar os registos selecionados?', + 'export' => 'Tem a certeza de que pretende exportar o registo selecionado?|Tem a certeza de que pretende exportar os registos selecionados?', + 'enable' => 'Tem a certeza de que pretende ativar o registo selecionado?|Tem a certeza de que pretende ativar os registos selecionados?', + 'disable' => 'Tem a certeza de que pretende desativar o registo selecionado?|Tem a certeza de que pretende desativar os registos selecionados?', + 'paid' => 'Tem a certeza de que pretende marcar a fatura selecionada como paga?|Tem a certeza de que pretende marcar as faturas selecionadas como pagas?', + 'sent' => 'Tem a certeza de que pretende marcar a fatura selecionada como enviada?|Tem a certeza de que pretende marcar as faturas selecionadas como enviadas?', + 'received' => 'Tem a certeza de que pretende marcar a conta selecionada como recebida?|Tem a certeza de que pretende marcar as contas selecionadas como recebidas?', + 'cancelled' => 'Tem a certeza de que pretende cancelar a fatura/conta selecionada?|Tem a certeza de que pretende cancelar as faturas/contas selecionadas?', ], ]; diff --git a/resources/lang/pt-PT/companies.php b/resources/lang/pt-PT/companies.php index 5157a22d7..3e5329b27 100644 --- a/resources/lang/pt-PT/companies.php +++ b/resources/lang/pt-PT/companies.php @@ -7,8 +7,8 @@ return [ 'error' => [ 'not_user_company' => 'Erro: Não tem permissão para alterar esta empresa!', - 'delete_active' => 'Error: Can not delete the active company. Please, switch to another first!', - 'disable_active' => 'Error: Can not disable the active company. Please, switch to another first!', + 'delete_active' => 'Erro: Não é possível eliminar a empresa ativa. Por favor, altere para outra primeiro!', + 'disable_active' => 'Erro: Não é possível desativar a empresa ativa. Por favor, altere para outra primeiro!', ], ]; diff --git a/resources/lang/pt-PT/customers.php b/resources/lang/pt-PT/customers.php index eafe11f26..5989f1003 100644 --- a/resources/lang/pt-PT/customers.php +++ b/resources/lang/pt-PT/customers.php @@ -2,7 +2,7 @@ return [ - 'can_login' => 'Can Login?', + 'can_login' => 'Pode Iniciar Sessão?', 'user_created' => 'Utilizador criado', 'error' => [ diff --git a/resources/lang/pt-PT/email_templates.php b/resources/lang/pt-PT/email_templates.php index 8ccef15bb..cfaa9125b 100644 --- a/resources/lang/pt-PT/email_templates.php +++ b/resources/lang/pt-PT/email_templates.php @@ -8,42 +8,42 @@ return [ ], 'invoice_remind_customer' => [ - 'subject' => '{invoice_number} invoice overdue notice', + 'subject' => '{invoice_number} aviso de fatura vencida', 'body' => 'Dear {customer_name},

    This is an overdue notice for {invoice_number} invoice.

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

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

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

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

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

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

    Best Regards,
    {company_name}', ], 'invoice_recur_customer' => [ - 'subject' => '{invoice_number} recurring invoice created', + 'subject' => 'Fatura recorrente {invoice_number} criada', 'body' => 'Dear {customer_name},

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

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

    Feel free to contact us for any question.

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

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

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

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

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

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

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

    Feel free to contact us for any question.

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

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

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

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

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

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

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

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

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

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

    Best Regards,
    {company_name}', ], diff --git a/resources/lang/pt-PT/errors.php b/resources/lang/pt-PT/errors.php index c72a47530..012666262 100644 --- a/resources/lang/pt-PT/errors.php +++ b/resources/lang/pt-PT/errors.php @@ -3,21 +3,21 @@ return [ 'title' => [ - '403' => 'Oops! Forbidden Access', - '404' => 'Oops! Page not found', - '500' => 'Oops! Something went wrong', + '403' => 'Ups! Acesso não Permitido', + '404' => 'Ups! Página não encontrada', + '500' => 'Ups! Algo correu mal', ], 'header' => [ - '403' => '403 Forbidden', - '404' => '404 Not Found', - '500' => '500 Internal Server Error', + '403' => '403 Não Permitido', + '404' => '404 Não Encontrada', + '500' => '500 Erro do Servidor', ], 'message' => [ - '403' => 'You can not access this page.', - '404' => 'We could not find the page you were looking for.', - '500' => 'We will work on fixing that right away.', + '403' => 'Não pode aceder a esta página.', + '404' => 'Não conseguimos encontrar a página que procura.', + '500' => 'Vamos tentar reparar o problema o mais rápido possível.', ], ]; diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php index fdcaa571f..dbcad5744 100644 --- a/resources/lang/pt-PT/general.php +++ b/resources/lang/pt-PT/general.php @@ -6,7 +6,7 @@ return [ 'items' => 'Item|Itens', 'incomes' => 'Receita|Receitas', 'invoices' => 'Factura|Facturas', - 'revenues' => 'Receitas|Receitas', + 'revenues' => 'Receita|Receitas', 'customers' => 'Cliente|Clientes', 'expenses' => 'Despesa|Despesas', 'bills' => 'Conta|Contas', @@ -41,8 +41,8 @@ return [ 'others' => 'Outro|Outros', 'contacts' => 'Contacto|Contactos', 'reconciliations' => 'Reconciliação|Reconciliações', - 'developers' => 'Desenvolvedor|Desenvolvedores', - 'schedules' => 'Schedule|Schedules', + 'developers' => 'Programador|Programadores', + 'schedules' => 'Agendado|Agendados', 'groups' => 'Grupo|Grupos', 'charts' => 'Gráfico|Gráficos', 'localisations' => 'Localização|Localizações', @@ -58,8 +58,8 @@ return [ 'no_records' => 'Sem Registos.', 'date' => 'Data', 'amount' => 'Montante', - 'enabled' => 'Activo', - 'disabled' => 'Inactivo', + 'enabled' => 'Ativo', + 'disabled' => 'Inativo', 'yes' => 'Sim', 'no' => 'Não', 'na' => 'N/D', @@ -78,7 +78,7 @@ return [ 'send' => 'Enviar', 'share' => 'Partilhar', 'download' => 'Transferir', - 'delete_confirm' => 'Confirmar a remoção de :type :name?', + 'delete_confirm' => 'Confirmar a eliminação de :type :name?', 'name' => 'Nome', 'email' => 'E-mail', 'tax_number' => 'Número de identificação fiscal', @@ -96,7 +96,7 @@ return [ 'change' => 'Alterar', 'change_type' => 'Alterar :type', 'switch' => 'Mudar', - 'color' => 'Côr', + 'color' => 'Cor', 'save' => 'Guardar', 'confirm' => 'Confirmar', 'cancel' => 'Cancelar', @@ -124,8 +124,8 @@ return [ 'finish' => 'Concluir', 'wizard' => 'Assistente de Configuração', 'skip' => 'Saltar', - 'enable' => 'Activar', - 'disable' => 'Desactivar', + 'enable' => 'Ativar', + 'disable' => 'Desativar', 'select_all' => 'Selecionar Tudo', 'unselect_all' => 'Desmarcar Tudo', 'created_date' => 'Data de Criação', @@ -138,26 +138,26 @@ return [ 'footer' => 'Rodapé', 'start_date' => 'Data Inicial', 'end_date' => 'Data Final', - 'basis' => 'Basis', + 'basis' => 'Base', 'accrual' => 'Accrual', 'cash' => 'Dinheiro', - 'group_by' => 'Group By', - 'accounting' => 'Accounting', + 'group_by' => 'Agrupar por', + 'accounting' => 'Contabilidade', 'sort' => 'Ordenar', 'width' => 'Largura', 'month' => 'Mês', 'year' => 'Ano', - 'type_item_name' => 'Type an item name', - 'no_data' => 'No data', - 'no_matching_data' => 'No matching data', + 'type_item_name' => 'Insira o nome do item', + 'no_data' => 'Sem dados', + 'no_matching_data' => 'Dados sem correspondência', 'clear_cache' => 'Limpar Cache', 'go_to_dashboard' => 'Ir para o Painel', 'card' => [ - 'name' => 'Name on Card', - 'number' => 'Card Number', - 'expiration_date' => 'Expiration Date', - 'cvv' => 'Card CVV', + 'name' => 'Nome no Cartão', + 'number' => 'Cartão Nº', + 'expiration_date' => 'Data de Validade', + 'cvv' => 'Código CVV', ], 'title' => [ @@ -168,7 +168,7 @@ return [ 'send' => 'Enviar :type', 'get' => 'Obter :type', 'add' => 'Adicionar :type', - 'manage' => 'Manage :type', + 'manage' => 'Gerir :type', ], 'form' => [ @@ -183,24 +183,24 @@ return [ 'date_range' => [ 'today' => 'Hoje', - 'yesterday' => 'Ontém', + 'yesterday' => 'Ontem', 'last_days' => 'Últimos :day Dias', 'this_month' => 'Este Mês', 'last_month' => 'Mês Anterior', ], 'empty' => [ - 'documentation' => 'Check out the documentation for more details.', - 'items' => 'Items can be products or services. You can use items when creating invoices and bills to have the price, tax etc fields populated.', - 'invoices' => 'Invoices can be one time or recurring. You can send them to customers and start accepting online payments.', - 'revenues' => 'Revenue is a paid income transaction. It can be an independent record (i.e. deposit) or attached to an invoice.', - 'customers' => 'Customers are required if you want to create invoices. They may also log in to Client Portal and see their balance.', - 'bills' => 'Bills can be one time or recurring. They indicate what you owe your vendors for the products or services you purchase.', - 'payments' => 'Payment is a paid expense transaction. It can be an independent record (i.e. food receipt) or attached to a bill.', - 'vendors' => 'Vendors are required if you want to create bills. You can see the balance you owe and filter reports by the vendor.', - 'transfers' => 'Transfers allow you to move money from one account to another, whether they use the same currency or not.', - 'taxes' => 'Taxes are used to apply extra fees to invoices and bills. Your financials are affected by these regulatory taxes.', - 'reconciliations' => 'Bank reconciliation is a process performed to ensure that your company bank records are also correct.', + 'documentation' => 'Para mais detalhes verifique a documentação.', + 'items' => 'Os Itens podem ser produtos ou serviços. Pode usar itens ao criar uma Fatura ou Conta para ter o campo do preço, campo do imposto etc preenchidos.', + 'invoices' => 'As Faturas podem ser únicas ou recorrentes. Pode enviá-las para os Clientes e começar a aceitar pagamentos online.', + 'revenues' => 'As Receitas são uma transação de crédito. Pode ser um registo independente (ex. depósito) ou ligado a uma Fatura.', + 'customers' => 'Os Clientes são necessários para a criação de Faturas. Eles também podem entrar no Portal do Cliente e ver o seu saldo.', + 'bills' => 'As Contas podem ser únicas ou recorrentes. Elas indicam o que está em dívida aos seus Fornecedores pelos produtos ou serviços que comprou.', + 'payments' => 'Os Pagamentos são uma transação de débito. Pode ser um registo independente (ex. refeição) ou ligado a uma Conta.', + 'vendors' => 'Os Fornecedores são necessários para a criação de Contas. Pode ver o saldo em dívida e filtrar relatórios por Fornecedor.', + 'transfers' => 'As transferências permitem a movimentação de dinheiro de uma conta para outra, mesmo que a moeda seja diferente.', + 'taxes' => 'Os Impostos são utilizados para adicionar uma taxa extra às Faturas e Contas. As suas finanças são afetadas por esses impostos reguladores.', + 'reconciliations' => 'Reconciliação bancária é um processo realizado para garantir que os registos bancários da sua empresa também estejam corretos.', ], ]; diff --git a/resources/lang/pt-PT/import.php b/resources/lang/pt-PT/import.php index e3e10331c..d22c73326 100644 --- a/resources/lang/pt-PT/import.php +++ b/resources/lang/pt-PT/import.php @@ -4,6 +4,6 @@ return [ 'import' => 'Importar', 'title' => 'Importar :type', - 'message' => 'Tipos de ficheiro permitidos: XLS, XLSX. Por favor, descarregue o ficheiro de amostra.', + 'message' => 'Tipos de ficheiro permitidos: XLS, XLSX. Por favor, transfira o ficheiro de exemplo.', ]; diff --git a/resources/lang/pt-PT/install.php b/resources/lang/pt-PT/install.php index c9ffbb129..aa813276d 100644 --- a/resources/lang/pt-PT/install.php +++ b/resources/lang/pt-PT/install.php @@ -6,7 +6,7 @@ return [ 'refresh' => 'Atualizar', 'steps' => [ - 'requirements' => 'Por favor, peça ao seu fornecedor de hospedagem para corrigir os erros!', + 'requirements' => 'Por favor, peça ao seu fornecedor de alojamento web para corrigir os erros!', 'language' => 'Passo 1/3: Selecionar idioma', 'database' => 'Passo 2/3: Configuração da base de dados', 'settings' => 'Passo 3/3: Detalhes da empresa e do administrador', @@ -21,13 +21,13 @@ return [ 'disabled' => ':feature precisa estar desativada!', 'extension' => ':extensão extensão precisa estar instalada e carregada!', 'directory' => 'O diretório :directory precisa de permissão para escrita!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', + 'executable' => 'O ficheiro executável PHP CLI não está definido ou a funcionar, ou a sua versão do PHP não é :php_version ou superior! Por favor, peça à sua empresa de alojamento web para definir corretamente a variável de ambiente PHP_BINARY ou PHP_PATH.', ], 'database' => [ 'hostname' => 'Nome do servidor', 'username' => 'Nome de utilizador', - 'password' => 'Senha', + 'password' => 'Palavra-passe', 'name' => 'Base de Dados', ], @@ -35,7 +35,7 @@ return [ 'company_name' => 'Nome da empresa', 'company_email' => 'E-mail da empresa', 'admin_email' => 'E-mail do administrador', - 'admin_password' => 'Senha do administrador', + 'admin_password' => 'Palavra-passe do administrador', ], 'error' => [ diff --git a/resources/lang/pt-PT/invoices.php b/resources/lang/pt-PT/invoices.php index bbeeb887e..3a40e7e07 100644 --- a/resources/lang/pt-PT/invoices.php +++ b/resources/lang/pt-PT/invoices.php @@ -28,13 +28,13 @@ return [ 'histories' => 'Histórico', 'payments' => 'Pagamentos', 'add_payment' => 'Adicionar Pagamento', - 'mark_paid' => 'Marcar como Pago', + 'mark_paid' => 'Marcar como Paga', 'mark_sent' => 'Marcar como Enviada', - 'mark_viewed' => 'Mark Viewed', - 'mark_cancelled' => 'Mark Cancelled', + 'mark_viewed' => 'Marcar como Visualizada', + 'mark_cancelled' => 'Marcar como Cancelada', 'download_pdf' => 'Transferir em PDF', 'send_mail' => 'Enviar E-mail', - 'all_invoices' => 'Faça o login para ver todas as faturas', + 'all_invoices' => 'Iniciar sessão para ver todas as faturas', 'create_invoice' => 'Criar Fatura', 'send_invoice' => 'Enviar Factura', 'get_paid' => 'Obter Pagamento', @@ -42,28 +42,28 @@ return [ 'statuses' => [ 'draft' => 'Rascunho', - 'sent' => 'Sent', - 'viewed' => 'Viewed', - 'approved' => 'Approved', + 'sent' => 'Enviada', + 'viewed' => 'Visualizada', + 'approved' => 'Aprovada', 'partial' => 'Parcial', - 'paid' => 'Paid', - 'overdue' => 'Overdue', + 'paid' => 'Paga', + 'overdue' => 'Vencida', 'unpaid' => 'Por Pagar', - 'cancelled' => 'Cancelled', + 'cancelled' => 'Cancelada', ], 'messages' => [ - 'email_sent' => 'Invoice email has been sent!', - 'marked_sent' => 'Invoice marked as sent!', - 'marked_paid' => 'Invoice marked as paid!', - 'marked_viewed' => 'Invoice marked as viewed!', - 'marked_cancelled' => 'Invoice marked as cancelled!', + 'email_sent' => 'A fatura foi enviada!', + 'marked_sent' => 'Fatura marcada como enviada!', + 'marked_paid' => 'Fatura marcada como paga!', + 'marked_viewed' => 'Fatura marcada como visualizada!', + 'marked_cancelled' => 'Fatura marcada como cancelada!', 'email_required' => 'Nenhum endereço de e-mail para este cliente!', 'draft' => 'Isto é um RASCUNHO da fatura e será refletida nos gráficos depois de enviada.', 'status' => [ 'created' => 'Criada em :date', - 'viewed' => 'Viewed', + 'viewed' => 'Visualizada', 'send' => [ 'draft' => 'Não Enviada', 'sent' => 'Enviada em :data', diff --git a/resources/lang/pt-PT/maintenance.php b/resources/lang/pt-PT/maintenance.php index ec79d916c..2544b8b9f 100644 --- a/resources/lang/pt-PT/maintenance.php +++ b/resources/lang/pt-PT/maintenance.php @@ -4,8 +4,8 @@ return [ 'title' => 'Em Manutenção', - 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', + 'message' => 'Pedimos desculpa, estamos em manutenção. Por favor, volte a tentar mais logo!', - 'last-updated' => 'This message was last updated :timestamp.', + 'last-updated' => 'Esta mensagem foi atualizada pela ultima vez em :timestamp.', ]; diff --git a/resources/lang/pt-PT/messages.php b/resources/lang/pt-PT/messages.php index fe1f366ea..8941f309f 100644 --- a/resources/lang/pt-PT/messages.php +++ b/resources/lang/pt-PT/messages.php @@ -5,12 +5,12 @@ return [ 'success' => [ 'added' => ':type adicionado(a)!', 'updated' => ':type atualizada(s)!', - 'deleted' => ':type excluído(a)!', + 'deleted' => ':type eliminado(a)!', 'duplicated' => ':type duplicado(a)!', 'imported' => ':type importado(a)!', - 'exported' => ':type exported!', + 'exported' => ':type importado(a)!', 'enabled' => ':type ativado(a)!', - 'disabled' => ': type desativado(a)!', + 'disabled' => ':type desativado(a)!', ], 'error' => [ @@ -18,20 +18,20 @@ return [ 'not_user_company' => 'Erro: Não tem permissão para gerir esta empresa!', 'customer' => 'Erro: O utilizador não foi criado! :name já está a usar este e-mail.', 'no_file' => 'Erro: Nenhum ficheiro selecionado!', - 'last_category' => 'Erro: Não pode excluir a última :type categoria!', - 'change_type' => 'Error: Can not change the type because it has :text related!', + 'last_category' => 'Erro: Não pode eliminara última :type categoria!', + 'change_type' => 'Erro: Não é possível alterar o tipo porque tem :text relacionado!', 'invalid_apikey' => 'Erro: A chave de API inserida é inválida!', 'import_column' => 'Erro: :message Nome da folha: :sheet. Linha número: :line.', 'import_sheet' => 'Erro: O nome da folha não é válido. Por favor, verifique o ficheiro de exemplo.', ], 'warning' => [ - 'deleted' => 'Aviso: Não está autorizado a excluir :name porque está relacionado com :text.', - 'disabled' => 'Aviso: Não está autorizado a desativar :name porque está relacionado com :text.', - 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', - 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', - 'disable_code' => 'Aviso: Não está autorizado a desativar ou modificar a moeda :name porque está relacionada com :text.', - 'payment_cancel' => 'Warning: You have cancelled your recent :method payment!', + 'deleted' => 'Aviso: Não é permitido eliminar:name porque está relacionado com :text.', + 'disabled' => 'Aviso: Não é permitido desativar :name porque está relacionado com :text.', + 'reconciled_tran' => 'Aviso: Não é permitido alterar/eliminar transações porque estão reconciliadas!', + 'reconciled_doc' => 'Aviso: Não é permitido alterar/eliminar :type, porque tem transações reconciliadas!', + 'disable_code' => 'Aviso: Não é permitido desativar ou modificar a moeda :name porque está relacionada com :text.', + 'payment_cancel' => 'Aviso: Cancelou o método de pagamento recente :method!', ], ]; diff --git a/resources/lang/pt-PT/modules.php b/resources/lang/pt-PT/modules.php index 6645d5d70..42f9fa238 100644 --- a/resources/lang/pt-PT/modules.php +++ b/resources/lang/pt-PT/modules.php @@ -3,7 +3,7 @@ return [ 'api_key' => 'Chave da API', - 'my_apps' => 'Minhas Aplicações', + 'my_apps' => 'As Minhas Aplicações', 'pre_sale' => 'Pré-Venda', 'top_paid' => 'Melhores Pagos', 'new' => 'Recentes', @@ -11,15 +11,15 @@ return [ 'free' => 'GRÁTIS', 'install' => 'Instalar', 'buy_now' => 'Comprar Agora', - 'get_api_key' => 'Click here to get your API key.', + 'get_api_key' => 'Clique aqui para obter a sua chave da API.', 'no_apps' => 'Ainda não existem aplicações nesta categoria.', - 'become_developer' => 'Are you a developer? Here you can learn how to create an app and start selling today!', + 'become_developer' => 'É um programador? Aqui poderá aprender como criar uma aplicação e começar a vende-la hoje mesmo!', 'recommended_apps' => 'Aplicações Recomendadas', 'about' => 'Sobre', - 'added' => 'Adicionado', - 'updated' => 'Atualizado', + 'added' => 'Adicionada', + 'updated' => 'Atualizada', 'compatibility' => 'Compatibilidade', 'documentation' => 'Documentação', 'view' => 'Ver', @@ -41,19 +41,19 @@ return [ 'installation' => [ 'header' => 'Instalação de aplicação', 'download' => 'A transferir :module', - 'unzip' => 'A extrair ficheiros :module', - 'file_copy' => 'Copying :module files', - 'finish' => 'Finalizing :module installation', - 'redirect' => ':module installed, redirecting to updates page', - 'install' => 'Installing :module', + 'unzip' => 'A extrair ficheiros de :module', + 'file_copy' => 'A copiar ficheiros de :module', + 'finish' => 'A finalizar a instalação de :module', + 'redirect' => ':module instalado, a redirecionar para a página de atualizações', + 'install' => 'A instalar :module', ], 'errors' => [ - 'download' => 'Not able to download :module', - 'zip' => 'Not able to create :module zip file', - 'unzip' => 'Not able to unzip :module', - 'file_copy' => 'Not able to copy :module files', - 'finish' => 'Not able to finalize :module installation', + 'download' => 'Não foi possível transferir :module', + 'zip' => 'Não foi possível criar o ficheiro zip de :module', + 'unzip' => 'Não foi possível descompactar :module', + 'file_copy' => 'Não foi possível copiar os ficheiros de :module', + 'finish' => 'Não foi possível finalizar a instalação de :module', ], 'badge' => [ @@ -63,8 +63,8 @@ return [ 'button' => [ 'uninstall' => 'Desinstalar', - 'disable' => 'Desactivar', - 'enable' => 'Activar', + 'disable' => 'Desativar', + 'enable' => 'Ativar', ], 'my' => [ diff --git a/resources/lang/pt-PT/notifications.php b/resources/lang/pt-PT/notifications.php index e32c51496..78c961e1f 100644 --- a/resources/lang/pt-PT/notifications.php +++ b/resources/lang/pt-PT/notifications.php @@ -4,7 +4,7 @@ return [ 'whoops' => 'Ups!', 'hello' => 'Olá!', - 'salutation' => 'Atenciosamente,
    :Nome_da_Empresa', + 'salutation' => 'Atenciosamente,
    :company_name', 'subcopy' => 'Se está a ter problemas ao clicar no botão ":text", copie e cole a URL abaixo no seu navegador web: [:url](:url)', ]; diff --git a/resources/lang/pt-PT/pagination.php b/resources/lang/pt-PT/pagination.php index de9b8023e..78a7951fc 100644 --- a/resources/lang/pt-PT/pagination.php +++ b/resources/lang/pt-PT/pagination.php @@ -2,9 +2,9 @@ return [ - 'previous' => 'Previous', - 'next' => 'Next', - 'showing' => ':first-:last of :total records.', - 'page' => 'per page.', + 'previous' => 'Anterior', + 'next' => 'Seguinte', + 'showing' => ':first-:last de :total registos.', + 'page' => 'por página.', ]; diff --git a/resources/lang/pt-PT/passwords.php b/resources/lang/pt-PT/passwords.php index db8d386c9..2c9a9e3c7 100644 --- a/resources/lang/pt-PT/passwords.php +++ b/resources/lang/pt-PT/passwords.php @@ -13,10 +13,10 @@ return [ | */ - 'password' => 'A password necessita conter, pelo menos, 6 caracteres e corresponder à sua confirmacao.', - 'reset' => 'A sua password foi redefinida!', - 'sent' => 'Enviámos um e-mail com o link para redefinir a sua password!', - 'token' => 'Token para recuperação da password inválido.', + 'password' => 'A palavra-passe necessita conter, pelo menos, 6 caracteres e corresponder à sua confirmação.', + 'reset' => 'A sua palavra-passe foi redefinida!', + 'sent' => 'Enviámos um e-mail com o link para redefinir a sua palavra-passe!', + 'token' => 'Token para recuperação da palavra-passe inválido.', 'user' => "Não encontramos nenhum utilizador com esse endereço de e-mail.", 'throttle' => 'Por favor, aguarde antes de tentar novamente.', diff --git a/resources/lang/pt-PT/settings.php b/resources/lang/pt-PT/settings.php index 10a9216ef..a8a2d3cfa 100644 --- a/resources/lang/pt-PT/settings.php +++ b/resources/lang/pt-PT/settings.php @@ -3,7 +3,7 @@ return [ 'company' => [ - 'description' => 'Change company name, email, address, tax number etc', + 'description' => 'Alterar nome da empresa, e-mail, endereço, número fiscal etc', 'name' => 'Nome', 'email' => 'E-mail', 'phone' => 'Telefone', @@ -12,7 +12,7 @@ return [ ], 'localisation' => [ - 'description' => 'Set fiscal year, time zone, date format and more locals', + 'description' => 'Definir o ano fiscal, fuso horário, formato da data e localizações', 'financial_start' => 'Início do ano fiscal', 'timezone' => 'Fuso Horário', 'date' => [ @@ -30,19 +30,19 @@ return [ 'after' => 'Depois do Número', ], 'discount_location' => [ - 'name' => 'Discount Location', - 'item' => 'At line', - 'total' => 'At total', - 'both' => 'Both line and total', + 'name' => 'Localização do Desconto', + 'item' => 'Por linha', + 'total' => 'No total', + 'both' => 'Em ambos (linha e total)', ], ], 'invoice' => [ - 'description' => 'Customize invoice prefix, number, terms, footer etc', + 'description' => 'Personalizar prefixo de fatura, número, termos, rodapé etc', 'prefix' => 'Prefixo', 'digit' => 'Quantidade de dígitos', 'next' => 'Próximo Número', - 'logo' => 'Logotipo', + 'logo' => 'Logótipo', 'custom' => 'Personalizado', 'item_name' => 'Nome do Item', 'item' => 'Itens', @@ -56,22 +56,22 @@ return [ 'payment_terms' => 'Termos de Pagamento', 'title' => 'Título', 'subheading' => 'Subtítulo', - 'due_receipt' => 'Due upon receipt', - 'due_days' => 'Due within :days days', - 'choose_template' => 'Choose invoice template', + 'due_receipt' => 'Vencida ao receber', + 'due_days' => 'Vencida após :days dias', + 'choose_template' => 'Escolher modelo da Fatura', 'default' => 'Padrão', 'classic' => 'Clássico', 'modern' => 'Moderno', ], 'default' => [ - 'description' => 'Default account, currency, language of your company', - 'list_limit' => 'Records Per Page', + 'description' => 'Conta padrão, moeda, idioma da sua empresa', + 'list_limit' => 'Registos por página', 'use_gravatar' => 'Usar Gravatar', ], 'email' => [ - 'description' => 'Change the sending protocol and email templates', + 'description' => 'Alterar o protocolo de envio e modelos de e-mail', 'protocol' => 'Protocolo', 'php' => 'PHP Mail', 'smtp' => [ @@ -79,7 +79,7 @@ return [ 'host' => 'Servidor SMTP', 'port' => 'Porta SMTP', 'username' => 'Utilizador SMTP', - 'password' => 'Senha SMTP', + 'password' => 'Palavra-passe SMTP', 'encryption' => 'Encriptação SMTP', 'none' => 'Nenhum', ], @@ -90,22 +90,22 @@ return [ 'templates' => [ 'subject' => 'Assunto', 'body' => 'Conteúdo', - 'tags' => 'Available Tags: :tag_list', - 'invoice_new_customer' => 'New Invoice Template (sent to customer)', - 'invoice_remind_customer' => 'Invoice Reminder Template (sent to customer)', - 'invoice_remind_admin' => 'Invoice Reminder Template (sent to admin)', - 'invoice_recur_customer' => 'Invoice Recurring Template (sent to customer)', - 'invoice_recur_admin' => 'Invoice Recurring Template (sent to admin)', - 'invoice_payment_customer' => 'Payment Received Template (sent to customer)', - 'invoice_payment_admin' => 'Payment Received Template (sent to admin)', - 'bill_remind_admin' => 'Bill Reminder Template (sent to admin)', - 'bill_recur_admin' => 'Bill Recurring Template (sent to admin)', + 'tags' => 'Etiquetas Disponíveis: :tag_list', + 'invoice_new_customer' => 'Novo modelo de Fatura (envio ao cliente)', + 'invoice_remind_customer' => 'Modelo de lembrete de Fatura (envio ao cliente)', + 'invoice_remind_admin' => 'Modelo de lembrete de Fatura (envio ao administrador)', + 'invoice_recur_customer' => 'Modelo de Fatura recorrente (envio ao cliente)', + 'invoice_recur_admin' => 'Modelo de Fatura recorrente (envio ao administrador)', + 'invoice_payment_customer' => 'Modelo de Pagamento recebido (envio ao cliente)', + 'invoice_payment_admin' => 'Modelo de Pagamento recebido (envio ao administrador)', + 'bill_remind_admin' => 'Modelo de lembrete de Conta (envio ao administrador)', + 'bill_recur_admin' => 'Modelo de Conta recorrente (envio ao administrador)', ], ], 'scheduling' => [ - 'name' => 'Scheduling', - 'description' => 'Automatic reminders and command for recurring', + 'name' => 'Agendado', + 'description' => 'Lembretes automáticos e comandos para recorrentes agendados', 'send_invoice' => 'Enviar lembrete de faturas', 'invoice_days' => 'Enviar após dias de vencimento', 'send_bill' => 'Enviar lembrete de Contas', @@ -115,15 +115,15 @@ return [ ], 'categories' => [ - 'description' => 'Unlimited categories for income, expense, and item', + 'description' => 'Categorias ilimitadas para receita, despesa, e itens', ], 'currencies' => [ - 'description' => 'Create and manage currencies and set their rates', + 'description' => 'Criar e gerir moedas e definir as taxas', ], 'taxes' => [ - 'description' => 'Fixed, normal, inclusive, and compound tax rates', + 'description' => 'Taxas de imposto fixa, normal, inclusiva e composta', ], ]; diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php index 1b3bd9c14..bcee48b2a 100644 --- a/resources/lang/pt-PT/validation.php +++ b/resources/lang/pt-PT/validation.php @@ -19,7 +19,7 @@ return [ 'after_or_equal' => 'O campo :attribute deverá conter uma data posterior ou igual a :date.', 'alpha' => 'O campo :attribute deverá conter apenas letras.', 'alpha_dash' => 'O campo :attribute deverá conter apenas letras, números e traços.', - 'alpha_num' => 'O campo :attribute deverá conter apenas letras e números .', + 'alpha_num' => 'O campo :attribute deverá conter apenas letras e números.', 'array' => 'O campo :attribute deverá conter uma coleção de elementos.', 'before' => 'O campo :attribute deverá conter uma data anterior a :date.', 'before_or_equal' => 'O Campo :attribute deverá conter uma data anterior ou igual a :date.', @@ -39,7 +39,7 @@ return [ 'dimensions' => 'O campo :attribute deverá conter um tamanho de imagem válida.', 'distinct' => 'O campo :attribute contém um valor duplicado.', 'email' => 'O campo :attribute não contém um endereço de correio eletrónico válido.', - 'ends_with' => 'O :attribute deve terminar com um dos seguintes: :values', + 'ends_with' => 'O campo :attribute deve terminar com um dos seguintes: :values', 'exists' => 'O valor selecionado para o campo :attribute é inválido.', 'file' => 'O campo :attribute deverá conter um ficheiro.', 'filled' => 'É obrigatória a indicação de um valor para o campo :attribute.', diff --git a/resources/lang/pt-PT/widgets.php b/resources/lang/pt-PT/widgets.php index b2d469e7a..99d58f236 100644 --- a/resources/lang/pt-PT/widgets.php +++ b/resources/lang/pt-PT/widgets.php @@ -2,7 +2,7 @@ return [ - 'total_income' => 'Rendimento Total', + 'total_income' => 'Receitas Totais', 'receivables' => 'A Receber', 'open_invoices' => 'Faturas em Aberto', 'overdue_invoices' => 'Faturas Vencidas', @@ -13,11 +13,11 @@ return [ 'total_profit' => 'Lucro Total', 'open_profit' => 'Lucro em Aberto', 'overdue_profit' => 'Lucro Vencido', - 'cash_flow' => 'Fluxo de Caixa', + 'cash_flow' => 'Movimento de Caixa', 'no_profit_loss' => 'Sem Perda de Lucro', - 'income_by_category' => 'Rendimento por Categoria', + 'income_by_category' => 'Receitas por Categoria', 'expenses_by_category' => 'Despesas por Categoria', - 'account_balance' => 'Saldo da Conta', + 'account_balance' => 'Saldo da(s) Conta(s)', 'latest_income' => 'Últimas Receitas', 'latest_expenses' => 'Últimas Despesas', ]; diff --git a/resources/lang/zh-TW/auth.php b/resources/lang/zh-TW/auth.php index f097abe7a..a8367329d 100644 --- a/resources/lang/zh-TW/auth.php +++ b/resources/lang/zh-TW/auth.php @@ -13,16 +13,18 @@ return [ 'current_email' => '目前的電子郵件', 'reset' => '重設', 'never' => '永遠不要', - + 'landing_page' => '登陸頁面', + 'password' => [ 'current' => '密碼', 'current_confirm' => '確認密碼', 'new' => '新的密碼', 'new_confirm' => '確認新的密碼', ], - + 'error' => [ 'self_delete' => '錯誤：無法刪除自己！', + 'self_disable' => '錯誤：無法停用自己！', 'no_company' => '錯誤：您的帳戶沒有分配公司，請聯繫系統管理員。', ], diff --git a/resources/lang/zh-TW/bills.php b/resources/lang/zh-TW/bills.php index 3c9bb727d..6f7807eaf 100644 --- a/resources/lang/zh-TW/bills.php +++ b/resources/lang/zh-TW/bills.php @@ -2,54 +2,65 @@ return [ - 'bill_number' => '帳單編號', - 'bill_date' => '帳單日期', - 'total_price' => '總價', - 'due_date' => '到期日', - 'order_number' => '訂單編號', - 'bill_from' => '帳單來自', + 'bill_number' => '帳單編號', + 'bill_date' => '帳單日期', + 'total_price' => '總價', + 'due_date' => '到期日', + 'order_number' => '訂單編號', + 'bill_from' => '帳單來自', - 'quantity' => '數量', - 'price' => '售價', - 'sub_total' => '小計', - 'discount' => '折扣', - 'tax_total' => '稅額', - 'total' => '總計', + 'quantity' => '數量', + 'price' => '售價', + 'sub_total' => '小計', + 'discount' => '折扣', + 'item_discount' => '單項折扣', + 'tax_total' => '稅額', + 'total' => '總計', - 'item_name' => '產品名稱 | 產品名稱', + 'item_name' => '產品名稱 | 產品名稱', - 'show_discount' => ':discount% 折扣', - 'add_discount' => '新增折扣', - 'discount_desc' => '小計', + 'show_discount' => ':discount% 折扣', + 'add_discount' => '新增折扣', + 'discount_desc' => '小計', - 'payment_due' => '付款到期日', - 'amount_due' => '到期金額', - 'paid' => '已付款', - 'histories' => '歷史記錄', - 'payments' => '付款方式', - 'add_payment' => '新增付款方式', - 'mark_received' => '標記已收到', - 'download_pdf' => '下載 PDF格式', - 'send_mail' => '傳送電子郵件', + 'payment_due' => '付款到期日', + 'amount_due' => '到期金額', + 'paid' => '已付款', + 'histories' => '歷史記錄', + 'payments' => '付款方式', + 'add_payment' => '新增付款方式', + 'mark_paid' => '標記為已付款', + 'mark_received' => '標記已收到', + 'mark_cancelled' => '標記為已取消', + 'download_pdf' => '下載 PDF格式', + 'send_mail' => '傳送電子郵件', + 'create_bill' => '創建帳單', + 'receive_bill' => '接收帳單', + 'make_payment' => '取消付款', 'statuses' => [ - 'draft' => '草稿', - 'received' => '已收到', - 'partial' => '部分', - 'paid' => '已付款', + 'draft' => '草稿', + 'received' => '已收到', + 'partial' => '部分', + 'paid' => '已付款', + 'overdue' => '逾期', + 'unpaid' => '未付款', + 'cancelled' => '已撤銷', ], 'messages' => [ - 'received' => '成功標記帳單為已收到！', - 'draft' => '這是 草稿 帳單, 在簽收後將反映在圖表上。', + 'marked_received' => '帳單標記為已收到', + 'marked_paid' => '帳單標記為已付款', + 'marked_cancelled' => '帳單標記為已撤銷', + 'draft' => '這是 草稿 帳單, 在簽收後將反映在圖表上。', 'status' => [ - 'created' => '創建於 :date', - 'receive' => [ + 'created' => '創建於 :date', + 'receive' => [ 'draft' => '未發送', 'received' => '簽收於 :date', ], - 'paid' => [ + 'paid' => [ 'await' => '等待付款', ], ], diff --git a/resources/lang/zh-TW/companies.php b/resources/lang/zh-TW/companies.php index 0ba2aa441..ce13f2ea3 100644 --- a/resources/lang/zh-TW/companies.php +++ b/resources/lang/zh-TW/companies.php @@ -4,10 +4,11 @@ return [ 'domain' => '網域', 'logo' => '商標', - 'manage' => '管理公司', - 'all' => '所有公司', + 'error' => [ - 'delete_active' => '錯誤：不能刪除使用中的公司，請先修改！', + 'not_user_company' => '錯誤：您不允許變更此公司！', + 'delete_active' => '錯誤：無法刪除使用中的公司。請先切換到另一家！', + 'disable_active' => '錯誤：無法停用使用中的公司。請先切換到另一家！', ], ]; diff --git a/resources/lang/zh-TW/customers.php b/resources/lang/zh-TW/customers.php index 23e21fb6e..d328c423c 100644 --- a/resources/lang/zh-TW/customers.php +++ b/resources/lang/zh-TW/customers.php @@ -2,15 +2,11 @@ return [ - 'allow_login' => '允許登入？', + 'can_login' => '需要登入？', 'user_created' => '已建立使用者', 'error' => [ - 'email' => '此郵件已被使用。' + 'email' => '此郵件已被使用。', ], - 'notification' => [ - 'message' => ':customer 付款 :amount 為發票編號 :invoice_number', - 'button' => '顯示', - ], ]; diff --git a/resources/lang/zh-TW/dashboard.php b/resources/lang/zh-TW/dashboard.php deleted file mode 100644 index 568b85b6c..000000000 --- a/resources/lang/zh-TW/dashboard.php +++ /dev/null @@ -1,24 +0,0 @@ - '總收入', - '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/zh-TW/demo.php b/resources/lang/zh-TW/demo.php index 927d76289..d4869854f 100644 --- a/resources/lang/zh-TW/demo.php +++ b/resources/lang/zh-TW/demo.php @@ -2,15 +2,33 @@ return [ - 'accounts_cash' => '現金', - 'categories_deposit' => '存款', - 'categories_sales' => '業務人員', - 'currencies_usd' => '美金', - 'currencies_eur' => '歐元', - 'currencies_gbp' => '英鎊', - 'currencies_try' => '土耳其里拉', - 'taxes_exempt' => '免稅', - 'taxes_normal' => '一般稅率', - 'taxes_sales' => '銷售稅', + 'accounts' => [ + 'cash' => '現金', + ], + + 'categories' => [ + 'deposit' => '存款', + 'sales' => '銷售額', + ], + + 'currencies' => [ + 'usd' => '美金', + 'eur' => '歐元', + 'gbp' => '英鎊', + 'try' => '土耳其里拉', + ], + + 'offline_payments' => [ + 'cash' => '現金', + 'bank' => '銀行轉帳', + ], + + 'reports' => [ + 'income' => '按類別分列的月收入總表。', + 'expense' => '按類別分列的月支出總表。', + 'income_expense' => '按類別分列的月收入/支出對比。', + 'tax' => '季度稅表。', + 'profit_loss' => '按類別分列的季度利潤和虧損統計表。', + ], ]; diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index 8e7a68ea2..09de4c27d 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -2,6 +2,7 @@ return [ + 'dashboards' => '控制面板|控制面板', 'items' => '產品 | 產品', 'incomes' => '收入 | 收入', 'invoices' => '訂單 | 訂單', @@ -40,10 +41,18 @@ return [ 'others' => '其他 | 其他', 'contacts' => '連絡人|連絡人', 'reconciliations' => '核對|核對', - 'deposits' => '存款|存款', - 'withdrawals' => '提款|提款', + 'developers' => '開發者|開發者', + 'schedules' => '時間表|時間表', + 'groups' => '群組|群組', + 'charts' => '圖表|圖表', + 'localisations' => '本地化|本地化', + 'defaults' => '預設|預設', + 'widgets' => '小工具|小工具', + 'templates' => '範本|範本|', + 'sales' => '銷售|銷售', + 'purchases' => '採購|採購', - 'dashboard' => '控制面板', + 'welcome' => '歡迎', 'banking' => '銀行', 'general' => '一般', 'no_records' => '尚無記錄。', @@ -55,15 +64,19 @@ return [ 'no' => '否', 'na' => 'N/A', 'daily' => '每日', + 'weekly' => '每週的', 'monthly' => '每月', 'quarterly' => '每季度', 'yearly' => '每年', 'add' => '新增', 'add_new' => '新增', + 'add_income' => '新增收益', + 'add_expense' => '新增支出', 'show' => '顯示', 'edit' => '編輯', 'delete' => '刪除', 'send' => '傳送', + 'share' => '共享', 'download' => '下載', 'delete_confirm' => '確認刪除 :name :type ？', 'name' => '名稱', @@ -81,9 +94,11 @@ return [ 'reference' => '参考', 'attachment' => '附件', 'change' => '修改', + 'change_type' => '更改 :type', 'switch' => '切換', 'color' => '顏色', 'save' => '儲存', + 'confirm' => '確認', 'cancel' => '取消', 'loading' => '正在加載…', 'from' => '來自', @@ -113,20 +128,47 @@ return [ 'disable' => '禁用', 'select_all' => '全部選取', 'unselect_all' => '取消全選', - 'go_to' => 'Go to :name', 'created_date' => '創建日期', - 'period' => 'Period', + 'period' => '區間', + 'frequency' => '頻率', 'start' => '開始', 'end' => '结束', 'clear' => '清除', 'difference' => '差異', + 'footer' => '頁尾', + 'start_date' => '起始日', + 'end_date' => '結束日期', + 'basis' => '基礎', + 'accrual' => '應計', + 'cash' => '現金', + 'group_by' => '群組依據', + 'accounting' => '會計', + 'sort' => '排序', + 'width' => '寬度', + 'month' => '月', + 'year' => '年', + 'type_item_name' => '輸入產品名稱', + 'no_data' => '沒有資料', + 'no_matching_data' => '沒肴合適的資料', + 'clear_cache' => '清除緩存', + 'go_to_dashboard' => '前往儀表板', + + 'card' => [ + 'name' => '持卡人姓名', + 'number' => '卡號', + 'expiration_date' => '有效日期', + 'cvv' => '信用卡 CVC', + ], 'title' => [ 'new' => '新增 :type', 'edit' => '編輯 :type', + 'delete' => '刪除 :type', 'create' => '創建 :type', - 'send' => 'Send :type', + 'send' => '傳送 :type', 'get' => '獲取 :type', + 'add' => '新增 :type', + 'manage' => '管理 :type', ], 'form' => [ @@ -135,6 +177,7 @@ return [ 'field' => '- 選擇 :field -', 'file' => '選擇檔案', ], + 'add_new' => '新增訂閱', 'no_file_selected' => '尚未選擇檔案...', ], @@ -145,4 +188,19 @@ return [ 'this_month' => '本月', 'last_month' => '上個月', ], + + 'empty' => [ + 'documentation' => '如欲了解詳情，請點撃 文檔 查看。', + 'items' => '項目可以是產品或服務。您可以在創建發票和賬單時使用項目來填寫價格、稅務等資料。', + 'invoices' => '發票可以是一次性發票或定期發票，您可以將其發送給客戶並接受在線付款。', + 'revenues' => '收入是一種已支付的收入交易，可以是一份獨立的記錄 （即存款），也可以是發票的附件。', + 'customers' => '如果您想要開發票，必需先行建立客戶資料。客戶可以經客戶端登錄查看到他們的結餘。', + 'bills' => '賬單可以是一次性訂單或定期訂單。它們用來表明您對您所購買的產品或服務的賣方所需要支付的款項。', + 'payments' => '付款是一項付費交易，它可以是獨立的記錄（即零用收據），也可以附在賬單上。', + 'vendors' => '如果您想要創建賬單，必需先行建立供應商資料。您可以看到您所欠的余額，並過濾供應商的報告。', + 'transfers' => '轉賬允許您將錢從一個帳戶轉移到另一個帳戶，不管他們是否使用同一貨幣。', + 'taxes' => '稅款是對發票和賬單收取的額外費用。您的金融交易受這些稅務管制。', + 'reconciliations' => '銀行對帳是一個能夠確保貴公司的銀行記錄正確無誤的手續。', + ], + ]; diff --git a/resources/lang/zh-TW/header.php b/resources/lang/zh-TW/header.php index 151b8deaa..e0e7204d6 100644 --- a/resources/lang/zh-TW/header.php +++ b/resources/lang/zh-TW/header.php @@ -8,9 +8,9 @@ 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 項目無庫存', 'view_all' => '檢視全部' ], 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/support', ]; diff --git a/resources/lang/zh-TW/install.php b/resources/lang/zh-TW/install.php index 94675e7fd..d897455d1 100644 --- a/resources/lang/zh-TW/install.php +++ b/resources/lang/zh-TW/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature 必須關閉！', 'extension' => '必須安裝並載入 :extension ！', 'directory' => ':directory 必須可寫入！', + 'executable' => 'PHP CLI 可執行文件未定義/無法運行，或者其版本不是或高於：php_version！ 請向您的託管公司要求正確設置 PHP_BINARY 或 PHP_PATH 的環境參數。', ], 'database' => [ diff --git a/resources/lang/zh-TW/invoices.php b/resources/lang/zh-TW/invoices.php index bce6ccf2a..df11b7765 100644 --- a/resources/lang/zh-TW/invoices.php +++ b/resources/lang/zh-TW/invoices.php @@ -2,67 +2,76 @@ return [ - 'invoice_number' => '訂單號碼', - 'invoice_date' => '訂單日期', - 'total_price' => '總價', - 'due_date' => '到期日', - 'order_number' => '訂單編號', - 'bill_to' => '帳單收件人', + 'invoice_number' => '訂單號碼', + 'invoice_date' => '訂單日期', + 'total_price' => '總價', + 'due_date' => '到期日', + 'order_number' => '訂單編號', + 'bill_to' => '帳單收件人', - 'quantity' => '數量', - 'price' => '售價', - 'sub_total' => '小計', - 'discount' => '折扣', - 'tax_total' => '稅額', - 'total' => '總計', + 'quantity' => '數量', + 'price' => '售價', + 'sub_total' => '小計', + 'discount' => '折扣', + 'item_discount' => '單項折扣', + 'tax_total' => '稅額', + 'total' => '總計', - 'item_name' => '產品名稱 | 產品名稱', + 'item_name' => '產品名稱 | 產品名稱', - 'show_discount' => ':discount% 折扣', - 'add_discount' => '新增折扣', - 'discount_desc' => '小計', + 'show_discount' => ':discount% 折扣', + 'add_discount' => '新增折扣', + 'discount_desc' => '小計', - 'payment_due' => '付款到期日', - 'paid' => '已付款', - 'histories' => '歷史記錄', - 'payments' => '付款方式', - 'add_payment' => '新增付款方式', - 'mark_paid' => '標記為已付款', - 'mark_sent' => '標記為已傳送', - 'download_pdf' => '下載 PDF格式', - 'send_mail' => '傳送電子郵件', - 'all_invoices' => '登錄以查看所有發票', + 'payment_due' => '付款到期日', + 'paid' => '已付款', + 'histories' => '歷史記錄', + 'payments' => '付款方式', + 'add_payment' => '新增付款方式', + 'mark_paid' => '標記為已付款', + 'mark_sent' => '標記為已傳送', + 'mark_viewed' => '標誌已閲', + 'mark_cancelled' => '標記為已註銷', + 'download_pdf' => '下載 PDF格式', + 'send_mail' => '傳送電子郵件', + 'all_invoices' => '登錄以查看所有發票', + 'create_invoice' => '創建發票', + 'send_invoice' => '發出發票', + 'get_paid' => '獲得報酬', + 'accept_payments' => '接受線上付款', 'statuses' => [ - 'draft' => '草稿', - 'sent' => '已傳送', - 'viewed' => '已瀏覽', - 'approved' => '已批准', - 'partial' => '部分', - 'paid' => '已付款', + 'draft' => '草稿', + 'sent' => '已發送', + 'viewed' => '已閲', + 'approved' => '已核准', + 'partial' => '部分', + 'paid' => '已付', + 'overdue' => '逾期', + 'unpaid' => '未付', + 'cancelled' => '已撤銷', ], 'messages' => [ - 'email_sent' => '成功傳送帳單郵件！', - 'marked_sent' => '成功標記帳單為已傳送！', - 'email_required' => '此客戶沒有電子郵件地址！', - 'draft' => '這是 草稿 發票, 在簽收後將反映在圖表上。', + 'email_sent' => '發票已發送', + 'marked_sent' => '發票標示為已發送', + 'marked_paid' => '帳單標記為已付款', + 'marked_viewed' => '發票標示為已閲', + 'marked_cancelled' => '發票標記為已撤銷', + 'email_required' => '此客戶沒有電子郵件地址！', + 'draft' => '這是 草稿 發票, 在簽收後將反映在圖表上。', 'status' => [ - 'created' => '創建於 :date', - 'send' => [ + 'created' => '創建於 :date', + 'viewed' => '已閲', + 'send' => [ 'draft' => '未發送', 'sent' => '發送於 :date', ], - 'paid' => [ + 'paid' => [ 'await' => '等待付款', ], ], ], - 'notification' => [ - 'message' => '由於您有一個即將到來的 :amount 帳單給客戶 :customer，因此收到此封郵件。', - 'button' => '立即付款', - ], - ]; diff --git a/resources/lang/zh-TW/items.php b/resources/lang/zh-TW/items.php index d37cf4616..d4adc217c 100644 --- a/resources/lang/zh-TW/items.php +++ b/resources/lang/zh-TW/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => '數量 | 數量', 'sales_price' => '定價', 'purchase_price' => '售價', - 'sku' => '庫存', - - 'notification' => [ - 'message' => [ - 'reminder' => 'You are receiving this email because only :quantity of :name has remained.', - 'out_of_stock' => '由於 :name 已缺貨，因此您會收到此封郵件。', - ], - 'button' => '現在檢視', - ], ]; diff --git a/resources/lang/zh-TW/messages.php b/resources/lang/zh-TW/messages.php index 186ceb22d..df30e778f 100644 --- a/resources/lang/zh-TW/messages.php +++ b/resources/lang/zh-TW/messages.php @@ -8,22 +8,30 @@ return [ 'deleted' => '已刪除:type ！', 'duplicated' => ':type 重複！', 'imported' => ':type 已匯入！', + 'exported' => ':type 已導出！', 'enabled' => '已啟用 :type ！', 'disabled' => '已停用 :type ！', ], + 'error' => [ 'over_payment' => '錯誤：付款未添加! 你輸入的金額超過總金額: :amount', 'not_user_company' => '錯誤：您不允許管理此公司！', 'customer' => '錯誤：未建立使用者！:name已經使用此電子郵件。', 'no_file' => '錯誤：沒有選擇檔案！', 'last_category' => '錯誤：無法刪除最後一個 :type 分類！', - 'invalid_apikey' => '錯誤：token輸入錯誤！', + 'change_type' => '錯誤：無法更改類型，因為它和 :text 相關！', + 'invalid_apikey' => '\'錯誤：輸入的 API 密鑰無效！', 'import_column' => '錯誤： :message工作表 name: :sheet，第 number: :line 行', 'import_sheet' => '錯誤：工作表名稱不正確，請檢查範例檔案。', ], + 'warning' => [ 'deleted' => '警告：由於和 :text 相關，你不能刪除:name。', 'disabled' => '警告：由於和 :text 相關，你不能停用:name。', + 'reconciled_tran' => '警告：您無權修改或刪除交易，因為它已經對賬。', + 'reconciled_doc' => '警告：您無權修改或刪除交易，因為它已經註銷。', + 'disable_code' => '警告：您無權停用或更改此貨幣 :name ，因為它和 :text有 關聯。', + 'payment_cancel' => '警告: 您已註銷了您最近的 :methods 付款 ！', ], ]; diff --git a/resources/lang/zh-TW/modules.php b/resources/lang/zh-TW/modules.php index 3dae29573..89f8a5109 100644 --- a/resources/lang/zh-TW/modules.php +++ b/resources/lang/zh-TW/modules.php @@ -2,20 +2,18 @@ return [ - 'title' => 'API Token', - 'api_token' => 'Token', + 'api_key' => 'API 密鑰', 'my_apps' => '我的應用程式', + 'pre_sale' => '售前服務', 'top_paid' => '最佳銷售', 'new' => '新增', 'top_free' => '最佳免費', 'free' => '免費', - 'search' => '搜尋', 'install' => '安裝', 'buy_now' => '現在購買', - 'token_link' => '點這裡取得您的 API token.', + 'get_api_key' => '點擊這裡 獲取您的 API 密鑰。', 'no_apps' => '此分類中尚無應用程式。', - 'developer' => '您是開發人員嗎？這裡可以幫助您學習如何建立應用程式並立即開始銷售！', - + 'become_developer' => '您是開發者嗎？ 在這裡 您可以學習如何創建一個 app 並立即開始銷售！', 'recommended_apps' => '推薦的程序', 'about' => '關於', @@ -23,6 +21,9 @@ return [ 'added' => '已新增', 'updated' => '已更新', 'compatibility' => '相容性', + 'documentation' => '文件', + 'view' => '檢視', + 'back' => '返回', 'installed' => '已安裝 :module', 'uninstalled' => '已移除 :module', @@ -34,30 +35,30 @@ return [ 'installation' => '安裝', 'faq' => '常見問題', 'changelog' => '更新日誌', - 'reviews' => '評論', + 'reviews' => '評論', ], 'installation' => [ 'header' => '應用程式安裝', - 'download' => '下載模組檔案中：:module', - 'unzip' => '解開模組封裝中：:module', - 'file_copy' => '複製 :module 檔案中。', - 'migrate' => '安裝 :module檔案中。', - 'finish' => '更新已成功安裝。您將重定向更新中心。', - 'install' => '安裝 :module檔案中。', + 'download' => '模板 :module 下載中', + 'unzip' => '模板 :module 解壓中', + 'file_copy' => '模板 :module 複製中', + 'finish' => '模板 :module 完成安裝中', + 'redirect' => '模板 :module 已完成安裝，將跳轉至更新頁面。', + 'install' => '正在安裝模板 :module ', ], 'errors' => [ - 'download' => ':module 無法下載!', - 'upload' => '已下載 :module無法保存！', - 'unzip' => ':module 無法解壓縮!', - 'file_copy' => ':module 文件無法複製!', - 'migrate' => ':module 遷移失敗!', - 'migrate core' => ':module 已經是最新版本，所以你無法更新。', + 'download' => '無法下載 :module', + 'zip' => '無法創建 :module zip 文件', + 'unzip' => '無法解壓 :module', + 'file_copy' => '無法復制 :module 文件', + 'finish' => '無法完成 :module 安裝', ], 'badge' => [ - 'installed' => '已安裝', + 'installed' => '已安裝', + 'pre_sale' => '售前服務', ], 'button' => [ @@ -67,14 +68,16 @@ return [ ], 'my' => [ - 'purchased' => '已購買', - 'installed' => '已安裝', + 'purchased' => '已購買', + 'installed' => '已安裝', ], 'reviews' => [ 'button' => [ - 'add' => '新增評論' + 'add' => '新增評論' ], - 'na' => '目前沒有評論' - ] + + 'na' => '目前沒有評論' + ], + ]; diff --git a/resources/lang/zh-TW/pagination.php b/resources/lang/zh-TW/pagination.php index ca04fdb00..8f2e0f844 100644 --- a/resources/lang/zh-TW/pagination.php +++ b/resources/lang/zh-TW/pagination.php @@ -2,8 +2,9 @@ return [ - 'previous' => '« 上一頁', - 'next' => '下一頁 »', - 'showing' => '顯示 :first 至 :last 的 :total :type', + 'previous' => '上一頁', + 'next' => '下一頁', + 'showing' => ':first-:last 的 :total 數據紀錄。', + 'page' => '每頁。', ]; diff --git a/resources/lang/zh-TW/passwords.php b/resources/lang/zh-TW/passwords.php index f1b382f9f..13705bdc7 100644 --- a/resources/lang/zh-TW/passwords.php +++ b/resources/lang/zh-TW/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => '密碼重設郵件已發送！', 'token' => '密碼重設隨機碼 (token) 無效。', 'user' => "找不到該電子郵件信箱對應的使用者。", + 'throttle' => '請等候一會，然後重試。', ]; diff --git a/resources/lang/zh-TW/reconciliations.php b/resources/lang/zh-TW/reconciliations.php index 6457e7803..12fe7f865 100644 --- a/resources/lang/zh-TW/reconciliations.php +++ b/resources/lang/zh-TW/reconciliations.php @@ -6,9 +6,11 @@ return [ 'reconciled' => '帳戶已核對', 'closing_balance' => '期末餘額', 'unreconciled' => '帳戶未核對', - 'list_transactions' => '查看交易記錄', + 'transactions' => '交易', 'start_date' => '開始日期', 'end_date' => '結束日期', 'cleared_amount' => '清算金額', + 'deposit' => '存款', + 'withdrawal' => '提款', ]; diff --git a/resources/lang/zh-TW/reports.php b/resources/lang/zh-TW/reports.php index 1ec9165f9..de1b4e7dd 100644 --- a/resources/lang/zh-TW/reports.php +++ b/resources/lang/zh-TW/reports.php @@ -12,6 +12,7 @@ return [ 'net_profit' => '初始利潤', 'total_expenses' => '總費用', 'net' => '初始', + 'income_expense' => '收入 及 支出', 'summary' => [ 'income' => '收入概要', @@ -20,11 +21,10 @@ return [ 'tax' => '稅務概要', ], - 'quarter' => [ - '1' => '一至三月', - '2' => '四至六月', - '3' => '七至九月', - '4' => '十至十二月', + 'charts' => [ + 'line' => '綠狀', + 'bar' => '條狀', + 'pie' => '餅狀', ], ]; diff --git a/resources/lang/zh-TW/settings.php b/resources/lang/zh-TW/settings.php index c8c621ee5..3e3dbcff4 100644 --- a/resources/lang/zh-TW/settings.php +++ b/resources/lang/zh-TW/settings.php @@ -3,14 +3,18 @@ return [ 'company' => [ + 'description' => '\'更改公司名稱、電子郵件、地址、稅號等等', 'name' => '名稱', 'email' => '電子郵件', 'phone' => '電話', 'address' => '地址', 'logo' => '商標', ], + 'localisation' => [ - 'tab' => '本地化', + 'description' => '設置財年、時區、日期格式和更多局部信息', + 'financial_start' => '財年開始', + 'timezone' => '時區', 'date' => [ 'format' => '日期格式', 'separator' => '日期分隔', @@ -20,15 +24,21 @@ return [ 'slash' => '斜線 (/)', 'space' => '空格 ( )', ], - 'timezone' => '時區', 'percent' => [ 'title' => '百分比 (%) 位置', 'before' => '編號之前', 'after' => '編號之後', ], + 'discount_location' => [ + 'name' => '折扣位置', + 'item' => '單項', + 'total' => '總計', + 'both' => '單項及總計', + ], ], + 'invoice' => [ - 'tab' => '訂單', + 'description' => '自定義發票前綴、數字、條款、註腳等。', 'prefix' => '數字字軌', 'digit' => '數字位數', 'next' => '下一個號碼', @@ -40,19 +50,28 @@ return [ 'service' => '服務', 'price_name' => '價格名稱', 'price' => '價格', - 'rate' => 'Rate', + 'rate' => '率', 'quantity_name' => '數量名稱', 'quantity' => '數量', + 'payment_terms' => '付款條件', + 'title' => '標題', + 'subheading' => '副標題', + 'due_receipt' => '收到日即行到期', + 'due_days' => ':days 內到期', + 'choose_template' => '選擇發票範本', + 'default' => '默認', + 'classic' => '傳統', + 'modern' => '新式', ], + 'default' => [ - 'tab' => '預設', - 'account' => '預設帳號', - 'currency' => '預設貨幣', - 'tax' => '預設稅率', - 'payment' => '預設付款方式', - 'language' => '預設語言', + 'description' => '默認賬戶、貨幣、公司語言', + 'list_limit' => '每頁行數', + 'use_gravatar' => '使用 Gravatar', ], + 'email' => [ + 'description' => '更改發送協議和電子郵件範本', 'protocol' => '協定', 'php' => 'PHP Mail', 'smtp' => [ @@ -67,36 +86,44 @@ return [ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 路徑', 'log' => '郵件日誌', + + 'templates' => [ + 'subject' => '主題', + 'body' => '正文', + 'tags' => '可用標簽： :tag_list', + 'invoice_new_customer' => '新發票範本 (發送給客戶)', + 'invoice_remind_customer' => '發票提醒範本 (發送給客戶)', + 'invoice_remind_admin' => '發票提醒範本 (發送給管理員)\'', + 'invoice_recur_customer' => '定期發票範本 (發送給客戶)', + 'invoice_recur_admin' => '定期發票範本 (發送給管理員)', + 'invoice_payment_customer' => '接收付款範本 (發送給客戶)', + 'invoice_payment_admin' => '收到付款範本 (發送給管理員)\'', + 'bill_remind_admin' => '帳單提醒範本 (發送給管理員)\'', + 'bill_recur_admin' => '定期帳單範本 (發送給管理員)', + ], ], + 'scheduling' => [ - 'tab' => '排程', + 'name' => '計劃任務', + 'description' => '定期的自動提醒和指令', 'send_invoice' => '傳送訂單提醒', 'invoice_days' => '於到期日後傳送', 'send_bill' => '傳送帳單提醒', 'bill_days' => '於到期日前傳送', 'cron_command' => 'Cron指令', 'schedule_time' => '執行時間', - 'send_item_reminder'=> '發送產品提醒', - 'item_stocks' => 'Send When Item Stock', ], - 'appearance' => [ - 'tab' => '外觀', - 'theme' => '主題', - 'light' => '明亮', - 'dark' => '暗色', - 'list_limit' => '每頁記錄', - 'use_gravatar' => '使用 Gravatar', + + 'categories' => [ + 'description' => '沒有限制 收入、支出和項目的類別 數量', ], - 'system' => [ - 'tab' => '系統', - 'session' => [ - 'lifetime' => '工作階段保存 (分鐘)', - 'handler' => '工作階段管理員', - 'file' => '檔案', - 'database' => '資料庫', - ], - 'file_size' => '最大檔案容量 (MB)', - 'file_types' => '允許檔案格式', + + 'currencies' => [ + 'description' => '創建、管理貨幣並設定它們的兌換率', + ], + + 'taxes' => [ + 'description' => '固定稅率，常規稅率，其他費率以及復合稅率', ], ]; diff --git a/resources/lang/zh-TW/taxes.php b/resources/lang/zh-TW/taxes.php index 32fc24d33..a1761e771 100644 --- a/resources/lang/zh-TW/taxes.php +++ b/resources/lang/zh-TW/taxes.php @@ -4,5 +4,8 @@ return [ 'rate' => '稅率', 'rate_percent' => '稅率 (%)', - + 'normal' => '一般', + 'inclusive' => '包含', + 'compound' => '複合', + 'fixed' => '固定的', ]; diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php index 5ed5ae637..2d7d24241 100644 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -33,19 +33,20 @@ return [ 'confirmed' => ':attribute 確認欄位的輸入不一致。', 'date' => ':attribute 並非一個有效的日期。', 'date_format' => ':attribute 不符合 :format 的格式。', - 'different' => ':attribute 與 :other 必須不同。', + 'different' => ':attribute 和 :other 必須不相同。', 'digits' => ':attribute 必須是 :digits 位數字。', 'digits_between' => ':attribute 必須介於 :min 至 :max 位數字。', 'dimensions' => ':attribute 圖片尺寸不正確。', 'distinct' => ':attribute 已經存在。', - 'email' => ':attribute 必須是有效的電子郵件位址。', + 'email' => ':attribute 必須是正確的電子郵件位置。', + 'ends_with' => ':attribute 必須以此值結尾： :values', 'exists' => '所選擇的 :attribute 選項無效。', - 'file' => ':attribute 必須是一個檔案。', - 'filled' => ':attribute 不能留空。', - 'image' => ':attribute 必須是一張圖片。', + 'file' => ':attribute 必須是檔案。', + 'filled' => ':attribute 欄位必須有值。', + 'image' => ':attribute 必須是圖片。', 'in' => '所選擇的 :attribute 選項無效。', 'in_array' => ':attribute 沒有在 :other 中。', - 'integer' => ':attribute 必須是一個整數。', + 'integer' => ':attribute 必須是整數。', 'ip' => ':attribute 必須是一個有效的 IP 位址。', 'json' => ':attribute 必須是正確的 JSON 字串。', 'max' => [ @@ -64,9 +65,9 @@ return [ ], 'not_in' => '所選擇的 :attribute 選項無效。', 'numeric' => ':attribute 必須為一個數字。', - 'present' => ':attribute 必須存在。', - 'regex' => ':attribute 的格式錯誤。', - 'required' => ':attribute 不能留空。', + 'present' => ':attribute 欄位必須是現在。', + 'regex' => ':attribute 格式不正確。', + 'required' => ':attribute 欄位是必要的。', 'required_if' => '當 :other 是 :value 時 :attribute 不能留空。', 'required_unless' => '當 :other 不是 :value 時 :attribute 不能留空。', 'required_with' => '當 :values 出現時 :attribute 不能留空。', @@ -77,14 +78,14 @@ return [ 'size' => [ 'numeric' => ':attribute 的大小必須是 :size。', 'file' => ':attribute 的大小必須是 :size kb。', - 'string' => ':attribute 必須是 :size 個字元。', + 'string' => ':attribute 必須是:size 字元。', 'array' => ':attribute 必須是 :size 個元素。', ], - 'string' => ':attribute 必須是一個字串。', + 'string' => ':attribute 必須是字串。', 'timezone' => ':attribute 必須是一個正確的時區值。', - 'unique' => ':attribute 已經存在。', - 'uploaded' => ':attribute 上傳失敗。', - 'url' => ':attribute 的格式錯誤。', + 'unique' => ':attribute 已經被使用。', + 'uploaded' => ':attribute 上傳錯誤。', + 'url' => ':attribute 格式不正確。', /* |-------------------------------------------------------------------------- @@ -99,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => '自訂訊息', + 'rule-name' => '自訂訊息', ], - 'invalid_currency' => ':attribute 的代碼不正確。', - 'invalid_amount' => 'The amount :attribute is invalid.', + 'invalid_currency' => ':attribute 的代碼不正確。', + 'invalid_amount' => ':attribute 的數額不正確', + 'invalid_extension' => '文件副名無效。', ], /* From 8e4583761d03b9a3e5b1a42fe69c6aae1355a04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 29 Jun 2020 17:14:04 +0300 Subject: [PATCH 089/208] missing files #1510 --- resources/lang/zh-TW/bulk_actions.php | 21 ++++++++++ resources/lang/zh-TW/dashboards.php | 11 ++++++ resources/lang/zh-TW/email_templates.php | 50 ++++++++++++++++++++++++ resources/lang/zh-TW/errors.php | 23 +++++++++++ resources/lang/zh-TW/maintenance.php | 11 ++++++ resources/lang/zh-TW/widgets.php | 23 +++++++++++ 6 files changed, 139 insertions(+) create mode 100644 resources/lang/zh-TW/bulk_actions.php create mode 100644 resources/lang/zh-TW/dashboards.php create mode 100644 resources/lang/zh-TW/email_templates.php create mode 100644 resources/lang/zh-TW/errors.php create mode 100644 resources/lang/zh-TW/maintenance.php create mode 100644 resources/lang/zh-TW/widgets.php diff --git a/resources/lang/zh-TW/bulk_actions.php b/resources/lang/zh-TW/bulk_actions.php new file mode 100644 index 000000000..5c12dcc7a --- /dev/null +++ b/resources/lang/zh-TW/bulk_actions.php @@ -0,0 +1,21 @@ + '批次動作|批次動作', + 'selected' => '已選取', + 'no_action' => '無需跟進', + + 'message' => [ + 'duplicate' => '你確定要復制這些選定的記錄的嗎？', + 'delete' => '你確定要刪除這些選定的記錄的嗎？|你確定要刪除這些選定的記錄的嗎？', + 'export' => '你確定要導出這些選定的記錄的嗎？|你確定要導出這些選定的記錄的嗎？', + 'enable' => '你確定要啟用這些選定的記錄的嗎？|你確定要啟用這些選定的記錄的嗎？', + 'disable' => '你確定要停用選定的記錄嗎？|你確定要停用 選定的記錄嗎？', + 'paid' => '您確定要將選定的發票標記為已支付嗎？|您確定要將選定的發票標記為已支付嗎？', + 'sent' => '您確定要將選定的發票標記為已發送嗎？|您確定要將選定的發票標記為已發送嗎？', + 'received' => '您確定要將選定的帳單標記為已收到嗎？|您確定要將選定的帳單標記為已收到嗎？', + 'cancelled' => '你確定要注銷這些選定的發票嗎？|你確定要注銷這些選定的發票嗎？', + ], + +]; diff --git a/resources/lang/zh-TW/dashboards.php b/resources/lang/zh-TW/dashboards.php new file mode 100644 index 000000000..d6d5251ca --- /dev/null +++ b/resources/lang/zh-TW/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => '錯誤：您無權更改此控制面板！', + 'delete_last' => '錯誤：無法刪除最後一個控制面板。請先創建一個新控制面板！', + 'disable_last' => '錯誤：無法禁用最後一個面板。請先創建一個新面板！', + ], + +]; diff --git a/resources/lang/zh-TW/email_templates.php b/resources/lang/zh-TW/email_templates.php new file mode 100644 index 000000000..7ed5d4823 --- /dev/null +++ b/resources/lang/zh-TW/email_templates.php @@ -0,0 +1,50 @@ + [ + 'subject' => '{invoice_number} 發票已創建', + 'body' => '尊敬的 {customer_name}，

    我們已經為您准備了以下發票： {invoice_number}

    您可以看到發票的詳細信息並從以下鏈接前往付款： {invoice_number}

    如您有任何問題可隨時聯繫我們

    祝好
    {company_name', + ], + + 'invoice_remind_customer' => [ + 'subject' => '{invoice_number} 發票逾期通知', + 'body' => '尊敬的 {customer_name},

    這是此發票 {invoice_number} 的逾期通知。

    發票總額為 {invoice_total} ，到期時間為 {invoice_due_date}

    您可以看到發票的詳細信息並從以下鏈接前往付款： {invoice_number}

    祝好，
    {company_name}', + ], + + 'invoice_remind_admin' => [ + 'subject' => '{invoice_number} 發票逾期通知', + 'body' => '您好，

    {customer_name} 收到了逾期的 {invoice_number} 發票通知。

    發票總額為 {invoice_total} ，到期時間為 {invoice_due_date}

    您可以從以下鏈接查看發票詳情： {invoice_number}

    祝好，
    {company_name}', + ], + + 'invoice_recur_customer' => [ + 'subject' => '{invoice_number} 定期發票已創建', + 'body' => '尊敬的 {customer_name},

    基於您的循環周期， 我們為您准備了以下發票： {invoice_number}。

    您可以看到發票的詳細信息並從以下鏈接前往付款： {invoice_number}

    如您有任何問題可隨時聯繫我們

    祝好
    {company_name}', + ], + + 'invoice_recur_admin' => [ + 'subject' => '{invoice_number} 定期發票已創建', + 'body' => '您好，

    基於 {customer_name} 的循環周期， {invoice_number} 發票已自動創建。

    您可以從以下鏈接查看發票詳情： {invoice_number}

    祝好，
    {company_name}', + ], + + 'invoice_payment_customer' => [ + 'subject' => '已收到發票 {invoice_number} 的付款', + 'body' => '尊敬的 {customer_name},

    謝謝謝您的付款。 請在下面查找付款詳情：

    ---------------------------------------------------------------
    金額： {transaction_total}
    日期： {transaction_paid_date}
    發票號碼： {invoice_number}
    -----------------------------------------------------------------------

    您隨時可以從以下鏈接查看發票細節： {invoice_number}

    如您有任何問題也可隨時聯繫我們

    祝好
    {company_name}', + ], + + 'invoice_payment_admin' => [ + 'subject' => '已收到發票 {invoice_number} 的付款', + 'body' => '您好，

    {customer_name} 己收到發票 {invoice_number} 的付款記錄。

    您可以從以下鏈接查看發票詳情： {invoice_number}

    祝好，
    {company_name}', + ], + + 'bill_remind_admin' => [ + 'subject' => '{bill_number} 帳單提醒通知', + 'body' => '您好，

    這是帳單 {bill_number} 付至 {vendor_name} 的提示。

    帳單總額為 {bill_total} ，到期時間為 {bill_due_date}

    您可以從以下鏈接查看帳單詳情： {bill_number}

    祝好，
    {company_name}', + ], + + 'bill_recur_admin' => [ + 'subject' => '{bill_number} 定期帳賬單已創建', + 'body' => '您好，

    基於 {vendor_name} 的循環周期， {bill_number} 帳單已自動創建。

    您可以從以下鏈接查看帳單詳情： {bill_number}

    祝好，
    {company_name}', + ], + +]; diff --git a/resources/lang/zh-TW/errors.php b/resources/lang/zh-TW/errors.php new file mode 100644 index 000000000..2ed8134ec --- /dev/null +++ b/resources/lang/zh-TW/errors.php @@ -0,0 +1,23 @@ + [ + '403' => '哎呀！禁止訪問', + '404' => '哎呀！找不到頁面', + '500' => '哎呀！出錯了。', + ], + + 'header' => [ + '403' => '403 禁止', + '404' => '404 未找到', + '500' => '500 服務器內部錯誤', + ], + + 'message' => [ + '403' => '您不能訪問此頁面。', + '404' => '我們找不到您正在尋找的頁面。', + '500' => '我們將立即全力解決這個問題。', + ], + +]; diff --git a/resources/lang/zh-TW/maintenance.php b/resources/lang/zh-TW/maintenance.php new file mode 100644 index 000000000..a734cfa69 --- /dev/null +++ b/resources/lang/zh-TW/maintenance.php @@ -0,0 +1,11 @@ + '維護中', + + 'message' => '抱歉，我們正在進行維護。請稍後再試！', + + 'last-updated' => '此消息最後更新：timestamp。', + +]; diff --git a/resources/lang/zh-TW/widgets.php b/resources/lang/zh-TW/widgets.php new file mode 100644 index 000000000..7b7fbd822 --- /dev/null +++ b/resources/lang/zh-TW/widgets.php @@ -0,0 +1,23 @@ + '總收入', + 'receivables' => '應收帳款', + 'open_invoices' => '未付發票', + 'overdue_invoices' => '逾期發票', + 'total_expenses' => '總支出', + 'payables' => '應付帳款', + 'open_bills' => '未結帳單', + 'overdue_bills' => '逾期帳單', + 'total_profit' => '總盈利', + 'open_profit' => '初始利潤', + 'overdue_profit' => '逾期利潤', + 'cash_flow' => '現金流', + 'no_profit_loss' => '無利潤損失', + 'income_by_category' => '收入分類', + 'expenses_by_category' => '支出分類', + 'account_balance' => '帳戶餘額', + 'latest_income' => '近期收入', + 'latest_expenses' => '近期支出', +]; From 340620c841eee4ae4874e4a0dd5981960c04382e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 29 Jun 2020 23:28:57 +0300 Subject: [PATCH 090/208] formatting --- app/Models/Auth/User.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index 759dc6367..be1268dcf 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -6,12 +6,11 @@ use App\Traits\Tenants; use App\Notifications\Auth\Reset; use App\Traits\Media; use Date; -use GuzzleHttp\Exception\RequestException; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; -use Laratrust\Traits\LaratrustUserTrait; use Kyslik\ColumnSortable\Sortable; +use Laratrust\Traits\LaratrustUserTrait; use Lorisleiva\LaravelSearchString\Concerns\SearchString; class User extends Authenticatable @@ -102,7 +101,7 @@ class User extends Authenticatable $client->request('GET', $url)->getBody()->getContents(); $value = $url; - } catch (RequestException $e) { + } catch (\GuzzleHttp\Exception\RequestException $e) { // 404 Not Found } } @@ -190,13 +189,7 @@ class User extends Authenticatable */ public function setCompanyIds() { - $company_ids = []; - - foreach ($this->companies as $company) { - $company_ids[] = (string) $company->id; - } - - $this->setAttribute('company_ids', $company_ids); + $this->setAttribute('company_ids', $this->companies->pluck('id')->toArray()); } public function unsetCompanyIds() From f4d1fe18779549be07606ad05c02d1d598576321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 1 Jul 2020 09:02:19 +0300 Subject: [PATCH 091/208] fixed #1499 --- overrides/akaunting/module/Commands/InstallCommand.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/overrides/akaunting/module/Commands/InstallCommand.php b/overrides/akaunting/module/Commands/InstallCommand.php index b5bf6318c..a49d4cb5f 100644 --- a/overrides/akaunting/module/Commands/InstallCommand.php +++ b/overrides/akaunting/module/Commands/InstallCommand.php @@ -31,6 +31,11 @@ class InstallCommand extends Command { $this->prepare(); + if ($this->getModel()) { + $this->comment("Module [{$this->alias}] is already installed."); + return; + } + $this->changeRuntime(); // Create db From 2b42f3168e2e076e8df596bc2abd2a7147a2abff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 1 Jul 2020 09:35:10 +0300 Subject: [PATCH 092/208] use event discovery for modules --- .../Stubs/Modules/providers/event.stub | 26 +++++++++----- modules/OfflinePayments/Providers/Event.php | 34 ++++++++++--------- modules/OfflinePayments/Providers/Main.php | 2 +- modules/PaypalStandard/Providers/Event.php | 26 +++++++++----- 4 files changed, 55 insertions(+), 33 deletions(-) diff --git a/app/Console/Stubs/Modules/providers/event.stub b/app/Console/Stubs/Modules/providers/event.stub index 90a59814f..5284c4ac9 100644 --- a/app/Console/Stubs/Modules/providers/event.stub +++ b/app/Console/Stubs/Modules/providers/event.stub @@ -3,18 +3,28 @@ namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Providers; use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider; -use $MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners\FinishInstallation; class Event extends Provider { /** - * The event listener mappings for the module. + * Determine if events and listeners should be automatically discovered. * - * @var array + * @return bool */ - protected $listen = [ - \App\Events\Module\Installed::class => [ - FinishInstallation::class, - ], - ]; + public function shouldDiscoverEvents() + { + return true; + } + + /** + * Get the listener directories that should be used to discover events. + * + * @return array + */ + protected function discoverEventsWithin() + { + return [ + __DIR__ . '/../Listeners', + ]; + } } diff --git a/modules/OfflinePayments/Providers/Event.php b/modules/OfflinePayments/Providers/Event.php index a83f4d980..79369acd7 100644 --- a/modules/OfflinePayments/Providers/Event.php +++ b/modules/OfflinePayments/Providers/Event.php @@ -3,26 +3,28 @@ namespace Modules\OfflinePayments\Providers; use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider; -use Modules\OfflinePayments\Listeners\FinishInstallation; -use Modules\OfflinePayments\Listeners\ShowAsPaymentMethod; -use Modules\OfflinePayments\Listeners\ShowInSettingsPage; class Event extends Provider { /** - * The event listener mappings for the module. + * Determine if events and listeners should be automatically discovered. * - * @var array + * @return bool */ - protected $listen = [ - \App\Events\Module\Installed::class => [ - FinishInstallation::class, - ], - \App\Events\Module\PaymentMethodShowing::class => [ - ShowAsPaymentMethod::class, - ], - \App\Events\Module\SettingShowing::class => [ - ShowInSettingsPage::class, - ], - ]; + public function shouldDiscoverEvents() + { + return true; + } + + /** + * Get the listener directories that should be used to discover events. + * + * @return array + */ + protected function discoverEventsWithin() + { + return [ + __DIR__ . '/../Listeners', + ]; + } } diff --git a/modules/OfflinePayments/Providers/Main.php b/modules/OfflinePayments/Providers/Main.php index a85ddd089..0d6de2ac6 100644 --- a/modules/OfflinePayments/Providers/Main.php +++ b/modules/OfflinePayments/Providers/Main.php @@ -44,7 +44,7 @@ class Main extends Provider */ public function loadTranslations() { - $this->loadTranslationsFrom(__DIR__ .'/../Resources/lang', 'offline-payments'); + $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'offline-payments'); } /** diff --git a/modules/PaypalStandard/Providers/Event.php b/modules/PaypalStandard/Providers/Event.php index ee4fa3008..cefb2d536 100644 --- a/modules/PaypalStandard/Providers/Event.php +++ b/modules/PaypalStandard/Providers/Event.php @@ -3,18 +3,28 @@ namespace Modules\PaypalStandard\Providers; use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider; -use Modules\PaypalStandard\Listeners\ShowAsPaymentMethod; class Event extends Provider { /** - * The event listener mappings for the module. + * Determine if events and listeners should be automatically discovered. * - * @var array + * @return bool */ - protected $listen = [ - \App\Events\Module\PaymentMethodShowing::class => [ - ShowAsPaymentMethod::class, - ], - ]; + public function shouldDiscoverEvents() + { + return true; + } + + /** + * Get the listener directories that should be used to discover events. + * + * @return array + */ + protected function discoverEventsWithin() + { + return [ + __DIR__ . '/../Listeners', + ]; + } } From a96d6f22bc32259ab53a21c014b6eaa0f102dee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 1 Jul 2020 16:29:58 +0300 Subject: [PATCH 093/208] refs #1511 User companies input change multi select groups --- app/Http/Controllers/Common/Companies.php | 19 +++++ app/Models/Common/Company.php | 26 +++++++ app/Providers/Form.php | 4 + .../assets/js/components/AkauntingSelect.vue | 33 +++++++- .../js/components/AkauntingSelectRemote.vue | 24 +++++- resources/views/auth/users/create.blade.php | 2 +- resources/views/auth/users/edit.blade.php | 2 +- .../form/multi_select_remote_group.blade.php | 76 +++++++++++++++++++ routes/admin.php | 1 + 9 files changed, 179 insertions(+), 8 deletions(-) create mode 100644 resources/views/partials/form/multi_select_remote_group.blade.php diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php index 02e13fcdd..2cd575a18 100644 --- a/app/Http/Controllers/Common/Companies.php +++ b/app/Http/Controllers/Common/Companies.php @@ -227,4 +227,23 @@ class Companies extends Controller return redirect()->route('dashboard'); } + + public function autocomplete() + { + $query = request('query'); + + $autocomplete = Company::autocomplete([ + 'name' => $query + ]); + + $companies = $autocomplete->get()->sortBy('name')->pluck('name', 'id'); + + return response()->json([ + 'success' => true, + 'message' => 'Get all companies.', + 'errors' => [], + 'count' => $companies->count(), + 'data' => ($companies->count()) ? $companies : null, + ]); + } } diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php index 62b3a28ed..2da164874 100644 --- a/app/Models/Common/Company.php +++ b/app/Models/Common/Company.php @@ -318,6 +318,32 @@ class Company extends Eloquent ->select('companies.*'); } + /** + * Scope autocomplete. + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @param array $filter + * @return \Illuminate\Database\Eloquent\Builder + */ + public function scopeAutocomplete($query, $filter) + { + return $query->join('settings', 'companies.id', '=', 'settings.company_id') + ->where(function ($query) use ($filter) { + foreach ($filter as $key => $value) { + $column = $key; + + if (!in_array($key, $this->fillable)) { + $column = 'company.' . $key; + $query->orWhere('key', $column); + $query->Where('value', 'LIKE', "%" . $value . "%"); + } else { + $query->orWhere($column, 'LIKE', "%" . $value . "%"); + } + } + }) + ->select('companies.*'); + } + /** * Get the current balance. * diff --git a/app/Providers/Form.php b/app/Providers/Form.php index 245d23c0f..df530311c 100644 --- a/app/Providers/Form.php +++ b/app/Providers/Form.php @@ -55,6 +55,10 @@ class Form extends Provider 'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', 'group_class' => null ]); + Facade::component('multiSelectRemoteGroup', 'partials.form.multi_select_remote_group', [ + 'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', 'group_class' => null + ]); + Facade::component('selectGroup', 'partials.form.select_group', [ 'name', 'text', 'icon', 'values', 'selected' => null, 'attributes' => ['required' => 'required'], 'col' => 'col-md-6', 'group_class' => null ]); diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 34f43f88f..9610b497d 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -763,7 +763,7 @@ {{ new_text }} - @@ -923,6 +923,7 @@ export default { add_new_html: '', form: {}, new_options: false, + couunt: 1, } }, @@ -989,6 +990,24 @@ export default { this.$emit('interface', this.real_model); this.$emit('change', this.real_model); + + //this.$children[0].$children[0].$emit('keydown.native.tab'); + //this.$children[0].$children[0].handleMenuEnter(); + + this.$children[0].$children[0].visible = false; + + /* + this.$children[0].$children[0].setSoftFocus(); + if (this.$children[0].$children[0].visible) return; + + let option = {}; + + option.value = this.real_model; + + this.$children[0].$children[0].$nextTick(() => { + this.$children[0].$children[0].scrollToOption(option); + }); + */ }, async onAddItem() { @@ -1180,7 +1199,17 @@ export default { return; } - this.change(); + if (this.real_model != value) { + this.change(); + } + + let e = $.Event('keyup'); + e.keyCode= 9; // tab + $('#' + this.name).trigger(e); + + let event = new window.KeyboardEvent('keydown', { keyCode: 9 }); // Tab key + + window.dispatchEvent(event); }, value: function (value) { diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index 714299cb0..da8f3bff2 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -12,7 +12,11 @@ ]" :error="formError"> + remote + reserve-keyword + :placeholder="placeholder" + :remote-method="remoteMethod" + :loading="loading">

    {{ noMatchingDataText }} @@ -85,7 +89,11 @@ + remote + reserve-keyword + :placeholder="placeholder" + :remote-method="remoteMethod" + :loading="loading">

    {{ noMatchingDataText }} @@ -158,7 +166,11 @@ + remote + reserve-keyword + :placeholder="placeholder" + :remote-method="remoteMethod" + :loading="loading">

    {{ noMatchingDataText }} @@ -231,7 +243,11 @@ + remote + reserve-keyword + :placeholder="placeholder" + :remote-method="remoteMethod" + :loading="loading">

    {{ noMatchingDataText }} diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php index 85949333b..06ba5e40e 100644 --- a/resources/views/auth/users/create.blade.php +++ b/resources/views/auth/users/create.blade.php @@ -48,7 +48,7 @@ @endif @permission('read-common-companies') - {{ Form::multiSelectGroup('companies', trans_choice('general.companies', 2), 'user', $companies) }} + {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, [], ['required' => 'required', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }} @endpermission @permission('read-auth-roles') diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index a46d7f0c1..2d631d8a0 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -49,7 +49,7 @@ @endif @permission('read-common-companies') - {{ Form::multiSelectGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required'], 'col-md-6') }} + {{ Form::multiSelectRemoteGroup('companies', trans_choice('general.companies', 2), 'user', $companies, $user->company_ids, ['required' => 'required', 'remote_action' => route('companies.autocomplete'), 'remote_type' => 'company']) }} @endpermission @permission('read-auth-roles') diff --git a/resources/views/partials/form/multi_select_remote_group.blade.php b/resources/views/partials/form/multi_select_remote_group.blade.php new file mode 100644 index 000000000..44eff83d1 --- /dev/null +++ b/resources/views/partials/form/multi_select_remote_group.blade.php @@ -0,0 +1,76 @@ +@stack($name . '_input_start') + + + +@stack($name . '_input_end') diff --git a/routes/admin.php b/routes/admin.php index 3c01cae9b..37b221147 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -14,6 +14,7 @@ Route::group(['as' => 'uploads.', 'prefix' => 'uploads'], function () { }); Route::group(['prefix' => 'common'], function () { + Route::get('companies/autocomplete', 'Common\Companies@autocomplete')->name('companies.autocomplete'); Route::get('companies/{company}/switch', 'Common\Companies@switch')->name('companies.switch'); Route::get('companies/{company}/enable', 'Common\Companies@enable')->name('companies.enable'); Route::get('companies/{company}/disable', 'Common\Companies@disable')->name('companies.disable'); From d22a3e20018c6d8b95e4cf60817505d16ccaca0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 2 Jul 2020 01:55:45 +0300 Subject: [PATCH 094/208] added events to manipulate report data --- app/Abstracts/Report.php | 13 ++++++++++- app/Events/Report/DataLoaded.php | 22 +++++++++++++++++++ app/Events/Report/DataLoading.php | 22 +++++++++++++++++++ app/Reports/ProfitLoss.php | 11 ---------- .../profit_loss/content/footer.blade.php | 12 ++++++++++ 5 files changed, 68 insertions(+), 12 deletions(-) create mode 100644 app/Events/Report/DataLoaded.php create mode 100644 app/Events/Report/DataLoading.php diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index dce1ea98f..2c07ec8c2 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -2,6 +2,8 @@ namespace App\Abstracts; +use App\Events\Report\DataLoaded; +use App\Events\Report\DataLoading; use App\Events\Report\FilterApplying; use App\Events\Report\FilterShowing; use App\Events\Report\GroupApplying; @@ -92,12 +94,21 @@ abstract class Report $this->setDates(); $this->setFilters(); $this->setRows(); - $this->setData(); + $this->loadData(); $this->setColumnWidth(); $this->loaded = true; } + public function loadData() + { + event(new DataLoading($this)); + + $this->setData(); + + event(new DataLoaded($this)); + } + public function getDefaultName() { if (!empty($this->default_name)) { diff --git a/app/Events/Report/DataLoaded.php b/app/Events/Report/DataLoaded.php new file mode 100644 index 000000000..03be50915 --- /dev/null +++ b/app/Events/Report/DataLoaded.php @@ -0,0 +1,22 @@ +class = $class; + } +} diff --git a/app/Events/Report/DataLoading.php b/app/Events/Report/DataLoading.php new file mode 100644 index 000000000..4684541af --- /dev/null +++ b/app/Events/Report/DataLoading.php @@ -0,0 +1,22 @@ +class = $class; + } +} diff --git a/app/Reports/ProfitLoss.php b/app/Reports/ProfitLoss.php index d225abab2..c30ab5d34 100644 --- a/app/Reports/ProfitLoss.php +++ b/app/Reports/ProfitLoss.php @@ -72,17 +72,6 @@ class ProfitLoss extends Report break; } - - // TODO: move to views - foreach ($this->footer_totals as $table => $dates) { - foreach ($dates as $date => $total) { - if (!isset($this->net_profit[$date])) { - $this->net_profit[$date] = 0; - } - - $this->net_profit[$date] += $total; - } - } } public function getFields() diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 2b4b4728a..b15ff7683 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -1,3 +1,15 @@ +@php +foreach ($class->footer_totals as $table => $dates) { + foreach ($dates as $date => $total) { + if (!isset($class->net_profit[$date])) { + $class->net_profit[$date] = 0; + } + + $class->net_profit[$date] += $total; + } +} +@endphp +

    From 6cc2d9682b62f5d512fe3e89c096873587bce9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 2 Jul 2020 10:09:23 +0300 Subject: [PATCH 095/208] refactored suggestions --- app/Http/ViewComposers/Suggestions.php | 53 ++++++++++--------- app/Traits/Modules.php | 6 +-- .../views/partials/admin/header.blade.php | 38 ++++++------- .../partials/admin/suggestions.blade.php | 6 +++ 4 files changed, 52 insertions(+), 51 deletions(-) create mode 100644 resources/views/partials/admin/suggestions.blade.php diff --git a/app/Http/ViewComposers/Suggestions.php b/app/Http/ViewComposers/Suggestions.php index 011c3c843..d97523097 100644 --- a/app/Http/ViewComposers/Suggestions.php +++ b/app/Http/ViewComposers/Suggestions.php @@ -3,13 +3,12 @@ namespace App\Http\ViewComposers; use Illuminate\View\View; -use App\Traits\Modules as RemoteModules; +use App\Traits\Modules; use Route; -use App\Models\Module\Module; class Suggestions { - use RemoteModules; + use Modules; /** * Bind data to the view. @@ -24,30 +23,32 @@ class Suggestions return; } - $modules = false; - - if (user()) { - $path = Route::current()->uri(); - - if ($path) { - $suggestions = $this->getSuggestions($path); - - if ($suggestions) { - $suggestion_modules = $suggestions->modules; - - foreach ($suggestion_modules as $key => $module) { - $installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first(); - - if ($installed) { - continue; - } - - $modules[] = $module; - } - } - } + if ((!$user = user()) || $user->cannot('read-modules-home')) { + return; } - $view->with(['suggestion_modules' => $modules]); + if (!$path = Route::current()->uri()) { + return; + } + + if (!$suggestions = $this->getSuggestions($path)) { + return; + } + + $modules = []; + + foreach ($suggestions->modules as $s_module) { + if ($this->moduleIsEnabled($s_module->alias)) { + continue; + } + + $modules[] = $s_module; + } + + if (empty($modules)) { + return; + } + + $view->getFactory()->startPush('header_button_end', view('partials.admin.suggestions', compact('modules'))); } } diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 5a81573fd..cfe5d58b7 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -558,7 +558,7 @@ trait Modules return true; } - public function moduleEnabled($alias) + public function moduleIsEnabled($alias) { if (!$this->moduleExists($alias)) { return false; @@ -674,10 +674,10 @@ trait Modules if (isset($data['query'])){ foreach($data['query'] as $key => $value) { - $result .= '.' . $key . '.' . $value; + $result .= '.' . $key . '.' . $value; } } return $result; - } + } } diff --git a/resources/views/partials/admin/header.blade.php b/resources/views/partials/admin/header.blade.php index 0381c8d74..ad0e8e486 100644 --- a/resources/views/partials/admin/header.blade.php +++ b/resources/views/partials/admin/header.blade.php @@ -1,32 +1,26 @@ @stack('header_start') - - + @foreach($rows as $row) @endforeach From 14f8ae464dd7ce4704c10c3b530759808dbd0b6d Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sat, 11 Jul 2020 10:32:54 +0300 Subject: [PATCH 118/208] empty line is added at the end of show.blade.php --- resources/views/partials/reports/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/reports/show.blade.php b/resources/views/partials/reports/show.blade.php index 69735da9e..a6db4a9ff 100644 --- a/resources/views/partials/reports/show.blade.php +++ b/resources/views/partials/reports/show.blade.php @@ -16,4 +16,4 @@ @push('scripts_start') -@endpush \ No newline at end of file +@endpush From b341d68c0dea5adc8d7f9b2939027cbc1f1d6b4c Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sat, 11 Jul 2020 13:00:15 +0300 Subject: [PATCH 119/208] tooltip feature is added to widgets --- .../views/partials/widgets/standard_header.blade.php | 10 +++++++++- resources/views/widgets/latest_expenses.blade.php | 10 +++++++++- resources/views/widgets/latest_income.blade.php | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/widgets/standard_header.blade.php b/resources/views/partials/widgets/standard_header.blade.php index 986728f56..9285156f1 100644 --- a/resources/views/partials/widgets/standard_header.blade.php +++ b/resources/views/partials/widgets/standard_header.blade.php @@ -3,7 +3,15 @@
    -

    {{ $class->model->name }}

    +

    + + {{ $class->model->name }} + +

    - + @endforeach diff --git a/resources/views/widgets/latest_income.blade.php b/resources/views/widgets/latest_income.blade.php index a9f0e619c..8a48070bb 100644 --- a/resources/views/widgets/latest_income.blade.php +++ b/resources/views/widgets/latest_income.blade.php @@ -17,7 +17,15 @@ @foreach($transactions as $item) - + @endforeach From c9261c7fce5f1db7fb313b0707397202c3618007 Mon Sep 17 00:00:00 2001 From: Mohammad Emran Hasan Date: Sun, 12 Jul 2020 18:31:38 +0600 Subject: [PATCH 120/208] Fixes loading app documentation --- app/Traits/Modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 30504453b..f43f417db 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -59,7 +59,7 @@ trait Modules return $item; } - public function getDocumentation($alias) + public function getDocumentation($alias, $data = []) { $key = 'apps.' . $alias . '.docs.' . $this->getDataKey($data); From be212a98474a817b4fb826ad724a1609e68222df Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sun, 12 Jul 2020 15:37:10 +0300 Subject: [PATCH 121/208] tooltip feature is finalized for rows of reports --- resources/views/partials/reports/show.blade.php | 4 ---- resources/views/partials/reports/table/rows.blade.php | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/resources/views/partials/reports/show.blade.php b/resources/views/partials/reports/show.blade.php index a6db4a9ff..e5d9de068 100644 --- a/resources/views/partials/reports/show.blade.php +++ b/resources/views/partials/reports/show.blade.php @@ -13,7 +13,3 @@ @include($class->views['content']) @endsection - -@push('scripts_start') - -@endpush diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index f2a060a27..85f4a91b6 100644 --- a/resources/views/partials/reports/table/rows.blade.php +++ b/resources/views/partials/reports/table/rows.blade.php @@ -1,14 +1,6 @@ @if ($row_total = array_sum($rows)) - + @foreach($rows as $row) @endforeach From 87f574a0d309b7e9ee25756c68bec71a5a5b29ae Mon Sep 17 00:00:00 2001 From: Mohammad Emran Hasan Date: Sun, 12 Jul 2020 18:42:24 +0600 Subject: [PATCH 122/208] Removes duplicate key from BillItem FormRequest --- app/Http/Requests/Purchase/BillItem.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Requests/Purchase/BillItem.php b/app/Http/Requests/Purchase/BillItem.php index 456436edf..13c6e4d5f 100644 --- a/app/Http/Requests/Purchase/BillItem.php +++ b/app/Http/Requests/Purchase/BillItem.php @@ -28,7 +28,6 @@ class BillItem extends FormRequest 'name' => 'required|string', 'quantity' => 'required|integer', 'price' => 'required', - 'price' => 'required', 'total' => 'required', 'tax' => 'required', 'tax_id' => 'required', From 7afc34ef116f989fc5871af8655e7f034dc78240 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sun, 12 Jul 2020 18:22:55 +0300 Subject: [PATCH 123/208] tooltip feature is finalized for widgets --- .../views/partials/widgets/standard_header.blade.php | 10 +--------- resources/views/widgets/latest_expenses.blade.php | 10 +--------- resources/views/widgets/latest_income.blade.php | 10 +--------- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/resources/views/partials/widgets/standard_header.blade.php b/resources/views/partials/widgets/standard_header.blade.php index 9285156f1..4c38851d0 100644 --- a/resources/views/partials/widgets/standard_header.blade.php +++ b/resources/views/partials/widgets/standard_header.blade.php @@ -3,15 +3,7 @@
    -

    - - {{ $class->model->name }} - -

    +

    {{ $class->model->name }}

     - + @endforeach diff --git a/resources/views/widgets/latest_income.blade.php b/resources/views/widgets/latest_income.blade.php index 8a48070bb..765d1a585 100644 --- a/resources/views/widgets/latest_income.blade.php +++ b/resources/views/widgets/latest_income.blade.php @@ -17,15 +17,7 @@ @foreach($transactions as $item) - + @endforeach From a067866de5bed295e613a8a0866da2ab265036d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 13 Jul 2020 15:16:56 +0300 Subject: [PATCH 124/208] fixed notifications --- app/Http/ViewComposers/Notifications.php | 21 +++++++++------------ app/Http/ViewComposers/Suggestions.php | 2 +- app/Traits/Modules.php | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/Http/ViewComposers/Notifications.php b/app/Http/ViewComposers/Notifications.php index cb7b5ba80..858a243e3 100644 --- a/app/Http/ViewComposers/Notifications.php +++ b/app/Http/ViewComposers/Notifications.php @@ -2,13 +2,13 @@ namespace App\Http\ViewComposers; +use App\Traits\Modules; use Route; use Illuminate\View\View; -use App\Traits\Modules as RemoteModules; class Notifications { - use RemoteModules; + use Modules; /** * Bind data to the view. @@ -23,30 +23,27 @@ class Notifications return; } - $path = Route::current()->uri(); - - if (empty($path)) { + if (!$path = Route::current()->uri()) { return; } - $notifications = $this->getNotifications($path); - - if (empty($notifications)) { + if (!$notifications = $this->getNotifications($path)) { return; } // Push to a stack foreach ($notifications as $notification) { - $setting = 'notifications.'. $notification->path . '.' . $notification->id . '.status'; - $path = str_replace('/', '#', $notification->path); $message = str_replace('#path#', $path, $notification->message); $message = str_replace('#token#', csrf_token(), $message); + $message = str_replace('#url#', url('/'), $message); - if (setting($setting, 1)) { - $view->getFactory()->startPush('content_content_start', $message); + if (!setting('notifications.' . $notification->path . '.' . $notification->id . '.status', 1)) { + continue; } + + $view->getFactory()->startPush('content_content_start', $message); } } } diff --git a/app/Http/ViewComposers/Suggestions.php b/app/Http/ViewComposers/Suggestions.php index d97523097..0992fa70f 100644 --- a/app/Http/ViewComposers/Suggestions.php +++ b/app/Http/ViewComposers/Suggestions.php @@ -2,8 +2,8 @@ namespace App\Http\ViewComposers; -use Illuminate\View\View; use App\Traits\Modules; +use Illuminate\View\View; use Route; class Suggestions diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index f43f417db..1efbd8069 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -608,7 +608,7 @@ trait Modules $data = []; - if (!$notifications = static::getResponse('GET', 'apps/notifications')) { + if (!$notifications = static::getResponseData('GET', 'apps/notifications')) { return $data; } From bd07382dd6421512aa33f60cee6cf027747cce64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 15 Jul 2020 14:14:20 +0300 Subject: [PATCH 125/208] fixed #1533 --- app/Abstracts/Http/Controller.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php index 1a3a2c2f2..f366929d5 100644 --- a/app/Abstracts/Http/Controller.php +++ b/app/Abstracts/Http/Controller.php @@ -44,16 +44,20 @@ abstract class Controller extends BaseController $controller = ''; + // Add module + if (isset($arr[3]) && isset($arr[4])) { + if (strtolower($arr[4]) == 'modules') { + $controller .= Str::kebab($arr[3]) . '-'; + } elseif (isset($arr[5]) && (strtolower($arr[5]) == 'modules')) { + $controller .= Str::kebab($arr[4]) . '-'; + } + } + // Add folder if (strtolower($arr[1]) != 'controllers') { $controller .= Str::kebab($arr[1]) . '-'; } - // Add module - if (isset($arr[3]) && isset($arr[4]) && (strtolower($arr[4]) == 'modules')) { - $controller .= Str::kebab($arr[3]) . '-'; - } - // Add file $controller .= Str::kebab($arr[0]); @@ -63,6 +67,11 @@ abstract class Controller extends BaseController return; } + // App\Http\Controllers\FooBar -->> foo-bar + // App\Http\Controllers\FooBar\Main -->> foo-bar-main + // Modules\Blog\Http\Controllers\Posts -->> blog-posts + // Modules\Blog\Http\Controllers\Portal\Posts -->> blog-portal-posts + // Add CRUD permission check $this->middleware('permission:create-' . $controller)->only('create', 'store', 'duplicate', 'import'); $this->middleware('permission:read-' . $controller)->only('index', 'show', 'edit', 'export'); From 3e36c6c77401b8b616462e1cd882139d6fb61b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 15 Jul 2020 19:12:11 +0300 Subject: [PATCH 126/208] added bulk permission detachment --- app/Traits/Permissions.php | 78 ++++++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 21 deletions(-) diff --git a/app/Traits/Permissions.php b/app/Traits/Permissions.php index 197bb56b5..269ccd9fc 100644 --- a/app/Traits/Permissions.php +++ b/app/Traits/Permissions.php @@ -43,34 +43,51 @@ trait Permissions public function attachPermissionsToAllRoles($permissions, $require = 'read-admin-panel') { - $this->getRoles($require)->each(function ($role) use ($permissions) { - foreach ($permissions as $id => $permission) { - if ($this->isActionList($permission)) { - $this->attachPermissionsByAction($role, $id, $permission); - - continue; - } - - $this->attachPermission($role, $permission); - } - }); + $this->applyPermissionsToAllRoles('attach', $permissions, $require); } public function detachPermissionsByRoleNames($roles) { foreach ($roles as $role_name => $permissions) { - $role = Role::where('name', $role_name)->first(); - - if (empty($role)) { - continue; - } - foreach ($permissions as $permission_name) { - $this->detachPermission($role, $permission_name); + $this->detachPermission($role_name, $permission_name); } } } + public function detachPermissionsFromAdminRoles($permissions) + { + $this->detachPermissionsFromAllRoles($permissions, 'read-admin-panel'); + } + + public function detachPermissionsFromPortalRoles($permissions) + { + $this->detachPermissionsFromAllRoles($permissions, 'read-client-portal'); + } + + public function detachPermissionsFromAllRoles($permissions, $require = 'read-admin-panel') + { + $this->applyPermissionsToAllRoles('detach', $permissions, $require); + } + + public function applyPermissionsToAllRoles($apply, $permissions, $require = 'read-admin-panel') + { + $this->getRoles($require)->each(function ($role) use ($apply, $permissions) { + $f1 = $apply . 'PermissionsByAction'; + $f2 = $apply . 'Permission'; + + foreach ($permissions as $id => $permission) { + if ($this->isActionList($permission)) { + $this->$f1($role, $id, $permission); + + continue; + } + + $this->$f2($role, $permission); + } + }); + } + public function updatePermissionNames($permissions) { $actions = $this->getActionsMap(); @@ -255,7 +272,7 @@ trait Permissions $role->attachPermission($permission); } - public function detachPermission($role, $permission) + public function detachPermission($role, $permission, $delete = true) { if (is_string($role)) { $role = Role::where('name', $role)->first(); @@ -273,7 +290,14 @@ trait Permissions return; } - $role->detachPermission($permission); + if ($role->hasPermission($permission->name)) { + $role->detachPermission($permission); + } + + if ($delete === false) { + return; + } + $permission->delete(); } @@ -289,6 +313,18 @@ trait Permissions public function attachPermissionsByAction($role, $page, $action_list) { + $this->applyPermissionsByAction('attach', $role, $page, $action_list); + } + + public function detachPermissionsByAction($role, $page, $action_list) + { + $this->applyPermissionsByAction('detach', $role, $page, $action_list); + } + + public function applyPermissionsByAction($apply, $role, $page, $action_list) + { + $function = $apply . 'Permission'; + $actions_map = collect($this->getActionsMap()); $actions = explode(',', $action_list); @@ -298,7 +334,7 @@ trait Permissions $name = $action . '-' . $page; - $this->attachPermission($role, $name); + $this->$function($role, $name); } } From 8692eb0e414318fa1dd568f535fad0e192c71836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 15 Jul 2020 23:36:29 +0300 Subject: [PATCH 127/208] added stacks to customer/vendor show page --- public/css/custom.css | 14 -- .../views/purchases/vendors/show.blade.php | 148 +++++++++++------- .../views/sales/customers/show.blade.php | 138 ++++++++++------ 3 files changed, 180 insertions(+), 120 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index 91fb421dc..13a4ed019 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -165,20 +165,6 @@ button:focus { overflow: hidden; } -/*--------Customer/Vendor Show--------*/ -.show-transaction-card-header { - padding: 1.14rem; -} - -.show-transaction-card-footer { - padding: 1.15rem; -} - -.edit-sv { - margin-bottom: 30px; -} -/*--------Customer/Vendor Show Finish--------*/ - /*--------Navbar Notification--------*/ .nav-link .badge-update { position: absolute; diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php index 725e882c8..b789bb85c 100644 --- a/resources/views/purchases/vendors/show.blade.php +++ b/resources/views/purchases/vendors/show.blade.php @@ -5,53 +5,76 @@ @section('content')
    -
    -
    - {{ trans_choice('general.bills', 2) }} {{ $counts['bills'] }} -
    +
    + @stack('vendor_transactions_count_start') +
  • + {{ trans_choice('general.transactions', 2) }} + {{ $counts['transactions'] }} +
    • + @stack('vendor_transactions_count_end') + -
    -
    -

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

    -
    +
    + @stack('vendor_phone_start') +
  • +
    {{ trans('general.phone') }}
    +
    {{ $vendor->phone }}
    +
    • + @stack('vendor_phone_end') -
    -
    -

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

    -
    + @stack('vendor_website_start') +
  • +
    {{ trans('general.website') }}
    +
    {{ $vendor->website }}
    +
    • + @stack('vendor_website_end') -
    - - {{ $vendor->address }} -

    -
    -
    + @stack('vendor_tax_number_start') +
  • +
    {{ trans('general.tax_number') }}
    +
    {{ $vendor->tax_number }}
    +
    • + @stack('vendor_tax_number_end') -     {{ trans('general.edit') }} + @stack('vendor_address_start') +
  • +
    {{ trans('general.address') }}
    +
    {{ $vendor->address }}
    +
    • + @stack('vendor_address_end') + + @if ($vendor->reference) + @stack('vendor_reference_start') +
  • +
    {{ trans('general.reference') }}
    +
    {{ $vendor->reference }}
    +
    • + @stack('vendor_reference_end') + @endif + + + @stack('vendor_edit_button_start') + {{ trans('general.edit') }} + @stack('vendor_edit_button_end')
    + @stack('vendor_paid_card_start')
    @@ -65,7 +88,9 @@
    + @stack('vendor_paid_card_end') + @stack('vendor_open_card_start')
    @@ -79,7 +104,9 @@
    + @stack('vendor_open_card_end') + @stack('vendor_overdue_card_start')
    @@ -93,57 +120,64 @@
    + @stack('vendor_overdue_card_end')
    - -
    +
    -
    + @stack('vendor_transactions_content_start') +
    -
    - {{ Form::checkbox($item->type . '_' . $item->id, $item->price, $item->reconciled, [ + {{ Form::checkbox($item->type . '_' . $item->id, $item->amount_for_account, $item->reconciled, [ 'data-field' => 'transactions', 'v-model' => 'form.transactions.' . $item->type . '_' . $item->id, 'id' => 'transaction-' . $item->id . '-'. $item->type, From 59727e46fce64ffcdc5664e6dc0eaaa6e9fb8ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 6 Jul 2020 12:00:07 +0300 Subject: [PATCH 100/208] close #1516 Changed: Currencies precision field change type --- app/Http/Controllers/Settings/Currencies.php | 20 +++++++++++++++++-- .../settings/currencies/create.blade.php | 2 +- .../views/settings/currencies/edit.blade.php | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Settings/Currencies.php b/app/Http/Controllers/Settings/Currencies.php index 2d26c29b3..080d11e3f 100644 --- a/app/Http/Controllers/Settings/Currencies.php +++ b/app/Http/Controllers/Settings/Currencies.php @@ -56,7 +56,15 @@ class Currencies extends Controller $codes[$key] = $key; } - return view('settings.currencies.create', compact('codes')); + $precisions = (object) [ + 0 => 0, + 1 => 1, + 2 => 2, + 3 => 3, + 4 => 4, + ]; + + return view('settings.currencies.create', compact('codes', 'precisions')); } /** @@ -114,7 +122,15 @@ class Currencies extends Controller // Set default currency $currency->default_currency = ($currency->code == setting('default.currency')) ? 1 : 0; - return view('settings.currencies.edit', compact('currency', 'codes')); + $precisions = (object) [ + 0 => 0, + 1 => 1, + 2 => 2, + 3 => 3, + 4 => 4, + ]; + + return view('settings.currencies.edit', compact('currency', 'codes', 'precisions')); } /** diff --git a/resources/views/settings/currencies/create.blade.php b/resources/views/settings/currencies/create.blade.php index 1a0541b1f..ff8e9c02c 100644 --- a/resources/views/settings/currencies/create.blade.php +++ b/resources/views/settings/currencies/create.blade.php @@ -23,7 +23,7 @@ {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }} - {{ Form::textGroup('precision', trans('currencies.precision'), 'dot-circle') }} + {{ Form::selectGroup('precision', trans('currencies.precision'), 'dot-circle', $precisions) }} {{ Form::textGroup('symbol', trans('currencies.symbol.symbol'), 'font') }} diff --git a/resources/views/settings/currencies/edit.blade.php b/resources/views/settings/currencies/edit.blade.php index 4933060d4..6b51885e2 100644 --- a/resources/views/settings/currencies/edit.blade.php +++ b/resources/views/settings/currencies/edit.blade.php @@ -24,7 +24,7 @@ {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }} - {{ Form::textGroup('precision', trans('currencies.precision'), 'dot-circle') }} + {{ Form::selectGroup('precision', trans('currencies.precision'), 'dot-circle', $precisions, $currency->precision) }} {{ Form::textGroup('symbol', trans('currencies.symbol.symbol'), 'font') }} From ebf355e44a01d636516d6620809dde8d09e6ae99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 6 Jul 2020 12:09:44 +0300 Subject: [PATCH 101/208] Use company added take 10 --- app/Http/Controllers/Auth/Users.php | 4 ++-- resources/assets/js/components/AkauntingSelectRemote.vue | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index 39663b7f9..cc8d259c2 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -70,7 +70,7 @@ class Users extends Controller return $r->hasPermission('read-client-portal'); }); - $companies = user()->companies()->get()->sortBy('name')->pluck('name', 'id'); + $companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id'); return view('auth.users.create', compact('roles', 'companies', 'routes')); } @@ -148,7 +148,7 @@ class Users extends Controller }); } - $companies = user()->companies()->get()->sortBy('name')->pluck('name', 'id'); + $companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id'); return view('auth.users.edit', compact('user', 'companies', 'roles', 'routes')); } diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue index aa87a358b..3dd7f799c 100644 --- a/resources/assets/js/components/AkauntingSelectRemote.vue +++ b/resources/assets/js/components/AkauntingSelectRemote.vue @@ -598,7 +598,6 @@ export default { }, mounted() { - if (this.multiple) { if (!this.value.length) { this.real_model = []; @@ -621,6 +620,8 @@ export default { methods: { remoteMethod(query) { + document.getElementById('form-select-' + this.name).getElementsByTagName("input")[1].readOnly = false; + if (query !== '') { this.loading = true; From af324b3267118d8ccefb4f85615a61bd5e2ae810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 6 Jul 2020 13:04:42 +0300 Subject: [PATCH 102/208] workaround --- bootstrap/autoload.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 8c7d3df97..b99ab5d9a 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -10,6 +10,21 @@ if (version_compare(PHP_VERSION, AKAUNTING_PHP, '<')) { define('LARAVEL_START', microtime(true)); +// workaround until https://github.com/lorisleiva/laravel-search-string/pull/21 +if (! function_exists('resolve')) { + /** + * Resolve a service from the container. + * + * @param string $name + * @param array $parameters + * @return mixed + */ + function resolve($name, array $parameters = []) + { + return app($name, $parameters); + } +} + // Load composer for core require __DIR__ . '/../vendor/autoload.php'; From 7e01634c8f00d83ab60bd4988a6633006ef71163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 6 Jul 2020 13:14:22 +0300 Subject: [PATCH 103/208] updated translations --- resources/lang/da-DK/install.php | 1 + resources/lang/es-MX/install.php | 1 + resources/lang/it-IT/install.php | 1 + resources/lang/it-IT/modules.php | 1 - resources/lang/ne-NP/auth.php | 12 ++++++------ resources/lang/ne-NP/install.php | 1 + resources/lang/pt-BR/install.php | 1 + resources/lang/pt-PT/install.php | 1 + resources/lang/sq-AL/install.php | 1 + resources/lang/sq-AL/modules.php | 1 - resources/lang/sv-SE/bills.php | 6 +++++- resources/lang/sv-SE/bulk_actions.php | 1 + resources/lang/sv-SE/install.php | 2 ++ resources/lang/sv-SE/invoices.php | 5 +++++ resources/lang/sv-SE/modules.php | 1 - resources/lang/sv-SE/settings.php | 6 ++++++ resources/lang/tr-TR/install.php | 1 + resources/lang/tr-TR/modules.php | 1 - 18 files changed, 33 insertions(+), 11 deletions(-) diff --git a/resources/lang/da-DK/install.php b/resources/lang/da-DK/install.php index 0b5e468dc..918f39e6b 100644 --- a/resources/lang/da-DK/install.php +++ b/resources/lang/da-DK/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Fejl: Anmod din host om at bruge PHP :php_version eller højere for både HTTP og CLI', 'connection' => 'Error: Kunne ikke forbinde til databasen! Kontroller, at oplysningerne er korrekte.', ], diff --git a/resources/lang/es-MX/install.php b/resources/lang/es-MX/install.php index 24998fab2..7be16519d 100644 --- a/resources/lang/es-MX/install.php +++ b/resources/lang/es-MX/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Error: solicite a su proveedor de hosting que use PHP: php_version o superior para HTTP y CLI.', 'connection' => 'Error: ¡No se pudo conectar a la base de datos! Por favor, asegúrese de que los datos son correctos.', ], diff --git a/resources/lang/it-IT/install.php b/resources/lang/it-IT/install.php index fc6603a16..398d21588 100644 --- a/resources/lang/it-IT/install.php +++ b/resources/lang/it-IT/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Errore: chiedi al tuo provider di usare PHP :php_version o superiore sia per HTTP che per CLI.', 'connection' => 'Errore: Impossibile connettersi al database! Per favore, assicurati che i dettagli siano corretti.', ], diff --git a/resources/lang/it-IT/modules.php b/resources/lang/it-IT/modules.php index ceecb48dd..486426a2a 100644 --- a/resources/lang/it-IT/modules.php +++ b/resources/lang/it-IT/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nuovo', 'top_free' => 'Top gratis', 'free' => 'GRATIS', - 'search' => 'Ricerca', 'install' => 'Installa', 'buy_now' => 'Acquista ora', 'get_api_key' => 'Clicca qui per ottenere la tua chiave API.', diff --git a/resources/lang/ne-NP/auth.php b/resources/lang/ne-NP/auth.php index dcea5d6ab..761e5754a 100644 --- a/resources/lang/ne-NP/auth.php +++ b/resources/lang/ne-NP/auth.php @@ -16,15 +16,15 @@ return [ 'landing_page' => 'अवतरण पृष्ठ', 'password' => [ - 'current' => 'प्रवेश शब्द', - 'current_confirm' => 'प्रवेश शब्दको सुनिश्चितत़ा', - 'new' => 'नयाँँ प्रवेश शब्द लिनुहोस', - 'new_confirm' => 'नयाँ प्रवेश शब्दको सुनिश्चितत़ा', + 'current' => 'संकेत शब्द', + 'current_confirm' => 'संकेत शब्दको सुनिश्चितत़ा', + 'new' => 'नयाँँ संकेत शब्द लिनुहोस', + 'new_confirm' => 'नयाँ संकेत शब्दको सुनिश्चितत़ा', ], 'error' => [ - 'self_delete' => 'त्रुटि: तपाई आफैंलाई हटाउन सक्नुहुन्न !', - 'self_disable' => 'त्रुटि: आफैँ हटाउन सकिदैन!', + 'self_delete' => 'त्रुटि: आफैंलाई हटाउन सकिदैन !', + 'self_disable' => 'त्रुटि: आफैँलाइ असक्षम गराउन सकिदैन!', 'no_company' => 'त्रुटि: तपाईको खातासँग सम्बन्धित कम्पनि तोकिएको छैन । कृपया प्प्ररणाली शासकसँग सम्पर्क गर्नुहोस।', ], diff --git a/resources/lang/ne-NP/install.php b/resources/lang/ne-NP/install.php index 54c0afd50..780243d09 100644 --- a/resources/lang/ne-NP/install.php +++ b/resources/lang/ne-NP/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Error: Ask your hosting provider to use PHP :php_version or higher for both HTTP and CLI.', 'connection' => 'त्रुटि: डाटाबेसमा जोड्न सकिएन! कृपया, सम्पूर्ण विवरण ठीक छन् भनि निश्चित गर्नुहोस।', ], diff --git a/resources/lang/pt-BR/install.php b/resources/lang/pt-BR/install.php index 565d53f4f..a6a05bd37 100644 --- a/resources/lang/pt-BR/install.php +++ b/resources/lang/pt-BR/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Erro: Peça ao seu provedor de hospedagem para usar PHP :php_version ou superior para HTTP e CLI.', 'connection' => 'Erro: Não foi possível conectar ao banco de dados! Certifique-se de que os detalhes estão corretos.', ], diff --git a/resources/lang/pt-PT/install.php b/resources/lang/pt-PT/install.php index aa813276d..b74ae0e5e 100644 --- a/resources/lang/pt-PT/install.php +++ b/resources/lang/pt-PT/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Erro: Peça ao seu fornecedor de alojamento web para usar PHP :php_version ou superior para HTTP e CLI.', 'connection' => 'Erro: Não foi possível ligar à base de dados! Por favor, verifique se a informação que inseriu está correcta.', ], diff --git a/resources/lang/sq-AL/install.php b/resources/lang/sq-AL/install.php index c3ad2385c..714b0fbc7 100644 --- a/resources/lang/sq-AL/install.php +++ b/resources/lang/sq-AL/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Gabim: Kërkoni nga ofruesi juaj i hosting të përdorë PHP :php_version ose më të lartë si për HTTP dhe CLI.', 'connection' => 'Gabim: Nuk mund të lidhej me database! Ju lutemi, sigurohuni që të dhënat janë të sakta.', ], diff --git a/resources/lang/sq-AL/modules.php b/resources/lang/sq-AL/modules.php index cc90d9938..445fd3367 100644 --- a/resources/lang/sq-AL/modules.php +++ b/resources/lang/sq-AL/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'I ri', 'top_free' => 'Më të mirët Falas', 'free' => 'FALAS', - 'search' => 'Kërko', 'install' => 'Instalo', 'buy_now' => 'Bli Tani', 'get_api_key' => 'Klikoni këtu për të marrë çelësin tuaj API.', diff --git a/resources/lang/sv-SE/bills.php b/resources/lang/sv-SE/bills.php index 7c6da4f16..f805f9191 100644 --- a/resources/lang/sv-SE/bills.php +++ b/resources/lang/sv-SE/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Pris', 'sub_total' => 'Delsumma', 'discount' => 'Rabatt', + 'item_discount' => 'Line Discount', 'tax_total' => 'Summa moms', 'total' => 'Summa', @@ -30,6 +31,7 @@ return [ 'add_payment' => 'Lägg till betalning', 'mark_paid' => 'Markera som betald', 'mark_received' => 'Markerad som mottagen', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Ladda ner PDF', 'send_mail' => 'Skicka E-post', 'create_bill' => 'Skapa faktura', @@ -43,11 +45,13 @@ return [ 'paid' => 'Betald', 'overdue' => 'Förfallen', 'unpaid' => 'Obetald', + 'cancelled' => 'Cancelled', ], 'messages' => [ - 'received' => 'Faktura markerad som mottagen!', + 'marked_received' => 'Bill marked as received!', 'marked_paid' => 'Fakturan markerad som betald!', + 'marked_cancelled' => 'Bill marked as cancelled!', 'draft' => 'Detta är ett DRAFT förslag och kommer att stämmas av innan den mottages.', 'status' => [ diff --git a/resources/lang/sv-SE/bulk_actions.php b/resources/lang/sv-SE/bulk_actions.php index 2478a571a..4e5f6017a 100644 --- a/resources/lang/sv-SE/bulk_actions.php +++ b/resources/lang/sv-SE/bulk_actions.php @@ -15,6 +15,7 @@ return [ 'paid' => 'Är du säker på att du vill markera vald faktura som betald?|Är du säker på att du vill markera markerade fakturor som betalada?', 'sent' => 'Är du säker på att du vill markera vald faktura som skickad?|Vill du verkligen markera markerade fakturor som skickade?', 'received' => 'Är du säker på att du vill markera vald faktura som mottagen?|Är du säker på att du vill markera markerade räkningar som mottagna?', + 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', ], ]; diff --git a/resources/lang/sv-SE/install.php b/resources/lang/sv-SE/install.php index 821afcb89..8c673be3c 100644 --- a/resources/lang/sv-SE/install.php +++ b/resources/lang/sv-SE/install.php @@ -21,6 +21,7 @@ return [ 'disabled' => ':feature måste inaktiveras!', 'extension' => ':extension tillägget måste vara installerad och laddad!', 'directory' => ':directory katalogen måste vara skrivbar!', + 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', ], 'database' => [ @@ -38,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Fel: Be ditt webbhotell leverantör att använda PHP :php_version eller högre för både HTTP och CLI.', 'connection' => 'Fel: Kunde inte ansluta till databasen! Snälla, se till att uppgifterna stämmer.', ], diff --git a/resources/lang/sv-SE/invoices.php b/resources/lang/sv-SE/invoices.php index def631baf..564007586 100644 --- a/resources/lang/sv-SE/invoices.php +++ b/resources/lang/sv-SE/invoices.php @@ -13,6 +13,7 @@ return [ 'price' => 'Pris', 'sub_total' => 'Delsumma', 'discount' => 'Rabatt', + 'item_discount' => 'Line Discount', 'tax_total' => 'Summa Skatt', 'total' => 'Totalt', @@ -30,6 +31,7 @@ return [ 'mark_paid' => 'Markera som betald', 'mark_sent' => 'Markera som skickad', 'mark_viewed' => 'Markera som visad', + 'mark_cancelled' => 'Mark Cancelled', 'download_pdf' => 'Ladda ner PDF', 'send_mail' => 'Skicka E-post', 'all_invoices' => 'Logga in för att visa alla fakturor', @@ -47,12 +49,15 @@ return [ 'paid' => 'Betald', 'overdue' => 'Förfallen', 'unpaid' => 'Obetald', + 'cancelled' => 'Cancelled', ], 'messages' => [ 'email_sent' => 'E-postadress till faktura har skickats!', 'marked_sent' => 'Faktura markerad som skickad!', 'marked_paid' => 'Faktura markerad som betald!', + 'marked_viewed' => 'Invoice marked as viewed!', + 'marked_cancelled' => 'Invoice marked as cancelled!', 'email_required' => 'Ingen e-postadress för den här kunden!', 'draft' => 'Detta är en utkast faktura och kommer att speglas till diagramet efter det skickas.', diff --git a/resources/lang/sv-SE/modules.php b/resources/lang/sv-SE/modules.php index f60006f7a..a8e72b158 100644 --- a/resources/lang/sv-SE/modules.php +++ b/resources/lang/sv-SE/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nytt', 'top_free' => 'Bästa gratis', 'free' => 'Fri', - 'search' => 'Sök', 'install' => 'Installera', 'buy_now' => 'Köp nu', 'get_api_key' => 'Klicka här för att få din API-nyckel.', diff --git a/resources/lang/sv-SE/settings.php b/resources/lang/sv-SE/settings.php index c7158e685..b8a9f8688 100644 --- a/resources/lang/sv-SE/settings.php +++ b/resources/lang/sv-SE/settings.php @@ -29,6 +29,12 @@ return [ 'before' => 'Innan nummret', 'after' => 'Efter nummret', ], + 'discount_location' => [ + 'name' => 'Discount Location', + 'item' => 'At line', + 'total' => 'At total', + 'both' => 'Both line and total', + ], ], 'invoice' => [ diff --git a/resources/lang/tr-TR/install.php b/resources/lang/tr-TR/install.php index ff9417118..ed4bc73d2 100644 --- a/resources/lang/tr-TR/install.php +++ b/resources/lang/tr-TR/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Hata: HTTP ve CLI için PHP sürümün :php_version ve üstü olması gerektiğini hosting firmanıza bildirin.', 'connection' => 'Hata: Veritabanına bağlanamıyoruz! Lütfen veritabanı bilgilerini kontrol ediniz.', ], diff --git a/resources/lang/tr-TR/modules.php b/resources/lang/tr-TR/modules.php index 7f0afe3b5..f46eef49d 100644 --- a/resources/lang/tr-TR/modules.php +++ b/resources/lang/tr-TR/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Yeni', 'top_free' => 'Popüler Ücretsiz', 'free' => 'Ücretsiz', - 'search' => 'Arama', 'install' => 'Yükle', 'buy_now' => 'Şimdi Satın Al', 'get_api_key' => 'API Anahtarını almak için buraya tıklayın.', From 92fdefc8fb7cedc9a1402e0a1f984b03793f83cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 6 Jul 2020 15:17:46 +0300 Subject: [PATCH 104/208] include modules vendor --- phpunit.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index d59f4c3a9..4a514d787 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,7 +1,7 @@ From 15217f9e96ab830553fc1b89dfa28ada25f1ce11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 6 Jul 2020 15:27:25 +0300 Subject: [PATCH 105/208] downgraded search string package --- bootstrap/autoload.php | 15 - composer.json | 2 +- composer.lock | 796 +---------------------------------------- 3 files changed, 7 insertions(+), 806 deletions(-) diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index b99ab5d9a..8c7d3df97 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -10,21 +10,6 @@ if (version_compare(PHP_VERSION, AKAUNTING_PHP, '<')) { define('LARAVEL_START', microtime(true)); -// workaround until https://github.com/lorisleiva/laravel-search-string/pull/21 -if (! function_exists('resolve')) { - /** - * Resolve a service from the container. - * - * @param string $name - * @param array $parameters - * @return mixed - */ - function resolve($name, array $parameters = []) - { - return app($name, $parameters); - } -} - // Load composer for core require __DIR__ . '/../vendor/autoload.php'; diff --git a/composer.json b/composer.json index 80228c163..ef698baf2 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "laravel/ui": "^2.0", "laravelcollective/html": "6.1.*", "league/omnipay": "3.0.*", - "lorisleiva/laravel-search-string": "1.0.*", + "lorisleiva/laravel-search-string": "0.1.*", "maatwebsite/excel": "3.1.*", "misterphilip/maintenance-mode": "2.0.*", "monooso/unobserve": "^2.0", diff --git a/composer.lock b/composer.lock index d0e213afc..c93bdad2e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c44aedb0ed90d8deff47a73d86074257", + "content-hash": "d1b643139c31f613261680c874c1d145", "packages": [ { "name": "akaunting/firewall", @@ -2753,789 +2753,6 @@ ], "time": "2019-07-01T23:21:34+00:00" }, - { - "name": "hoa/compiler", - "version": "3.17.08.08", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Compiler.git", - "reference": "aa09caf0bf28adae6654ca6ee415ee2f522672de" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/aa09caf0bf28adae6654ca6ee415ee2f522672de", - "reference": "aa09caf0bf28adae6654ca6ee415ee2f522672de", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/file": "~1.0", - "hoa/iterator": "~2.0", - "hoa/math": "~1.0", - "hoa/protocol": "~1.0", - "hoa/regex": "~1.0", - "hoa/visitor": "~2.0" - }, - "require-dev": { - "hoa/json": "~2.0", - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Compiler\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Compiler library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "algebraic", - "ast", - "compiler", - "context-free", - "coverage", - "exhaustive", - "grammar", - "isotropic", - "language", - "lexer", - "library", - "ll1", - "llk", - "parser", - "pp", - "random", - "regular", - "rule", - "sampler", - "syntax", - "token", - "trace", - "uniform" - ], - "time": "2017-08-08T07:44:07+00:00" - }, - { - "name": "hoa/consistency", - "version": "1.17.05.02", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Consistency.git", - "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f", - "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f", - "shasum": "" - }, - "require": { - "hoa/exception": "~1.0", - "php": ">=5.5.0" - }, - "require-dev": { - "hoa/stream": "~1.0", - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Consistency\\": "." - }, - "files": [ - "Prelude.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Consistency library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "autoloader", - "callable", - "consistency", - "entity", - "flex", - "keyword", - "library" - ], - "time": "2017-05-02T12:18:12+00:00" - }, - { - "name": "hoa/event", - "version": "1.17.01.13", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Event.git", - "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54", - "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Event\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Event library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "event", - "library", - "listener", - "observer" - ], - "time": "2017-01-13T15:30:50+00:00" - }, - { - "name": "hoa/exception", - "version": "1.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Exception.git", - "reference": "091727d46420a3d7468ef0595651488bfc3a458f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f", - "reference": "091727d46420a3d7468ef0595651488bfc3a458f", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Exception\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Exception library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "exception", - "library" - ], - "time": "2017-01-16T07:53:27+00:00" - }, - { - "name": "hoa/file", - "version": "1.17.07.11", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/File.git", - "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0", - "hoa/exception": "~1.0", - "hoa/iterator": "~2.0", - "hoa/stream": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\File\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\File library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "Socket", - "directory", - "file", - "finder", - "library", - "link", - "temporary" - ], - "time": "2017-07-11T07:42:15+00:00" - }, - { - "name": "hoa/iterator", - "version": "2.17.01.10", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Iterator.git", - "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Iterator\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Iterator library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "iterator", - "library" - ], - "time": "2017-01-10T10:34:47+00:00" - }, - { - "name": "hoa/math", - "version": "1.17.05.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Math.git", - "reference": "7150785d30f5d565704912116a462e9f5bc83a0c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Math/zipball/7150785d30f5d565704912116a462e9f5bc83a0c", - "reference": "7150785d30f5d565704912116a462e9f5bc83a0c", - "shasum": "" - }, - "require": { - "hoa/compiler": "~3.0", - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/iterator": "~2.0", - "hoa/protocol": "~1.0", - "hoa/zformat": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Math\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Math library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "arrangement", - "combination", - "combinatorics", - "counting", - "library", - "math", - "permutation", - "sampler", - "set" - ], - "time": "2017-05-16T08:02:17+00:00" - }, - { - "name": "hoa/protocol", - "version": "1.17.01.14", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Protocol.git", - "reference": "5c2cf972151c45f373230da170ea015deecf19e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2", - "reference": "5c2cf972151c45f373230da170ea015deecf19e2", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Protocol\\": "." - }, - "files": [ - "Wrapper.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Protocol library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "protocol", - "resource", - "stream", - "wrapper" - ], - "time": "2017-01-14T12:26:10+00:00" - }, - { - "name": "hoa/regex", - "version": "1.17.01.13", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Regex.git", - "reference": "7e263a61b6fb45c1d03d8e5ef77668518abd5bec" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Regex/zipball/7e263a61b6fb45c1d03d8e5ef77668518abd5bec", - "reference": "7e263a61b6fb45c1d03d8e5ef77668518abd5bec", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0", - "hoa/math": "~1.0", - "hoa/protocol": "~1.0", - "hoa/ustring": "~4.0", - "hoa/visitor": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Regex\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Regex library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "compiler", - "library", - "regex" - ], - "time": "2017-01-13T16:10:24+00:00" - }, - { - "name": "hoa/stream", - "version": "1.17.02.21", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Stream.git", - "reference": "3293cfffca2de10525df51436adf88a559151d82" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82", - "reference": "3293cfffca2de10525df51436adf88a559151d82", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/event": "~1.0", - "hoa/exception": "~1.0", - "hoa/protocol": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Stream\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Stream library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "Context", - "bucket", - "composite", - "filter", - "in", - "library", - "out", - "protocol", - "stream", - "wrapper" - ], - "time": "2017-02-21T16:01:06+00:00" - }, - { - "name": "hoa/ustring", - "version": "4.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Ustring.git", - "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0", - "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "suggest": { - "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().", - "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Ustring\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Ustring library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "search", - "string", - "unicode" - ], - "time": "2017-01-16T07:08:25+00:00" - }, - { - "name": "hoa/visitor", - "version": "2.17.01.16", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Visitor.git", - "reference": "c18fe1cbac98ae449e0d56e87469103ba08f224a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/c18fe1cbac98ae449e0d56e87469103ba08f224a", - "reference": "c18fe1cbac98ae449e0d56e87469103ba08f224a", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0" - }, - "require-dev": { - "hoa/test": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Visitor\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Visitor library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "structure", - "visit", - "visitor" - ], - "time": "2017-01-16T07:02:03+00:00" - }, - { - "name": "hoa/zformat", - "version": "1.17.01.10", - "source": { - "type": "git", - "url": "https://github.com/hoaproject/Zformat.git", - "reference": "522c381a2a075d4b9dbb42eb4592dd09520e4ac2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/522c381a2a075d4b9dbb42eb4592dd09520e4ac2", - "reference": "522c381a2a075d4b9dbb42eb4592dd09520e4ac2", - "shasum": "" - }, - "require": { - "hoa/consistency": "~1.0", - "hoa/exception": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Hoa\\Zformat\\": "." - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Ivan Enderlin", - "email": "ivan.enderlin@hoa-project.net" - }, - { - "name": "Hoa community", - "homepage": "https://hoa-project.net/" - } - ], - "description": "The Hoa\\Zformat library.", - "homepage": "https://hoa-project.net/", - "keywords": [ - "library", - "parameter", - "zformat" - ], - "time": "2017-01-10T10:39:54+00:00" - }, { "name": "intervention/image", "version": "2.5.1", @@ -4603,20 +3820,19 @@ }, { "name": "lorisleiva/laravel-search-string", - "version": "v1.0.1", + "version": "v0.1.6", "source": { "type": "git", "url": "https://github.com/lorisleiva/laravel-search-string.git", - "reference": "f5b0df4be4b774076fc726a0daeb891491d04385" + "reference": "68189cad7614d0c9cb09a83315e1ccfe49e7f0c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lorisleiva/laravel-search-string/zipball/f5b0df4be4b774076fc726a0daeb891491d04385", - "reference": "f5b0df4be4b774076fc726a0daeb891491d04385", + "url": "https://api.github.com/repos/lorisleiva/laravel-search-string/zipball/68189cad7614d0c9cb09a83315e1ccfe49e7f0c1", + "reference": "68189cad7614d0c9cb09a83315e1ccfe49e7f0c1", "shasum": "" }, "require": { - "hoa/compiler": "^3.17", "illuminate/support": "^5.5|^6.0|^7.0" }, "require-dev": { @@ -4646,7 +3862,7 @@ } ], "description": "Generates database queries based on one unique string using a simple and customizable syntax.", - "time": "2020-07-04T11:30:30+00:00" + "time": "2020-04-05T15:40:30+00:00" }, { "name": "maatwebsite/excel", From eca4588780d2dafc64599049c69ce9fb05d36e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 6 Jul 2020 17:22:24 +0300 Subject: [PATCH 106/208] check if module.json exists --- app/Traits/Modules.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index cfe5d58b7..fc34071bd 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -405,6 +405,15 @@ trait Modules $temp_path = storage_path('app/temp') . '/' . $path; + if (!is_file($temp_path . '/module.json')) { + return [ + 'success' => false, + 'error' => true, + 'message' => trans('modules.errors.finish', ['module' => '']), + 'data' => null, + ]; + } + $modules_path = config('module.paths.modules'); // Create modules directory From 7617b796de577bd39932171c7211c06e91f5de03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 6 Jul 2020 17:23:22 +0300 Subject: [PATCH 107/208] formatting --- app/Traits/Modules.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index fc34071bd..30504453b 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -317,7 +317,7 @@ trait Modules $file = $response->getBody()->getContents(); $path = 'temp-' . md5(mt_rand()); - $temp_path = storage_path('app/temp') . '/' . $path; + $temp_path = storage_path('app/temp/' . $path); $file_path = $temp_path . '/upload.zip'; @@ -359,7 +359,7 @@ trait Modules ]; } - $temp_path = storage_path('app/temp') . '/' . $path; + $temp_path = storage_path('app/temp/' . $path); $file = $temp_path . '/upload.zip'; @@ -394,18 +394,9 @@ trait Modules public function installModule($path) { - if (empty($path)) { - return [ - 'success' => false, - 'error' => true, - 'message' => trans('modules.errors.finish', ['module' => '']), - 'data' => null, - ]; - } + $temp_path = storage_path('app/temp/' . $path); - $temp_path = storage_path('app/temp') . '/' . $path; - - if (!is_file($temp_path . '/module.json')) { + if (empty($path) || !is_file($temp_path . '/module.json')) { return [ 'success' => false, 'error' => true, From 954cdbf6a8f964b233ddc5849556fcd2a0d84929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 6 Jul 2020 20:50:36 +0300 Subject: [PATCH 108/208] Select box value issue solved.. --- resources/assets/js/components/AkauntingSelect.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 9610b497d..83cf65c5d 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -1018,6 +1018,10 @@ export default { var value = this.$children[0].$children[0].$refs.input.value; } + if (value === '') { + return false; + } + if (this.add_new.type == 'inline') { if (value === '') { return false; @@ -1275,4 +1279,4 @@ export default { margin-right: 35px; position: relative; } - \ No newline at end of file + From b56be5a6ab0967d14294ee86bb85d01c842e5f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 6 Jul 2020 20:52:12 +0300 Subject: [PATCH 109/208] invoice text group fixed.. --- .../partials/form/invoice_text.blade.php | 102 ++++++++++++++---- 1 file changed, 79 insertions(+), 23 deletions(-) diff --git a/resources/views/partials/form/invoice_text.blade.php b/resources/views/partials/form/invoice_text.blade.php index bf86226aa..766bdf833 100644 --- a/resources/views/partials/form/invoice_text.blade.php +++ b/resources/views/partials/form/invoice_text.blade.php @@ -1,31 +1,87 @@ @stack($name . '_input_start') +
    + - @if (!empty($text)) - {!! Form::label($name, $text, ['class' => 'form-control-label'])!!} - @endif + @if (!empty($attributes['v-error'])) + :form-classes="[{'has-error': {{ $attributes['v-error'] }} }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']" + @else + :form-classes="[{'has-error': form.errors.has('{{ $name }}') }, form.{{ $name }} == 'custom' ? 'col-md-6' : 'col-md-12']" + @endif -
    -
    - - - + icon="{{ $icon }}" + title="{{ $text }}" + placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}" + name="{{ $name }}" + :options="{{ json_encode($values) }}" + + @if (isset($selected) || old($name)) + value="{{ old($name, $selected) }}" + @endif + + @if (!empty($attributes['model'])) + :model="{{ $attributes['model'] }}" + @endif + + @if (!empty($attributes['v-model'])) + @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}" + @elseif (!empty($attributes['data-field'])) + @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" + @else + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event; clickTab('{{ $name }}');" + @endif + + @if (!empty($attributes['change'])) + @change="{{ $attributes['change'] }}($event)" + @endif + + @if (isset($attributes['readonly'])) + :readonly="{{ $attributes['readonly'] }}" + @endif + + @if (isset($attributes['disabled'])) + :disabled="{{ $attributes['disabled'] }}" + @endif + + @if (isset($attributes['show'])) + v-if="{{ $attributes['show'] }}" + @endif + + @if (isset($attributes['v-error-message'])) + :form-error="{{ $attributes['v-error-message'] }}" + @else + :form-error="form.errors.get('{{ $name }}')" + @endif + + no-data-text="{{ trans('general.no_data') }}" + no-matching-data-text="{{ trans('general.no_matching_data') }}" + > + +
    + {!! Form::label($input_name, trans('settings.invoice.custom'), ['class' => 'form-control-label'])!!} + +
    +
    + + + +
    + + {!! Form::text($input_name, $input_value, [ + 'class' => 'form-control', + 'data-name' => $input_name, + 'data-value' => $input_value, + 'placeholder' => trans('general.form.enter', ['field' => $text]), + 'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $input_name : 'form.' . $input_name), + ]) !!}
    - {!! Form::text($input_name, $input_value, [ - 'class' => 'form-control', - 'data-name' => $input_name, - 'data-value' => $input_value, - 'placeholder' => trans('general.form.enter', ['field' => $text]), - 'v-model' => !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name), - ]) !!} -
    - -
    +
    +
    From caff19b258b8c57cc196c3e38f3d3ccc80ab81ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 6 Jul 2020 21:32:27 +0300 Subject: [PATCH 110/208] version update 2.0.15 to 2.0.16 --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 33d204bdb..6f67dd2a2 100644 --- a/config/version.php +++ b/config/version.php @@ -10,13 +10,13 @@ return [ 'minor' => '0', - 'patch' => '15', + 'patch' => '16', 'build' => '', 'status' => 'Stable', - 'date' => '13-Jun-2020', + 'date' => '6-July-2020', 'time' => '10:00', From ff4f70442c4e6f0898b6f14241a378780baa1006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 9 Jul 2020 10:46:35 +0300 Subject: [PATCH 111/208] override executable finder --- composer.json | 8 +- overrides/Illuminate/Console/Application.php | 318 ------------------ .../symfony/process/PhpExecutableFinder.php | 104 ++++++ 3 files changed, 108 insertions(+), 322 deletions(-) delete mode 100644 overrides/Illuminate/Console/Application.php create mode 100644 overrides/symfony/process/PhpExecutableFinder.php diff --git a/composer.json b/composer.json index ef698baf2..6155ff46e 100644 --- a/composer.json +++ b/composer.json @@ -74,16 +74,16 @@ "App\\": "app/", "Modules\\": "modules/", "Akaunting\\Module\\Commands\\": "overrides/akaunting/module/Commands/", - "Illuminate\\Console\\": "overrides/Illuminate/Console/", - "Illuminate\\Translation\\": "overrides/Illuminate/Translation/" + "Illuminate\\Translation\\": "overrides/Illuminate/Translation/", + "Symfony\\Component\\Process\\": "overrides/symfony/process/" }, "exclude-from-classmap": [ "vendor/akaunting/module/src/Commands/DeleteCommand.php", "vendor/akaunting/module/src/Commands/DisableCommand.php", "vendor/akaunting/module/src/Commands/EnableCommand.php", "vendor/akaunting/module/src/Commands/InstallCommand.php", - "vendor/laravel/framework/src/Illuminate/Console/Application.php", - "vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php" + "vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php", + "vendor/symfony/process/PhpExecutableFinder.php" ], "files": [ "app/Utilities/helpers.php" diff --git a/overrides/Illuminate/Console/Application.php b/overrides/Illuminate/Console/Application.php deleted file mode 100644 index fdf2f4cc3..000000000 --- a/overrides/Illuminate/Console/Application.php +++ /dev/null @@ -1,318 +0,0 @@ -laravel = $laravel; - $this->events = $events; - $this->setAutoExit(false); - $this->setCatchExceptions(false); - - $this->events->dispatch(new ArtisanStarting($this)); - - $this->bootstrap(); - } - - /** - * {@inheritdoc} - */ - public function run(InputInterface $input = null, OutputInterface $output = null) - { - $commandName = $this->getCommandName( - $input = $input ?: new ArgvInput - ); - - $this->events->dispatch( - new CommandStarting( - $commandName, $input, $output = $output ?: new ConsoleOutput - ) - ); - - $exitCode = parent::run($input, $output); - - $this->events->dispatch( - new CommandFinished($commandName, $input, $output, $exitCode) - ); - - return $exitCode; - } - - /** - * Determine the proper PHP executable. - * - * @return string - */ - public static function phpBinary() - { - // Not working on shared hosting due to "open_basedir" restriction applied by cPanel/Plesk - //return ProcessUtils::escapeArgument((new PhpExecutableFinder)->find(false)); - return 'php'; - } - - /** - * Determine the proper Artisan executable. - * - * @return string - */ - public static function artisanBinary() - { - return defined('ARTISAN_BINARY') ? ProcessUtils::escapeArgument(ARTISAN_BINARY) : 'artisan'; - } - - /** - * Format the given command as a fully-qualified executable command. - * - * @param string $string - * @return string - */ - public static function formatCommandString($string) - { - return sprintf('%s %s %s', static::phpBinary(), static::artisanBinary(), $string); - } - - /** - * Register a console "starting" bootstrapper. - * - * @param \Closure $callback - * @return void - */ - public static function starting(Closure $callback) - { - static::$bootstrappers[] = $callback; - } - - /** - * Bootstrap the console application. - * - * @return void - */ - protected function bootstrap() - { - foreach (static::$bootstrappers as $bootstrapper) { - $bootstrapper($this); - } - } - - /** - * Clear the console application bootstrappers. - * - * @return void - */ - public static function forgetBootstrappers() - { - static::$bootstrappers = []; - } - - /** - * Run an Artisan console command by name. - * - * @param string $command - * @param array $parameters - * @param \Symfony\Component\Console\Output\OutputInterface|null $outputBuffer - * @return int - * - * @throws \Symfony\Component\Console\Exception\CommandNotFoundException - */ - public function call($command, array $parameters = [], $outputBuffer = null) - { - [$command, $input] = $this->parseCommand($command, $parameters); - - if (! $this->has($command)) { - throw new CommandNotFoundException(sprintf('The command "%s" does not exist.', $command)); - } - - return $this->run( - $input, $this->lastOutput = $outputBuffer ?: new BufferedOutput - ); - } - - /** - * Parse the incoming Artisan command and its input. - * - * @param string $command - * @param array $parameters - * @return array - */ - protected function parseCommand($command, $parameters) - { - if (is_subclass_of($command, SymfonyCommand::class)) { - $callingClass = true; - - $command = $this->laravel->make($command)->getName(); - } - - if (! isset($callingClass) && empty($parameters)) { - $command = $this->getCommandName($input = new StringInput($command)); - } else { - array_unshift($parameters, $command); - - $input = new ArrayInput($parameters); - } - - return [$command, $input ?? null]; - } - - /** - * Get the output for the last run command. - * - * @return string - */ - public function output() - { - return $this->lastOutput && method_exists($this->lastOutput, 'fetch') - ? $this->lastOutput->fetch() - : ''; - } - - /** - * Add a command to the console. - * - * @param \Symfony\Component\Console\Command\Command $command - * @return \Symfony\Component\Console\Command\Command - */ - public function add(SymfonyCommand $command) - { - if ($command instanceof Command) { - $command->setLaravel($this->laravel); - } - - return $this->addToParent($command); - } - - /** - * Add the command to the parent instance. - * - * @param \Symfony\Component\Console\Command\Command $command - * @return \Symfony\Component\Console\Command\Command - */ - protected function addToParent(SymfonyCommand $command) - { - return parent::add($command); - } - - /** - * Add a command, resolving through the application. - * - * @param string $command - * @return \Symfony\Component\Console\Command\Command - */ - public function resolve($command) - { - return $this->add($this->laravel->make($command)); - } - - /** - * Resolve an array of commands through the application. - * - * @param array|mixed $commands - * @return $this - */ - public function resolveCommands($commands) - { - $commands = is_array($commands) ? $commands : func_get_args(); - - foreach ($commands as $command) { - $this->resolve($command); - } - - return $this; - } - - /** - * Get the default input definition for the application. - * - * This is used to add the --env option to every available command. - * - * @return \Symfony\Component\Console\Input\InputDefinition - */ - protected function getDefaultInputDefinition() - { - return tap(parent::getDefaultInputDefinition(), function ($definition) { - $definition->addOption($this->getEnvironmentOption()); - }); - } - - /** - * Get the global environment option for the definition. - * - * @return \Symfony\Component\Console\Input\InputOption - */ - protected function getEnvironmentOption() - { - $message = 'The environment the command should run under'; - - return new InputOption('--env', null, InputOption::VALUE_OPTIONAL, $message); - } - - /** - * Get the Laravel application instance. - * - * @return \Illuminate\Contracts\Foundation\Application - */ - public function getLaravel() - { - return $this->laravel; - } -} diff --git a/overrides/symfony/process/PhpExecutableFinder.php b/overrides/symfony/process/PhpExecutableFinder.php new file mode 100644 index 000000000..b8a7b1071 --- /dev/null +++ b/overrides/symfony/process/PhpExecutableFinder.php @@ -0,0 +1,104 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Process; + +/** + * An executable finder specifically designed for the PHP executable. + * + * @author Fabien Potencier + * @author Johannes M. Schmitt + */ +class PhpExecutableFinder +{ + private $executableFinder; + + public function __construct() + { + # @override + //$this->executableFinder = new ExecutableFinder(); + } + + /** + * Finds The PHP executable. + * + * @return string|false The PHP executable path or false if it cannot be found + */ + public function find(bool $includeArgs = true) + { + # @override + // Not working on shared hosting due to "open_basedir" restriction applied by cPanel/Plesk + return 'php'; + + if ($php = getenv('PHP_BINARY')) { + if (!is_executable($php)) { + $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v'; + if ($php = strtok(exec($command.' '.escapeshellarg($php)), PHP_EOL)) { + if (!is_executable($php)) { + return false; + } + } else { + return false; + } + } + + return $php; + } + + $args = $this->findArguments(); + $args = $includeArgs && $args ? ' '.implode(' ', $args) : ''; + + // PHP_BINARY return the current sapi executable + if (PHP_BINARY && \in_array(\PHP_SAPI, ['cgi-fcgi', 'cli', 'cli-server', 'phpdbg'], true)) { + return PHP_BINARY.$args; + } + + if ($php = getenv('PHP_PATH')) { + if (!@is_executable($php)) { + return false; + } + + return $php; + } + + if ($php = getenv('PHP_PEAR_PHP_BIN')) { + if (@is_executable($php)) { + return $php; + } + } + + if (@is_executable($php = PHP_BINDIR.('\\' === \DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) { + return $php; + } + + $dirs = [PHP_BINDIR]; + if ('\\' === \DIRECTORY_SEPARATOR) { + $dirs[] = 'C:\xampp\php\\'; + } + + return $this->executableFinder->find('php', false, $dirs); + } + + /** + * Finds the PHP executable arguments. + * + * @return array The PHP executable arguments + */ + public function findArguments() + { + $arguments = []; + if ('phpdbg' === \PHP_SAPI) { + $arguments[] = '-qrr'; + } + + return $arguments; + } +} From ddf04c4c905fc4d819002a6d364db76848d55c2d Mon Sep 17 00:00:00 2001 From: Raphael Owino Date: Tue, 7 Jul 2020 13:36:58 +0300 Subject: [PATCH 112/208] add date group field to reports editor --- resources/views/common/reports/edit.blade.php | 7 +++++++ resources/views/partials/reports/fields.blade.php | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php index 5809a408f..2dbee43ed 100644 --- a/resources/views/common/reports/edit.blade.php +++ b/resources/views/common/reports/edit.blade.php @@ -37,6 +37,13 @@ ) }} @elseif ($type == 'textareaGroup') {{ Form::$type($field['name'], $field['title']) }} + @elseif ($type == 'dateGroup') + {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([ + 'data-field' => 'settings', + ], + $field['attributes']), + isset($class->model->settings->{$field['name']}) ? $class->model->settings->{$field['name']}: null + ) }} @elseif ($type == 'selectGroup') {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $report->settings->{$field['name']}, array_merge([ 'data-field' => 'settings' diff --git a/resources/views/partials/reports/fields.blade.php b/resources/views/partials/reports/fields.blade.php index 440793ec7..7a47a5ea0 100644 --- a/resources/views/partials/reports/fields.blade.php +++ b/resources/views/partials/reports/fields.blade.php @@ -9,6 +9,12 @@ ) }} @elseif ($type == 'textareaGroup') {{ Form::$type($field['name'], $field['title']) }} + @elseif ($type == 'dateGroup') + {{ Form::$type($field['name'], $field['title'], $field['icon'], array_merge([ + 'model' => 'form.settings'.'.'.$field['name'] + ], + $field['attributes']) + ) }} @elseif ($type == 'selectGroup') {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $field['selected'], array_merge([ 'data-field' => 'settings' From a2bd4758ad1f42e97ff7ed22eecfe76730c774fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 9 Jul 2020 15:46:48 +0300 Subject: [PATCH 113/208] added date field to module settings #1522 --- resources/views/settings/modules/edit.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php index 667ab081a..24ca180d8 100644 --- a/resources/views/settings/modules/edit.blade.php +++ b/resources/views/settings/modules/edit.blade.php @@ -33,6 +33,8 @@ {{ Form::$type($field['name'], trans($field['title']), $field['items'], $field['value'], $field['id'], $field['attributes']) }} @elseif ($type == 'fileGroup') {{ Form::$type($field['name'], trans($field['title']), $field['attributes']) }} + @elseif ($type == 'dateGroup') + {{ Form::$type($field['name'], trans($field['title']), $field['icon'], array_merge(['id' => $field['name'], 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], $field['attributes']), Date::parse($setting[$field['name']] ?? now())->toDateString()) }} @elseif ($type == 'accountSelectGroup') {{ Form::selectGroup($field['name'], trans_choice('general.accounts', 1), 'university', $accounts, setting($module->getAlias() . '.' . $field['name']), $field['attributes']) }} @elseif ($type == 'categorySelectGroup') From 0c061a01eaca723cc29bf87979d2ebaa2096a134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 10 Jul 2020 13:37:48 +0300 Subject: [PATCH 114/208] catch errors --- app/Console/Commands/BillReminder.php | 9 +++++++-- app/Console/Commands/InvoiceReminder.php | 8 +++++++- app/Console/Commands/RecurringCheck.php | 11 +++++++++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/Console/Commands/BillReminder.php b/app/Console/Commands/BillReminder.php index 13caf2a93..69cc3075a 100644 --- a/app/Console/Commands/BillReminder.php +++ b/app/Console/Commands/BillReminder.php @@ -78,8 +78,13 @@ class BillReminder extends Command $bills = Bill::with('contact')->accrued()->notPaid()->due($date)->cursor(); foreach ($bills as $bill) { - event(new BillReminded($bill)); - + try { + event(new BillReminded($bill)); + } catch (\Exception | \Throwable | \Swift_RfcComplianceException | \Illuminate\Database\QueryException $e) { + $this->error($e->getMessage()); + + logger('Bill reminder:: ' . $e->getMessage()); + } } } } diff --git a/app/Console/Commands/InvoiceReminder.php b/app/Console/Commands/InvoiceReminder.php index 9f6d6af7e..d59aa8171 100644 --- a/app/Console/Commands/InvoiceReminder.php +++ b/app/Console/Commands/InvoiceReminder.php @@ -78,7 +78,13 @@ class InvoiceReminder extends Command $invoices = Invoice::with('contact')->accrued()->notPaid()->due($date)->cursor(); foreach ($invoices as $invoice) { - event(new InvoiceReminded($invoice)); + try { + event(new InvoiceReminded($invoice)); + } catch (\Exception | \Throwable | \Swift_RfcComplianceException | \Illuminate\Database\QueryException $e) { + $this->error($e->getMessage()); + + logger('Invoice reminder:: ' . $e->getMessage()); + } } } } diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php index cf99bd0af..e69ef3c74 100644 --- a/app/Console/Commands/RecurringCheck.php +++ b/app/Console/Commands/RecurringCheck.php @@ -145,8 +145,15 @@ class RecurringCheck extends Command $model->cloneable_relations = ['items', 'totals']; - // Create new record - $clone = $model->duplicate(); + try { + $clone = $model->duplicate(); + } catch (\Exception | \Throwable | \Swift_RfcComplianceException | \Illuminate\Database\QueryException $e) { + $this->error($e->getMessage()); + + logger('Recurring check:: ' . $e->getMessage()); + + return false; + } // Set original model id $clone->parent_id = $model->id; From 194a719a1c7b01e3f9fa03a88f35841c4e9812ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 10 Jul 2020 16:36:04 +0300 Subject: [PATCH 115/208] fixed #1520 --- config/menu.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/menu.php b/config/menu.php index fca9b0a61..8958f4108 100644 --- a/config/menu.php +++ b/config/menu.php @@ -3,10 +3,14 @@ return [ 'styles' => [ - 'argon' => \Akaunting\Menu\Presenters\Admin\Argon::class, ], + 'home_urls' => [ + '/', + 'portal', + ], + 'ordering' => true, ]; From a0f453d2bf99a45b0b5a56337f9b56dbee7aeaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 10 Jul 2020 23:23:17 +0300 Subject: [PATCH 116/208] updated stubs --- app/Console/Stubs/Modules/package.stub | 4 ++-- app/Console/Stubs/Modules/resource.stub | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Console/Stubs/Modules/package.stub b/app/Console/Stubs/Modules/package.stub index 67dd768d7..d3cc7469b 100644 --- a/app/Console/Stubs/Modules/package.stub +++ b/app/Console/Stubs/Modules/package.stub @@ -10,8 +10,8 @@ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { - "cross-env": "^5.1.4", - "laravel-mix": "^4.0.7", + "cross-env": "^5.2.1", + "laravel-mix": "^4.1.4", "laravel-mix-merge-manifest": "^0.1.2" } } diff --git a/app/Console/Stubs/Modules/resource.stub b/app/Console/Stubs/Modules/resource.stub index c67afeea9..6a1f18390 100644 --- a/app/Console/Stubs/Modules/resource.stub +++ b/app/Console/Stubs/Modules/resource.stub @@ -2,9 +2,9 @@ namespace $NAMESPACE$; -use Illuminate\Http\Resources\Json\Resource; +use Illuminate\Http\Resources\Json\JsonResource; -class $CLASS$ extends Resource +class $CLASS$ extends JsonResource { /** * Transform the resource into an array. From 5afb369ef559edb7bececefd5ffb9af65994a6f7 Mon Sep 17 00:00:00 2001 From: Sevan Nerse Date: Sat, 11 Jul 2020 09:40:45 +0300 Subject: [PATCH 117/208] tooltip feature is added to rows of reports --- resources/views/partials/reports/show.blade.php | 4 ++++ resources/views/partials/reports/table/rows.blade.php | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/resources/views/partials/reports/show.blade.php b/resources/views/partials/reports/show.blade.php index e5d9de068..69735da9e 100644 --- a/resources/views/partials/reports/show.blade.php +++ b/resources/views/partials/reports/show.blade.php @@ -13,3 +13,7 @@ @include($class->views['content'])
    @endsection + +@push('scripts_start') + +@endpush \ No newline at end of file diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php index 35f8c5cfc..f2a060a27 100644 --- a/resources/views/partials/reports/table/rows.blade.php +++ b/resources/views/partials/reports/table/rows.blade.php @@ -1,6 +1,14 @@ @if ($row_total = array_sum($rows))
    {{ $class->row_names[$table][$id] }} + + {{ $class->row_names[$table][$id] }} + + @money($row, setting('default.currency'), true)
    @date($item->paid_at){{ $item->category->name }} + + {{ $item->category->name }} + + @money($item->amount, $item->currency_code, true)
    @date($item->paid_at){{ $item->category->name }} + + {{ $item->category->name }} + + @money($item->amount, $item->currency_code, true)
    - - {{ $class->row_names[$table][$id] }} - - {{ $class->row_names[$table][$id] }}@money($row, setting('default.currency'), true)
    @date($item->paid_at) - - {{ $item->category->name }} - - {{ $item->category->name }} @money($item->amount, $item->currency_code, true)
    @date($item->paid_at) - - {{ $item->category->name }} - - {{ $item->category->name }} @money($item->amount, $item->currency_code, true)
    +
    - - - - + + + + @foreach($transactions as $item) - - - - + + + + @endforeach
    {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}
    @date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}@date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}
    -
    @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions'])
    + @stack('vendor_transactions_content_end') -
    + @stack('vendor_bills_content_start') +
    - +
    @@ -158,7 +192,7 @@ - + @@ -166,13 +200,13 @@
    {{ trans_choice('general.numbers', 1) }}
    {{ $item->bill_number }} @money($item->amount, $item->currency_code, true)@date($item->billed_at)@date($item->billd_at) @date($item->due_at) {{ trans('bills.statuses.' . $item->status) }}
    -
    @include('partials.admin.pagination', ['items' => $bills, 'type' => 'bills'])
    + @stack('vendor_bills_content_end')
    @@ -182,5 +216,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/sales/customers/show.blade.php b/resources/views/sales/customers/show.blade.php index ab4b9ab1e..fc392737e 100644 --- a/resources/views/sales/customers/show.blade.php +++ b/resources/views/sales/customers/show.blade.php @@ -5,50 +5,76 @@ @section('content')
    -
    -
    - {{ trans_choice('general.invoices', 2) }} {{ $counts['invoices'] }} -
    -
    - {{ trans_choice('general.transactions', 2) }} {{ $counts['transactions'] }} -
    -
    + -
    -
    -

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

    -
    -
    - - {{ $customer->address }} - -
    -
    +
      + @stack('customer_email_start') +
    • +
      {{ trans('general.email') }}
      +
      {{ $customer->email }}
      +
      • + @stack('customer_email_end') - {{ trans('general.edit') }} + @stack('customer_phone_start') +
    • +
      {{ trans('general.phone') }}
      +
      {{ $customer->phone }}
      +
      • + @stack('customer_phone_end') + + @stack('customer_website_start') +
    • +
      {{ trans('general.website') }}
      +
      {{ $customer->website }}
      +
      • + @stack('customer_website_end') + + @stack('customer_tax_number_start') +
    • +
      {{ trans('general.tax_number') }}
      +
      {{ $customer->tax_number }}
      +
      • + @stack('customer_tax_number_end') + + @stack('customer_address_start') +
    • +
      {{ trans('general.address') }}
      +
      {{ $customer->address }}
      +
      • + @stack('customer_address_end') + + @if ($customer->reference) + @stack('customer_reference_start') +
    • +
      {{ trans('general.reference') }}
      +
      {{ $customer->reference }}
      +
      • + @stack('customer_reference_end') + @endif +
    + + @stack('customer_edit_button_start') + {{ trans('general.edit') }} + @stack('customer_edit_button_end')
    + @stack('customer_paid_card_start')
    @@ -62,7 +88,9 @@
    + @stack('customer_paid_card_end') + @stack('customer_open_card_start')
    @@ -76,7 +104,9 @@
    + @stack('customer_open_card_end') + @stack('customer_overdue_card_start')
    @@ -90,40 +120,47 @@
    + @stack('customer_overdue_card_end')
    -
    + @stack('customer_transactions_content_start') +
    - - - - + + + + @foreach($transactions as $item) - - - - + + + + @endforeach @@ -135,8 +172,10 @@ + @stack('customer_transactions_content_end') -
    + @stack('customer_invoices_content_start') +
    {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}
    @date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}@date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}
    @@ -167,6 +206,7 @@ + @stack('customer_invoices_content_end') From 12131b249a8a07f5784ba9b5d1af1e12669501a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 15 Jul 2020 23:38:38 +0300 Subject: [PATCH 128/208] fixed copy-paste --- resources/views/purchases/vendors/show.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php index b789bb85c..258023423 100644 --- a/resources/views/purchases/vendors/show.blade.php +++ b/resources/views/purchases/vendors/show.blade.php @@ -192,7 +192,7 @@ - + @@ -216,5 +216,5 @@ @endsection @push('scripts_start') - + @endpush From fd469dd91b2d2093a6e0b25d730cbb3b03cc5c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 15 Jul 2020 23:39:38 +0300 Subject: [PATCH 129/208] with default --- resources/views/purchases/vendors/show.blade.php | 2 +- resources/views/sales/customers/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php index 258023423..d0d66e097 100644 --- a/resources/views/purchases/vendors/show.blade.php +++ b/resources/views/purchases/vendors/show.blade.php @@ -159,7 +159,7 @@ - + @endforeach diff --git a/resources/views/sales/customers/show.blade.php b/resources/views/sales/customers/show.blade.php index fc392737e..ba2e47f77 100644 --- a/resources/views/sales/customers/show.blade.php +++ b/resources/views/sales/customers/show.blade.php @@ -159,7 +159,7 @@ - + @endforeach From f2522a4c78381548c700e96d98479b98ff8cf366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 16 Jul 2020 12:38:05 +0300 Subject: [PATCH 130/208] fixed radio group field in reports --- resources/views/partials/reports/fields.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/reports/fields.blade.php b/resources/views/partials/reports/fields.blade.php index 7a47a5ea0..de8bb3417 100644 --- a/resources/views/partials/reports/fields.blade.php +++ b/resources/views/partials/reports/fields.blade.php @@ -22,7 +22,7 @@ $field['attributes']) ) }} @elseif ($type == 'radioGroup') - {{ Form::$type($field['name'], $field['title'], 1, $field['enable'], $field['disable'], array_merge([ + {{ Form::$type($field['name'], $field['title'], $field['selected'] ?? true, $field['enable'], $field['disable'], array_merge([ 'data-field' => 'settings' ], $field['attributes']) From 1cd85d446cccf99f5d6a028d597fa70d6533efc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 19 Jul 2020 12:09:17 +0300 Subject: [PATCH 131/208] improved permissions trait --- app/Traits/Permissions.php | 58 ++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/app/Traits/Permissions.php b/app/Traits/Permissions.php index 269ccd9fc..cc721c5bd 100644 --- a/app/Traits/Permissions.php +++ b/app/Traits/Permissions.php @@ -33,17 +33,17 @@ trait Permissions public function attachPermissionsToAdminRoles($permissions) { - $this->attachPermissionsToAllRoles($permissions, 'read-admin-panel'); + $this->applyPermissionsToRoles($this->getDefaultAdminRoles(), 'attach', $permissions); } public function attachPermissionsToPortalRoles($permissions) { - $this->attachPermissionsToAllRoles($permissions, 'read-client-portal'); + $this->applyPermissionsToRoles($this->getDefaultPortalRoles(), 'attach', $permissions); } public function attachPermissionsToAllRoles($permissions, $require = 'read-admin-panel') { - $this->applyPermissionsToAllRoles('attach', $permissions, $require); + $this->applyPermissionsToRoles($this->getRoles($require), 'attach', $permissions); } public function detachPermissionsByRoleNames($roles) @@ -57,22 +57,22 @@ trait Permissions public function detachPermissionsFromAdminRoles($permissions) { - $this->detachPermissionsFromAllRoles($permissions, 'read-admin-panel'); + $this->applyPermissionsToRoles($this->getDefaultAdminRoles(), 'detach', $permissions); } public function detachPermissionsFromPortalRoles($permissions) { - $this->detachPermissionsFromAllRoles($permissions, 'read-client-portal'); + $this->applyPermissionsToRoles($this->getDefaultPortalRoles(), 'detach', $permissions); } public function detachPermissionsFromAllRoles($permissions, $require = 'read-admin-panel') { - $this->applyPermissionsToAllRoles('detach', $permissions, $require); + $this->applyPermissionsToRoles($this->getRoles($require), 'detach', $permissions, $require); } - public function applyPermissionsToAllRoles($apply, $permissions, $require = 'read-admin-panel') + public function applyPermissionsToRoles($roles, $apply, $permissions) { - $this->getRoles($require)->each(function ($role) use ($apply, $permissions) { + $roles->each(function ($role) use ($apply, $permissions) { $f1 = $apply . 'PermissionsByAction'; $f2 = $apply . 'Permission'; @@ -113,7 +113,7 @@ trait Permissions } } - public function attachDefaultModulePermissions($module, $require = 'read-admin-panel') + public function attachDefaultModulePermissions($module, $require = null) { $this->attachModuleReportPermissions($module, $require); @@ -122,7 +122,7 @@ trait Permissions $this->attachModuleSettingPermissions($module, $require); } - public function attachModuleReportPermissions($module, $require = 'read-admin-panel') + public function attachModuleReportPermissions($module, $require = null) { if (is_string($module)) { $module = module($module); @@ -142,10 +142,12 @@ trait Permissions $permissions[] = $this->createModuleReportPermission($module, $class); } - $this->attachPermissionsToAllRoles($permissions, $require); + $require + ? $this->attachPermissionsToAllRoles($permissions, $require) + : $this->attachPermissionsToAdminRoles($permissions); } - public function attachModuleWidgetPermissions($module, $require = 'read-admin-panel') + public function attachModuleWidgetPermissions($module, $require = null) { if (is_string($module)) { $module = module($module); @@ -165,10 +167,12 @@ trait Permissions $permissions[] = $this->createModuleWidgetPermission($module, $class); } - $this->attachPermissionsToAllRoles($permissions, $require); + $require + ? $this->attachPermissionsToAllRoles($permissions, $require) + : $this->attachPermissionsToAdminRoles($permissions); } - public function attachModuleSettingPermissions($module, $require = 'read-admin-panel') + public function attachModuleSettingPermissions($module, $require = null) { if (is_string($module)) { $module = module($module); @@ -183,7 +187,9 @@ trait Permissions $permissions[] = $this->createModuleSettingPermission($module, 'read'); $permissions[] = $this->createModuleSettingPermission($module, 'update'); - $this->attachPermissionsToAllRoles($permissions, $require); + $require + ? $this->attachPermissionsToAllRoles($permissions, $require) + : $this->attachPermissionsToAdminRoles($permissions); } public function createModuleReportPermission($module, $class) @@ -359,4 +365,26 @@ trait Permissions return $require ? $role->hasPermission($require) : true; }); } + + public function getDefaultAdminRoles($custom = null) + { + $roles = Role::whereIn('name', $custom ?? ['admin', 'manager'])->get(); + + if ($roles->isNotEmpty()) { + return $roles; + } + + return $this->getRoles('read-admin-panel'); + } + + public function getDefaultPortalRoles($custom = null) + { + $roles = Role::whereIn('name', $custom ?? ['customer'])->get(); + + if ($roles->isNotEmpty()) { + return $roles; + } + + return $this->getRoles('read-client-portal'); + } } From d934bc419ee759eaf673c379bc1f87ea44694bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 21 Jul 2020 00:01:26 +0300 Subject: [PATCH 132/208] removed module category from json --- app/Abstracts/Commands/Module.php | 1 - app/Console/Stubs/Modules/json.stub | 1 - app/Http/Controllers/Install/Updates.php | 1 - app/Http/Controllers/Modules/Item.php | 1 - .../Update/CreateModuleUpdatedHistory.php | 1 - app/Listeners/Update/V20/Version2017.php | 29 ++++++++++++++++++ app/Models/Module/ModuleHistory.php | 3 +- app/Providers/Event.php | 1 + app/Traits/Modules.php | 4 --- .../2020_07_20_000000_core_v2017.php | 30 +++++++++++++++++++ .../views/install/updates/index.blade.php | 10 +++---- 11 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 app/Listeners/Update/V20/Version2017.php create mode 100644 database/migrations/2020_07_20_000000_core_v2017.php diff --git a/app/Abstracts/Commands/Module.php b/app/Abstracts/Commands/Module.php index d995f505e..35f4d49b7 100644 --- a/app/Abstracts/Commands/Module.php +++ b/app/Abstracts/Commands/Module.php @@ -56,7 +56,6 @@ abstract class Module extends Command ModelHistory::create([ 'company_id' => $this->company_id, 'module_id' => $this->model->id, - 'category' => $this->module->get('category'), 'version' => $this->module->get('version'), 'description' => trans('modules.' . $action, ['module' => $this->alias]), ]); diff --git a/app/Console/Stubs/Modules/json.stub b/app/Console/Stubs/Modules/json.stub index ced9ddb44..4f9b5b754 100644 --- a/app/Console/Stubs/Modules/json.stub +++ b/app/Console/Stubs/Modules/json.stub @@ -2,7 +2,6 @@ "alias": "$ALIAS$", "icon": "fa fa-cog", "version": "1.0.0", - "category": "accounting", "active": 1, "providers": [ "$MODULE_NAMESPACE$\\$STUDLY_NAME$\\Providers\\Event", diff --git a/app/Http/Controllers/Install/Updates.php b/app/Http/Controllers/Install/Updates.php index 841a16da6..e4b1cabb0 100644 --- a/app/Http/Controllers/Install/Updates.php +++ b/app/Http/Controllers/Install/Updates.php @@ -39,7 +39,6 @@ class Updates extends Controller $m = new \stdClass(); $m->name = $row->getName(); $m->alias = $row->get('alias'); - $m->category = $row->get('category'); $m->installed = $row->get('version'); $m->latest = $updates[$alias]; diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index 46e8dbc65..9fa93887b 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Modules; use App\Abstracts\Http\Controller; use App\Models\Module\Module; -use App\Models\Module\ModuleHistory; use App\Traits\Modules; use Illuminate\Http\Request; diff --git a/app/Listeners/Update/CreateModuleUpdatedHistory.php b/app/Listeners/Update/CreateModuleUpdatedHistory.php index 1059630ad..5f28ee7b4 100644 --- a/app/Listeners/Update/CreateModuleUpdatedHistory.php +++ b/app/Listeners/Update/CreateModuleUpdatedHistory.php @@ -33,7 +33,6 @@ class CreateModuleUpdatedHistory ModuleHistory::create([ 'company_id' => $model->company_id, 'module_id' => $model->id, - 'category' => $module->get('category', 'payment-method'), 'version' => $event->new, 'description' => trans('modules.history.updated', ['module' => $module->getAlias()]), ]); diff --git a/app/Listeners/Update/V20/Version2017.php b/app/Listeners/Update/V20/Version2017.php new file mode 100644 index 000000000..b5b9dcf76 --- /dev/null +++ b/app/Listeners/Update/V20/Version2017.php @@ -0,0 +1,29 @@ +skipThisUpdate($event)) { + return; + } + + Artisan::call('migrate', ['--force' => true]); + } +} diff --git a/app/Models/Module/ModuleHistory.php b/app/Models/Module/ModuleHistory.php index c3a61ba76..dbd3376dd 100644 --- a/app/Models/Module/ModuleHistory.php +++ b/app/Models/Module/ModuleHistory.php @@ -6,7 +6,6 @@ use App\Abstracts\Model; class ModuleHistory extends Model { - protected $table = 'module_histories'; /** @@ -14,5 +13,5 @@ class ModuleHistory extends Model * * @var array */ - protected $fillable = ['company_id', 'module_id', 'category', 'version', 'description']; + protected $fillable = ['company_id', 'module_id', 'version', 'description']; } diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 3051a8b4f..52175a0bb 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -21,6 +21,7 @@ class Event extends Provider 'App\Listeners\Update\V20\Version208', 'App\Listeners\Update\V20\Version209', 'App\Listeners\Update\V20\Version2014', + 'App\Listeners\Update\V20\Version2017', ], 'Illuminate\Auth\Events\Login' => [ 'App\Listeners\Auth\Login', diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 1efbd8069..98e0d8529 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -460,7 +460,6 @@ trait Modules { $module = module($alias); $name = $module->getName(); - $category = $module->get('category'); $version = $module->get('version'); $company_id = session('company_id'); @@ -483,7 +482,6 @@ trait Modules 'message' => null, 'data' => [ 'name' => $name, - 'category' => $category, 'version' => $version, ], ]; @@ -513,7 +511,6 @@ trait Modules 'message' => null, 'data' => [ 'name' => $module->getName(), - 'category' => $module->get('category'), 'version' => $module->get('version'), ], ]; @@ -543,7 +540,6 @@ trait Modules 'message' => null, 'data' => [ 'name' => $module->getName(), - 'category' => $module->get('category'), 'version' => $module->get('version'), ], ]; diff --git a/database/migrations/2020_07_20_000000_core_v2017.php b/database/migrations/2020_07_20_000000_core_v2017.php new file mode 100644 index 000000000..48d82fc4c --- /dev/null +++ b/database/migrations/2020_07_20_000000_core_v2017.php @@ -0,0 +1,30 @@ +dropColumn('category'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php index 1c08c7872..d43c5c603 100644 --- a/resources/views/install/updates/index.blade.php +++ b/resources/views/install/updates/index.blade.php @@ -46,9 +46,8 @@ - - - + + @@ -57,9 +56,8 @@ @foreach($modules as $module) - - - + + diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php index e1d172c4e..1263029a1 100644 --- a/resources/views/portal/invoices/signed.blade.php +++ b/resources/views/portal/invoices/signed.blade.php @@ -171,7 +171,7 @@ diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php index 052c9d6a2..82c827a68 100644 --- a/resources/views/sales/invoices/print_classic.blade.php +++ b/resources/views/sales/invoices/print_classic.blade.php @@ -160,7 +160,7 @@ @stack('notes_input_start') @if ($invoice->notes) {{ trans_choice('general.notes', 2) }}

    - {{ $invoice->notes }} + {!! nl2br($invoice->notes) !!} @endif @stack('notes_input_end') @@ -199,7 +199,7 @@
    - {!! $invoice->footer !!} + {!! nl2br($invoice->footer) !!}
    diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 5431ec817..2594a4126 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -148,7 +148,7 @@ @if ($invoice->notes)
    {{ trans_choice('general.notes', 2) }}

    - {{ $invoice->notes }} + {!! nl2br($invoice->notes) !!} @endif @stack('notes_input_end') @@ -187,7 +187,7 @@
    - {!! $invoice->footer !!} + {!! nl2br($invoice->footer) !!}
    diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php index d8a65626c..f5a4f38dc 100644 --- a/resources/views/sales/invoices/print_modern.blade.php +++ b/resources/views/sales/invoices/print_modern.blade.php @@ -129,7 +129,7 @@ @stack('notes_input_start') @if ($invoice->notes) {{ trans_choice('general.notes', 2) }}

    - {{ $invoice->notes }} + {!! nl2br($invoice->notes) !!} @endif @stack('notes_input_end') @@ -162,7 +162,7 @@
    - {!! $invoice->footer !!} + {!! nl2br($invoice->footer) !!}
    diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index 90dfebf9e..1972486dc 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -387,7 +387,7 @@     @endif From aa604b7056170552f36f7a4e39406dfa03092a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 27 Jul 2020 13:08:26 +0300 Subject: [PATCH 154/208] added cast for enabled field --- app/Abstracts/Model.php | 4 ++++ app/Models/Auth/User.php | 9 +++++++++ app/Models/Common/Company.php | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php index 951a5963f..f2fd309ea 100644 --- a/app/Abstracts/Model.php +++ b/app/Abstracts/Model.php @@ -18,6 +18,10 @@ abstract class Model extends Eloquent protected $dates = ['deleted_at']; + protected $casts = [ + 'enabled' => 'boolean', + ]; + /** * The "booting" method of the model. * diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php index be1268dcf..f8c7e94e0 100644 --- a/app/Models/Auth/User.php +++ b/app/Models/Auth/User.php @@ -42,6 +42,15 @@ class User extends Authenticatable */ protected $dates = ['last_logged_in_at', 'created_at', 'updated_at', 'deleted_at']; + /** + * The attributes that should be cast. + * + * @var array + */ + protected $casts = [ + 'enabled' => 'boolean', + ]; + /** * Sortable columns. * diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php index 2da164874..32390caa6 100644 --- a/app/Models/Common/Company.php +++ b/app/Models/Common/Company.php @@ -21,6 +21,10 @@ class Company extends Eloquent protected $fillable = ['domain', 'enabled']; + protected $casts = [ + 'enabled' => 'boolean', + ]; + /** * Sortable columns. * From 41608226ab77f441a127ec7026b6b5aee8d35850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 27 Jul 2020 14:35:01 +0300 Subject: [PATCH 155/208] close #1539 Fixed: clickTab is not defined --- resources/assets/js/mixins/global.js | 10 ---------- resources/views/partials/form/invoice_text.blade.php | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index 1afbc2bb6..13572c88d 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -386,15 +386,5 @@ export default { }) }); }, - - clickTab(id) { - let event = new document.window.KeyboardEvent('keydown', { keyCode: 9 }); // Tab key - - document.window.dispatchEvent(event); - - let e = $.Event('keyup'); - e.keyCode= 9; // tab - $('#' + id).trigger(e); - } } } diff --git a/resources/views/partials/form/invoice_text.blade.php b/resources/views/partials/form/invoice_text.blade.php index 766bdf833..41a86f0cc 100644 --- a/resources/views/partials/form/invoice_text.blade.php +++ b/resources/views/partials/form/invoice_text.blade.php @@ -28,7 +28,7 @@ @elseif (!empty($attributes['data-field'])) @interface="form.errors.clear('{{ 'form.' . $attributes['data-field'] . '.' . $name }}'); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}" @else - @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event; clickTab('{{ $name }}');" + @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;" @endif @if (!empty($attributes['change'])) From 719fecb7ba07a773a87f88302bc9ea18b7e5ec1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 27 Jul 2020 17:07:29 +0300 Subject: [PATCH 156/208] Akaunting select add new modal value empty issue solved --- resources/assets/js/components/AkauntingSelect.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue index 83cf65c5d..b6742b50e 100644 --- a/resources/assets/js/components/AkauntingSelect.vue +++ b/resources/assets/js/components/AkauntingSelect.vue @@ -1018,10 +1018,6 @@ export default { var value = this.$children[0].$children[0].$refs.input.value; } - if (value === '') { - return false; - } - if (this.add_new.type == 'inline') { if (value === '') { return false; From a9c873d448b82ec9178ba17f169e574b398447d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 27 Jul 2020 17:07:32 +0300 Subject: [PATCH 157/208] updated translations --- resources/lang/ar-SA/taxes.php | 2 +- resources/lang/de-DE/taxes.php | 2 +- resources/lang/pt-BR/taxes.php | 1 + resources/lang/pt-PT/bills.php | 2 +- resources/lang/pt-PT/email_templates.php | 18 +++++++++--------- resources/lang/pt-PT/invoices.php | 2 +- resources/lang/pt-PT/taxes.php | 1 + resources/lang/sq-AL/taxes.php | 1 + 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/lang/ar-SA/taxes.php b/resources/lang/ar-SA/taxes.php index 440a77ef5..4d1e8660f 100644 --- a/resources/lang/ar-SA/taxes.php +++ b/resources/lang/ar-SA/taxes.php @@ -8,5 +8,5 @@ return [ 'inclusive' => 'شامل', 'compound' => 'مُركب', 'fixed' => 'ثابت', - 'withholding' => 'Withholding', + 'withholding' => 'حجز', ]; diff --git a/resources/lang/de-DE/taxes.php b/resources/lang/de-DE/taxes.php index 00ebc96ea..fb1f38fd6 100644 --- a/resources/lang/de-DE/taxes.php +++ b/resources/lang/de-DE/taxes.php @@ -8,5 +8,5 @@ return [ 'inclusive' => 'Inklusive', 'compound' => 'zusammengesetzt', 'fixed' => 'Fest', - 'withholding' => 'Withholding', + 'withholding' => 'Auszahlung', ]; diff --git a/resources/lang/pt-BR/taxes.php b/resources/lang/pt-BR/taxes.php index 1df250650..cca63fbda 100644 --- a/resources/lang/pt-BR/taxes.php +++ b/resources/lang/pt-BR/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Incluído', 'compound' => 'Composto', 'fixed' => 'Fixo', + 'withholding' => 'Retenção', ]; diff --git a/resources/lang/pt-PT/bills.php b/resources/lang/pt-PT/bills.php index 351a724da..6891bd8ba 100644 --- a/resources/lang/pt-PT/bills.php +++ b/resources/lang/pt-PT/bills.php @@ -57,7 +57,7 @@ return [ 'status' => [ 'created' => 'Criada em :date', 'receive' => [ - 'draft' => 'Não enviada', + 'draft' => 'Não Recebida', 'received' => 'Recebida em :date', ], 'paid' => [ diff --git a/resources/lang/pt-PT/email_templates.php b/resources/lang/pt-PT/email_templates.php index cfaa9125b..2d1bc702e 100644 --- a/resources/lang/pt-PT/email_templates.php +++ b/resources/lang/pt-PT/email_templates.php @@ -4,47 +4,47 @@ return [ 'invoice_new_customer' => [ 'subject' => '{invoice_number} fatura criada', - 'body' => 'Dear {customer_name},

    We have prepared the following invoice for you: {invoice_number}.

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

    Feel free to contact us for any question.

    Best Regards,
    {company_name}', + 'body' => 'Exmo(a) Sr(a) {customer_name},

    Preparamos a seguinte Fatura para si: {invoice_number}.

    Pode ver os detalhes da Fatura e prosseguir com o pagamento a partir do seguinte link: {invoice_number}.

    Sinta-se à vontade para entrar em contacto connosco para qualquer duvida.

    Atenciosamente,
    {company_name}', ], 'invoice_remind_customer' => [ 'subject' => '{invoice_number} aviso de fatura vencida', - 'body' => 'Dear {customer_name},

    This is an overdue notice for {invoice_number} invoice.

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

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

    Best Regards,
    {company_name}', + 'body' => 'Exmo(a) Sr(a) {customer_name},

    Este é um aviso de Fatura em atraso referente ao documento {invoice_number}.

    O total da Fatura é {invoice_total} e venceu em {invoice_due_date}.

    Pode ver os detalhes da Fatura e prosseguir com o pagamento a partir do seguinte link: {invoice_number}.

    Atenciosamente,
    {company_name}', ], 'invoice_remind_admin' => [ 'subject' => '{invoice_number} aviso de fatura vencida', - 'body' => 'Hello,

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

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

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

    Best Regards,
    {company_name}', + 'body' => 'Olá,

    {customer_name} recebeu um aviso de Fatura em atraso {invoice_number}.

    O total da Fatura é {invoice_total} e venceu em {invoice_due_date}.

    Pode ver os detalhes da Fatura a partir do seguinte link: {invoice_number}.

    Atenciosamente,
    {company_name}', ], 'invoice_recur_customer' => [ 'subject' => 'Fatura recorrente {invoice_number} criada', - 'body' => 'Dear {customer_name},

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

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

    Feel free to contact us for any question.

    Best Regards,
    {company_name}', + 'body' => 'Exmo(a) Sr(a) {customer_name},

    Baseado no seu ciclo recorrente, preparamos a seguinte Fatura para si: {invoice_number}.

    Pode ver os detalhes da Fatura e prosseguir com o pagamento a partir do seguinte link: {invoice_number}.

    Sinta-se à vontade para entrar em contacto connosco para qualquer duvida.

    Atenciosamente,
    {company_name}', ], 'invoice_recur_admin' => [ 'subject' => 'Fatura recorrente {invoice_number} criada', - 'body' => 'Hello,

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

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

    Best Regards,
    {company_name}', + 'body' => 'Olá,

    Baseado no ciclo recorrente de {customer_name}, a Fatura {invoice_number} foi criada automaticamente.

    Pode ver os detalhes da Fatura a partir do seguinte link: {invoice_number}.

    Atenciosamente,
    {company_name}', ], 'invoice_payment_customer' => [ 'subject' => 'Pagamento recebido da fatura {invoice_number}', - 'body' => 'Dear {customer_name},

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

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

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

    Feel free to contact us for any question.

    Best Regards,
    {company_name}', + 'body' => 'Exmo(a) Sr(a) {customer_name},

    Obrigado pelo pagamento. Encontra os detalhes do pagamento abaixo:

    -------------------------------------------------
    Valor: {transaction_total}
    Data: {transaction_paid_date}
    Fatura nº: {invoice_number}
    -------------------------------------------------

    Pode sempre ver os detalhes da Fatura no seguinte link: {invoice_number}.

    Sinta-se à vontade para entrar em contacto connosco para qualquer duvida.

    Atenciosamente,
    {company_name}', ], 'invoice_payment_admin' => [ 'subject' => 'Pagamento recebido da fatura {invoice_number}', - 'body' => 'Hello,

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

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

    Best Regards,
    {company_name}', + 'body' => 'Olá,

    {customer_name} registou um pagamento para a Fatura {invoice_number}.

    Pode ver os detalhes da Fatura a partir do seguinte link: {invoice_number}.

    Atenciosamente,
    {company_name}', ], 'bill_remind_admin' => [ 'subject' => 'Aviso de lembrete de conta {bill_number}', - 'body' => 'Hello,

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

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

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

    Best Regards,
    {company_name}', + 'body' => 'Olá,

    Este é um lembrete de vencimento da Conta {bill_number} do Fornecedor {vendor_name}.

    O total da Conta é {bill_total} e vence em {bill_due_date}.

    Pode ver os detalhes da Conta a partir do seguinte link: {bill_number}.

    Atenciosamente,
    {company_name}', ], 'bill_recur_admin' => [ 'subject' => 'Conta recorrente {bill_number} criada', - 'body' => 'Hello,

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

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

    Best Regards,
    {company_name}', + 'body' => 'Olá,

    Baseado no ciclo recorrente do Fornecedor {vendor_name}, a Conta {bill_number} foi criada automaticamente.

    Pode ver os detalhes da Conta a partir do seguinte link: {bill_number}.

    Atenciosamente,
    {company_name}', ], ]; diff --git a/resources/lang/pt-PT/invoices.php b/resources/lang/pt-PT/invoices.php index 3a40e7e07..cec9ff1e3 100644 --- a/resources/lang/pt-PT/invoices.php +++ b/resources/lang/pt-PT/invoices.php @@ -66,7 +66,7 @@ return [ 'viewed' => 'Visualizada', 'send' => [ 'draft' => 'Não Enviada', - 'sent' => 'Enviada em :data', + 'sent' => 'Enviada em :date', ], 'paid' => [ 'await' => 'Aguarda pagamento', diff --git a/resources/lang/pt-PT/taxes.php b/resources/lang/pt-PT/taxes.php index 94a5f8caf..9655cd90e 100644 --- a/resources/lang/pt-PT/taxes.php +++ b/resources/lang/pt-PT/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inclusiva', 'compound' => 'Composta', 'fixed' => 'Fixa', + 'withholding' => 'Retenção', ]; diff --git a/resources/lang/sq-AL/taxes.php b/resources/lang/sq-AL/taxes.php index 3311372ff..250b39145 100644 --- a/resources/lang/sq-AL/taxes.php +++ b/resources/lang/sq-AL/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Gjithëpërfshirës', 'compound' => 'Përbërës', 'fixed' => 'Fikse', + 'withholding' => 'Në burim', ]; From be8e0eb9e485072b8071140808d07adccf025e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 27 Jul 2020 18:41:12 +0300 Subject: [PATCH 158/208] composer.lock file update --- composer.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index 83f3dafe5..2d7b478dc 100644 --- a/composer.lock +++ b/composer.lock @@ -3306,16 +3306,16 @@ }, { "name": "laravel/framework", - "version": "v7.21.0", + "version": "v7.22.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "3ccdb116524de408fdc00715b6f06a1031ddace9" + "reference": "efc1fdb01016224a29fc8732be7464829e9273d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/3ccdb116524de408fdc00715b6f06a1031ddace9", - "reference": "3ccdb116524de408fdc00715b6f06a1031ddace9", + "url": "https://api.github.com/repos/laravel/framework/zipball/efc1fdb01016224a29fc8732be7464829e9273d7", + "reference": "efc1fdb01016224a29fc8732be7464829e9273d7", "shasum": "" }, "require": { @@ -3459,7 +3459,7 @@ "framework", "laravel" ], - "time": "2020-07-21T14:26:42+00:00" + "time": "2020-07-27T15:05:08+00:00" }, { "name": "laravel/tinker", @@ -3745,16 +3745,16 @@ }, { "name": "league/flysystem", - "version": "1.0.69", + "version": "1.0.70", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "7106f78428a344bc4f643c233a94e48795f10967" + "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967", - "reference": "7106f78428a344bc4f643c233a94e48795f10967", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493", + "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493", "shasum": "" }, "require": { @@ -3765,7 +3765,7 @@ "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "phpspec/phpspec": "^3.4", + "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0", "phpunit/phpunit": "^5.7.26" }, "suggest": { @@ -3831,7 +3831,7 @@ "type": "other" } ], - "time": "2020-05-18T15:13:39+00:00" + "time": "2020-07-26T07:20:36+00:00" }, { "name": "league/fractal", @@ -9862,16 +9862,16 @@ }, { "name": "facade/ignition", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "cc7df15806aad8a9915148ea4daf7f0dd0be45b5" + "reference": "87335b120bc9652e4ee2bf285b7322a785211476" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/cc7df15806aad8a9915148ea4daf7f0dd0be45b5", - "reference": "cc7df15806aad8a9915148ea4daf7f0dd0be45b5", + "url": "https://api.github.com/repos/facade/ignition/zipball/87335b120bc9652e4ee2bf285b7322a785211476", + "reference": "87335b120bc9652e4ee2bf285b7322a785211476", "shasum": "" }, "require": { @@ -9930,7 +9930,7 @@ "laravel", "page" ], - "time": "2020-07-14T11:34:42+00:00" + "time": "2020-07-27T15:17:39+00:00" }, { "name": "facade/ignition-contracts", From 2c2c22958a5e8afa969852dd81d29b9d1e10e103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 27 Jul 2020 18:57:28 +0300 Subject: [PATCH 159/208] version update 2.0.18 to 2.0.19 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index 2d78add6d..c65f93673 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '0', - 'patch' => '18', + 'patch' => '19', 'build' => '', 'status' => 'Stable', - 'date' => '24-July-2020', + 'date' => '27-July-2020', - 'time' => '23:30', + 'time' => '19:00', 'zone' => 'GMT +3', From 8509b6f5ef09c7a7fe209eef810b4369c76d0ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 28 Jul 2020 16:34:45 +0300 Subject: [PATCH 160/208] close #1552 Fixed: Text Editor value can not change --- .../js/components/AkauntingHtmlEditor.vue | 31 +++++++++++++++---- .../partials/form/text_editor_group.blade.php | 8 ++--- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/resources/assets/js/components/AkauntingHtmlEditor.vue b/resources/assets/js/components/AkauntingHtmlEditor.vue index 22be7451b..329a6119a 100644 --- a/resources/assets/js/components/AkauntingHtmlEditor.vue +++ b/resources/assets/js/components/AkauntingHtmlEditor.vue @@ -49,45 +49,64 @@ let editorRef = this.$refs.editor; let node = editorRef.children[0]; + this.editor.on('text-change', () => { - let html = node.innerHTML + let html = node.innerHTML; + if (html === '


    ') { html = ''; } - this.content = html + + this.content = html; + this.$emit('input', this.content); }) }, + pasteHTML () { if (!this.editor) { return } - this.editor.pasteHTML(this.value) + + this.editor.pasteHTML(this.value); }, + randomString() { let text = ""; let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - for (let i = 0; i < 5; i++) + for (let i = 0; i < 5; i++) { text += possible.charAt(Math.floor(Math.random() * possible.length)); + } return text; } }, + async mounted () { - let Quill = await import('quill') - Quill = Quill.default || Quill + this.content = this.value; + + let Quill = await import('quill'); + + Quill = Quill.default || Quill; + this.editorId = this.randomString(); this.toolbarId = this.randomString(); + this.$nextTick(() => { this.initialize(Quill) }); }, + watch: { value (newVal) { if (newVal !== this.content) { this.pasteHTML(newVal); } + }, + + content (newVal) { + this.$emit('input', newVal); } } } diff --git a/resources/views/partials/form/text_editor_group.blade.php b/resources/views/partials/form/text_editor_group.blade.php index 807f6cad0..d249fee82 100644 --- a/resources/views/partials/form/text_editor_group.blade.php +++ b/resources/views/partials/form/text_editor_group.blade.php @@ -10,12 +10,8 @@ Date: Tue, 28 Jul 2020 17:37:35 +0300 Subject: [PATCH 161/208] refs #1552 --- resources/views/partials/form/text_editor_group.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/partials/form/text_editor_group.blade.php b/resources/views/partials/form/text_editor_group.blade.php index d249fee82..d38276d2d 100644 --- a/resources/views/partials/form/text_editor_group.blade.php +++ b/resources/views/partials/form/text_editor_group.blade.php @@ -12,6 +12,8 @@ @if (!empty($value)) :value="{{ `$value` }}" + @else + :value="''" @endif @if (!empty($attributes['v-model'])) From 57addec549d46d6899ec1190c43a8ed604741fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 28 Jul 2020 18:31:40 +0300 Subject: [PATCH 162/208] refs # 1552 text editor set value issue. --- resources/views/partials/form/text_editor_group.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/form/text_editor_group.blade.php b/resources/views/partials/form/text_editor_group.blade.php index d38276d2d..6c3708cfd 100644 --- a/resources/views/partials/form/text_editor_group.blade.php +++ b/resources/views/partials/form/text_editor_group.blade.php @@ -11,7 +11,7 @@ name="{{ $name }}" @if (!empty($value)) - :value="{{ `$value` }}" + :value="`{{ $value }}`" @else :value="''" @endif From b5300e416c1e330e4dfa9fa60ff22abc5682c920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 6 Aug 2020 19:10:05 +0300 Subject: [PATCH 163/208] use fallback for default settings --- app/Http/Controllers/Common/Items.php | 2 +- app/Http/Controllers/Modals/Items.php | 2 +- app/Http/Controllers/Sales/Invoices.php | 2 +- app/Http/Controllers/Settings/Company.php | 11 +- app/Http/Controllers/Settings/Defaults.php | 8 - app/Http/Controllers/Settings/Email.php | 8 - app/Http/Controllers/Settings/Invoice.php | 8 - .../Controllers/Settings/Localisation.php | 8 - app/Http/Controllers/Settings/Schedule.php | 11 +- app/Traits/Currencies.php | 2 +- composer.json | 2 +- composer.lock | 176 +++++++++--------- config/setting.php | 57 ++++++ database/seeds/Settings.php | 57 ++---- database/seeds/TestCompany.php | 2 +- .../settings/invoice_template.blade.php | 4 +- .../views/settings/company/edit.blade.php | 12 +- .../views/settings/default/edit.blade.php | 16 +- resources/views/settings/email/edit.blade.php | 6 +- .../views/settings/invoice/edit.blade.php | 18 +- .../settings/localisation/edit.blade.php | 14 +- .../views/settings/schedule/edit.blade.php | 10 +- 22 files changed, 211 insertions(+), 225 deletions(-) diff --git a/app/Http/Controllers/Common/Items.php b/app/Http/Controllers/Common/Items.php index 36a47306a..6421effcf 100644 --- a/app/Http/Controllers/Common/Items.php +++ b/app/Http/Controllers/Common/Items.php @@ -54,7 +54,7 @@ class Items extends Controller $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id'); - $currency = Currency::where('code', setting('default.currency', 'USD'))->first(); + $currency = Currency::where('code', setting('default.currency'))->first(); return view('common.items.create', compact('categories', 'taxes', 'currency')); } diff --git a/app/Http/Controllers/Modals/Items.php b/app/Http/Controllers/Modals/Items.php index a60b4f318..0c5f50f46 100644 --- a/app/Http/Controllers/Modals/Items.php +++ b/app/Http/Controllers/Modals/Items.php @@ -34,7 +34,7 @@ class Items extends Controller $taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id'); - $currency = Currency::where('code', setting('default.currency', 'USD'))->first(); + $currency = Currency::where('code', setting('default.currency'))->first(); $html = view('modals.items.create', compact('categories', 'taxes', 'currency'))->render(); diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php index bd2d6e131..059f3e16e 100644 --- a/app/Http/Controllers/Sales/Invoices.php +++ b/app/Http/Controllers/Sales/Invoices.php @@ -435,7 +435,7 @@ class Invoices extends Controller $currency = Currency::where('code', $currency_code)->first(); if (empty($currency)) { - $currency = Currency::where('code', setting('default.currency', 'USD'))->first(); + $currency = Currency::where('code', setting('default.currency'))->first(); } if ($currency) { diff --git a/app/Http/Controllers/Settings/Company.php b/app/Http/Controllers/Settings/Company.php index 7bc35145d..e97f6079c 100644 --- a/app/Http/Controllers/Settings/Company.php +++ b/app/Http/Controllers/Settings/Company.php @@ -3,20 +3,11 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; -use App\Models\Setting\Setting; class Company extends Controller { public function edit() { - $setting = Setting::prefix('company')->get()->transform(function ($s) { - $s->key = str_replace('company.', '', $s->key); - - return $s; - })->pluck('value', 'key'); - - return view('settings.company.edit', compact( - 'setting' - )); + return view('settings.company.edit'); } } diff --git a/app/Http/Controllers/Settings/Defaults.php b/app/Http/Controllers/Settings/Defaults.php index 476c8a155..6be3afb9e 100644 --- a/app/Http/Controllers/Settings/Defaults.php +++ b/app/Http/Controllers/Settings/Defaults.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; use App\Models\Banking\Account; use App\Models\Setting\Currency; -use App\Models\Setting\Setting; use App\Models\Setting\Tax; use App\Utilities\Modules; @@ -13,12 +12,6 @@ class Defaults extends Controller { public function edit() { - $setting = Setting::prefix('default')->get()->transform(function ($s) { - $s->key = str_replace('default.', '', $s->key); - - return $s; - })->pluck('value', 'key'); - $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code'); @@ -28,7 +21,6 @@ class Defaults extends Controller $payment_methods = Modules::getPaymentMethods(); return view('settings.default.edit', compact( - 'setting', 'accounts', 'currencies', 'taxes', diff --git a/app/Http/Controllers/Settings/Email.php b/app/Http/Controllers/Settings/Email.php index 8b92b4b00..1f8e54f3c 100644 --- a/app/Http/Controllers/Settings/Email.php +++ b/app/Http/Controllers/Settings/Email.php @@ -6,7 +6,6 @@ use App\Abstracts\Http\Controller; use App\Http\Requests\Setting\Setting as Request; use App\Models\Common\Company; use App\Models\Common\EmailTemplate; -use App\Models\Setting\Setting; use App\Utilities\Installer; use Illuminate\Support\Str; @@ -33,12 +32,6 @@ class Email extends Controller public function edit() { - $setting = Setting::prefix('email')->get()->transform(function ($s) { - $s->key = str_replace('email.', '', $s->key); - - return $s; - })->pluck('value', 'key'); - $templates = EmailTemplate::all(); $email_protocols = [ @@ -49,7 +42,6 @@ class Email extends Controller ]; return view('settings.email.edit', compact( - 'setting', 'templates', 'email_protocols' )); diff --git a/app/Http/Controllers/Settings/Invoice.php b/app/Http/Controllers/Settings/Invoice.php index 4b58c69e0..387bd17e3 100644 --- a/app/Http/Controllers/Settings/Invoice.php +++ b/app/Http/Controllers/Settings/Invoice.php @@ -3,18 +3,11 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; -use App\Models\Setting\Setting; class Invoice extends Controller { public function edit() { - $setting = Setting::prefix('invoice')->get()->transform(function ($s) { - $s->key = str_replace('invoice.', '', $s->key); - - return $s; - })->pluck('value', 'key'); - $item_names = [ 'settings.invoice.item' => trans('settings.invoice.item'), 'settings.invoice.product' => trans('settings.invoice.product'), @@ -43,7 +36,6 @@ class Invoice extends Controller ]; return view('settings.invoice.edit', compact( - 'setting', 'item_names', 'price_names', 'quantity_names', diff --git a/app/Http/Controllers/Settings/Localisation.php b/app/Http/Controllers/Settings/Localisation.php index fc7200491..6f4b1f709 100644 --- a/app/Http/Controllers/Settings/Localisation.php +++ b/app/Http/Controllers/Settings/Localisation.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; -use App\Models\Setting\Setting; use App\Traits\DateTime; class Localisation extends Controller @@ -12,12 +11,6 @@ class Localisation extends Controller public function edit() { - $setting = Setting::prefix('localisation')->get()->transform(function ($s) { - $s->key = str_replace('localisation.', '', $s->key); - - return $s; - })->pluck('value', 'key'); - $timezones = $this->getTimezones(); $date_formats = [ @@ -49,7 +42,6 @@ class Localisation extends Controller ]; return view('settings.localisation.edit', compact( - 'setting', 'timezones', 'date_formats', 'date_separators', diff --git a/app/Http/Controllers/Settings/Schedule.php b/app/Http/Controllers/Settings/Schedule.php index 5905c8fe4..187644d27 100644 --- a/app/Http/Controllers/Settings/Schedule.php +++ b/app/Http/Controllers/Settings/Schedule.php @@ -3,20 +3,11 @@ namespace App\Http\Controllers\Settings; use App\Abstracts\Http\Controller; -use App\Models\Setting\Setting; class Schedule extends Controller { public function edit() { - $setting = Setting::prefix('schedule')->get()->transform(function ($s) { - $s->key = str_replace('schedule.', '', $s->key); - - return $s; - })->pluck('value', 'key'); - - return view('settings.schedule.edit', compact( - 'setting' - )); + return view('settings.schedule.edit'); } } diff --git a/app/Traits/Currencies.php b/app/Traits/Currencies.php index 7fda86161..b7b07c036 100644 --- a/app/Traits/Currencies.php +++ b/app/Traits/Currencies.php @@ -73,7 +73,7 @@ trait Currencies public function getDefaultCurrency() { - return !empty($this->default_currency_code) ? $this->default_currency_code : setting('default.currency', 'USD'); + return !empty($this->default_currency_code) ? $this->default_currency_code : setting('default.currency'); } public function setDefaultCurrency($code) diff --git a/composer.json b/composer.json index 27837692d..c16db87f3 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "akaunting/menu": "1.0.*", "akaunting/module": "1.0.*", "akaunting/money": "1.2.*", - "akaunting/setting": "1.1.*", + "akaunting/setting": "1.2.*", "akaunting/version": "1.0.*", "barryvdh/laravel-debugbar": "3.3.*", "barryvdh/laravel-dompdf": "0.*", diff --git a/composer.lock b/composer.lock index 2d7b478dc..16f983dda 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d5770340d17c7c145a2f78e3d22c25d8", + "content-hash": "bbdd9ace718fa625472523fd9e6982c9", "packages": [ { "name": "akaunting/firewall", @@ -323,16 +323,16 @@ }, { "name": "akaunting/setting", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/akaunting/setting.git", - "reference": "194f8c60285f66835f70e0a8e87e1a66d989b111" + "reference": "87df3967ffaea8e01fdb6ce5f142bdb4584d0f9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/setting/zipball/194f8c60285f66835f70e0a8e87e1a66d989b111", - "reference": "194f8c60285f66835f70e0a8e87e1a66d989b111", + "url": "https://api.github.com/repos/akaunting/setting/zipball/87df3967ffaea8e01fdb6ce5f142bdb4584d0f9f", + "reference": "87df3967ffaea8e01fdb6ce5f142bdb4584d0f9f", "shasum": "" }, "require": { @@ -382,7 +382,7 @@ "laravel", "persistent" ], - "time": "2020-04-29T07:18:49+00:00" + "time": "2020-08-06T10:01:46+00:00" }, { "name": "akaunting/version", @@ -1012,16 +1012,16 @@ }, { "name": "composer/composer", - "version": "1.10.9", + "version": "1.10.10", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "83c3250093d5491600a822e176b107a945baf95a" + "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a", - "reference": "83c3250093d5491600a822e176b107a945baf95a", + "url": "https://api.github.com/repos/composer/composer/zipball/32966a3b1d48bc01472a8321fd6472b44fad033a", + "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a", "shasum": "" }, "require": { @@ -1102,7 +1102,7 @@ "type": "tidelift" } ], - "time": "2020-07-16T10:57:00+00:00" + "time": "2020-08-03T09:35:19+00:00" }, { "name": "composer/semver", @@ -1681,16 +1681,16 @@ }, { "name": "doctrine/collections", - "version": "1.6.6", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "5f0470363ff042d0057006ae7acabc5d7b5252d5" + "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/5f0470363ff042d0057006ae7acabc5d7b5252d5", - "reference": "5f0470363ff042d0057006ae7acabc5d7b5252d5", + "url": "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a", + "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a", "shasum": "" }, "require": { @@ -1742,21 +1742,7 @@ "iterators", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", - "type": "tidelift" - } - ], - "time": "2020-06-22T19:14:02+00:00" + "time": "2020-07-27T17:53:49+00:00" }, { "name": "doctrine/dbal", @@ -1842,20 +1828,20 @@ }, { "name": "doctrine/event-manager", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "629572819973f13486371cb611386eb17851e85c" + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c", - "reference": "629572819973f13486371cb611386eb17851e85c", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", + "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "doctrine/common": "<2.9@dev" @@ -1914,7 +1900,21 @@ "event system", "events" ], - "time": "2019-11-10T09:48:07+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2020-05-29T18:28:51+00:00" }, { "name": "doctrine/inflector", @@ -3306,16 +3306,16 @@ }, { "name": "laravel/framework", - "version": "v7.22.1", + "version": "v7.23.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "efc1fdb01016224a29fc8732be7464829e9273d7" + "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/efc1fdb01016224a29fc8732be7464829e9273d7", - "reference": "efc1fdb01016224a29fc8732be7464829e9273d7", + "url": "https://api.github.com/repos/laravel/framework/zipball/17cbce101f2fc78e61a6135861823563c7cfb50b", + "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b", "shasum": "" }, "require": { @@ -3459,7 +3459,7 @@ "framework", "laravel" ], - "time": "2020-07-27T15:05:08+00:00" + "time": "2020-08-04T14:36:37+00:00" }, { "name": "laravel/tinker", @@ -3997,16 +3997,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.20", + "version": "3.1.21", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "39545fa96b84d5a90f702239659c49a5d7b1edea" + "reference": "405ff5f0dd014a0d5a1fdb8fd6f525a9a1ece3f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/39545fa96b84d5a90f702239659c49a5d7b1edea", - "reference": "39545fa96b84d5a90f702239659c49a5d7b1edea", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/405ff5f0dd014a0d5a1fdb8fd6f525a9a1ece3f6", + "reference": "405ff5f0dd014a0d5a1fdb8fd6f525a9a1ece3f6", "shasum": "" }, "require": { @@ -4068,7 +4068,7 @@ "type": "github" } ], - "time": "2020-07-17T20:39:28+00:00" + "time": "2020-08-06T09:25:20+00:00" }, { "name": "maennchen/zipstream-php", @@ -4644,16 +4644,16 @@ }, { "name": "monooso/unobserve", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/monooso/unobserve.git", - "reference": "93d5c974380b95783d3c2db015440a88d1d6b635" + "reference": "88c20c4dce6b16b02bc197b616826e99c2cdbe7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monooso/unobserve/zipball/93d5c974380b95783d3c2db015440a88d1d6b635", - "reference": "93d5c974380b95783d3c2db015440a88d1d6b635", + "url": "https://api.github.com/repos/monooso/unobserve/zipball/88c20c4dce6b16b02bc197b616826e99c2cdbe7c", + "reference": "88c20c4dce6b16b02bc197b616826e99c2cdbe7c", "shasum": "" }, "require": { @@ -4695,7 +4695,7 @@ "keywords": [ "laravel" ], - "time": "2020-03-13T10:33:22+00:00" + "time": "2020-08-05T11:28:54+00:00" }, { "name": "myclabs/php-enum", @@ -4745,16 +4745,16 @@ }, { "name": "nesbot/carbon", - "version": "2.36.1", + "version": "2.38.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "ee7378a36cc62952100e718bcc58be4c7210e55f" + "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ee7378a36cc62952100e718bcc58be4c7210e55f", - "reference": "ee7378a36cc62952100e718bcc58be4c7210e55f", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d8f6a6a91d1eb9304527b040500f61923e97674b", + "reference": "d8f6a6a91d1eb9304527b040500f61923e97674b", "shasum": "" }, "require": { @@ -4769,7 +4769,7 @@ "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.8", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.30", + "phpstan/phpstan": "^0.12.35", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, @@ -4830,7 +4830,7 @@ "type": "tidelift" } ], - "time": "2020-07-04T12:29:56+00:00" + "time": "2020-08-04T19:12:46+00:00" }, { "name": "nikic/php-parser", @@ -6452,16 +6452,16 @@ }, { "name": "ramsey/uuid", - "version": "4.0.1", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d" + "reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d", - "reference": "ba8fff1d3abb8bb4d35a135ed22a31c6ef3ede3d", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/988dbefc7878d0a35f12afb4df1f7dd0bd153c43", + "reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43", "shasum": "" }, "require": { @@ -6476,7 +6476,7 @@ }, "require-dev": { "codeception/aspect-mock": "^3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2", + "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0", "doctrine/annotations": "^1.8", "goaop/framework": "^2", "mockery/mockery": "^1.3", @@ -6485,8 +6485,8 @@ "php-mock/php-mock-mockery": "^1.3", "php-mock/php-mock-phpunit": "^2.5", "php-parallel-lint/php-parallel-lint": "^1.1", + "phpbench/phpbench": "^0.17.1", "phpstan/extension-installer": "^1.0", - "phpstan/phpdoc-parser": "0.4.3", "phpstan/phpstan": "^0.12", "phpstan/phpstan-mockery": "^0.12", "phpstan/phpstan-phpunit": "^0.12", @@ -6529,7 +6529,13 @@ "identifier", "uuid" ], - "time": "2020-03-29T20:13:32+00:00" + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + } + ], + "time": "2020-07-28T16:51:01+00:00" }, { "name": "riverskies/laravel-mobile-detect", @@ -7927,7 +7933,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -8003,7 +8009,7 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", @@ -8080,7 +8086,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -8158,16 +8164,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe" + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", - "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251", + "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251", "shasum": "" }, "require": { @@ -8239,11 +8245,11 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-08-04T06:02:08+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -8324,7 +8330,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -8401,7 +8407,7 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", @@ -8475,7 +8481,7 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", @@ -8552,7 +8558,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -8625,7 +8631,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -8701,7 +8707,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -8781,7 +8787,7 @@ }, { "name": "symfony/polyfill-util", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", @@ -9862,16 +9868,16 @@ }, { "name": "facade/ignition", - "version": "2.3.4", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "87335b120bc9652e4ee2bf285b7322a785211476" + "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/87335b120bc9652e4ee2bf285b7322a785211476", - "reference": "87335b120bc9652e4ee2bf285b7322a785211476", + "url": "https://api.github.com/repos/facade/ignition/zipball/58dc4a8df3d41174c677a370b6779b694e4539e7", + "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7", "shasum": "" }, "require": { @@ -9930,7 +9936,7 @@ "laravel", "page" ], - "time": "2020-07-27T15:17:39+00:00" + "time": "2020-08-01T21:20:01+00:00" }, { "name": "facade/ignition-contracts", diff --git a/config/setting.php b/config/setting.php index ae4eb5f13..7fdfe0f3a 100644 --- a/config/setting.php +++ b/config/setting.php @@ -84,6 +84,62 @@ return [ ], + /* + |-------------------------------------------------------------------------- + | Fallback + |-------------------------------------------------------------------------- + | + | Define fallback settings to be used in case the default is null + | + | Sample: + | "currency" => "USD", + | + */ + 'fallback' => [ + 'localisation' => [ + 'financial_start' => env('SETTING_FALLBACK_LOCALISATION_FINANCIAL_START', '01-01'), + 'timezone' => env('SETTING_FALLBACK_LOCALISATION_TIMEZONE', 'Europe/London'), + 'date_format' => env('SETTING_FALLBACK_LOCALISATION_DATE_FORMAT', 'd M Y'), + 'date_separator' => env('SETTING_FALLBACK_LOCALISATION_DATE_SEPARATOR', 'space'), + 'percent_position' => env('SETTING_FALLBACK_LOCALISATION_PERCENT_POSITION', 'after'), + 'discount_location' => env('SETTING_FALLBACK_LOCALISATION_DISCOUNT_LOCATION', 'total'), + ], + 'invoice' => [ + 'number_prefix' => env('SETTING_FALLBACK_INVOICE_NUMBER_PREFIX', 'INV-'), + 'number_digit' => env('SETTING_FALLBACK_INVOICE_NUMBER_DIGIT', '5'), + 'number_next' => env('SETTING_FALLBACK_INVOICE_NUMBER_NEXT', '1'), + 'item_name' => env('SETTING_FALLBACK_INVOICE_ITEM_NAME', 'settings.invoice.item'), + 'price_name' => env('SETTING_FALLBACK_INVOICE_PRICE_NAME', 'settings.invoice.price'), + 'quantity_name' => env('SETTING_FALLBACK_INVOICE_QUANTITY_NAME', 'settings.invoice.quantity'), + 'payment_terms' => env('SETTING_FALLBACK_INVOICE_PAYMENT_TERMS', '0'), + 'template' => env('SETTING_FALLBACK_INVOICE_TEMPLATE', 'default'), + 'color' => env('SETTING_FALLBACK_INVOICE_COLOR', '#55588b'), + ], + 'default' => [ + 'currency' => env('SETTING_FALLBACK_DEFAULT_CURRENCY', 'USD'), + 'locale' => env('SETTING_FALLBACK_DEFAULT_LOCALE', 'en-GB'), + 'list_limit' => env('SETTING_FALLBACK_DEFAULT_LIST_LIMIT', '25'), + 'payment_method' => env('SETTING_FALLBACK_DEFAULT_PAYMENT_METHOD', 'offline-payments.cash.1'), + ], + 'email' => [ + 'protocol' => env('SETTING_FALLBACK_EMAIL_PROTOCOL', 'mail'), + 'sendmail_path' => env('SETTING_FALLBACK_EMAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs'), + ], + 'schedule' => [ + 'send_invoice_reminder' => env('SETTING_FALLBACK_SCHEDULE_SEND_INVOICE_REMINDER', '0'), + 'invoice_days' => env('SETTING_FALLBACK_SCHEDULE_INVOICE_DAYS', '1,3,5,10'), + 'send_bill_reminder' => env('SETTING_FALLBACK_SCHEDULE_SEND_BILL_REMINDER', '0'), + 'bill_days' => env('SETTING_FALLBACK_SCHEDULE_BILL_DAYS', '10,5,3,1'), + 'time' => env('SETTING_FALLBACK_SCHEDULE_TIME', '09:00'), + ], + 'contact' => [ + 'type' => [ + 'customer' => env('SETTING_FALLBACK_CONTACT_TYPE_CUSTOMER', 'customer'), + 'vendor' => env('SETTING_FALLBACK_CONTACT_TYPE_VENDOR', 'vendor'), + ], + ], + ], + /* |-------------------------------------------------------------------------- | Required Extra Columns @@ -99,4 +155,5 @@ return [ 'required_extra_columns' => [ 'company_id', ], + ]; diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php index d12ef1230..2bf4bfb86 100644 --- a/database/seeds/Settings.php +++ b/database/seeds/Settings.php @@ -27,54 +27,27 @@ class Settings extends Seeder setting()->setExtraColumns(['company_id' => $company_id]); - $offline_payments = []; - - $offline_payments[] = [ - 'code' => 'offline-payments.cash.1', - 'name' => trans('demo.offline_payments.cash'), - 'customer' => '0', - 'order' => '1', - 'description' => null, - ]; - - $offline_payments[] = [ - 'code' => 'offline-payments.bank_transfer.2', - 'name' => trans('demo.offline_payments.bank'), - 'customer' => '0', - 'order' => '2', - 'description' => null, + $offline_payments = [ + [ + 'code' => 'offline-payments.cash.1', + 'name' => trans('demo.offline_payments.cash'), + 'customer' => '0', + 'order' => '1', + 'description' => null, + ], + [ + 'code' => 'offline-payments.bank_transfer.2', + 'name' => trans('demo.offline_payments.bank'), + 'customer' => '0', + 'order' => '2', + 'description' => null, + ], ]; setting()->set([ - 'localisation.financial_start' => now()->startOfYear()->format('d-m'), - 'localisation.timezone' => 'Europe/London', - 'localisation.date_format' => 'd M Y', - 'localisation.date_separator' => 'space', - 'localisation.percent_position' => 'after', - 'invoice.number_prefix' => 'INV-', - 'invoice.number_digit' => '5', - 'invoice.number_next' => '1', - 'invoice.item_name' => 'settings.invoice.item', - 'invoice.price_name' => 'settings.invoice.price', - 'invoice.quantity_name' => 'settings.invoice.quantity', 'invoice.title' => trans_choice('general.invoices', 1), - 'invoice.payment_terms' => '0', - 'invoice.template' => 'default', - 'invoice.color' => '#55588b', - 'default.payment_method' => 'offline-payments.cash.1', - 'default.list_limit' => '25', - 'default.use_gravatar' => '0', - 'email.protocol' => 'mail', - 'email.sendmail_path' => '/usr/sbin/sendmail -bs', - 'schedule.send_invoice_reminder' => '0', - 'schedule.invoice_days' => '1,3,5,10', - 'schedule.send_bill_reminder' => '0', - 'schedule.bill_days' => '10,5,3,1', - 'schedule.time' => '09:00', 'wizard.completed' => '0', 'offline-payments.methods' => json_encode($offline_payments), - 'contact.type.customer' => 'customer', - 'contact.type.vendor' => 'vendor', ]); } } diff --git a/database/seeds/TestCompany.php b/database/seeds/TestCompany.php index d2df1735b..e915c8163 100644 --- a/database/seeds/TestCompany.php +++ b/database/seeds/TestCompany.php @@ -79,7 +79,7 @@ class TestCompany extends Seeder 'type' => 'customer', 'name' => 'Test Customer', 'email' => 'customer@company.com', - 'currency_code' => setting('default.currency', 'USD'), + 'currency_code' => setting('default.currency'), 'password' => '123456', 'password_confirmation' => '123456', 'company_id' => session('company_id'), diff --git a/resources/views/modals/settings/invoice_template.blade.php b/resources/views/modals/settings/invoice_template.blade.php index 0ae1d8654..dd495bda2 100644 --- a/resources/views/modals/settings/invoice_template.blade.php +++ b/resources/views/modals/settings/invoice_template.blade.php @@ -52,14 +52,14 @@ - {!! Form::text('color', $setting['color'], ['v-model' => 'invoice_form.color', '@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!} + {!! Form::text('color', setting('invoice.color'), ['v-model' => 'invoice_form.color', '@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!} {!! $errors->first('color', '

    :message

    ') !!} @stack('color_input_end') - {!! Form::hidden('_template', $setting['template']) !!} + {!! Form::hidden('_template', setting('invoice.template')) !!} {!! Form::hidden('_prefix', 'invoice') !!} {!! Form::close() !!} diff --git a/resources/views/settings/company/edit.blade.php b/resources/views/settings/company/edit.blade.php index 0f9ae0507..29ba258d9 100644 --- a/resources/views/settings/company/edit.blade.php +++ b/resources/views/settings/company/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.companies', 1)) @section('content') - {!! Form::model($setting, [ + {!! Form::open([ 'id' => 'setting', 'method' => 'PATCH', 'route' => 'settings.update', @@ -18,15 +18,15 @@
    - {{ Form::textGroup('name', trans('settings.company.name'), 'building') }} + {{ Form::textGroup('name', trans('settings.company.name'), 'building', ['required' => 'required'], setting('company.name')) }} - {{ Form::textGroup('email', trans('settings.company.email'), 'envelope') }} + {{ Form::textGroup('email', trans('settings.company.email'), 'envelope', ['required' => 'required'], setting('company.email')) }} - {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }} + {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', [], setting('company.tax_number')) }} - {{ Form::textGroup('phone', trans('settings.company.phone'), 'phone', []) }} + {{ Form::textGroup('phone', trans('settings.company.phone'), 'phone', [], setting('company.phone')) }} - {{ Form::textareaGroup('address', trans('settings.company.address')) }} + {{ Form::textareaGroup('address', trans('settings.company.address'), null, setting('company.address')) }} {{ Form::fileGroup('logo', trans('settings.company.logo')) }}
    diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php index 5c9595c1a..84a1a52b4 100644 --- a/resources/views/settings/default/edit.blade.php +++ b/resources/views/settings/default/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.defaults', 1)) @section('content') - {!! Form::model($setting, [ + {!! Form::open([ 'id' => 'setting', 'method' => 'PATCH', 'route' => 'settings.update', @@ -18,19 +18,19 @@
    - {{ Form::selectGroup('account', trans_choice('general.accounts', 1), 'university', $accounts, !empty($setting['account']) ? $setting['account'] : null, []) }} + {{ Form::selectGroup('account', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), []) }} - {{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, !empty($setting['currency']) ? $setting['currency'] : null, []) }} + {{ Form::selectGroup('currency', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), []) }} - {{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, !empty($setting['tax']) ? $setting['tax'] : null, []) }} + {{ Form::selectGroup('tax', trans_choice('general.taxes', 1), 'percent', $taxes, setting('default.tax'), []) }} - {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, !empty($setting['payment_method']) ? $setting['payment_method'] : null, []) }} + {{ Form::selectGroup('payment_method', trans_choice('general.payment_methods', 1), 'credit-card', $payment_methods, setting('default.payment_method'), []) }} - {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), !empty($setting['locale']) ? $setting['locale'] : null, []) }} + {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale'), []) }} - {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], !empty($setting['list_limit']) ? $setting['list_limit'] : null, []) }} + {{ Form::selectGroup('list_limit', trans('settings.default.list_limit'), 'columns', ['10' => '10', '25' => '25', '50' => '50', '100' => '100'], setting('default.list_limit'), []) }} - {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), $setting->get('use_gravatar')) }} + {{ Form::radioGroup('use_gravatar', trans('settings.default.use_gravatar'), setting('default.use_gravatar')) }}
    diff --git a/resources/views/settings/email/edit.blade.php b/resources/views/settings/email/edit.blade.php index 0a0de079c..c2d497ebe 100644 --- a/resources/views/settings/email/edit.blade.php +++ b/resources/views/settings/email/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans('general.email')) @section('content') - {!! Form::model($setting, [ + {!! Form::open([ 'id' => 'setting', 'method' => 'PATCH', 'route' => 'settings.email.update', @@ -64,9 +64,9 @@
    - {{ Form::selectGroup('protocol', trans('settings.email.protocol'), 'share', $email_protocols, !empty($setting['protocol']) ? $setting['protocol'] : null, ['change' => 'onChangeProtocol']) }} + {{ Form::selectGroup('protocol', trans('settings.email.protocol'), 'share', $email_protocols, setting('email.protocol'), ['change' => 'onChangeProtocol']) }} - {{ Form::textGroup('sendmail_path', trans('settings.email.sendmail_path'), 'road', [':disabled'=> 'email.sendmailPath']) }} + {{ Form::textGroup('sendmail_path', trans('settings.email.sendmail_path'), 'road', [':disabled'=> 'email.sendmailPath'], setting('email.sendmail_path')) }} {{ Form::textGroup('smtp_host', trans('settings.email.smtp.host'), 'paper-plane', [':disabled' => 'email.smtpHost']) }} diff --git a/resources/views/settings/invoice/edit.blade.php b/resources/views/settings/invoice/edit.blade.php index 7f4a0d2a1..f2e1731dd 100644 --- a/resources/views/settings/invoice/edit.blade.php +++ b/resources/views/settings/invoice/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.invoices', 1)) @section('content') - {!! Form::model($setting, [ + {!! Form::open([ 'id' => 'setting', 'method' => 'PATCH', 'route' => 'settings.update', @@ -18,15 +18,15 @@
    - {{ Form::textGroup('number_prefix', trans('settings.invoice.prefix'), 'font', []) }} + {{ Form::textGroup('number_prefix', trans('settings.invoice.prefix'), 'font', [], setting('invoice.number_prefix')) }} - {{ Form::textGroup('number_digit', trans('settings.invoice.digit'), 'text-width', []) }} + {{ Form::textGroup('number_digit', trans('settings.invoice.digit'), 'text-width', [], setting('invoice.number_digit')) }} - {{ Form::textGroup('number_next', trans('settings.invoice.next'), 'chevron-right', []) }} + {{ Form::textGroup('number_next', trans('settings.invoice.next'), 'chevron-right', [], setting('invoice.number_next')) }} - {{ Form::selectGroup('payment_terms', trans('settings.invoice.payment_terms'), 'calendar', $payment_terms, $setting['payment_terms'], []) }} + {{ Form::selectGroup('payment_terms', trans('settings.invoice.payment_terms'), 'calendar', $payment_terms, setting('invoice.payment_terms'), []) }} - {{ Form::textGroup('title', trans('settings.invoice.title'), 'font', []) }} + {{ Form::textGroup('title', trans('settings.invoice.title'), 'font', [], setting('invoice.title')) }} {{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', []) }} @@ -34,11 +34,11 @@ {{ Form::textareaGroup('footer', trans('general.footer')) }} - {{ Form::invoice_text('item_name', trans('settings.invoice.item_name'), 'font', $item_names, null, [], 'item_name_input', null) }} + {{ Form::invoice_text('item_name', trans('settings.invoice.item_name'), 'font', $item_names, setting('invoice.item_name'), [], 'item_name_input', null) }} - {{ Form::invoice_text('price_name', trans('settings.invoice.price_name'), 'font', $price_names, null, [], 'price_name_input', null) }} + {{ Form::invoice_text('price_name', trans('settings.invoice.price_name'), 'font', $price_names, setting('invoice.price_name'), [], 'price_name_input', null) }} - {{ Form::invoice_text('quantity_name', trans('settings.invoice.quantity_name'), 'font', $quantity_names, null, [], 'quantity_name_input', null) }} + {{ Form::invoice_text('quantity_name', trans('settings.invoice.quantity_name'), 'font', $quantity_names, setting('invoice.quantity_name'), [], 'quantity_name_input', null) }}
    {!! Form::label('invoice_template', trans_choice('general.templates', 1), ['class' => 'form-control-label']) !!} diff --git a/resources/views/settings/localisation/edit.blade.php b/resources/views/settings/localisation/edit.blade.php index 1d259817f..c8017802b 100644 --- a/resources/views/settings/localisation/edit.blade.php +++ b/resources/views/settings/localisation/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans_choice('general.localisations', 1)) @section('content') - {!! Form::model($setting, [ + {!! Form::open([ 'id' => 'setting', 'method' => 'PATCH', 'route' => 'settings.update', @@ -18,17 +18,17 @@
    - {{ Form::dateGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar', ['id' => 'financial_start', 'class' => 'form-control datepicker', 'show-date-format' => 'j F', 'date-format' => 'd-m', 'autocomplete' => 'off'], $setting['financial_start']) }} + {{ Form::dateGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar', ['id' => 'financial_start', 'class' => 'form-control datepicker', 'show-date-format' => 'j F', 'date-format' => 'd-m', 'autocomplete' => 'off'], setting('localisation.financial_start')) }} - {{ Form::selectGroupGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, $setting['timezone'], []) }} + {{ Form::selectGroupGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, setting('localisation.timezone'), []) }} - {{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, $setting['date_format'], ['autocomplete' => 'off']) }} + {{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, setting('localisation.date_format'), ['autocomplete' => 'off']) }} - {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, $setting['date_separator'], []) }} + {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, setting('localisation.date_separator'), []) }} - {{ Form::selectGroup('percent_position', trans('settings.localisation.percent.title'), 'percent', $percent_positions, $setting['percent_position'], []) }} + {{ Form::selectGroup('percent_position', trans('settings.localisation.percent.title'), 'percent', $percent_positions, setting('localisation.percent_position'), []) }} - {{ Form::selectGroup('discount_location', trans('settings.localisation.discount_location.name'), 'percent', $discount_locations, !empty($setting['discount_location']) ? $setting['discount_location'] : 'total', []) }} + {{ Form::selectGroup('discount_location', trans('settings.localisation.discount_location.name'), 'percent', $discount_locations, setting('localisation.discount_location'), []) }}
    diff --git a/resources/views/settings/schedule/edit.blade.php b/resources/views/settings/schedule/edit.blade.php index aef91a769..ce2e9a522 100644 --- a/resources/views/settings/schedule/edit.blade.php +++ b/resources/views/settings/schedule/edit.blade.php @@ -3,7 +3,7 @@ @section('title', trans('settings.scheduling.name')) @section('content') - {!! Form::model($setting, [ + {!! Form::open([ 'id' => 'setting', 'method' => 'PATCH', 'route' => 'settings.update', @@ -18,13 +18,13 @@
    - {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice'), $setting->get('send_invoice_reminder')) }} + {{ Form::radioGroup('send_invoice_reminder', trans('settings.scheduling.send_invoice'), setting('schedule.send_invoice_reminder')) }} - {{ Form::textGroup('invoice_days', trans('settings.scheduling.invoice_days'), 'calendar', []) }} + {{ Form::textGroup('invoice_days', trans('settings.scheduling.invoice_days'), 'calendar', [], setting('schedule.invoice_days')) }} - {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill'), $setting->get('send_bill_reminder')) }} + {{ Form::radioGroup('send_bill_reminder', trans('settings.scheduling.send_bill'), setting('schedule.send_bill_reminder')) }} - {{ Form::textGroup('bill_days', trans('settings.scheduling.bill_days'), 'calendar', []) }} + {{ Form::textGroup('bill_days', trans('settings.scheduling.bill_days'), 'calendar', [], setting('schedule.bill_days')) }}
    From a84b1488ea7d98b0ec55b611b514bd5ba1f51b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 6 Aug 2020 22:11:12 +0300 Subject: [PATCH 164/208] Added cache_prefix function for cache system --- app/Utilities/helpers.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Utilities/helpers.php b/app/Utilities/helpers.php index 7ba73c658..59d7b0776 100644 --- a/app/Utilities/helpers.php +++ b/app/Utilities/helpers.php @@ -54,3 +54,14 @@ if (!function_exists('show_widget')) { return Widgets::show($model, ...$arguments); } } + +if (!function_exists('cache_prefix')) { + /** + * Cache system added company_id prefix. + * + * @return string + */ + function cache_prefix() { + return session('company_id') . '_'; + } +} From 1b5dc9fa22804983346f0394e4952974002bbb0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 6 Aug 2020 23:52:08 +0300 Subject: [PATCH 165/208] added crowdin workflow --- .github/workflows/crowdin.yml | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/crowdin.yml diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml new file mode 100644 index 000000000..cfffbade6 --- /dev/null +++ b/.github/workflows/crowdin.yml @@ -0,0 +1,39 @@ +name: Crowdin + +on: + schedule: + - cron: '0 0 * * *' + workflow_dispatch: + +jobs: + sync: + name: Sync + + runs-on: ubuntu-latest + + steps: + + - name: Checkout + uses: actions/checkout@v2 + + - name: Sync with Crowdin + uses: crowdin/github-action@master + with: + upload_sources: true + upload_translations: true + download_translations: true + skip_untranslated_files: true + + source: 'resources/lang/en-GB/*.php' + translation: 'resources/lang/%locale%/%original_file_name%' + + localization_branch_name: 'crowdin' + commit_message: 'new crowdin translations' + pull_request_title: 'New Crowdin translations' + pull_request_body: 'https://crowdin.com/project/akaunting' + pull_request_labels: 'Translation' + + project_id: ${{ secrets.CROWDIN_CORE_ID }} + token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c65f87e7cc8b3845194aeb67de74d4d5cbb35e82 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Thu, 6 Aug 2020 21:02:03 +0000 Subject: [PATCH 166/208] new crowdin translations --- resources/lang/bg-BG/modules.php | 1 - resources/lang/bn-BD/taxes.php | 2 +- resources/lang/cs-CZ/auth.php | 3 +- resources/lang/cs-CZ/customers.php | 2 +- resources/lang/cs-CZ/maintenance.php | 2 +- resources/lang/cs-CZ/pagination.php | 2 +- resources/lang/da-DK/demo.php | 2 +- resources/lang/da-DK/email_templates.php | 6 +-- resources/lang/da-DK/general.php | 4 +- resources/lang/da-DK/settings.php | 28 +++++----- resources/lang/da-DK/taxes.php | 2 +- resources/lang/el-GR/auth.php | 1 + resources/lang/el-GR/bulk_actions.php | 22 ++++---- resources/lang/el-GR/companies.php | 3 +- resources/lang/el-GR/customers.php | 2 +- resources/lang/el-GR/maintenance.php | 2 +- resources/lang/el-GR/modules.php | 9 ++-- resources/lang/el-GR/pagination.php | 2 +- resources/lang/el-GR/passwords.php | 1 + resources/lang/el-GR/reports.php | 2 +- resources/lang/el-GR/taxes.php | 1 + resources/lang/el-GR/validation.php | 7 +-- resources/lang/en-US/accounts.php | 14 +++++ resources/lang/es-CO/accounts.php | 14 +++++ resources/lang/es-CO/currencies.php | 18 +++++++ resources/lang/es-CO/footer.php | 10 ++++ resources/lang/es-ES/modules.php | 1 - resources/lang/et-EE/accounts.php | 14 +++++ resources/lang/et-EE/auth.php | 41 ++++++++++++++ resources/lang/et-EE/bills.php | 69 ++++++++++++++++++++++++ resources/lang/et-EE/bulk_actions.php | 21 ++++++++ resources/lang/et-EE/companies.php | 14 +++++ resources/lang/et-EE/currencies.php | 18 +++++++ resources/lang/et-EE/customers.php | 12 +++++ resources/lang/et-EE/footer.php | 10 ++++ resources/lang/et-EE/import.php | 9 ++++ resources/lang/et-EE/items.php | 8 +++ resources/lang/et-EE/recurring.php | 20 +++++++ resources/lang/et-EE/transfers.php | 12 +++++ resources/lang/fi-FI/accounts.php | 14 +++++ resources/lang/fi-FI/currencies.php | 18 +++++++ resources/lang/fi-FI/customers.php | 12 +++++ resources/lang/fi-FI/footer.php | 10 ++++ resources/lang/he-IL/items.php | 10 ---- resources/lang/hr-HR/modules.php | 1 - resources/lang/hu-HU/accounts.php | 14 +++++ resources/lang/hu-HU/currencies.php | 18 +++++++ resources/lang/hu-HU/errors.php | 23 ++++++++ resources/lang/hu-HU/footer.php | 10 ++++ resources/lang/hu-HU/import.php | 9 ++++ resources/lang/hu-HU/items.php | 8 +++ resources/lang/hu-HU/notifications.php | 10 ++++ resources/lang/hu-HU/recurring.php | 20 +++++++ resources/lang/hu-HU/transfers.php | 12 +++++ resources/lang/hu-HU/updates.php | 15 ++++++ resources/lang/hu-HU/widgets.php | 23 ++++++++ resources/lang/ja-JP/modules.php | 1 - resources/lang/ka-GE/auth.php | 6 ++- resources/lang/ka-GE/companies.php | 5 +- resources/lang/ka-GE/customers.php | 8 +-- resources/lang/ka-GE/demo.php | 35 +++++++++--- resources/lang/ka-GE/email_templates.php | 50 +++++++++++++++++ resources/lang/ka-GE/header.php | 2 +- resources/lang/ka-GE/items.php | 10 ---- resources/lang/ka-GE/maintenance.php | 11 ++++ resources/lang/ka-GE/pagination.php | 1 + resources/lang/ka-GE/validation.php | 8 +-- resources/lang/ko-KR/items.php | 10 ---- resources/lang/mk-MK/items.php | 10 ---- resources/lang/ms-MY/modules.php | 1 - resources/lang/nb-NO/modules.php | 1 - resources/lang/ne-NP/install.php | 2 +- resources/lang/ne-NP/taxes.php | 1 + resources/lang/pl-PL/accounts.php | 14 +++++ resources/lang/pl-PL/currencies.php | 18 +++++++ resources/lang/pl-PL/customers.php | 12 +++++ resources/lang/pl-PL/footer.php | 10 ++++ resources/lang/pl-PL/header.php | 16 ++++++ resources/lang/pl-PL/items.php | 8 +++ resources/lang/pl-PL/maintenance.php | 11 ++++ resources/lang/pl-PL/notifications.php | 10 ++++ resources/lang/pl-PL/transfers.php | 12 +++++ resources/lang/pl-PL/updates.php | 15 ++++++ resources/lang/ro-RO/items.php | 10 ---- resources/lang/ru-RU/auth.php | 1 + resources/lang/ru-RU/customers.php | 2 +- resources/lang/ru-RU/demo.php | 35 +++++++++--- resources/lang/ru-RU/maintenance.php | 2 +- resources/lang/sk-SK/items.php | 10 ---- resources/lang/sk-SK/recurring.php | 2 +- resources/lang/sl-SI/accounts.php | 14 +++++ resources/lang/sl-SI/currencies.php | 18 +++++++ resources/lang/sl-SI/footer.php | 10 ++++ resources/lang/sl-SI/import.php | 9 ++++ resources/lang/sl-SI/items.php | 8 +++ resources/lang/sl-SI/notifications.php | 10 ++++ resources/lang/sl-SI/recurring.php | 20 +++++++ resources/lang/sl-SI/transfers.php | 12 +++++ resources/lang/sl-SI/updates.php | 15 ++++++ resources/lang/sr-CS/accounts.php | 14 +++++ resources/lang/sr-CS/auth.php | 41 ++++++++++++++ resources/lang/sr-CS/bills.php | 69 ++++++++++++++++++++++++ resources/lang/sr-CS/companies.php | 14 +++++ resources/lang/sr-CS/currencies.php | 18 +++++++ resources/lang/sr-CS/customers.php | 12 +++++ resources/lang/sr-CS/dashboards.php | 11 ++++ resources/lang/sr-CS/demo.php | 34 ++++++++++++ resources/lang/sr-CS/errors.php | 23 ++++++++ resources/lang/sr-CS/footer.php | 10 ++++ resources/lang/sr-CS/import.php | 9 ++++ resources/lang/sr-CS/items.php | 8 +++ resources/lang/sr-CS/pagination.php | 10 ++++ resources/lang/sr-CS/transfers.php | 12 +++++ resources/lang/sr-CS/updates.php | 15 ++++++ resources/lang/sr-CS/widgets.php | 23 ++++++++ resources/lang/sr-SP/accounts.php | 14 +++++ resources/lang/sr-SP/currencies.php | 18 +++++++ resources/lang/sr-SP/footer.php | 10 ++++ resources/lang/sr-SP/import.php | 9 ++++ resources/lang/sr-SP/items.php | 8 +++ resources/lang/sr-SP/notifications.php | 10 ++++ resources/lang/sr-SP/recurring.php | 20 +++++++ resources/lang/sr-SP/transfers.php | 12 +++++ resources/lang/sr-SP/updates.php | 15 ++++++ resources/lang/th-TH/items.php | 10 ---- resources/lang/uk-UA/modules.php | 1 - resources/lang/ur-PK/items.php | 10 ---- resources/lang/uz-UZ/auth.php | 1 + resources/lang/uz-UZ/companies.php | 3 +- resources/lang/uz-UZ/customers.php | 2 +- resources/lang/uz-UZ/dashboards.php | 11 ++++ resources/lang/uz-UZ/demo.php | 35 +++++++++--- resources/lang/uz-UZ/errors.php | 29 +++++----- resources/lang/uz-UZ/maintenance.php | 2 +- resources/lang/uz-UZ/modules.php | 9 ++-- resources/lang/uz-UZ/pagination.php | 2 +- resources/lang/uz-UZ/reports.php | 2 +- resources/lang/uz-UZ/widgets.php | 23 ++++++++ resources/lang/vi-VN/items.php | 10 ---- 139 files changed, 1481 insertions(+), 212 deletions(-) create mode 100644 resources/lang/en-US/accounts.php create mode 100644 resources/lang/es-CO/accounts.php create mode 100644 resources/lang/es-CO/currencies.php create mode 100644 resources/lang/es-CO/footer.php create mode 100644 resources/lang/et-EE/accounts.php create mode 100644 resources/lang/et-EE/auth.php create mode 100644 resources/lang/et-EE/bills.php create mode 100644 resources/lang/et-EE/bulk_actions.php create mode 100644 resources/lang/et-EE/companies.php create mode 100644 resources/lang/et-EE/currencies.php create mode 100644 resources/lang/et-EE/customers.php create mode 100644 resources/lang/et-EE/footer.php create mode 100644 resources/lang/et-EE/import.php create mode 100644 resources/lang/et-EE/items.php create mode 100644 resources/lang/et-EE/recurring.php create mode 100644 resources/lang/et-EE/transfers.php create mode 100644 resources/lang/fi-FI/accounts.php create mode 100644 resources/lang/fi-FI/currencies.php create mode 100644 resources/lang/fi-FI/customers.php create mode 100644 resources/lang/fi-FI/footer.php create mode 100644 resources/lang/hu-HU/accounts.php create mode 100644 resources/lang/hu-HU/currencies.php create mode 100644 resources/lang/hu-HU/errors.php create mode 100644 resources/lang/hu-HU/footer.php create mode 100644 resources/lang/hu-HU/import.php create mode 100644 resources/lang/hu-HU/items.php create mode 100644 resources/lang/hu-HU/notifications.php create mode 100644 resources/lang/hu-HU/recurring.php create mode 100644 resources/lang/hu-HU/transfers.php create mode 100644 resources/lang/hu-HU/updates.php create mode 100644 resources/lang/hu-HU/widgets.php create mode 100644 resources/lang/ka-GE/email_templates.php create mode 100644 resources/lang/ka-GE/maintenance.php create mode 100644 resources/lang/pl-PL/accounts.php create mode 100644 resources/lang/pl-PL/currencies.php create mode 100644 resources/lang/pl-PL/customers.php create mode 100644 resources/lang/pl-PL/footer.php create mode 100644 resources/lang/pl-PL/header.php create mode 100644 resources/lang/pl-PL/items.php create mode 100644 resources/lang/pl-PL/maintenance.php create mode 100644 resources/lang/pl-PL/notifications.php create mode 100644 resources/lang/pl-PL/transfers.php create mode 100644 resources/lang/pl-PL/updates.php create mode 100644 resources/lang/sl-SI/accounts.php create mode 100644 resources/lang/sl-SI/currencies.php create mode 100644 resources/lang/sl-SI/footer.php create mode 100644 resources/lang/sl-SI/import.php create mode 100644 resources/lang/sl-SI/items.php create mode 100644 resources/lang/sl-SI/notifications.php create mode 100644 resources/lang/sl-SI/recurring.php create mode 100644 resources/lang/sl-SI/transfers.php create mode 100644 resources/lang/sl-SI/updates.php create mode 100644 resources/lang/sr-CS/accounts.php create mode 100644 resources/lang/sr-CS/auth.php create mode 100644 resources/lang/sr-CS/bills.php create mode 100644 resources/lang/sr-CS/companies.php create mode 100644 resources/lang/sr-CS/currencies.php create mode 100644 resources/lang/sr-CS/customers.php create mode 100644 resources/lang/sr-CS/dashboards.php create mode 100644 resources/lang/sr-CS/demo.php create mode 100644 resources/lang/sr-CS/errors.php create mode 100644 resources/lang/sr-CS/footer.php create mode 100644 resources/lang/sr-CS/import.php create mode 100644 resources/lang/sr-CS/items.php create mode 100644 resources/lang/sr-CS/pagination.php create mode 100644 resources/lang/sr-CS/transfers.php create mode 100644 resources/lang/sr-CS/updates.php create mode 100644 resources/lang/sr-CS/widgets.php create mode 100644 resources/lang/sr-SP/accounts.php create mode 100644 resources/lang/sr-SP/currencies.php create mode 100644 resources/lang/sr-SP/footer.php create mode 100644 resources/lang/sr-SP/import.php create mode 100644 resources/lang/sr-SP/items.php create mode 100644 resources/lang/sr-SP/notifications.php create mode 100644 resources/lang/sr-SP/recurring.php create mode 100644 resources/lang/sr-SP/transfers.php create mode 100644 resources/lang/sr-SP/updates.php create mode 100644 resources/lang/uz-UZ/dashboards.php create mode 100644 resources/lang/uz-UZ/widgets.php diff --git a/resources/lang/bg-BG/modules.php b/resources/lang/bg-BG/modules.php index a0b1c868f..19fb9aeb5 100644 --- a/resources/lang/bg-BG/modules.php +++ b/resources/lang/bg-BG/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Нов', 'top_free' => 'Топ безплатни', 'free' => 'БЕЗПЛАТНО', - 'search' => 'Търси', 'install' => 'Инсталирай', 'buy_now' => 'Купете сега', 'get_api_key' => 'Натиснете тук за да получите вашия API ключ.', diff --git a/resources/lang/bn-BD/taxes.php b/resources/lang/bn-BD/taxes.php index 90d827844..f620617d2 100644 --- a/resources/lang/bn-BD/taxes.php +++ b/resources/lang/bn-BD/taxes.php @@ -8,5 +8,5 @@ return [ 'inclusive' => 'অন্তর্ভুক্তি', 'compound' => 'যৌগিক', 'fixed' => 'স্থায়ী', - 'withholding' => 'Withholding', + 'withholding' => 'আটকে যাওয়া', ]; diff --git a/resources/lang/cs-CZ/auth.php b/resources/lang/cs-CZ/auth.php index 5967bd34b..94ca659c8 100644 --- a/resources/lang/cs-CZ/auth.php +++ b/resources/lang/cs-CZ/auth.php @@ -13,6 +13,7 @@ return [ 'current_email' => 'Aktuální e-mail', 'reset' => 'Obnovit', 'never' => 'nikdy', + 'landing_page' => 'Úvodní stránka', 'password' => [ 'current' => 'Heslo', @@ -23,7 +24,7 @@ return [ 'error' => [ 'self_delete' => 'Chyba: nemůžete smazat sám sebe!', - 'self_disable' => 'Chyba: Nemůžete zakázat sebe!', + 'self_disable' => 'Chyba: Nemůžete zakázat sami sebe!', 'no_company' => 'Chyba: Váš účet nemá přidělenou firmu/společnost. Prosím, kontaktujte systémového administrátora.', ], diff --git a/resources/lang/cs-CZ/customers.php b/resources/lang/cs-CZ/customers.php index ae8439fc1..40dcc8c5d 100644 --- a/resources/lang/cs-CZ/customers.php +++ b/resources/lang/cs-CZ/customers.php @@ -6,7 +6,7 @@ return [ 'user_created' => 'Uživatel byl vytvořen', 'error' => [ - 'email' => 'Tato e-mailová adresa je již obsazena.' + 'email' => 'Tato e-mailová adresa je již obsazena.', ], ]; diff --git a/resources/lang/cs-CZ/maintenance.php b/resources/lang/cs-CZ/maintenance.php index 195d4f512..54516a44b 100644 --- a/resources/lang/cs-CZ/maintenance.php +++ b/resources/lang/cs-CZ/maintenance.php @@ -8,4 +8,4 @@ return [ 'last-updated' => 'Tato zpráva byla naposledy aktualizována :timestamp', -]; \ No newline at end of file +]; diff --git a/resources/lang/cs-CZ/pagination.php b/resources/lang/cs-CZ/pagination.php index cdf79dc01..051179a24 100644 --- a/resources/lang/cs-CZ/pagination.php +++ b/resources/lang/cs-CZ/pagination.php @@ -4,7 +4,7 @@ return [ 'previous' => '« předchozí', 'next' => 'další »', - 'showing' => ':first-:last of :total records.', + 'showing' => ':first-:last z :total záznamů.', 'page' => 'na stránku.', ]; diff --git a/resources/lang/da-DK/demo.php b/resources/lang/da-DK/demo.php index 45df9ced8..bd12a05f9 100644 --- a/resources/lang/da-DK/demo.php +++ b/resources/lang/da-DK/demo.php @@ -28,7 +28,7 @@ return [ 'expense' => 'Månedlig udgiftsoversigt efter kategori', 'income_expense' => 'Månedlig Indkomstoversigt efter kategori', 'tax' => 'Kvartalsvis afgifts-oversigt', - 'profit_loss' => 'Kvartalsvis indtægt & tab efter kategori ', + 'profit_loss' => 'Kvartalsvise indtægter & udgifter efter kategori', ], ]; diff --git a/resources/lang/da-DK/email_templates.php b/resources/lang/da-DK/email_templates.php index 0032cc5a5..6fa04153c 100644 --- a/resources/lang/da-DK/email_templates.php +++ b/resources/lang/da-DK/email_templates.php @@ -9,12 +9,12 @@ return [ ], 'invoice_remind_customer' => [ - 'subject' => '{invoice_number} forfalden faktura notifikation', + 'subject' => 'Din faktura nr. {invoice_number} er forfalden', 'body' => 'Kære {customer_name},

    Vi gør opmærksom på at fakturaen på {invoice_total} hvor sidste betalingsdag var den {invoice_due_date} med faktura nr. {invoice_number} ikke er betalt.

    Du kan se faktura detaljerne og betale på dette link: {invoice_number}.

    Med venlig hilsen,
    {company_name}', ], 'invoice_remind_admin' => [ - 'subject' => '{invoice_number} faktura overskredet notificering', + 'subject' => 'Betalingen af faktura nr. {invoice_number} er overskredet', 'body' => 'Hej,

    {customer_name} har modtaget en forfaldsmeddelelse for {invoice_number} faktura.

    Fakturaens samlede beløb er {invoice_total} og skulle betales < strong>{invoice_due_date}.

    Du kan se fakturaoplysningerne fra følgende link: {invoice_number}.

    Med venlig hilsen
    {company_name}', ], @@ -45,7 +45,7 @@ return [ 'bill_recur_admin' => [ 'subject' => '{bill_number} tilbagevendende regning er oprettet', - 'body' => 'Hej,

    Baseret på {vendor_name} tilbagevendende betaling, er regnings nummer {bill_number} automatisk genereret.

    Du kan se regningsdetaljerne på dette link: {bill_number}.

    Med venlig,
    {company_name}', + 'body' => 'Hej,

    Baseret på {vendor_name}\'s tilbagevendende betaling, er faktura nummer {bill_number} automatisk genereret.

    Du kan se fakturadetaljerne på dette link: {bill_number}.

    Med venlig hilsen,
    {company_name}', ], ]; diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php index 94d681d80..e35f2bad9 100644 --- a/resources/lang/da-DK/general.php +++ b/resources/lang/da-DK/general.php @@ -163,8 +163,8 @@ return [ 'title' => [ 'new' => 'Ny :type', 'edit' => 'Rediger :type', - 'delete' => 'Slet !type', - 'create' => 'Opret !type', + 'delete' => 'Slet :type', + 'create' => 'Opret :type', 'send' => 'Send :type', 'get' => 'Hent :type', 'add' => 'Tilføj :type', diff --git a/resources/lang/da-DK/settings.php b/resources/lang/da-DK/settings.php index d47cbec40..57fea0cd2 100644 --- a/resources/lang/da-DK/settings.php +++ b/resources/lang/da-DK/settings.php @@ -3,7 +3,7 @@ return [ 'company' => [ - 'description' => 'Ændre firmanavn, email, adresse, momsnummer etc', + 'description' => 'Ændre navn, email, adresse, CVR-nummer mv.', 'name' => 'Navn', 'email' => 'E-mail', 'phone' => 'Telefon', @@ -65,7 +65,7 @@ return [ ], 'default' => [ - 'description' => 'Standard konto, valuta, firmasprog', + 'description' => 'Standard konto, valuta og sprog', 'list_limit' => 'Poster pr side', 'use_gravatar' => 'Brug Gravatar', ], @@ -91,14 +91,14 @@ return [ 'subject' => 'Emne', 'body' => 'Indhold', 'tags' => 'Tilgængelige Tags: :tag_list', - 'invoice_new_customer' => 'Ny fakturaskabelon (sendt til kunder)', - 'invoice_remind_customer' => 'Faktura påmindelses skabelon (sendt til kunder)', - 'invoice_remind_admin' => 'Faktura påmindelsesskabelon (sendt til administrator)', + 'invoice_new_customer' => 'Skabelon til ny faktura (sendt til kunder)', + 'invoice_remind_customer' => 'Fakturapåmindelses-skabelon (sendt til kunder)', + 'invoice_remind_admin' => 'Fakturapåmindelses-skabelon (sendt til administrator)', 'invoice_recur_customer' => 'Tilbagevendende skabelon for faktura (sendt til kunde)', - 'invoice_recur_admin' => 'Tilbagevendende skabelon for faktura (sendt til administrator)', - 'invoice_payment_customer' => 'Modtaget betalingsskabelon (sendt til kunder)', - 'invoice_payment_admin' => 'Modtaget betalingsskabelon (sendt til administrator)', - 'bill_remind_admin' => 'Regnings påmindelsesskabelon (sendt til administrator)', + 'invoice_recur_admin' => 'Skabelon for tilbagevendende faktura (sendt til administrator)', + 'invoice_payment_customer' => 'Skabelon for modtaget betaling (sendt til kunder)', + 'invoice_payment_admin' => 'Skabelon for modtaget betaling (sendt til administrator)', + 'bill_remind_admin' => 'Skabelon for regningspåmindelse (sendt til administrator)', 'bill_recur_admin' => 'Tilbagevendende skabelon for regning (sendt til administrator)', ], ], @@ -106,12 +106,12 @@ return [ 'scheduling' => [ 'name' => 'Planlægning', 'description' => 'Automatiske påmindelser og gentagelser', - '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', + 'send_invoice' => 'Send fakturapåmindelse', + 'invoice_days' => 'Send efter forfaldsdato', + 'send_bill' => 'Send regningspåmindelse', + 'bill_days' => 'Send før forfaldsdato', 'cron_command' => 'Cron kommando', - 'schedule_time' => 'Timer at køre', + 'schedule_time' => 'Afsendingstid', ], 'categories' => [ diff --git a/resources/lang/da-DK/taxes.php b/resources/lang/da-DK/taxes.php index 16e36e3f2..cf9d428de 100644 --- a/resources/lang/da-DK/taxes.php +++ b/resources/lang/da-DK/taxes.php @@ -8,5 +8,5 @@ return [ 'inclusive' => 'Inklusiv', 'compound' => 'Sammensatte', 'fixed' => 'Fast', - 'withholding' => 'Withholding', + 'withholding' => 'Tilbageholdt', ]; diff --git a/resources/lang/el-GR/auth.php b/resources/lang/el-GR/auth.php index c98d0a202..8b1d4e151 100644 --- a/resources/lang/el-GR/auth.php +++ b/resources/lang/el-GR/auth.php @@ -13,6 +13,7 @@ return [ 'current_email' => 'Τρέχον ηλεκτρονικό ταχυδρομείο', 'reset' => 'Επαναφορά', 'never' => 'ποτέ', + 'landing_page' => 'Σελίδα Προορισμού', 'password' => [ 'current' => 'Κωδικός πρόσβασης', diff --git a/resources/lang/el-GR/bulk_actions.php b/resources/lang/el-GR/bulk_actions.php index 8662fd4ca..828b3188a 100644 --- a/resources/lang/el-GR/bulk_actions.php +++ b/resources/lang/el-GR/bulk_actions.php @@ -2,18 +2,20 @@ return [ - 'bulk_actions' => 'Μαζική Ενέργεια|Μαζικές Ενέργειες', - 'selected' => 'επιλεγμένα', + 'bulk_actions' => 'Μαζική Ενέργεια|Μαζικές Ενέργειες', + 'selected' => 'επιλεγμένα', + 'no_action' => 'Καμία διαθέσιμη ενέργεια', 'message' => [ - 'duplicate' => 'Are you sure you want to duplicate selected record?', - 'delete' => 'Are you sure you want to delete selected record?|Are you sure you want to delete selected records?', - 'export' => 'Are you sure you want to export selected record?|Are you sure you want to export selected records?', - 'enable' => 'Are you sure you want to enable selected record?|Are you sure you want to enable selected records?', - 'disable' => 'Are you sure you want to disable selected record?|Are you sure you want to disable selected records?', - 'paid' => 'Are you sure you want to mark selected invoice as paid?|Are you sure you want to mark selected invoices as paid?', - 'sent' => 'Are you sure you want to mark selected invoice as sent?|Are you sure you want to mark selected invoices as sent?', - 'received' => 'Are you sure you want to mark selected bill as received?|Are you sure you want to mark selected bills as received?', + 'duplicate' => 'Είστε σίγουροι ότι θέλετε να αντιγράψετε την επιλεγμένη εγγραφή;', + 'delete' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε την επιλεγμένη εγγραφή;|Είστε σίγουροι ότι θέλετε να διαγράψετε τις επιλεγμένες εγγραφές;', + 'export' => 'Είστε σίγουροι ότι θέλετε να εξάγετε την επιλεγμένη εγγραφή;|Είστε σίγουροι ότι θέλετε να εξάγετε τις επιλεγμένες εγγραφές;', + 'enable' => 'Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε την επιλεγμένη εγγραφή;|Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε τις επιλεγμένες εγγραφές;', + 'disable' => 'Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε την επιλεγμένη εγγραφή;|Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε τις επιλεγμένες εγγραφές;', + 'paid' => 'Είστε σίγουροι ότι θέλετε να σημειώσετε το επιλεγμένο τιμολόγιο ως πληρωμένο;Είστε σίγουροι ότι θέλετε να σημειώσετε τα επιλεγμένα τιμολόγια ως πληρωμένα;', + 'sent' => 'Είστε σίγουροι ότι θέλετε να σημειώσετε το επιλεγμένο τιμολόγιο ως απεσταλμένο;Είστε σίγουροι ότι θέλετε να σημειώσετε τα επιλεγμένα τιμολόγια ως απεσταλμένα;', + 'received' => 'Είστε σίγουροι ότι θέλετε να σημειώσετε το επιλεγμένο τιμολόγιο ως ελήφθη;Είστε σίγουροι ότι θέλετε να σημειώσετε τα επιλεγμένα τιμολόγια ως ελήφθησαν;', + 'cancelled' => 'Είστε σίγουροι ότι θέλετε να ακυρώσετε το επιλεγμένο τιμολόγιο;|Είστε σίγουροι ότι θέλετε να ακυρώσετε τα επιλεγμένα τιμολόγια;', ], ]; diff --git a/resources/lang/el-GR/companies.php b/resources/lang/el-GR/companies.php index b2cd237ba..d181453ac 100644 --- a/resources/lang/el-GR/companies.php +++ b/resources/lang/el-GR/companies.php @@ -4,12 +4,11 @@ return [ 'domain' => 'Ιστοσελίδα', 'logo' => 'Λογότυπο', - 'manage' => 'Διαχείριση εταιρειών', - 'all' => 'Όλες οι εταιρείες', 'error' => [ 'not_user_company' => 'Σφάλμα: Δεν επιτρέπεται να αλλάξετε αυτή την εταιρεία!', 'delete_active' => 'Σφάλμα: Δεν μπορείτε να διαγράψετε μια ενεργή εταιρεία, παρακαλώ πρέπει πρώτα να την τροποποιήσετε!', + 'disable_active' => 'Σφάλμα: Δεν μπορείτε να απενεργοποιήσετε την ενεργή εταιρεία. Παρακαλούμε, πρώτα επιλέξτε μια άλλη εταιρία!', ], ]; diff --git a/resources/lang/el-GR/customers.php b/resources/lang/el-GR/customers.php index e9cd1a023..c0184b347 100644 --- a/resources/lang/el-GR/customers.php +++ b/resources/lang/el-GR/customers.php @@ -6,7 +6,7 @@ return [ 'user_created' => 'Ο χρήστης δημιουργήθηκε', 'error' => [ - 'email' => 'Το email αυτό χρησιμοποιείται ήδη.' + 'email' => 'Το email αυτό χρησιμοποιείται ήδη.', ], ]; diff --git a/resources/lang/el-GR/maintenance.php b/resources/lang/el-GR/maintenance.php index 515db4212..cf5a8a614 100644 --- a/resources/lang/el-GR/maintenance.php +++ b/resources/lang/el-GR/maintenance.php @@ -8,4 +8,4 @@ return [ 'last-updated' => 'Το μήνυμα ανανεώθηκε στις :timestamp', -]; \ No newline at end of file +]; diff --git a/resources/lang/el-GR/modules.php b/resources/lang/el-GR/modules.php index c893ea3cf..881074790 100644 --- a/resources/lang/el-GR/modules.php +++ b/resources/lang/el-GR/modules.php @@ -9,13 +9,11 @@ return [ 'new' => 'Νέο', 'top_free' => 'Κορυφαία δωρεάν Προϊόντα', 'free' => 'ΔΩΡΕΑΝ', - 'search' => 'Αναζήτηση', 'install' => 'Εγκατάσταση', 'buy_now' => 'Αγοράστε τώρα', - 'api_key_link' => 'Πατήστε εδώ για να πάρετε το API κλειδί σας.', + 'get_api_key' => 'Πατήστε εδώ για να παραλάβετε το κλειδί API σας.', 'no_apps' => 'Δεν υπάρχουν εφαρμογές σε αυτή την κατηγορία, ακόμα.', - 'developer' => 'Είστε προγραμματιστής;Εδώ εδώ μπορείτε να μάθετε πώς να δημιουργήσετε μια εφαρμογή και να ξεκινήσετε να την πουλάτε σήμερα!', - + 'become_developer' => 'Είστε προγραματιστής; Εδώ μπορείτε να μάθετε πως να δημιουργήσετε μια εφαρμογή και να αρχίσετε να την πουλάτε σήμερα!', 'recommended_apps' => 'Προτεινόμενες Εφαρμογές', 'about' => 'Σχετικά με', @@ -80,5 +78,6 @@ return [ ], 'na' => 'Δεν υπάρχουν αξιολογήσεις.' - ] + ], + ]; diff --git a/resources/lang/el-GR/pagination.php b/resources/lang/el-GR/pagination.php index 9deb7ca99..743e250b0 100644 --- a/resources/lang/el-GR/pagination.php +++ b/resources/lang/el-GR/pagination.php @@ -4,7 +4,7 @@ return [ 'previous' => '« Προηγούμενη', 'next' => 'Επόμενη »', - 'showing' => ':first-:last of :total records.', + 'showing' => ':first-:last από :total εγγραφές.', 'page' => 'ανά σελίδα.', ]; diff --git a/resources/lang/el-GR/passwords.php b/resources/lang/el-GR/passwords.php index a85247da6..bae7274c2 100644 --- a/resources/lang/el-GR/passwords.php +++ b/resources/lang/el-GR/passwords.php @@ -18,5 +18,6 @@ return [ 'sent' => 'Η υπενθύμιση του συνθηματικού εστάλη στην ηλεκτρονική σας διεύθυνση!', 'token' => 'Το κλειδί επαναφοράς του συνθηματικού σας δεν είναι έγκυρο.', 'user' => "Δεν βρέθηκε χρήστης με τη συγκεκριμένη ηλεκτρονική διεύθυνση.", + 'throttle' => 'Παρακαλούμε περιμένετε πριν προσπαθήσετε ξανά.', ]; diff --git a/resources/lang/el-GR/reports.php b/resources/lang/el-GR/reports.php index 65debf904..0ce2b96e3 100644 --- a/resources/lang/el-GR/reports.php +++ b/resources/lang/el-GR/reports.php @@ -12,7 +12,7 @@ return [ 'net_profit' => 'Καθαρό Κέρδος', 'total_expenses' => 'Συνολικά Έξοδα', 'net' => 'Καθαρά', - 'income-expense' => 'Έσοδα & Έξοδα', + 'income_expense' => 'Έσοδα & Έξοδα', 'summary' => [ 'income' => 'Σύνοψη εσόδων', diff --git a/resources/lang/el-GR/taxes.php b/resources/lang/el-GR/taxes.php index 4f4366d46..37a748f0d 100644 --- a/resources/lang/el-GR/taxes.php +++ b/resources/lang/el-GR/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Συμπεριλαμβανόμενος', 'compound' => 'Μεικτός', 'fixed' => 'Πάγιο', + 'withholding' => 'Κρατήσεις', ]; diff --git a/resources/lang/el-GR/validation.php b/resources/lang/el-GR/validation.php index caf96f8d8..9da76bae7 100644 --- a/resources/lang/el-GR/validation.php +++ b/resources/lang/el-GR/validation.php @@ -100,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'προσαρμοσμένο-μήνυμα', + 'rule-name' => 'προσαρμοσμένο-μήνυμα', ], - 'invalid_currency' => 'Το πεδίο :attribute δεν είναι έγκυρος κωδικός νομίσματος.', - 'invalid_amount' => 'Το πεδίο :attribute δεν είναι έγκυρο ποσό.', + 'invalid_currency' => 'Το πεδίο :attribute δεν είναι έγκυρος κωδικός νομίσματος.', + 'invalid_amount' => 'Το πεδίο :attribute δεν είναι έγκυρο ποσό.', + 'invalid_extension' => 'Η επέκταση του αρχείου δεν είναι έγκυρη.', ], /* diff --git a/resources/lang/en-US/accounts.php b/resources/lang/en-US/accounts.php new file mode 100644 index 000000000..bed4f6f06 --- /dev/null +++ b/resources/lang/en-US/accounts.php @@ -0,0 +1,14 @@ + 'Account Name', + 'number' => 'Account Number', + 'opening_balance' => 'Starting Balance', + 'current_balance' => 'Current Balance', + 'bank_name' => 'Bank Name', + 'bank_phone' => 'Bank Phone', + 'bank_address' => 'Bank Address', + 'default_account' => 'Default Account', + +]; diff --git a/resources/lang/es-CO/accounts.php b/resources/lang/es-CO/accounts.php new file mode 100644 index 000000000..abe5fed16 --- /dev/null +++ b/resources/lang/es-CO/accounts.php @@ -0,0 +1,14 @@ + 'Nombre de la cuenta', + 'number' => 'Número', + 'opening_balance' => 'Balance de cierre', + 'current_balance' => 'Saldo actual', + 'bank_name' => 'Nombre del Banco', + 'bank_phone' => 'Teléfono del Banco', + 'bank_address' => 'Dirección del Banco', + 'default_account' => 'Cuenta Predeterminada', + +]; diff --git a/resources/lang/es-CO/currencies.php b/resources/lang/es-CO/currencies.php new file mode 100644 index 000000000..6e5999e86 --- /dev/null +++ b/resources/lang/es-CO/currencies.php @@ -0,0 +1,18 @@ + 'Código', + 'rate' => 'Tasa', + 'default' => 'Moneda Predeterminada', + 'decimal_mark' => 'Punto decimal', + 'thousands_separator' => 'Separador de miles', + 'precision' => 'Precisión', + 'symbol' => [ + 'symbol' => 'Símbolo', + 'position' => 'Posición del Símbolo', + 'before' => 'Antes del Monto', + 'after' => 'Después del Monto', + ] + +]; diff --git a/resources/lang/es-CO/footer.php b/resources/lang/es-CO/footer.php new file mode 100644 index 000000000..2b541c945 --- /dev/null +++ b/resources/lang/es-CO/footer.php @@ -0,0 +1,10 @@ + 'Versión', + 'powered' => 'Desarrollado por Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Software de Contabilidad Libre', + +]; diff --git a/resources/lang/es-ES/modules.php b/resources/lang/es-ES/modules.php index dcbfaa418..3a3783d7b 100644 --- a/resources/lang/es-ES/modules.php +++ b/resources/lang/es-ES/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Nuevo', 'top_free' => 'Top gratis', 'free' => 'GRATIS', - 'search' => 'Buscar', 'install' => 'Instalar', 'buy_now' => 'Comprar ahora', 'get_api_key' => 'Haga clic aquí para obtener su clave API.', diff --git a/resources/lang/et-EE/accounts.php b/resources/lang/et-EE/accounts.php new file mode 100644 index 000000000..490422f25 --- /dev/null +++ b/resources/lang/et-EE/accounts.php @@ -0,0 +1,14 @@ + 'Konto nimi', + 'number' => 'Number', + 'opening_balance' => 'Algsaldo', + 'current_balance' => 'Jooksev saldo', + 'bank_name' => 'Panga nimi', + 'bank_phone' => 'Panga telefon', + 'bank_address' => 'Panga aadress', + 'default_account' => 'Vaikimisi konto', + +]; diff --git a/resources/lang/et-EE/auth.php b/resources/lang/et-EE/auth.php new file mode 100644 index 000000000..615731884 --- /dev/null +++ b/resources/lang/et-EE/auth.php @@ -0,0 +1,41 @@ + 'Profiil', + 'logout' => 'Logi välja', + 'login' => 'Logi sisse', + 'login_to' => 'Sessiooni alustamiseks logi sisse', + 'remember_me' => 'Jäta mind meelde', + 'forgot_password' => 'Unustasin oma parooli', + 'reset_password' => 'Lähtesta parool', + 'enter_email' => 'Sisesta oma e-posti aadress', + 'current_email' => 'Praegune e-mail', + 'reset' => 'Lähesta', + 'never' => 'mitte kunagi', + 'landing_page' => 'Sihtleht', + + 'password' => [ + 'current' => 'Parool', + 'current_confirm' => 'Parooli kinnitus', + 'new' => 'Uus parool', + 'new_confirm' => 'Uue parooli kinnitus', + ], + + 'error' => [ + 'self_delete' => 'Viga: ennast ei saa kustutada!', + 'self_disable' => 'Viga: ennast ei saa ära keelata!', + 'no_company' => 'Viga: teie kontole pole määratud ühtegi ettevõtet. Palun pöörduge süsteemiadministraatori poole.', + ], + + 'failed' => 'Need andmed ei klapi meie kirjetega.', + 'disabled' => 'See konto on keelatud. Palun pöörduge süsteemiadministraatori poole.', + 'throttle' => 'Liiga palju sisselogimise katseid. Palun proovi uuesti :seconds sekundi pärast.', + + 'notification' => [ + 'message_1' => 'Saite selle meili, kuna meile saadeti teie konto parooli lähtestamise taotlus.', + 'message_2' => 'Kui te ei taotlenud parooli lähtestamist, pole vaja midagi teha.', + 'button' => 'Lähtesta parool', + ], + +]; diff --git a/resources/lang/et-EE/bills.php b/resources/lang/et-EE/bills.php new file mode 100644 index 000000000..bd417f75e --- /dev/null +++ b/resources/lang/et-EE/bills.php @@ -0,0 +1,69 @@ + 'Arve number', + 'bill_date' => 'Arve kuupäev', + 'total_price' => 'Koguhind', + 'due_date' => 'Tähtaeg', + 'order_number' => 'Tellimuse number', + 'bill_from' => 'Arve saatja', + + 'quantity' => 'Kogus', + 'price' => 'Hind', + 'sub_total' => 'Vahesumma', + 'discount' => 'Allahindlus', + 'item_discount' => 'Rea soodustus', + 'tax_total' => 'Maksud kokku', + 'total' => 'Kokku', + + 'item_name' => 'Kauba nimi | Kauba nimed', + + 'show_discount' => 'Soodustus :discount%', + 'add_discount' => 'Lisa allahindlus', + 'discount_desc' => 'vahesummast', + + 'payment_due' => 'Makse tähtaeg', + 'amount_due' => 'Tasumisele kuuluv summa', + 'paid' => 'Makstud', + 'histories' => 'Ajalood', + 'payments' => 'Maksed', + 'add_payment' => 'Lisa makse', + 'mark_paid' => 'Märgi makstuks', + 'mark_received' => 'Makse on saabunud', + 'mark_cancelled' => 'Märgi tühistatuks', + 'download_pdf' => 'Laadi alla PDF', + 'send_mail' => 'Saada kiri', + 'create_bill' => 'Loo arve', + 'receive_bill' => 'Arve vastuvõtmine', + 'make_payment' => 'Tee makse', + + 'statuses' => [ + 'draft' => 'Mustand', + 'received' => 'Vastuvõetud', + 'partial' => 'Osaline', + 'paid' => 'Makstud', + 'overdue' => 'Tähtaja ületanud', + 'unpaid' => 'Maksmata', + 'cancelled' => 'Tühistatud', + ], + + 'messages' => [ + 'marked_received' => 'Arve on märgitud kättesaaduks!', + 'marked_paid' => 'Arve on märgitud makstuks!', + 'marked_cancelled' => 'Arve on märgitud tühistatuks!', + 'draft' => 'See on MUSTAND arve ja kajastub graafikutes pärast selle vastuvõtmist.', + + 'status' => [ + 'created' => 'Loodud :date', + 'receive' => [ + 'draft' => 'Saatmata', + 'received' => 'Saadud :date', + ], + 'paid' => [ + 'await' => 'Ootab tasumist', + ], + ], + ], + +]; diff --git a/resources/lang/et-EE/bulk_actions.php b/resources/lang/et-EE/bulk_actions.php new file mode 100644 index 000000000..0c177b57d --- /dev/null +++ b/resources/lang/et-EE/bulk_actions.php @@ -0,0 +1,21 @@ + 'Hulgitoiming|Hulgitoimingud', + 'selected' => 'valitud', + 'no_action' => 'Ühtegi tegevust pole saadaval', + + 'message' => [ + 'duplicate' => 'Kas soovite kindlasti valitud kirjet dubleerida?', + 'delete' => 'Kas soovite kindlasti valitud kirje kustutada?|Kas soovite kindlasti valitud kirjed kustutada?', + 'export' => 'Kas soovite kindlasti valitud kirje eksportida?|Kas soovite kindlasti valitud kirjed eksportida?', + 'enable' => 'Kas soovite kindlasti valitud kirje lubada?|Kas soovite kindlasti valitud kirjed lubada?', + 'disable' => 'Kas soovite kindlasti valitud kirje keelata?|Kas soovite kindlasti valitud kirjed keelata?', + 'paid' => 'Kas olete kindel, et soovite valitud arve märkida kui makstud?|Kas soovite kindlasti märkida valitud arved kui makstud?', + 'sent' => 'Kas olete kindel, et soovite valitud arve märkida kui saadetud?|Kas soovite kindlasti märkida valitud arved kui saadetud?', + 'received' => 'Kas olete kindel, et soovite valitud arve märkida kui vastuvõetud?|Kas soovite kindlasti märkida valitud arved kui vastuvõetud?', + 'cancelled' => 'Kas soovite kindlasti valitud kirje tühistada?|Kas soovite kindlasti valitud kirjed tühistada?', + ], + +]; diff --git a/resources/lang/et-EE/companies.php b/resources/lang/et-EE/companies.php new file mode 100644 index 000000000..14dfa12e7 --- /dev/null +++ b/resources/lang/et-EE/companies.php @@ -0,0 +1,14 @@ + 'Domeen', + 'logo' => 'Logo', + + 'error' => [ + 'not_user_company' => 'Viga: Teil pole lubatud seda ettevõtet muuta!', + 'delete_active' => 'Viga: aktiivset ettevõtet ei saa kustutada. Palun valige kõigepealt teine ettevõte!', + 'disable_active' => 'Viga: aktiivset ettevõtet ei saa keelata. Palun valige kõigepealt teine ettevõte!', + ], + +]; diff --git a/resources/lang/et-EE/currencies.php b/resources/lang/et-EE/currencies.php new file mode 100644 index 000000000..ed9e98ce3 --- /dev/null +++ b/resources/lang/et-EE/currencies.php @@ -0,0 +1,18 @@ + 'Kood', + 'rate' => 'Kurss', + 'default' => 'Vaikevaluuta', + 'decimal_mark' => 'Kümnendmärk', + 'thousands_separator' => 'Tuhandeliste eraldaja', + 'precision' => 'Täpsus', + 'symbol' => [ + 'symbol' => 'Sümbol', + 'position' => 'Sümbol seisukoht', + 'before' => 'Enne summat', + 'after' => 'Pärast summat', + ] + +]; diff --git a/resources/lang/et-EE/customers.php b/resources/lang/et-EE/customers.php new file mode 100644 index 000000000..f56c5b40d --- /dev/null +++ b/resources/lang/et-EE/customers.php @@ -0,0 +1,12 @@ + 'Saab sisse logida?', + 'user_created' => 'Kasutaja on loodud', + + 'error' => [ + 'email' => 'See e-posti aadress on juba kasutusel.', + ], + +]; diff --git a/resources/lang/et-EE/footer.php b/resources/lang/et-EE/footer.php new file mode 100644 index 000000000..e18ab2808 --- /dev/null +++ b/resources/lang/et-EE/footer.php @@ -0,0 +1,10 @@ + 'Versioon', + 'powered' => 'Kasutatud tarkvara: Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Tasuta raamatupidamistarkvara', + +]; diff --git a/resources/lang/et-EE/import.php b/resources/lang/et-EE/import.php new file mode 100644 index 000000000..997da7a02 --- /dev/null +++ b/resources/lang/et-EE/import.php @@ -0,0 +1,9 @@ + 'Impordi', + 'title' => 'Import :liik', + 'message' => 'Lubatud failitüübid: XLS, XLSX. Palun laadi alla näidisfail.', + +]; diff --git a/resources/lang/et-EE/items.php b/resources/lang/et-EE/items.php new file mode 100644 index 000000000..11f759d18 --- /dev/null +++ b/resources/lang/et-EE/items.php @@ -0,0 +1,8 @@ + 'Müügihind', + 'purchase_price' => 'Ostuhind', + +]; diff --git a/resources/lang/et-EE/recurring.php b/resources/lang/et-EE/recurring.php new file mode 100644 index 000000000..fadc36c26 --- /dev/null +++ b/resources/lang/et-EE/recurring.php @@ -0,0 +1,20 @@ + 'Korduv', + 'every' => 'Iga', + 'period' => 'Periood', + 'times' => 'Korda', + 'daily' => 'Iga päev', + 'weekly' => 'Iganädalane', + 'monthly' => 'Igakuine', + 'yearly' => 'Aastane', + 'custom' => 'Kohandatud', + 'days' => 'päev(a)', + 'weeks' => 'nädal(at)', + 'months' => 'kuu(d)', + 'years' => 'aasta(t)', + 'message' => 'See on korduv :type ja järgmine :type luuakse automaatselt kuupäeval :date', + +]; diff --git a/resources/lang/et-EE/transfers.php b/resources/lang/et-EE/transfers.php new file mode 100644 index 000000000..f5081a3bf --- /dev/null +++ b/resources/lang/et-EE/transfers.php @@ -0,0 +1,12 @@ + 'Kontolt', + 'to_account' => 'Kontole', + + 'messages' => [ + 'delete' => ':from => :to (:amount)', + ], + +]; diff --git a/resources/lang/fi-FI/accounts.php b/resources/lang/fi-FI/accounts.php new file mode 100644 index 000000000..30369644c --- /dev/null +++ b/resources/lang/fi-FI/accounts.php @@ -0,0 +1,14 @@ + 'Tilin nimi', + 'number' => 'Numero', + 'opening_balance' => 'Alkusaldo', + 'current_balance' => 'Nykyinen saldo', + 'bank_name' => 'Pankin nimi', + 'bank_phone' => 'Pankin puhelinnumero', + 'bank_address' => 'Pankin osoite', + 'default_account' => 'Oletustili', + +]; diff --git a/resources/lang/fi-FI/currencies.php b/resources/lang/fi-FI/currencies.php new file mode 100644 index 000000000..15a39a0da --- /dev/null +++ b/resources/lang/fi-FI/currencies.php @@ -0,0 +1,18 @@ + 'Koodi', + 'rate' => 'Arvioi', + 'default' => 'Oletusvaluutta', + 'decimal_mark' => 'Desimaali Merkki', + 'thousands_separator' => 'Tuhaterotin', + 'precision' => 'Tarkkuus', + 'symbol' => [ + 'symbol' => 'Symboli', + 'position' => 'Valuuttasymbolin paikka', + 'before' => 'Määrä Ennen', + 'after' => 'Määrä Jälkeen', + ] + +]; diff --git a/resources/lang/fi-FI/customers.php b/resources/lang/fi-FI/customers.php new file mode 100644 index 000000000..5b20e880d --- /dev/null +++ b/resources/lang/fi-FI/customers.php @@ -0,0 +1,12 @@ + 'Voi Kirjautua?', + 'user_created' => 'Käyttäjä luotu', + + 'error' => [ + 'email' => 'Sähköposti on jo varattu.', + ], + +]; diff --git a/resources/lang/fi-FI/footer.php b/resources/lang/fi-FI/footer.php new file mode 100644 index 000000000..0e8fcae23 --- /dev/null +++ b/resources/lang/fi-FI/footer.php @@ -0,0 +1,10 @@ + 'Versio', + 'powered' => 'Ohjelmistona Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Ilmainen kirjanpito-ohjelma', + +]; diff --git a/resources/lang/he-IL/items.php b/resources/lang/he-IL/items.php index 72a197576..f9ed01ccb 100644 --- a/resources/lang/he-IL/items.php +++ b/resources/lang/he-IL/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'כמות | כמויות', 'sales_price' => 'מחיר מבצע', 'purchase_price' => 'מחיר רכישה', - 'sku' => 'מספר מזהה', - - 'notification' => [ - 'message' => [ - 'reminder' => 'You are receiving this email because only :quantity of :name has remained.', - 'out_of_stock' => 'You are receiving this email because the :name is running out of stock.', - ], - 'button' => 'הצג עכשיו', - ], ]; diff --git a/resources/lang/hr-HR/modules.php b/resources/lang/hr-HR/modules.php index 0150e62ab..6abd4efce 100644 --- a/resources/lang/hr-HR/modules.php +++ b/resources/lang/hr-HR/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Novo', 'top_free' => 'Najbolje besplatno', 'free' => 'BESPLATNO', - 'search' => 'Pretraživanje', 'install' => 'Instaliraj', 'buy_now' => 'Kupi odmah', 'get_api_key' => ' Kliknite ovdje da biste dobili svoj API ključ.', diff --git a/resources/lang/hu-HU/accounts.php b/resources/lang/hu-HU/accounts.php new file mode 100644 index 000000000..6519b8259 --- /dev/null +++ b/resources/lang/hu-HU/accounts.php @@ -0,0 +1,14 @@ + 'Számla név', + 'number' => 'Szám', + 'opening_balance' => 'Nyitó egyenleg', + 'current_balance' => 'Aktuális egyenleg', + 'bank_name' => 'Bank neve', + 'bank_phone' => 'Bank telefonszáma', + 'bank_address' => 'Bank címe', + 'default_account' => 'Alapértelmezett számla', + +]; diff --git a/resources/lang/hu-HU/currencies.php b/resources/lang/hu-HU/currencies.php new file mode 100644 index 000000000..e8463b986 --- /dev/null +++ b/resources/lang/hu-HU/currencies.php @@ -0,0 +1,18 @@ + 'Kód', + 'rate' => 'Mérték/kulcs', + 'default' => 'Alapértelmezett pénznem', + 'decimal_mark' => 'Tizedesvessző', + 'thousands_separator' => 'Ezres tagoló', + 'precision' => 'Pontosság', + 'symbol' => [ + 'symbol' => 'Szimbólum', + 'position' => 'Szimbólum helye', + 'before' => 'Összeg előtt', + 'after' => 'Összeg után', + ] + +]; diff --git a/resources/lang/hu-HU/errors.php b/resources/lang/hu-HU/errors.php new file mode 100644 index 000000000..510650756 --- /dev/null +++ b/resources/lang/hu-HU/errors.php @@ -0,0 +1,23 @@ + [ + '403' => 'Hoppá! Tiltott hozzáférés', + '404' => 'Hoppá! Az oldal nem található', + '500' => 'Hoppá! Valami hiba történt.', + ], + + 'header' => [ + '403' => '403 Tiltott', + '404' => '404 Nem találtható', + '500' => 'Belső kiszolgálóhiba', + ], + + 'message' => [ + '403' => 'Nem férhet hozzá ehhez az oldalhoz.', + '404' => 'A keresett oldal nem található.', + '500' => 'Dolgozunk azon, hogy ezt azonnal megjavítsuk.', + ], + +]; diff --git a/resources/lang/hu-HU/footer.php b/resources/lang/hu-HU/footer.php new file mode 100644 index 000000000..851d94f0e --- /dev/null +++ b/resources/lang/hu-HU/footer.php @@ -0,0 +1,10 @@ + 'Verzió', + 'powered' => 'Powered By Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Ingyenes könyvelő program', + +]; diff --git a/resources/lang/hu-HU/import.php b/resources/lang/hu-HU/import.php new file mode 100644 index 000000000..f76c2b5dc --- /dev/null +++ b/resources/lang/hu-HU/import.php @@ -0,0 +1,9 @@ + 'Import', + 'title' => 'Import: típus', + 'message' => 'Engedélyezett fájltípusok: CSV, XLS. Kérjük Töltse le a mintafájlt.', + +]; diff --git a/resources/lang/hu-HU/items.php b/resources/lang/hu-HU/items.php new file mode 100644 index 000000000..ec786016e --- /dev/null +++ b/resources/lang/hu-HU/items.php @@ -0,0 +1,8 @@ + 'Eladási ár', + 'purchase_price' => 'Beszerzési ár', + +]; diff --git a/resources/lang/hu-HU/notifications.php b/resources/lang/hu-HU/notifications.php new file mode 100644 index 000000000..64f471204 --- /dev/null +++ b/resources/lang/hu-HU/notifications.php @@ -0,0 +1,10 @@ + 'Hoppá!', + 'hello' => 'Helló!', + 'salutation' => 'Üdvözlettel,
    :company_name', + 'subcopy' => 'Ha nem tudsz a(z) ":text" gombra kattintani, akkor másold be a a következő címet a a böngésződ címsorába: [:url](:url)', + +]; diff --git a/resources/lang/hu-HU/recurring.php b/resources/lang/hu-HU/recurring.php new file mode 100644 index 000000000..ddb40db05 --- /dev/null +++ b/resources/lang/hu-HU/recurring.php @@ -0,0 +1,20 @@ + 'Ismétlődő', + 'every' => 'Minden', + 'period' => 'Időszak', + 'times' => 'Alkalommal', + 'daily' => 'Napi', + 'weekly' => 'Heti', + 'monthly' => 'Havi', + 'yearly' => 'Éves', + 'custom' => 'Egyéni', + 'days' => 'Nap(ok)', + 'weeks' => 'Hét(ek)', + 'months' => 'Hónap(ok)', + 'years' => 'Év(ek)', + 'message' => 'Ez egy ismétlődő :type, és a következő :type automatikusan generálódik ekkor: :date', + +]; diff --git a/resources/lang/hu-HU/transfers.php b/resources/lang/hu-HU/transfers.php new file mode 100644 index 000000000..4bd99af93 --- /dev/null +++ b/resources/lang/hu-HU/transfers.php @@ -0,0 +1,12 @@ + 'Forrás számla', + 'to_account' => 'Cél számla', + + 'messages' => [ + 'delete' => ':from -ról :to -ra (:amount)', + ], + +]; diff --git a/resources/lang/hu-HU/updates.php b/resources/lang/hu-HU/updates.php new file mode 100644 index 000000000..d2b719fac --- /dev/null +++ b/resources/lang/hu-HU/updates.php @@ -0,0 +1,15 @@ + 'Telepített verzió', + 'latest_version' => 'Legújabb verzió', + 'update' => 'Akaunting frissítése a :version verzióra', + 'changelog' => 'Változások', + 'check' => 'Ellenőrzés', + 'new_core' => 'Az Akaunting egy újabb változata elérhető.', + 'latest_core' => 'Gratulálunk! Az Akaunting legújabb verziójával rendelkezik. A jövőbeni biztonsági frissítések automatikusan települni fognak.', + 'success' => 'A telepítés sikeresen befejeződött.', + 'error' => 'A telepítés sikertelen volt, kérjük, próbálja újra!', + +]; diff --git a/resources/lang/hu-HU/widgets.php b/resources/lang/hu-HU/widgets.php new file mode 100644 index 000000000..bb81fb632 --- /dev/null +++ b/resources/lang/hu-HU/widgets.php @@ -0,0 +1,23 @@ + 'Összes bevétel', + 'receivables' => 'Követelések', + 'open_invoices' => 'Nyitott számlák', + 'overdue_invoices' => 'Lejárt számlák', + 'total_expenses' => 'Összes költség', + 'payables' => 'Kötelezettségek', + 'open_bills' => 'Nyitott számlák', + 'overdue_bills' => 'Lejárt számlák', + 'total_profit' => 'Teljes nyereség', + 'open_profit' => 'Nyitott profit', + 'overdue_profit' => 'Lejárt profit', + 'cash_flow' => 'Pénzforgalom', + 'no_profit_loss' => 'Veszteségmentes', + 'income_by_category' => 'Bevételek kategóriánként', + 'expenses_by_category' => 'Költségek kategóriánként', + 'account_balance' => 'Számlaegyenleg', + 'latest_income' => 'Letutóbbi bevételek', + 'latest_expenses' => 'Letutóbbi kiadások', +]; diff --git a/resources/lang/ja-JP/modules.php b/resources/lang/ja-JP/modules.php index 8a1c7dea9..0693e4feb 100644 --- a/resources/lang/ja-JP/modules.php +++ b/resources/lang/ja-JP/modules.php @@ -9,7 +9,6 @@ return [ 'new' => '新しい', 'top_free' => '無料トップ', 'free' => '無料', - 'search' => '探索', 'install' => 'インストール', 'buy_now' => '今すぐ購入', 'get_api_key' => 'ここをクリック APIキーを取得します。', diff --git a/resources/lang/ka-GE/auth.php b/resources/lang/ka-GE/auth.php index cc51ffa49..acabe507a 100644 --- a/resources/lang/ka-GE/auth.php +++ b/resources/lang/ka-GE/auth.php @@ -13,16 +13,18 @@ return [ 'current_email' => 'მიმდინარე Email-ი', 'reset' => 'განულება', 'never' => 'არასდროს', - + 'landing_page' => 'მთვარი გვერდი', + 'password' => [ 'current' => 'პაროლი', 'current_confirm' => 'პაროლის დადასტურება', 'new' => 'ახალი პაროლი', 'new_confirm' => 'ახალი პაროლის დადასტურება', ], - + 'error' => [ 'self_delete' => 'შეცდომა: მომხმარებლის წაშლა შეუძლებელია!', + 'self_disable' => 'შეცდომა: არ შეგიძლიათ გამორთოთ საკუთარი თავი!', 'no_company' => 'შეცდომა: ანგარიშზე არ არის მითითებული კომპანია. გთხოვთ დაუკავშირდეთ სისტემურ ადმინისტრატორს.', ], diff --git a/resources/lang/ka-GE/companies.php b/resources/lang/ka-GE/companies.php index 2f5dd9d99..4dfb1a842 100644 --- a/resources/lang/ka-GE/companies.php +++ b/resources/lang/ka-GE/companies.php @@ -4,10 +4,11 @@ return [ 'domain' => 'დომეინი', 'logo' => 'ლოგო', - 'manage' => 'კომპანიის მართვა', - 'all' => 'ყველა კომპანია', + 'error' => [ + 'not_user_company' => 'შეცდომა: თქვენ არ გაქვთ უფლება შეცვალოთ ეს კომპანია!', 'delete_active' => 'სეცდომა: შეუძლებელია აქტიური კომპანიის წაშლა, ჯერ შეცვალეთ ის!', + 'disable_active' => 'შეცდომა: აქტიური კომპანიის გათიშვა შეუძლებელია. გთხოვთ აირჩიოთ სხვა!', ], ]; diff --git a/resources/lang/ka-GE/customers.php b/resources/lang/ka-GE/customers.php index e2e2f0208..ebba3e5c4 100644 --- a/resources/lang/ka-GE/customers.php +++ b/resources/lang/ka-GE/customers.php @@ -2,15 +2,11 @@ return [ - 'allow_login' => 'შესვლა?', + 'can_login' => 'შეგიძლიათ შესვლა?', 'user_created' => 'მომხმარებელი შექმნილია', 'error' => [ - 'email' => 'ელ-ფოსტა უკვე დაკავებულია.' + 'email' => 'ელ-ფოსტა უკვე დაკავებულია.', ], - 'notification' => [ - 'message' => ':მომხმარებელმა გააკეთა: თანხის გადახდა ფაქტურის ნომერზე: ფაქტურის_ნომერი.', - 'button' => 'ჩვენება', - ], ]; diff --git a/resources/lang/ka-GE/demo.php b/resources/lang/ka-GE/demo.php index 621a163bb..6385bc6cf 100644 --- a/resources/lang/ka-GE/demo.php +++ b/resources/lang/ka-GE/demo.php @@ -2,12 +2,33 @@ return [ - 'accounts_cash' => 'ნაღდი ფული', - 'categories_deposit' => 'დეპოზიტი', - 'categories_sales' => 'გაყიდვები', - 'currencies_usd' => 'აშშ დოლარი', - 'currencies_eur' => 'ეურო', - 'currencies_gbp' => 'ბრიტანული ფუნტი', - 'currencies_try' => 'თურქული ლირა', + 'accounts' => [ + 'cash' => 'ნაღდი ფული', + ], + + 'categories' => [ + 'deposit' => 'დეპოზიტი', + 'sales' => 'გაყიდვები', + ], + + 'currencies' => [ + 'usd' => 'აშშ დოლარი', + 'eur' => 'ევრო', + 'gbp' => 'ბრიტანული ფუნტი', + 'try' => 'თურქული ლირა', + ], + + 'offline_payments' => [ + 'cash' => 'ნაღდი ფული', + 'bank' => 'საბანკო გადარიცხვა', + ], + + 'reports' => [ + 'income' => 'თვიური შემოსავლის ჯამი კატეგორიის მიხედვით.', + 'expense' => 'თვიური ხარჯის ჯამი კატეგორიის მიხედვით.', + 'income_expense' => 'თვიური შემოსავლის და ხარჯის ჯამი კატეგორიის მიხედვით.', + 'tax' => 'კვარტალური საგადასახადო შეჯამება.', + 'profit_loss' => 'კვარტალური მოგება და ზარალი კატეგორიის მიხედვით.', + ], ]; diff --git a/resources/lang/ka-GE/email_templates.php b/resources/lang/ka-GE/email_templates.php new file mode 100644 index 000000000..3e21a8705 --- /dev/null +++ b/resources/lang/ka-GE/email_templates.php @@ -0,0 +1,50 @@ + [ + 'subject' => '{invoice_number} ინვოისი შეიქმნა', + 'body' => 'ძვირფასო {customer_name},

    თქვენთვის შემდეგი ინვოისი მოვამზადეთ: {invoice_number}.

    შეგიძლიათ იხილოთ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {invoice_number}.

    ნუ მოგერიდებათ დაგვიკავშირდეთ ნებისმიერი შეკითხვისათვის.

    Საუკეთესო სურვილებით,
    {company_name}', + ], + + 'invoice_remind_customer' => [ + 'subject' => '{invoice_number} ინვოისის ვადაგადაცილების შეტყობინება', + 'body' => 'ძვირფასო {customer_name},

    ეს ვადაგასული შეტყობინებაა: {invoice_number}ინვოისი.

    ინვოისის მთლიანი თანხა {invoice_total} უნდა იყოს {invoice_due_date}.

    შეგიძლიათ იხილოთ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {invoice_number}.

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'invoice_remind_admin' => [ + 'subject' => '{invoice_number} ინვოისის ვადაგადაცილების შეტყობინება', + 'body' => 'გამარჯობათ,

    {customer_name} მიიღო ვადაგადაცილებული ცნობა {invoice_number} invoice.

    ინვოისის მთლიანი თანხა {invoice_total} უნდა იყოს {invoice_due_date}.

    Yშეგიძლიათ იხილოთ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {invoice_number}.

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'invoice_recur_customer' => [ + 'subject' => '{invoice_number} განმეორებადი ინვოისი შეიქმნა', + 'body' => 'ძვირფასო {customer_name},

    თქვენი განმეორებითი წრის საფუძველზე, ჩვენ მოამზადეთ შემდეგი ინვოისი თქვენთვის: {invoice_number}.

    შეგიძლიათ იხილოთ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {invoice_number}.

    ნუ მოგერიდებათ, დაგვიკავშირდით ნებისმიერ კითხვაზე

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'invoice_recur_admin' => [ + 'subject' => '{invoice_number} განმეორებადი ინვოისი შეიქმნა', + 'body' => 'გამარჯობათ,

    დაფუძნებული {customer_name} განმეორებადი წრე, {invoice_number} ინვოისი ავტომატურად შეიქმნა.

    შეგიძლიათ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {invoice_number}.

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'invoice_payment_customer' => [ + 'subject' => 'გადახდა მიღებულია {invoice_number} ინვოისი', + 'body' => 'ძვირფასო {customer_name},

    გმადლობთ გადახდისთვის. იხილეთ გადახდის დეტალები ქვემოთ:

    -------------------------------------------------

    თანხა: {transaction_total}
    თარიღი: {transaction_paid_date}
    ინვოისის ნომერი: {invoice_number}

    -------------------------------------------------

    ყოველთვის შეგიძლიათ ნახოთ ინვოისის დეტალები შემდეგ ბმულზე: {invoice_number}.

    ნი მოგერიდებათ, დაგვიკავშირდით ნებისმიერ კითხვაზე.

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'invoice_payment_admin' => [ + 'subject' => 'გადახდა მიღებულია {invoice_number} ინვოისი', + 'body' => 'განარჯობათ,

    {customer_name} ჩაიწერა გადასახადი{invoice_number} ინვოისი.

    შეგიძლიათ იხილოთ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {invoice_number}.

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'bill_remind_admin' => [ + 'subject' => '{bill_number} ანგარიშის შეხსენება', + 'body' => 'გამარჯობათ,

    ეს არის შეხსენება {bill_number} გადამხდელი {vendor_name}.

    აგარიშის მთლიანი თანხა {bill_total} უნდა იყოს {bill_due_date}.

    შეგიძლიათ იხილოთ ინვოისის დეტალები და განაგრძოთ გადახდა შემდეგი ბმულიდან: {bill_number}.

    საუკეთესო სურვილებით,
    {company_name}', + ], + + 'bill_recur_admin' => [ + 'subject' => '{bill_number} განმეორებადი ანგარიში შეიქმნა', + 'body' => 'გამარჯობათ,

    დაფიზნებულია {vendor_name} განმეორებად წრეზე, {bill_number} ინვოისი შეიქმნა აუტომატურად.

    შეგიძლიათ იხილოთk: {bill_number}.

    საუკეთესო სურვილებით,
    {company_name}', + ], + +]; diff --git a/resources/lang/ka-GE/header.php b/resources/lang/ka-GE/header.php index e17141ef7..637ade836 100644 --- a/resources/lang/ka-GE/header.php +++ b/resources/lang/ka-GE/header.php @@ -8,9 +8,9 @@ return [ 'counter' => '{0} თქვენ არ გაქვთ შეტყობინება|{1} თქვენ გაქვთ :შეტყობინებების დათვლა|[2,*] თქვენ გაქვთ :შეტყობინებების დათვლა', 'overdue_invoices' => '{1} :ვადაგადაცილებული ფაქტურების დათვლა|[2,*] :ვადაგადაცილებული ფაქტურების დათვლა', 'upcoming_bills' => '{1} :მომავალი ანგარიშის დათვლა|[2,*] :მომავალი ანგარიშის დათვლა', - 'items_stock' => '{1} :საწყობში არსებული საქონლის დათვლა|[2,*] :საწყობში არსებული საქონლის დათვლა', 'view_all' => 'ყველას დათვალიერება' ], 'docs_link' => 'https://akaunting.com', + 'support_link' => 'https://akaunting.com/support', ]; diff --git a/resources/lang/ka-GE/items.php b/resources/lang/ka-GE/items.php index a395a64b0..3a36b9a0f 100644 --- a/resources/lang/ka-GE/items.php +++ b/resources/lang/ka-GE/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'რაოდენობა|რაოდენობები', 'sales_price' => 'გასაყიდი ფასი', 'purchase_price' => 'შეძენის ფასი', - 'sku' => 'არტიკული', - - 'notification' => [ - 'message' => [ - 'reminder' => 'თქვენ მიიღეთ ეს წერილი, რადგან დარჩა მხოლოდ :რაოდენობა :სახელწოდება.', - 'out_of_stock' => 'თქვენ მიიღეთ ეს წერილი, რადგან :სახლეწოდება იწურება საწყობში.', - ], - 'button' => 'იხილეთ ახლავე', - ], ]; diff --git a/resources/lang/ka-GE/maintenance.php b/resources/lang/ka-GE/maintenance.php new file mode 100644 index 000000000..7edb9d98e --- /dev/null +++ b/resources/lang/ka-GE/maintenance.php @@ -0,0 +1,11 @@ + 'მიმდინარეობს მომსახურეობა', + + 'message' => 'უკაცრავად, ჩვენთან რემონტია. გთხოვთ, სცადოთ მოგვიანებით!', + + 'last-updated' => 'ეს შეტყობინება ბოლოს განახლდა: დროის ნიშნული.', + +]; diff --git a/resources/lang/ka-GE/pagination.php b/resources/lang/ka-GE/pagination.php index e5f4e4587..4911751ca 100644 --- a/resources/lang/ka-GE/pagination.php +++ b/resources/lang/ka-GE/pagination.php @@ -5,5 +5,6 @@ return [ 'previous' => '« წინა', 'next' => 'შემდეგი »', 'showing' => 'ჩვენება :პირველი :ბოლო :სულ :ტიპი', + 'page' => 'თითო გვერდზე.', ]; diff --git a/resources/lang/ka-GE/validation.php b/resources/lang/ka-GE/validation.php index 2d4177e36..42b83077d 100644 --- a/resources/lang/ka-GE/validation.php +++ b/resources/lang/ka-GE/validation.php @@ -39,6 +39,7 @@ return [ 'dimensions' => ':attribute შეიცავს სურათის არასწორ ზომებს.', 'distinct' => ':attribute უნდა იყოს უნიკალური.', 'email' => ':attribute უნდა იყოს სწორი ელ.ფოსტა.', + 'ends_with' => ': ატრიბუტი უნდა სრულდეოდეს ერთ ერთი შემდეგი მნიშვნელობიდან : ფასეულობები', 'exists' => 'ასეთი :attribute არ არსებობს.', 'file' => ':attribute უნდა იყოს ფაილი.', 'filled' => ':attribute აუცილებელია.', @@ -99,10 +100,11 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'მორგებული-წერილი', + 'rule-name' => 'მორგებული-წერილი', ], - 'invalid_currency' => ':ატრიბუტის კოდი არასწორია.', - 'invalid_amount' => 'თანხა: ატრიბუტი არასწორია.', + 'invalid_currency' => ':ატრიბუტის კოდი არასწორია.', + 'invalid_amount' => 'თანხა: ატრიბუტი არასწორია.', + 'invalid_extension' => 'Ფაილის გაფართოება არასწორია. ', ], /* diff --git a/resources/lang/ko-KR/items.php b/resources/lang/ko-KR/items.php index 7a0a7b1b5..f91e62ec9 100644 --- a/resources/lang/ko-KR/items.php +++ b/resources/lang/ko-KR/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => '수량|수량', 'sales_price' => '판매 가격', 'purchase_price' => '구매 가격', - 'sku' => 'SKU', - - 'notification' => [ - 'message' => [ - 'reminder' => ':name 의 수량이 :quantity 만큼 남아서 이메일로 알립니다.', - 'out_of_stock' => ':name 의 재고가 거의 없어, 이메일로 알립니다.', - ], - 'button' => '지금 보기', - ], ]; diff --git a/resources/lang/mk-MK/items.php b/resources/lang/mk-MK/items.php index 6ccf480e2..3c58eb311 100644 --- a/resources/lang/mk-MK/items.php +++ b/resources/lang/mk-MK/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'Кочичина| Количини', 'sales_price' => 'Продажна Цена', 'purchase_price' => 'Набавна цена', - 'sku' => 'SKU', - - 'notification' => [ - 'message' => [ - 'reminder' => 'You are receiving this email because only :quantity of :name has remained.', - 'out_of_stock' => 'You are receiving this email because the :name is running out of stock.', - ], - 'button' => 'Погледни сега', - ], ]; diff --git a/resources/lang/ms-MY/modules.php b/resources/lang/ms-MY/modules.php index cdfb7a0cf..765ed7d33 100644 --- a/resources/lang/ms-MY/modules.php +++ b/resources/lang/ms-MY/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Baharu', 'top_free' => 'Percuma Tertinggi', 'free' => 'PERCUMA', - 'search' => 'Carian', 'install' => 'Pasang', 'buy_now' => 'Beli Sekarang', 'get_api_key' => 'Tekan disini untuk mendapatkan kunci API anda.', diff --git a/resources/lang/nb-NO/modules.php b/resources/lang/nb-NO/modules.php index 7cd6af7f5..b8ad17ab0 100644 --- a/resources/lang/nb-NO/modules.php +++ b/resources/lang/nb-NO/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Ny', 'top_free' => 'Topp gratis', 'free' => 'GRATIS', - 'search' => 'Søk', 'install' => 'Installer', 'buy_now' => 'Kjøp nå', 'get_api_key' => 'Klikk her for å motta din API nøkkel.', diff --git a/resources/lang/ne-NP/install.php b/resources/lang/ne-NP/install.php index 780243d09..d27387d49 100644 --- a/resources/lang/ne-NP/install.php +++ b/resources/lang/ne-NP/install.php @@ -39,7 +39,7 @@ return [ ], 'error' => [ - 'php_version' => 'Error: Ask your hosting provider to use PHP :php_version or higher for both HTTP and CLI.', + 'php_version' => 'त्रुटी: तपाईको होस्टिंग सेवा प्रदायकलाई PHP को HTTP वा CLI को भर्सन :php_version वा भन्दा नया प्रयोग भन्नुहोस् |', 'connection' => 'त्रुटि: डाटाबेसमा जोड्न सकिएन! कृपया, सम्पूर्ण विवरण ठीक छन् भनि निश्चित गर्नुहोस।', ], diff --git a/resources/lang/ne-NP/taxes.php b/resources/lang/ne-NP/taxes.php index 4488d1dde..41f701337 100644 --- a/resources/lang/ne-NP/taxes.php +++ b/resources/lang/ne-NP/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'समावेसी', 'compound' => 'चक्रीय कर', 'fixed' => 'मुद्दती', + 'withholding' => 'रोक्का गर्ने', ]; diff --git a/resources/lang/pl-PL/accounts.php b/resources/lang/pl-PL/accounts.php new file mode 100644 index 000000000..a6d6c8b97 --- /dev/null +++ b/resources/lang/pl-PL/accounts.php @@ -0,0 +1,14 @@ + 'Nazwa konta bankowego', + 'number' => 'Liczba', + 'opening_balance' => 'Bilans otwarcia', + 'current_balance' => 'Aktualne saldo', + 'bank_name' => 'Nazwa banku', + 'bank_phone' => 'Numer telefonu do banku', + 'bank_address' => 'Adres banku', + 'default_account' => 'Domyślne konto', + +]; diff --git a/resources/lang/pl-PL/currencies.php b/resources/lang/pl-PL/currencies.php new file mode 100644 index 000000000..eff796a67 --- /dev/null +++ b/resources/lang/pl-PL/currencies.php @@ -0,0 +1,18 @@ + 'Kod', + 'rate' => 'Przelicznik', + 'default' => 'Domyślna waluta', + 'decimal_mark' => 'Separator dziesiętny', + 'thousands_separator' => 'Separator tysięczny', + 'precision' => 'Miejsc po przecinku', + 'symbol' => [ + 'symbol' => 'Symbol', + 'position' => 'Pozycja symbolu', + 'before' => 'Przed kwotą', + 'after' => 'Po kwocie', + ] + +]; diff --git a/resources/lang/pl-PL/customers.php b/resources/lang/pl-PL/customers.php new file mode 100644 index 000000000..5062ae4d4 --- /dev/null +++ b/resources/lang/pl-PL/customers.php @@ -0,0 +1,12 @@ + 'Czy może się zalogować?', + 'user_created' => 'Konto zostało już utworzone', + + 'error' => [ + 'email' => 'Ten adres e-mail jest już zajęty.', + ], + +]; diff --git a/resources/lang/pl-PL/footer.php b/resources/lang/pl-PL/footer.php new file mode 100644 index 000000000..b6ae4cd74 --- /dev/null +++ b/resources/lang/pl-PL/footer.php @@ -0,0 +1,10 @@ + 'Wersja', + 'powered' => 'Obsługiwany przez', + 'link' => 'https://akaunting.com', + 'software' => 'Darmowe oprogramowanie księgowe', + +]; diff --git a/resources/lang/pl-PL/header.php b/resources/lang/pl-PL/header.php new file mode 100644 index 000000000..182c8ffa9 --- /dev/null +++ b/resources/lang/pl-PL/header.php @@ -0,0 +1,16 @@ + 'Zmień język', + 'last_login' => 'Ostatnie logowanie :time', + 'notifications' => [ + 'counter' => '{0} Nie masz powiadomień|{1} Masz :count powiadomienie|[2,*] Masz :count powiadomienia', + 'overdue_invoices' => '{1} :count zaległa faktura|[2,*] :count zaległe faktury|[5,*] :count zaległych faktur', + 'upcoming_bills' => '{1} :count nadchodzący rachunek|[2,*] :count nadchodzące rachunki', + 'view_all' => 'Pokaż wszystko' + ], + 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/support', + +]; diff --git a/resources/lang/pl-PL/items.php b/resources/lang/pl-PL/items.php new file mode 100644 index 000000000..6a2e59f59 --- /dev/null +++ b/resources/lang/pl-PL/items.php @@ -0,0 +1,8 @@ + 'Cena sprzedaży', + 'purchase_price' => 'Cena zakupu', + +]; diff --git a/resources/lang/pl-PL/maintenance.php b/resources/lang/pl-PL/maintenance.php new file mode 100644 index 000000000..5f0864a24 --- /dev/null +++ b/resources/lang/pl-PL/maintenance.php @@ -0,0 +1,11 @@ + 'W trakcie konserwacji', + + 'message' => 'Przepraszamy, jesteśmy w trakcie konserwacji. Spróbuj ponownie później!', + + 'last-updated' => 'Ta wiadomość została ostatnio zaktualizowana :timestamp.', + +]; diff --git a/resources/lang/pl-PL/notifications.php b/resources/lang/pl-PL/notifications.php new file mode 100644 index 000000000..bc79d185e --- /dev/null +++ b/resources/lang/pl-PL/notifications.php @@ -0,0 +1,10 @@ + 'Ups!', + 'hello' => 'Witaj!', + 'salutation' => 'Pozdrawiam,
    :company_name', + 'subcopy' => 'Jeśli masz problem z kliknięciem przycisku ":text", skopiuj i wklej poniższy adres URL do swojej przeglądarki: [:url](:url)', + +]; diff --git a/resources/lang/pl-PL/transfers.php b/resources/lang/pl-PL/transfers.php new file mode 100644 index 000000000..c08741c2a --- /dev/null +++ b/resources/lang/pl-PL/transfers.php @@ -0,0 +1,12 @@ + 'Z konta', + 'to_account' => 'Do konta', + + 'messages' => [ + 'delete' => ':from do :to (:amount)', + ], + +]; diff --git a/resources/lang/pl-PL/updates.php b/resources/lang/pl-PL/updates.php new file mode 100644 index 000000000..bb0a4f606 --- /dev/null +++ b/resources/lang/pl-PL/updates.php @@ -0,0 +1,15 @@ + 'Zainstalowana wersja', + 'latest_version' => 'Najnowsza wersja', + 'update' => 'Aktualizuj Akaunting do wersji :version', + 'changelog' => 'Lista zmian', + 'check' => 'Sprawdź', + 'new_core' => 'Dostępna jest nowsza wersja Akaunting.', + 'latest_core' => 'Gratulacje! Masz najnowszą wersję Akaunting. Przyszłe aktualizacje bezpieczeństwa zostaną zastosowane automatycznie.', + 'success' => 'Proces aktualizacji został pomyślnie zakończony.', + 'error' => 'Aktualizacja nie powiodła się, spróbuj ponownie.', + +]; diff --git a/resources/lang/ro-RO/items.php b/resources/lang/ro-RO/items.php index d3948fc29..83cad7a5b 100644 --- a/resources/lang/ro-RO/items.php +++ b/resources/lang/ro-RO/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'Cantitate | Cantităţi', 'sales_price' => 'Pret de vanzare', 'purchase_price' => 'Cost de achizitie', - 'sku' => 'Unitate de stoc', - - 'notification' => [ - 'message' => [ - 'reminder' => 'You are receiving this email because only :quantity of :name has remained.', - 'out_of_stock' => 'You are receiving this email because the :name is running out of stock.', - ], - 'button' => 'Vezi acum', - ], ]; diff --git a/resources/lang/ru-RU/auth.php b/resources/lang/ru-RU/auth.php index 0ad0221eb..909c1c5ea 100644 --- a/resources/lang/ru-RU/auth.php +++ b/resources/lang/ru-RU/auth.php @@ -13,6 +13,7 @@ return [ 'current_email' => 'Текущий E-mail', 'reset' => 'Сбросить', 'never' => 'никогда', + 'landing_page' => 'Стартовая страница', 'password' => [ 'current' => 'Пароль', diff --git a/resources/lang/ru-RU/customers.php b/resources/lang/ru-RU/customers.php index a92c80bc0..d0db11b68 100644 --- a/resources/lang/ru-RU/customers.php +++ b/resources/lang/ru-RU/customers.php @@ -6,7 +6,7 @@ return [ 'user_created' => 'Пользователь создан', 'error' => [ - 'email' => 'Этот e-mail уже занят.' + 'email' => 'Этот e-mail уже занят.', ], ]; diff --git a/resources/lang/ru-RU/demo.php b/resources/lang/ru-RU/demo.php index 11044dc1d..efba566f0 100644 --- a/resources/lang/ru-RU/demo.php +++ b/resources/lang/ru-RU/demo.php @@ -2,12 +2,33 @@ return [ - 'accounts_cash' => 'Средства', - 'categories_deposit' => 'Депозит', - 'categories_sales' => 'Продажи', - 'currencies_usd' => 'Доллар США', - 'currencies_eur' => 'Евро', - 'currencies_gbp' => 'Британский Фунт', - 'currencies_try' => 'Турецкая Лира', + 'accounts' => [ + 'cash' => 'Оплата наличными', + ], + + 'categories' => [ + 'deposit' => 'Депозит', + 'sales' => 'Продажи', + ], + + 'currencies' => [ + 'usd' => 'Доллар США', + 'eur' => 'Евро', + 'gbp' => 'Британский Фунт', + 'try' => 'Турецкая Лира', + ], + + 'offline_payments' => [ + 'cash' => 'Оплата наличными', + 'bank' => 'Банковский перевод', + ], + + 'reports' => [ + 'income' => 'Итоги месячных доходов по категориям.', + 'expense' => 'Итоги месячных расходов по категориям.', + 'income_expense' => 'Итоги месячных доходов и расходов по категориям.', + 'tax' => 'Ежеквартальные итоги по налогам.', + 'profit_loss' => 'Ежеквартальная прибыль и убыток по категориям.', + ], ]; diff --git a/resources/lang/ru-RU/maintenance.php b/resources/lang/ru-RU/maintenance.php index f4da5c544..78b87dc01 100644 --- a/resources/lang/ru-RU/maintenance.php +++ b/resources/lang/ru-RU/maintenance.php @@ -8,4 +8,4 @@ return [ 'last-updated' => 'Последнее обновление сообщения :timestamp', -]; \ No newline at end of file +]; diff --git a/resources/lang/sk-SK/items.php b/resources/lang/sk-SK/items.php index dfff5df64..29ff7d525 100644 --- a/resources/lang/sk-SK/items.php +++ b/resources/lang/sk-SK/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'Množstvo|množstvo', 'sales_price' => 'Predajná cena', 'purchase_price' => 'Nákúpna cena', - 'sku' => 'Kód SKU', - - 'notification' => [ - 'message' => [ - 'reminder' => 'Dostávate tento e-mail, pretože pre tovar :name zostáva už len :quantity dostupných na sklade.', - 'out_of_stock' => 'Dostávate tento e-mail, pretože tovar :name práve dochádza na sklade.', - ], - 'button' => 'Zobraziť teraz', - ], ]; diff --git a/resources/lang/sk-SK/recurring.php b/resources/lang/sk-SK/recurring.php index ac9593b04..df90b9e6d 100644 --- a/resources/lang/sk-SK/recurring.php +++ b/resources/lang/sk-SK/recurring.php @@ -15,6 +15,6 @@ return [ 'weeks' => 'Týždeň(ov)', 'months' => 'Mesiac(e)', 'years' => 'Rok(y)', - 'message' => 'Toto je opakujúci sa :type a ďalši :type bude automaticky vygenerovaný v :date', + 'message' => 'Toto je opakujúca sa :type a ďalšia :type bude automaticky vygenerovaná :date', ]; diff --git a/resources/lang/sl-SI/accounts.php b/resources/lang/sl-SI/accounts.php new file mode 100644 index 000000000..0d5cea045 --- /dev/null +++ b/resources/lang/sl-SI/accounts.php @@ -0,0 +1,14 @@ + 'Ime računa', + 'number' => 'Številka', + 'opening_balance' => 'Začetni saldo', + 'current_balance' => 'Trenutno stanje', + 'bank_name' => 'Ime banke', + 'bank_phone' => 'Telefonska številka banke', + 'bank_address' => 'Naslov banke', + 'default_account' => 'Privzeti račun', + +]; diff --git a/resources/lang/sl-SI/currencies.php b/resources/lang/sl-SI/currencies.php new file mode 100644 index 000000000..4fece87b6 --- /dev/null +++ b/resources/lang/sl-SI/currencies.php @@ -0,0 +1,18 @@ + 'Oznaka', + 'rate' => 'Tečaj', + 'default' => 'Privzeta valuta', + 'decimal_mark' => 'Decimalno ločilo', + 'thousands_separator' => 'Ločilo tisočic', + 'precision' => 'Natančnost', + 'symbol' => [ + 'symbol' => 'Simbol', + 'position' => 'Mesto simbola', + 'before' => 'Pred zneskom', + 'after' => 'Za zneskom', + ] + +]; diff --git a/resources/lang/sl-SI/footer.php b/resources/lang/sl-SI/footer.php new file mode 100644 index 000000000..3f5df689c --- /dev/null +++ b/resources/lang/sl-SI/footer.php @@ -0,0 +1,10 @@ + 'Verzija', + 'powered' => 'Poganja Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Brezplačni program za računovodstvo', + +]; diff --git a/resources/lang/sl-SI/import.php b/resources/lang/sl-SI/import.php new file mode 100644 index 000000000..78ff78585 --- /dev/null +++ b/resources/lang/sl-SI/import.php @@ -0,0 +1,9 @@ + 'Uvozi', + 'title' => 'Uvozi :type', + 'message' => 'Dovoljene vrste datotek: XLS, XLSX. Naloži testno datoteko.', + +]; diff --git a/resources/lang/sl-SI/items.php b/resources/lang/sl-SI/items.php new file mode 100644 index 000000000..b37f82204 --- /dev/null +++ b/resources/lang/sl-SI/items.php @@ -0,0 +1,8 @@ + 'Prodajna cena', + 'purchase_price' => 'Nabavna cena', + +]; diff --git a/resources/lang/sl-SI/notifications.php b/resources/lang/sl-SI/notifications.php new file mode 100644 index 000000000..0d884e56b --- /dev/null +++ b/resources/lang/sl-SI/notifications.php @@ -0,0 +1,10 @@ + 'Ops!', + 'hello' => 'Dobrodošli!', + 'salutation' => 'S spoštovanjem,
    : company_name', + 'subcopy' => 'Če imate težave s klikom na gumb ": besedilo", kopirajte in prilepite spodnji URL v spletni brskalnik: [: url](:url)', + +]; diff --git a/resources/lang/sl-SI/recurring.php b/resources/lang/sl-SI/recurring.php new file mode 100644 index 000000000..2d29ea7c7 --- /dev/null +++ b/resources/lang/sl-SI/recurring.php @@ -0,0 +1,20 @@ + 'Ponavljajoče', + 'every' => 'Vsakih', + 'period' => 'Obdobje', + 'times' => 'Krat', + 'daily' => 'Dnevno', + 'weekly' => 'Tedensko', + 'monthly' => 'Mesečno', + 'yearly' => 'Letno', + 'custom' => 'Po meri', + 'days' => 'Dan(dni)', + 'weeks' => 'Teden(tednov)', + 'months' => 'Mesec(ov)', + 'years' => 'Let', + 'message' => 'To je ponavljajoč :type in naslednji :type bo avtomatsko ustvarjen :date', + +]; diff --git a/resources/lang/sl-SI/transfers.php b/resources/lang/sl-SI/transfers.php new file mode 100644 index 000000000..45c6f06f1 --- /dev/null +++ b/resources/lang/sl-SI/transfers.php @@ -0,0 +1,12 @@ + 'Iz računa', + 'to_account' => 'Na račun', + + 'messages' => [ + 'delete' => ': od do: do (: znesek)', + ], + +]; diff --git a/resources/lang/sl-SI/updates.php b/resources/lang/sl-SI/updates.php new file mode 100644 index 000000000..3f95f86a0 --- /dev/null +++ b/resources/lang/sl-SI/updates.php @@ -0,0 +1,15 @@ + 'Nameščena različica', + 'latest_version' => 'Najnovejša različica', + 'update' => 'Posodobitev programa Akaunting za: verzija verzija', + 'changelog' => 'Seznam sprememb', + 'check' => 'Preveri', + 'new_core' => 'Na voljo je posodobljena verzija programa Akaunting.', + 'latest_core' => 'Čestitamo! Imate najnovejšo verzijo programa Akaunting. Varnostne posodobitve bodo naložene samodejno.', + 'success' => 'Nadgradnja je bila uspešno dokončana.', + 'error' => 'Nadgradnja ni bila uspešno dokončana.', + +]; diff --git a/resources/lang/sr-CS/accounts.php b/resources/lang/sr-CS/accounts.php new file mode 100644 index 000000000..c4a75a074 --- /dev/null +++ b/resources/lang/sr-CS/accounts.php @@ -0,0 +1,14 @@ + 'Naziv računa', + 'number' => 'Broj', + 'opening_balance' => 'Početni saldo', + 'current_balance' => 'Trenutni saldo', + 'bank_name' => 'Ime banke', + 'bank_phone' => 'Broj telefona banke', + 'bank_address' => 'Adresa banke', + 'default_account' => 'Podrazumevani račun', + +]; diff --git a/resources/lang/sr-CS/auth.php b/resources/lang/sr-CS/auth.php new file mode 100644 index 000000000..556652b94 --- /dev/null +++ b/resources/lang/sr-CS/auth.php @@ -0,0 +1,41 @@ + 'Profil', + 'logout' => 'Odjava', + 'login' => 'Prijava', + 'login_to' => 'Prijavite se kako biste započeli sesiju', + 'remember_me' => 'Zapamti me', + 'forgot_password' => 'Zabooravljena lozinka', + 'reset_password' => 'Resetovanje Lozinke', + 'enter_email' => 'Unesi svoju e-mail adresu', + 'current_email' => 'Tekući e-mail', + 'reset' => 'Resetuj', + 'never' => 'nikad', + 'landing_page' => 'Strana', + + 'password' => [ + 'current' => 'Lozinka', + 'current_confirm' => 'Potvrda lozinke', + 'new' => 'Nova lozinka', + 'new_confirm' => 'Potvrda lozinke', + ], + + 'error' => [ + 'self_delete' => 'Greška: Ne možete izbrisati sebe!', + 'self_disable' => 'Greška: Ne možete deaktivirati sebe!', + 'no_company' => 'Greška: Nema dodeljeno preduzeće na vaš nalog. Molim vas, obratite se administratoru sistema.', + ], + + 'failed' => 'Podaci ne odgovaraju ni jednom nalogu.', + 'disabled' => 'Ovaj nalog je onemogućen. Molim vas, obratite se administratoru sistema.', + 'throttle' => 'Previše neuspelih pokušaja. Pokušajte ponovo za :seconds sekundi.', + + 'notification' => [ + 'message_1' => 'Dobili ste ovu e-poruku jer smo primili poziv za poništavanje lozinke za vaš nalog.', + 'message_2' => 'Ako vi niste zahtevali poništavanje lozinke, nije potrebna nikakva dodatna radnja.', + 'button' => 'Resetovanje Lozinke', + ], + +]; diff --git a/resources/lang/sr-CS/bills.php b/resources/lang/sr-CS/bills.php new file mode 100644 index 000000000..c7c532c26 --- /dev/null +++ b/resources/lang/sr-CS/bills.php @@ -0,0 +1,69 @@ + 'Broj računa', + 'bill_date' => 'Datum računa', + 'total_price' => 'Ukupna cena', + 'due_date' => 'Datum dospeća', + 'order_number' => 'Broj narudžbine', + 'bill_from' => 'Račun od', + + 'quantity' => 'Količina', + 'price' => 'Cena', + 'sub_total' => 'Međuzbir', + 'discount' => 'Popust', + 'item_discount' => 'Popust', + 'tax_total' => 'Ukupan porez', + 'total' => 'Ukupno', + + 'item_name' => 'Naziv stavke', + + 'show_discount' => ':discount% Popust', + 'add_discount' => 'Dodajte popust', + 'discount_desc' => 'od međuzbira', + + 'payment_due' => 'Dospeće plaćanja', + 'amount_due' => 'Dospeli iznos', + 'paid' => 'Plaćeno', + 'histories' => 'Istorija', + 'payments' => 'Uplate', + 'add_payment' => 'Dodaj plaćanje', + 'mark_paid' => 'Označeno plaćeno', + 'mark_received' => 'Označi kao primljeno', + 'mark_cancelled' => 'Označeno otkazano', + 'download_pdf' => 'Preuzmite PDF', + 'send_mail' => 'Pošaljite email', + 'create_bill' => 'Kreiraj račun', + 'receive_bill' => 'Primi račun', + 'make_payment' => 'Napravite plaćanja', + + 'statuses' => [ + 'draft' => 'Skica', + 'received' => 'Primljeno', + 'partial' => 'Delimično', + 'paid' => 'Plaćeno', + 'overdue' => 'Dospelo', + 'unpaid' => 'Nije plaćeno', + 'cancelled' => 'Otkazano', + ], + + 'messages' => [ + 'marked_received' => 'Račun označen kao primljen!', + 'marked_paid' => 'Račun označen kao plaćen!', + 'marked_cancelled' => 'Račun označen kao otkazan!', + 'draft' => 'Ovo je SKICA računa koji će se odraziti na grafikone nakon prijema.', + + 'status' => [ + 'created' => 'Datum kreiranja :date', + 'receive' => [ + 'draft' => 'Nije poslato', + 'received' => 'Datum prijema :date', + ], + 'paid' => [ + 'await' => 'Čekanje uplate', + ], + ], + ], + +]; diff --git a/resources/lang/sr-CS/companies.php b/resources/lang/sr-CS/companies.php new file mode 100644 index 000000000..fc4f45d0f --- /dev/null +++ b/resources/lang/sr-CS/companies.php @@ -0,0 +1,14 @@ + 'Domеn', + 'logo' => 'Logo', + + 'error' => [ + 'not_user_company' => 'Greška: Nije vam dozvoljeno da menjate ovu kompaniju!', + 'delete_active' => 'Greška: Nije moguće brisanje aktivne kompanije. Molim vas promenite na drugu pre brisanja!', + 'disable_active' => 'Greška: Nije moguće deaktiviranje aktivne kompanije. Molim vas promenite na drugu pre deaktivacije!', + ], + +]; diff --git a/resources/lang/sr-CS/currencies.php b/resources/lang/sr-CS/currencies.php new file mode 100644 index 000000000..52245db4b --- /dev/null +++ b/resources/lang/sr-CS/currencies.php @@ -0,0 +1,18 @@ + 'Šifra', + 'rate' => 'Stopa', + 'default' => 'Podrazumevana valuta', + 'decimal_mark' => 'Decimalni znak', + 'thousands_separator' => 'Znak za razdvajanje hiljada', + 'precision' => 'Preciznost', + 'symbol' => [ + 'symbol' => 'Simbol', + 'position' => 'Pozicija simbola', + 'before' => 'Pre iznosa', + 'after' => 'Nakon iznosa', + ] + +]; diff --git a/resources/lang/sr-CS/customers.php b/resources/lang/sr-CS/customers.php new file mode 100644 index 000000000..5ad7e414a --- /dev/null +++ b/resources/lang/sr-CS/customers.php @@ -0,0 +1,12 @@ + 'Možete se prijaviti?', + 'user_created' => 'Korisnik kreiran', + + 'error' => [ + 'email' => 'Email već postoji.', + ], + +]; diff --git a/resources/lang/sr-CS/dashboards.php b/resources/lang/sr-CS/dashboards.php new file mode 100644 index 000000000..ec6fa69f7 --- /dev/null +++ b/resources/lang/sr-CS/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'Greška: Nije vam dozvoljeno da menjate ovaj prikaz!', + 'delete_last' => 'Greška: Ne možete obrisati poslednji prikaz. Kreirajte novi prvo!', + 'disable_last' => 'Greška: Ne možete onemogućiti poslednji prikaz. Kreirajte novi prvo!', + ], + +]; diff --git a/resources/lang/sr-CS/demo.php b/resources/lang/sr-CS/demo.php new file mode 100644 index 000000000..6747b5548 --- /dev/null +++ b/resources/lang/sr-CS/demo.php @@ -0,0 +1,34 @@ + [ + 'cash' => 'Gotovina', + ], + + 'categories' => [ + 'deposit' => 'Depozit', + 'sales' => 'Prodaja', + ], + + 'currencies' => [ + 'usd' => 'Američki dolar', + 'eur' => 'Euro', + 'gbp' => 'Britanska funta', + 'try' => 'Turska Lira', + ], + + 'offline_payments' => [ + 'cash' => 'Gotovina', + 'bank' => 'Bankarski prenos', + ], + + 'reports' => [ + 'income' => 'Mesečni prihodi zbirno po kategorijama.', + 'expense' => 'Mesečni troškovi zbirno po kategorijama.', + 'income_expense' => 'Mesečni prihodi / troškovi zbirno po kategorijama.', + 'tax' => 'Kvartalni porezi zbirno.', + 'profit_loss' => 'Kvartalni prihodi/troškovi po kategorijama.', + ], + +]; diff --git a/resources/lang/sr-CS/errors.php b/resources/lang/sr-CS/errors.php new file mode 100644 index 000000000..440e36649 --- /dev/null +++ b/resources/lang/sr-CS/errors.php @@ -0,0 +1,23 @@ + [ + '403' => 'Ups! Zabranjen pristup', + '404' => 'Ups! Strana nije pronađena', + '500' => 'Ups! Došlo je do greške', + ], + + 'header' => [ + '403' => '403 Zabranjeno', + '404' => '404 Nije pronađeno', + '500' => '500 Unutrašnja grеška sеrvеra', + ], + + 'message' => [ + '403' => 'Ne možete pristupiti ovoj strani.', + '404' => 'Ne možemo da pronađemo stranu koju tražite.', + '500' => 'Radićemo na ispravci odmah.', + ], + +]; diff --git a/resources/lang/sr-CS/footer.php b/resources/lang/sr-CS/footer.php new file mode 100644 index 000000000..d6ae7ecb0 --- /dev/null +++ b/resources/lang/sr-CS/footer.php @@ -0,0 +1,10 @@ + 'Vеrzija', + 'powered' => 'Omogućio vam je Akaunting', + 'link' => 'https://Akaunting.com', + 'software' => 'Slobodan softver za knjigovodstvo', + +]; diff --git a/resources/lang/sr-CS/import.php b/resources/lang/sr-CS/import.php new file mode 100644 index 000000000..84059292e --- /dev/null +++ b/resources/lang/sr-CS/import.php @@ -0,0 +1,9 @@ + 'Uvezi', + 'title' => 'Uvoz: type', + 'message' => 'Dozvoljeni tipovi datoteka: XLS, XLSX. Molim vas preuzmite, , probnu datoteku.', + +]; diff --git a/resources/lang/sr-CS/items.php b/resources/lang/sr-CS/items.php new file mode 100644 index 000000000..9e49ec4ad --- /dev/null +++ b/resources/lang/sr-CS/items.php @@ -0,0 +1,8 @@ + 'Prodajna cena', + 'purchase_price' => 'Tip kupovine', + +]; diff --git a/resources/lang/sr-CS/pagination.php b/resources/lang/sr-CS/pagination.php new file mode 100644 index 000000000..0bd412299 --- /dev/null +++ b/resources/lang/sr-CS/pagination.php @@ -0,0 +1,10 @@ + 'Prеthodno', + 'next' => 'Slеdеćе', + 'showing' => ':first-:last od :total podataka.', + 'page' => 'po stranici.', + +]; diff --git a/resources/lang/sr-CS/transfers.php b/resources/lang/sr-CS/transfers.php new file mode 100644 index 000000000..16fd0bf73 --- /dev/null +++ b/resources/lang/sr-CS/transfers.php @@ -0,0 +1,12 @@ + 'Sa računa', + 'to_account' => 'Na račun', + + 'messages' => [ + 'delete' => ':from na :to (:amount)', + ], + +]; diff --git a/resources/lang/sr-CS/updates.php b/resources/lang/sr-CS/updates.php new file mode 100644 index 000000000..69ac22333 --- /dev/null +++ b/resources/lang/sr-CS/updates.php @@ -0,0 +1,15 @@ + 'Instalirana verzija', + 'latest_version' => 'Najnovija verzija', + 'update' => 'Ažuriraj Akaunting do verzije :version', + 'changelog' => 'Evidеncija promеna', + 'check' => 'Proveri', + 'new_core' => 'Dostupna je novija verzija aplikacije.', + 'latest_core' => 'Čestitamo! Imate najnoviju verziju Akaunting. Buduće bezbednosne ispravke će automatski biti instalirane.', + 'success' => 'Proces ažuriranja je uspešno završen.', + 'error' => 'Proces ažuriranja je propao, molim te, probaj ponovo.', + +]; diff --git a/resources/lang/sr-CS/widgets.php b/resources/lang/sr-CS/widgets.php new file mode 100644 index 000000000..9ee2985e4 --- /dev/null +++ b/resources/lang/sr-CS/widgets.php @@ -0,0 +1,23 @@ + 'Ukupni prihodi', + 'receivables' => 'Potraživanja', + 'open_invoices' => 'Otvorene fakture', + 'overdue_invoices' => 'Dospele fakture', + 'total_expenses' => 'Ukupni troškovi', + 'payables' => 'Dugovanja', + 'open_bills' => 'Otvoreni računi', + 'overdue_bills' => 'Dospeli računi', + 'total_profit' => 'Ukupna dobit', + 'open_profit' => 'Otvorena dobit', + 'overdue_profit' => 'Dospela dobit', + 'cash_flow' => 'Novčani tok', + 'no_profit_loss' => 'Nema gubitka dobita', + 'income_by_category' => 'Prihodi po kategoriji', + 'expenses_by_category' => 'Troškovi po kategoriji', + 'account_balance' => 'Stanje na računu', + 'latest_income' => 'Najnoviji prihodi', + 'latest_expenses' => 'Najnoviji troškovi', +]; diff --git a/resources/lang/sr-SP/accounts.php b/resources/lang/sr-SP/accounts.php new file mode 100644 index 000000000..73249bf22 --- /dev/null +++ b/resources/lang/sr-SP/accounts.php @@ -0,0 +1,14 @@ + 'Назив рачуна', + 'number' => 'Број', + 'opening_balance' => 'Почетни салдо', + 'current_balance' => 'Тренутни салдо', + 'bank_name' => 'Назив банке', + 'bank_phone' => 'Телефон банке', + 'bank_address' => 'Адреса банке', + 'default_account' => 'Основни рачун', + +]; diff --git a/resources/lang/sr-SP/currencies.php b/resources/lang/sr-SP/currencies.php new file mode 100644 index 000000000..9a7bb7d30 --- /dev/null +++ b/resources/lang/sr-SP/currencies.php @@ -0,0 +1,18 @@ + 'Код', + 'rate' => 'Стопа', + 'default' => 'Задата валута', + 'decimal_mark' => 'Децимална ознака', + 'thousands_separator' => 'Знак за раздвајање хиљада', + 'precision' => 'Број децимала', + 'symbol' => [ + 'symbol' => 'Симбол', + 'position' => 'Положај симбола', + 'before' => 'Пре износа', + 'after' => 'Након износа', + ] + +]; diff --git a/resources/lang/sr-SP/footer.php b/resources/lang/sr-SP/footer.php new file mode 100644 index 000000000..07c319721 --- /dev/null +++ b/resources/lang/sr-SP/footer.php @@ -0,0 +1,10 @@ + 'Верзија', + 'powered' => 'Омогућио вам је Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Слободан рачуноводствени програм', + +]; diff --git a/resources/lang/sr-SP/import.php b/resources/lang/sr-SP/import.php new file mode 100644 index 000000000..6adc6653c --- /dev/null +++ b/resources/lang/sr-SP/import.php @@ -0,0 +1,9 @@ + 'Увези', + 'title' => 'Увоз :type', + 'message' => 'Допуштени типови датотека: CSV, XLS. Молимо, преузмите пример датотеке.', + +]; diff --git a/resources/lang/sr-SP/items.php b/resources/lang/sr-SP/items.php new file mode 100644 index 000000000..be26911fa --- /dev/null +++ b/resources/lang/sr-SP/items.php @@ -0,0 +1,8 @@ + 'Продајна цена', + 'purchase_price' => 'Набавна цена', + +]; diff --git a/resources/lang/sr-SP/notifications.php b/resources/lang/sr-SP/notifications.php new file mode 100644 index 000000000..f8ec72499 --- /dev/null +++ b/resources/lang/sr-SP/notifications.php @@ -0,0 +1,10 @@ + 'Упс!', + 'hello' => 'Здраво!', + 'salutation' => 'С поштовањем,
    :company_name', + 'subcopy' => 'Ако имате проблема кликнути на „:text” дугме, копирајте и налепите УРЛ адресу испод у веб прегледачу: [:url](:url)', + +]; diff --git a/resources/lang/sr-SP/recurring.php b/resources/lang/sr-SP/recurring.php new file mode 100644 index 000000000..bf775454e --- /dev/null +++ b/resources/lang/sr-SP/recurring.php @@ -0,0 +1,20 @@ + 'Понављајуће', + 'every' => 'Сваких', + 'period' => 'Период', + 'times' => 'Пута', + 'daily' => 'Дневно', + 'weekly' => 'Недељно', + 'monthly' => 'Месечно', + 'yearly' => 'Годишње', + 'custom' => 'Шрилагођено', + 'days' => 'Дан(a)', + 'weeks' => 'Недеља(е)', + 'months' => 'Месеца(и)', + 'years' => 'Године(a)', + 'message' => 'Ово је понављајући :type и следећи :type ће аутоматски бити генерисан :date', + +]; diff --git a/resources/lang/sr-SP/transfers.php b/resources/lang/sr-SP/transfers.php new file mode 100644 index 000000000..615f5229d --- /dev/null +++ b/resources/lang/sr-SP/transfers.php @@ -0,0 +1,12 @@ + 'Са рачуна', + 'to_account' => 'На рачун', + + 'messages' => [ + 'delete' => ':from за :to (:amount)', + ], + +]; diff --git a/resources/lang/sr-SP/updates.php b/resources/lang/sr-SP/updates.php new file mode 100644 index 000000000..7e655a1c8 --- /dev/null +++ b/resources/lang/sr-SP/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/th-TH/items.php b/resources/lang/th-TH/items.php index e81192170..a478fb03b 100644 --- a/resources/lang/th-TH/items.php +++ b/resources/lang/th-TH/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'จำนวน | จำนวน', 'sales_price' => 'ราคาขาย', 'purchase_price' => 'ราคาซื้อ', - 'sku' => 'SKU', - - 'notification' => [ - 'message' => [ - 'reminder' => 'You are receiving this email because only :quantity of :name has remained.', - 'out_of_stock' => 'You are receiving this email because the :name is running out of stock.', - ], - 'button' => 'ดูตอนนี้', - ], ]; diff --git a/resources/lang/uk-UA/modules.php b/resources/lang/uk-UA/modules.php index 878eb4ecd..379985f4d 100644 --- a/resources/lang/uk-UA/modules.php +++ b/resources/lang/uk-UA/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Новий', 'top_free' => 'Топ безкоштовних', 'free' => 'БЕЗКОШТОВНО', - 'search' => 'Пошук', 'install' => 'Встановити', 'buy_now' => 'Купити зараз', 'get_api_key' => 'Натисніть тут , щоб отримати свій ключ API.', diff --git a/resources/lang/ur-PK/items.php b/resources/lang/ur-PK/items.php index a0155ac7e..802305f51 100644 --- a/resources/lang/ur-PK/items.php +++ b/resources/lang/ur-PK/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'مقدار|مقدار', 'sales_price' => 'فروخت کی قیمت', 'purchase_price' => 'قیمت خرید', - 'sku' => 'SKU', - - 'notification' => [ - 'message' => [ - 'reminder' => 'آپ یہ ای میل وصول کر رہے ہیں کیونکہ صرف: مقدار: نام جاری ہے.', - 'out_of_stock' => 'آپ اس ای میل وصول کر رہے ہیں کیونکہ: نام اسٹاک سے باہر چل رہا ہے.', - ], - 'button' => 'اب دیکھیں', - ], ]; diff --git a/resources/lang/uz-UZ/auth.php b/resources/lang/uz-UZ/auth.php index 93281140a..eb4f1732e 100644 --- a/resources/lang/uz-UZ/auth.php +++ b/resources/lang/uz-UZ/auth.php @@ -13,6 +13,7 @@ return [ 'current_email' => 'Email adresingiz', 'reset' => 'Yangilash', 'never' => 'hech qachon', + 'landing_page' => 'Qo‘shilish sahifasi', 'password' => [ 'current' => 'Parol', diff --git a/resources/lang/uz-UZ/companies.php b/resources/lang/uz-UZ/companies.php index 6cc78bef3..478dab6cb 100644 --- a/resources/lang/uz-UZ/companies.php +++ b/resources/lang/uz-UZ/companies.php @@ -4,12 +4,11 @@ return [ 'domain' => 'Domen', 'logo' => 'Logotip', - 'manage' => 'Kompaniyalarni boshqarish', - 'all' => 'Barcha kompaniyalar', 'error' => [ 'not_user_company' => 'Xato: ushbu kompaniyani o\'zgartirish huquqingiz yo\'q!', 'delete_active' => 'Xato: Faol kompaniyani o\'chirib bo\'lmaydi, iltimos, avval o\'zgartiring!', + 'disable_active' => 'Xato: Faol kompaniyani o\'chirib qo\'yib bo\'lmaydi. Iltimos, avval boshqasiga o\'ting!', ], ]; diff --git a/resources/lang/uz-UZ/customers.php b/resources/lang/uz-UZ/customers.php index a4dc76129..c1f033573 100644 --- a/resources/lang/uz-UZ/customers.php +++ b/resources/lang/uz-UZ/customers.php @@ -6,7 +6,7 @@ return [ 'user_created' => 'Foydalanuvchi yaratilgan', 'error' => [ - 'email' => 'Bu elektron pochta band.' + 'email' => 'Bu elektron pochta band.', ], ]; diff --git a/resources/lang/uz-UZ/dashboards.php b/resources/lang/uz-UZ/dashboards.php new file mode 100644 index 000000000..9c22eb485 --- /dev/null +++ b/resources/lang/uz-UZ/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'Xato: boshqaruv panelini o\'zgartirishga ruxsat yo\'q!', + 'delete_last' => 'Xato: oxirgi boshqaruv panelini o\'chirib bo\'lmadi. Iltimos, avval yangisini yarating!', + 'disable_last' => 'Xato: oxirgi boshqaruv panelini o\'chirib bo\'lmayapti. Iltimos, avval yangisini yarating!', + ], + +]; diff --git a/resources/lang/uz-UZ/demo.php b/resources/lang/uz-UZ/demo.php index c80854f3c..d0f7258ed 100644 --- a/resources/lang/uz-UZ/demo.php +++ b/resources/lang/uz-UZ/demo.php @@ -2,12 +2,33 @@ return [ - 'accounts_cash' => 'Naqd pul', - 'categories_deposit' => 'Omonat', - 'categories_sales' => 'Savdo', - 'currencies_usd' => 'AQSh dollari', - 'currencies_eur' => 'Evro', - 'currencies_gbp' => 'Britaniya funti', - 'currencies_try' => 'Turk lirasi', + 'accounts' => [ + 'cash' => 'Naqd pul', + ], + + 'categories' => [ + 'deposit' => 'Omonat', + 'sales' => 'Savdo', + ], + + 'currencies' => [ + 'usd' => 'AQSh dollari', + 'eur' => 'Evro', + 'gbp' => 'Britaniya funti', + 'try' => 'Turk lirasi', + ], + + 'offline_payments' => [ + 'cash' => 'Naqd pul', + 'bank' => 'Bank o\'tkazmasi', + ], + + 'reports' => [ + 'income' => 'Toifalar bo\'yicha oylik daromadlarning qisqacha tavsifi.', + 'expense' => 'Toifalar bo\'yicha oylik xarajatlarning qisqacha tavsifi.', + 'income_expense' => 'Kategoriya bo\'yicha xarajatlar va oylik daromadlari.', + 'tax' => 'Har chorakda soliq xulosasi.', + 'profit_loss' => 'Toifalar bo\'yicha chorakfagi foyda va zarar.', + ], ]; diff --git a/resources/lang/uz-UZ/errors.php b/resources/lang/uz-UZ/errors.php index 56c3e3db6..84db32158 100644 --- a/resources/lang/uz-UZ/errors.php +++ b/resources/lang/uz-UZ/errors.php @@ -2,23 +2,22 @@ return [ - 'forbidden_access' => 'Taqiqlangan kirish', - 'error_page' => 'Xato sahifasi', - 'page_not_found' => 'Sahifa topilmadi', - - 'body' => [ - 'forbidden_access' => 'Afsuski! Taqiqlangan kirish.', - 'error_page' => 'Afsuski! Nimadir noto\'g\'ri bajarildi.', - 'page_not_found' => 'Afsuski! Sahifa topilmadi.', + 'title' => [ + '403' => 'Voy! Taqiqlangan kirish', + '404' => 'Voy! Sahifa topilmadi', + '500' => 'Voy! Nimadir noto\'g\'ri bajarildi', ], - 'messages' => [ - 'forbidden_access' => 'Siz ushbu sahifaga kira olmaysiz. - Shu bilan birga, siz boshqaruv paneliga qaytishingiz mumkin.', - 'error_page' => 'Biz buni darhol tuzatish ustida ishlaymiz. - Shu bilan birga, siz boshqaruv paneliga qaytishingiz mumkin.', - 'page_not_found' => 'Siz qidirayotgan sahifani topa olmadik. -         Shu bilan birga, siz boshqaruv paneliga qaytishingiz mumkin.', + 'header' => [ + '403' => '403 man etilgan', + '404' => '404 topilmadi', + '500' => '500 ichki server xatosi', + ], + + 'message' => [ + '403' => 'Siz ushbu sahifaga kira olmaysiz.', + '404' => 'Siz qidirayotgan sahifani topa olmadik.', + '500' => 'Biz buni darhol tuzatish ustida ishlaymiz.', ], ]; diff --git a/resources/lang/uz-UZ/maintenance.php b/resources/lang/uz-UZ/maintenance.php index 8da55f5e2..57439ab59 100644 --- a/resources/lang/uz-UZ/maintenance.php +++ b/resources/lang/uz-UZ/maintenance.php @@ -8,4 +8,4 @@ return [ 'last-updated' => 'Ushbu xabar oxirgi marta :timestamp da yangilandi', -]; \ No newline at end of file +]; diff --git a/resources/lang/uz-UZ/modules.php b/resources/lang/uz-UZ/modules.php index 98ff25414..40b81fbf9 100644 --- a/resources/lang/uz-UZ/modules.php +++ b/resources/lang/uz-UZ/modules.php @@ -9,13 +9,11 @@ return [ 'new' => 'Yangi', 'top_free' => 'Eng yaxshi bepul', 'free' => 'OZOD', - 'search' => 'Qidiruv', 'install' => 'O\'rnatish', 'buy_now' => 'Hozir xarid qilish', - 'api_key_link' => 'bu yerni bosing bu sizning API kalitingizni olish.', + 'get_api_key' => 'API kalitingizni olish uchun shu yerni bosing .', 'no_apps' => 'Ushbu toifadagi dasturlar hali mavjud emas.', - 'developer' => 'Siz dasturchisiz? Here Bu erdasiz qanday qilib dastur yaratishni va bugungi kunda sotishni boshlashni o\'rganishingiz mumkin!', - + 'become_developer' => 'Siz dasturchisiz? Bu erda siz qanday qilib dastur yaratishni va bugungi kunda sotishni boshlashni o\'rganishingiz mumkin!', 'recommended_apps' => 'Tavsiya etilgan ilovalar', 'about' => 'Haqida', @@ -80,5 +78,6 @@ return [ ], 'na' => 'U erda sharhlar yo\'q.' - ] + ], + ]; diff --git a/resources/lang/uz-UZ/pagination.php b/resources/lang/uz-UZ/pagination.php index fcd857d00..0b1768c2c 100644 --- a/resources/lang/uz-UZ/pagination.php +++ b/resources/lang/uz-UZ/pagination.php @@ -4,7 +4,7 @@ return [ 'previous' => '« Oldinga', 'next' => 'Keyingi »', - 'showing' => ':first-:last of :total records.', + 'showing' => ': birinchi-: oxirgisi: jami yozuvlar.', 'page' => 'sahifaga.', ]; diff --git a/resources/lang/uz-UZ/reports.php b/resources/lang/uz-UZ/reports.php index 7de49e05e..145d3ca92 100644 --- a/resources/lang/uz-UZ/reports.php +++ b/resources/lang/uz-UZ/reports.php @@ -12,7 +12,7 @@ return [ 'net_profit' => 'Sof foyda', 'total_expenses' => 'Umumiy xarajatlar', 'net' => 'NET', - 'income-expense' => 'Daromad va xarajatlar', + 'income_expense' => 'Daromad va xarajatlar', 'summary' => [ 'income' => 'Umumiy foyda', diff --git a/resources/lang/uz-UZ/widgets.php b/resources/lang/uz-UZ/widgets.php new file mode 100644 index 000000000..e7391b5b0 --- /dev/null +++ b/resources/lang/uz-UZ/widgets.php @@ -0,0 +1,23 @@ + 'Umumiy daromad', + 'receivables' => 'Debitorlik qarzlari', + 'open_invoices' => 'Hisob-fakturalarni oching', + 'overdue_invoices' => 'Hisob-fakturalarni oching', + 'total_expenses' => 'Umumiy xarajatlar', + 'payables' => 'Kreditorlik qarzlari', + 'open_bills' => 'Ochiq hisob-kitoblar', + 'overdue_bills' => 'Kechiktirilgan hisob-kitoblar', + 'total_profit' => 'Umumiy foyda', + 'open_profit' => 'Ochiq foyda', + 'overdue_profit' => 'Kechiktirilgan foyda', + 'cash_flow' => 'Pul muomalasi', + 'no_profit_loss' => 'Daromadni yo`qatmay', + 'income_by_category' => 'Kategoriya bo\'yicha daromadlar', + 'expenses_by_category' => 'Kategoriyalar bo\'yicha xarajatlar', + 'account_balance' => 'Hisob qoldig`i', + 'latest_income' => 'So\'nggi daromad', + 'latest_expenses' => 'So\'nggi xarajatlar', +]; diff --git a/resources/lang/vi-VN/items.php b/resources/lang/vi-VN/items.php index d9b31240a..96f70292c 100644 --- a/resources/lang/vi-VN/items.php +++ b/resources/lang/vi-VN/items.php @@ -2,17 +2,7 @@ return [ - 'quantities' => 'Số lượng | Số lượng', 'sales_price' => 'Giá bán', 'purchase_price' => 'Giá Mua', - 'sku' => 'SKU', - - 'notification' => [ - 'message' => [ - 'reminder' => 'You are receiving this email because only :quantity of :name has remained.', - 'out_of_stock' => 'You are receiving this email because the :name is running out of stock.', - ], - 'button' => 'Xem ngay', - ], ]; From 9d75637fa3113bc2e0cd1a1ecb0d4a5f32e9e2ce Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 7 Aug 2020 00:45:22 +0000 Subject: [PATCH 167/208] new crowdin translations --- resources/lang/pt-BR/reconciliations.php | 1 + resources/lang/sq-AL/reconciliations.php | 1 + resources/lang/sr-SP/auth.php | 41 ++++++++++++++ resources/lang/sr-SP/bills.php | 69 ++++++++++++++++++++++++ resources/lang/sr-SP/header.php | 16 ++++++ resources/lang/tr-TR/reconciliations.php | 1 + 6 files changed, 129 insertions(+) create mode 100644 resources/lang/sr-SP/auth.php create mode 100644 resources/lang/sr-SP/bills.php create mode 100644 resources/lang/sr-SP/header.php diff --git a/resources/lang/pt-BR/reconciliations.php b/resources/lang/pt-BR/reconciliations.php index 39024c29a..5ab8bf516 100644 --- a/resources/lang/pt-BR/reconciliations.php +++ b/resources/lang/pt-BR/reconciliations.php @@ -4,6 +4,7 @@ return [ 'reconcile' => 'Reconciliar', 'reconciled' => 'Reconciliado', + 'opening_balance' => 'Saldo de abertura', 'closing_balance' => 'Fechamento de balanço', 'unreconciled' => 'Não reconciliadas', 'transactions' => 'Transações', diff --git a/resources/lang/sq-AL/reconciliations.php b/resources/lang/sq-AL/reconciliations.php index bfd1a6440..7aa5bf8d1 100644 --- a/resources/lang/sq-AL/reconciliations.php +++ b/resources/lang/sq-AL/reconciliations.php @@ -4,6 +4,7 @@ return [ 'reconcile' => 'Pajtim', 'reconciled' => 'Pajtuar', + 'opening_balance' => 'Bilanci i Hapjes', 'closing_balance' => 'Bilanci i Mbylljes', 'unreconciled' => 'Papajtuar', 'transactions' => 'Transaksionet', diff --git a/resources/lang/sr-SP/auth.php b/resources/lang/sr-SP/auth.php new file mode 100644 index 000000000..d7f58dc9f --- /dev/null +++ b/resources/lang/sr-SP/auth.php @@ -0,0 +1,41 @@ + 'Профил', + 'logout' => 'Одјава', + 'login' => 'Пријава', + 'login_to' => 'Пријава за покретање сесије', + 'remember_me' => 'Запамти ме', + 'forgot_password' => 'Заборавили смо лозинку', + 'reset_password' => 'Обнављање лозинке', + 'enter_email' => 'Упишите своју адресу е-поште', + 'current_email' => 'Тренутна е-пошта', + 'reset' => 'Обнови', + 'never' => 'Никад', + 'landing_page' => 'Лендинг страница', + + 'password' => [ + 'current' => 'Лозинка', + 'current_confirm' => 'Потврда лозинке', + 'new' => 'Нова лозинка', + 'new_confirm' => 'Потврда нове лозинке', + ], + + 'error' => [ + 'self_delete' => 'Грешка: Није могуће избрисати себе!', + 'self_disable' => 'Грешка: Није могуће онеспособити себе!', + 'no_company' => 'Грешка: Ни једна компанија није додата Вашем налогу. Молимо Вас, контактирајте администратора система.', + ], + + 'failed' => 'Унети подаци не одговарају нашим записима.', + 'disabled' => 'Овај налог је искључен. Молимо Вас обратите се администратору система.', + 'throttle' => 'Превише покушаја пријаве. Молимо Вас покушајте поново за :seconds секунди.', + + 'notification' => [ + 'message_1' => 'Примили сте ову е-пошту зато што смо добили захтев за обнову лозинке за ваш налог.', + 'message_2' => 'Ако нисте тражили обнову лозинке, нису потребно било шта даље радити.', + 'button' => 'Обнови лозинку', + ], + +]; diff --git a/resources/lang/sr-SP/bills.php b/resources/lang/sr-SP/bills.php new file mode 100644 index 000000000..a6069fbe9 --- /dev/null +++ b/resources/lang/sr-SP/bills.php @@ -0,0 +1,69 @@ + 'Број рачуна', + 'bill_date' => 'Датум рачуна', + 'total_price' => 'Укупна цена', + 'due_date' => 'Датум доспећа', + 'order_number' => 'Број поруџбенице', + 'bill_from' => 'Рачун од', + + 'quantity' => 'Количина', + 'price' => 'Цена', + 'sub_total' => 'Међузбир', + 'discount' => 'Попуст', + 'item_discount' => 'Линијски попуст', + 'tax_total' => 'Укупно порез', + 'total' => 'Укупно', + + 'item_name' => 'Назив ставке| Назив ставки', + + 'show_discount' => ':discount% попуста', + 'add_discount' => 'Додај попуст', + 'discount_desc' => 'од међузбира', + + 'payment_due' => 'Доспећа плаћања', + 'amount_due' => 'Доспели износ', + 'paid' => 'Плаћено', + 'histories' => 'Историје', + 'payments' => 'Плаћања', + 'add_payment' => 'Додај плаћање', + 'mark_paid' => 'Означи као плаћено', + 'mark_received' => 'Означи као примљено', + 'mark_cancelled' => 'Означити као отказано ', + 'download_pdf' => 'Преузми ПДФ', + 'send_mail' => 'Пошаљи Е-пошту', + 'create_bill' => 'Направи фактуру', + 'receive_bill' => 'Прими фактуру', + 'make_payment' => 'Плати', + + 'statuses' => [ + 'draft' => 'Скица', + 'received' => 'Примљено', + 'partial' => 'Делимично', + 'paid' => 'Плаћено', + 'overdue' => 'Доспело', + 'unpaid' => 'Неплаћено', + 'cancelled' => 'Отказано', + ], + + 'messages' => [ + 'marked_received' => 'Рачун означен као примљен!', + 'marked_paid' => 'Рачун означен као плаћен!', + 'marked_cancelled' => 'Рачун означен као отказан!', + 'draft' => 'Ово је ПРОФАКТУРА и одразиће се на графикон након што буде примљен рачун.', + + 'status' => [ + 'created' => 'Формирана на: датум', + 'receive' => [ + 'draft' => 'Није послато', + 'received' => 'Примљено дана: датум', + ], + 'paid' => [ + 'await' => 'Чекајући плаћања', + ], + ], + ], + +]; diff --git a/resources/lang/sr-SP/header.php b/resources/lang/sr-SP/header.php new file mode 100644 index 000000000..249380603 --- /dev/null +++ b/resources/lang/sr-SP/header.php @@ -0,0 +1,16 @@ + 'Промена језика', + 'last_login' => 'Задња пријава :time', + 'notifications' => [ + 'counter' => '{0} Немате обавештења|{1} Имате :count обавештење | [2,*] Имате :count Обавештења', + 'overdue_invoices' => '{1} :count доспела фактура|[2,*] :count доспелих фактура', + 'upcoming_bills' => '{1} :count надолазећи рачун|[2,*] :count надолазећих рачуна', + 'view_all' => 'Види све' + ], + 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/support', + +]; diff --git a/resources/lang/tr-TR/reconciliations.php b/resources/lang/tr-TR/reconciliations.php index 4c6761925..dc914834a 100644 --- a/resources/lang/tr-TR/reconciliations.php +++ b/resources/lang/tr-TR/reconciliations.php @@ -4,6 +4,7 @@ return [ 'reconcile' => 'Mutabakat Yap', 'reconciled' => 'Mutabakat Yapıldı', + 'opening_balance' => 'Açılış Bakiyesi', 'closing_balance' => 'Kapanış Bakiyesi', 'unreconciled' => 'Mutabakat Sağlanmamış', 'transactions' => 'İşlemler', From 30639e29b6b6e920abbc76ad3d21a8c6dea5aa8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 7 Aug 2020 15:26:34 +0300 Subject: [PATCH 168/208] added more stacks --- .../views/portal/invoices/show.blade.php | 26 +-- .../views/portal/invoices/signed.blade.php | 6 + .../views/purchases/bills/show.blade.php | 126 +++++++------- resources/views/sales/invoices/show.blade.php | 154 +++++++++--------- 4 files changed, 168 insertions(+), 144 deletions(-) diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php index 193435737..532fa4491 100644 --- a/resources/views/portal/invoices/show.blade.php +++ b/resources/views/portal/invoices/show.blade.php @@ -238,27 +238,29 @@
    @foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') - - - - - @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') + + + + + @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start') + @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') - - - - - @stack('grand_total_td_end') + @stack('grand_total_tr_start') + + + + + @stack('grand_total_tr_end') @endif @endforeach diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php index 1263029a1..507522d5a 100644 --- a/resources/views/portal/invoices/signed.blade.php +++ b/resources/views/portal/invoices/signed.blade.php @@ -186,21 +186,27 @@ @foreach($invoice->totals_sorted as $total) @if($total->code != 'total') + @stack($total->code . '_total_tr_start') + @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start') + @stack('paid_total_tr_end') @endif + @stack('grand_total_tr_start') + @stack('grand_total_tr_end') @endif @endforeach diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index ab9f1625e..f0027869c 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -385,27 +385,29 @@ @foreach ($bill->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') - - - - - @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') + + + + + @stack($total->code . '_total_tr_end') @else @if ($bill->paid) + @stack('paid_total_tr_start') + @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') - - - - - @stack('grand_total_td_end') + @stack('grand_total_tr_start') + + + + + @stack('grand_total_tr_end') @endif @endforeach @@ -428,69 +430,75 @@
    @stack('button_edit_start') - @if(!$bill->reconciled) - -   {{ trans('general.edit') }} - - @endif + @if(!$bill->reconciled) + +   {{ trans('general.edit') }} + + @endif @stack('button_edit_end') @stack('button_print_start') - -   {{ trans('general.print') }} - + +   {{ trans('general.print') }} + @stack('button_print_end') @stack('button_group_start') -
    - - @stack('button_group_end')
    diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index 1972486dc..0d401e883 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -402,27 +402,29 @@     @foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') - - - - - @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') + + + + + @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start') + @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') - - - - - @stack('grand_total_td_end') + @stack('grand_total_tr_start') + + + + + @stack('grand_total_tr_end') @endif @endforeach @@ -445,87 +447,93 @@
    @stack('button_edit_start') - @if(!$invoice->reconciled) - -   {{ trans('general.edit') }} - - @endif + @if(!$invoice->reconciled) + +   {{ trans('general.edit') }} + + @endif @stack('button_edit_end') @stack('button_print_start') - -   {{ trans('general.print') }} - + +   {{ trans('general.print') }} + @stack('button_print_end') @if ($invoice->status != 'cancelled') - @stack('button_share_start') - -   {{ trans('general.share') }} - - @stack('button_share_end') + @stack('button_share_start') + +   {{ trans('general.share') }} + + @stack('button_share_end') @endif @stack('button_group_start') -
    - - @stack('button_group_end')
    From a67c03ef170baeac0fe69f52ec5e3c1abb36908a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 7 Aug 2020 17:10:24 +0300 Subject: [PATCH 169/208] added withholding option in report --- app/Reports/TaxSummary.php | 23 ++++++++++++++++++- resources/views/common/reports/edit.blade.php | 6 ++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index 2bf703d0a..6ed76977f 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -32,7 +32,9 @@ class TaxSummary extends Report public function setTables() { - $taxes = Tax::enabled()->notWithholding()->notRate(0)->orderBy('name')->pluck('name')->toArray(); + $withholding = ($this->getSetting('withholding') == 'yes') ? 'withholding' : 'notWithholding'; + + $taxes = Tax::enabled()->$withholding()->notRate(0)->orderBy('name')->pluck('name')->toArray(); $this->tables = array_combine($taxes, $taxes); } @@ -122,6 +124,25 @@ class TaxSummary extends Report return [ $this->getPeriodField(), $this->getBasisField(), + $this->getWithholdingField(), + ]; + } + + public function getWithholdingField() + { + return [ + 'type' => 'selectGroup', + 'name' => 'withholding', + 'title' => trans('taxes.withholding'), + 'icon' => 'hand-holding-usd', + 'values' => [ + 'yes' => trans('general.yes'), + 'no' => trans('general.no'), + ], + 'selected' => 'no', + 'attributes' => [ + 'required' => 'required', + ], ]; } } diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php index 8a57a73e4..dcf4d333b 100644 --- a/resources/views/common/reports/edit.blade.php +++ b/resources/views/common/reports/edit.blade.php @@ -42,16 +42,16 @@ 'data-field' => 'settings', ], $field['attributes']), - isset($class->model->settings->{$field['name']}) ? $class->model->settings->{$field['name']}: null + isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']}: null ) }} @elseif ($type == 'selectGroup') - {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], $report->settings->{$field['name']}, array_merge([ + {{ Form::$type($field['name'], $field['title'], $field['icon'], $field['values'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : $field['selected'], array_merge([ 'data-field' => 'settings' ], $field['attributes']) ) }} @elseif ($type == 'radioGroup') - {{ Form::$type($field['name'], $field['title'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : 1, $field['enable'], $field['disable'], array_merge([ + {{ Form::$type($field['name'], $field['title'], isset($report->settings->{$field['name']}) ? $report->settings->{$field['name']} : true, $field['enable'], $field['disable'], array_merge([ 'data-field' => 'settings' ], $field['attributes']) From 803b26e0f8b0fc53432137ad9fcc35e434d387f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 7 Aug 2020 19:39:23 +0300 Subject: [PATCH 170/208] invoice print stacks --- .../sales/invoices/print_classic.blade.php | 26 ++++++++++--------- .../sales/invoices/print_default.blade.php | 26 ++++++++++--------- .../sales/invoices/print_modern.blade.php | 14 +++++----- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php index 82c827a68..e762b0b20 100644 --- a/resources/views/sales/invoices/print_classic.blade.php +++ b/resources/views/sales/invoices/print_classic.blade.php @@ -170,25 +170,27 @@
    @foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') -
    - {{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true) -
    - @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') +
    + {{ trans($total->title) }}: + @money($total->amount, $invoice->currency_code, true) +
    + @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start')
    {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
    + @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') -
    - {{ trans($total->name) }}: - @money($total->amount - $invoice->paid, $invoice->currency_code, true) -
    - @stack('grand_total_td_end') + @stack('grand_total_tr_start') +
    + {{ trans($total->name) }}: + @money($total->amount - $invoice->paid, $invoice->currency_code, true) +
    + @stack('grand_total_tr_end') @endif @endforeach
    diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php index 2594a4126..a23333f92 100644 --- a/resources/views/sales/invoices/print_default.blade.php +++ b/resources/views/sales/invoices/print_default.blade.php @@ -158,25 +158,27 @@
    @foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') -
    - {{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true)
    -
    - @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') +
    + {{ trans($total->title) }}: + @money($total->amount, $invoice->currency_code, true)
    +
    + @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start')
    {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
    + @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') -
    - {{ trans($total->name) }}: - @money($total->amount - $invoice->paid, $invoice->currency_code, true) -
    - @stack('grand_total_td_end') + @stack('grand_total_tr_start') +
    + {{ trans($total->name) }}: + @money($total->amount - $invoice->paid, $invoice->currency_code, true) +
    + @stack('grand_total_tr_end') @endif @endforeach
    diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php index f5a4f38dc..80923a71c 100644 --- a/resources/views/sales/invoices/print_modern.blade.php +++ b/resources/views/sales/invoices/print_modern.blade.php @@ -139,19 +139,21 @@
    @foreach ($invoice->totals_sorted as $total) @if ($total->code != 'total') - @stack($total->code . '_td_start') - {{ trans($total->title) }}: - @money($total->amount, $invoice->currency_code, true)

    - @stack($total->code . '_td_end') + @stack($total->code . '_total_tr_start') + {{ trans($total->title) }}: + @money($total->amount, $invoice->currency_code, true)

    + @stack($total->code . '_total_tr_end') @else @if ($invoice->paid) + @stack('paid_total_tr_start') {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)

    + @stack('paid_total_tr_end') @endif - @stack('grand_total_td_start') + @stack('grand_total_tr_start') {{ trans($total->name) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true) - @stack('grand_total_td_end') + @stack('grandtotal_tr_end') @endif @endforeach
    From 8855b0582f550385c5e61616d72eaac91d690aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 7 Aug 2020 19:43:34 +0300 Subject: [PATCH 171/208] updated composer lock --- composer.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.lock b/composer.lock index 16f983dda..852e14aa9 100644 --- a/composer.lock +++ b/composer.lock @@ -323,16 +323,16 @@ }, { "name": "akaunting/setting", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/akaunting/setting.git", - "reference": "87df3967ffaea8e01fdb6ce5f142bdb4584d0f9f" + "reference": "2134f1dbaf9f3a25fb1d2a122875aa2c08a226e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/setting/zipball/87df3967ffaea8e01fdb6ce5f142bdb4584d0f9f", - "reference": "87df3967ffaea8e01fdb6ce5f142bdb4584d0f9f", + "url": "https://api.github.com/repos/akaunting/setting/zipball/2134f1dbaf9f3a25fb1d2a122875aa2c08a226e6", + "reference": "2134f1dbaf9f3a25fb1d2a122875aa2c08a226e6", "shasum": "" }, "require": { @@ -382,7 +382,7 @@ "laravel", "persistent" ], - "time": "2020-08-06T10:01:46+00:00" + "time": "2020-08-07T10:26:13+00:00" }, { "name": "akaunting/version", @@ -3306,16 +3306,16 @@ }, { "name": "laravel/framework", - "version": "v7.23.0", + "version": "v7.24.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b" + "reference": "71bfb1f2f89e4e31fba539d43fe287143e635e68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/17cbce101f2fc78e61a6135861823563c7cfb50b", - "reference": "17cbce101f2fc78e61a6135861823563c7cfb50b", + "url": "https://api.github.com/repos/laravel/framework/zipball/71bfb1f2f89e4e31fba539d43fe287143e635e68", + "reference": "71bfb1f2f89e4e31fba539d43fe287143e635e68", "shasum": "" }, "require": { @@ -3459,7 +3459,7 @@ "framework", "laravel" ], - "time": "2020-08-04T14:36:37+00:00" + "time": "2020-08-07T15:13:57+00:00" }, { "name": "laravel/tinker", From c4ff98febeb7c0f3e16ca68734c8b5736e2f9453 Mon Sep 17 00:00:00 2001 From: CTSoft Date: Sun, 9 Aug 2020 11:45:40 +0200 Subject: [PATCH 172/208] Remove empty spaces in show invoice view --- app/Providers/Macro.php | 10 ++ resources/views/sales/invoices/show.blade.php | 112 ++++++++++-------- 2 files changed, 73 insertions(+), 49 deletions(-) diff --git a/app/Providers/Macro.php b/app/Providers/Macro.php index 10103900d..74bc2773c 100644 --- a/app/Providers/Macro.php +++ b/app/Providers/Macro.php @@ -4,6 +4,7 @@ namespace App\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Str; +use Illuminate\View\Factory as ViewFactory; class Macro extends ServiceProvider { @@ -26,6 +27,15 @@ class Macro extends ServiceProvider return $string; }); + + ViewFactory::macro('hasStack', function (...$sections) { + foreach ($sections as $section) { + if (isset($this->pushes[$section]) || isset($this->prepends[$section])) { + return true; + } + } + return false; + }); } /** diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index 0d401e883..c96c48deb 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -216,25 +216,27 @@ {{ setting('company.name') }} -     - - - - + + + @endif + @if (setting('company.tax_number')) + + - - - + + @endif + @if (setting('company.phone')) + + - + + + @endif - - - - - - - - - - - - + @if ($invoice->contact_address || $__env->hasStack('address_input_start', 'address_input_end')) + + + + @endif + @if ($invoice->contact_tax_number || $__env->hasStack('tax_number_input_start', 'tax_number_input_end')) + + + + @endif + @if ($invoice->contact_phone || $__env->hasStack('phone_input_start', 'phone_input_end')) + + + + @endif + @if ($invoice->contact_email || $__env->hasStack('email_start', 'email_input_end')) + + + + @endif
    {{ $item->bill_number }} @money($item->amount, $item->currency_code, true)@date($item->billd_at)@date($item->billed_at) @date($item->due_at) {{ trans('bills.statuses.' . $item->status) }}
    @date($item->paid_at) @money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->category->name }} {{ $item->account->name }}
    @date($item->paid_at) @money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->category->name }} {{ $item->account->name }}
    {{ trans('general.name') }}{{ trans_choice('general.categories', 1) }}{{ trans('updates.installed_version') }}{{ trans('updates.latest_version') }}{{ trans('updates.installed_version') }}{{ trans('updates.latest_version') }} {{ trans('general.actions') }}
    {{ $module->name }}{{ $module->category }}{{ $module->installed }}{{ $module->latest }}{{ $module->installed }}{{ $module->latest }} {{ trans_choice('general.updates', 1) }} From bc2f2793c5619553b05d86c96f7c86dcd5f78188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Wed, 22 Jul 2020 12:46:23 +0300 Subject: [PATCH 133/208] intervention/imagecache implementation --- app/Http/ViewComposers/Logo.php | 6 +- composer.json | 1 + composer.lock | 295 ++++++++++++++++++++++++++++---- config/imagecache.php | 71 ++++++++ 4 files changed, 334 insertions(+), 39 deletions(-) create mode 100644 config/imagecache.php diff --git a/app/Http/ViewComposers/Logo.php b/app/Http/ViewComposers/Logo.php index ebdbf687a..bac2e43e6 100644 --- a/app/Http/ViewComposers/Logo.php +++ b/app/Http/ViewComposers/Logo.php @@ -32,9 +32,11 @@ class Logo $path = base_path('public/img/company.png'); } - $width = $height = setting('invoice.logo_size', 128); + $image = Image::cache(function($image) use ($path) { + $width = $height = setting('invoice.logo_size', 128); - $image = Image::make($path)->resize($width, $height)->encode()->getEncoded(); + $image->make($path)->resize($width, $height)->encode(); + }); if (empty($image)) { return $logo; diff --git a/composer.json b/composer.json index 6155ff46e..27837692d 100644 --- a/composer.json +++ b/composer.json @@ -34,6 +34,7 @@ "graham-campbell/markdown": "12.0.*", "guzzlehttp/guzzle": "^6.5", "intervention/image": "2.5.*", + "intervention/imagecache": "^2.4", "kyslik/column-sortable": "^6.0", "laracasts/flash": "3.1.*", "laravel/framework": "^7.0", diff --git a/composer.lock b/composer.lock index c93bdad2e..4bacf291e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d1b643139c31f613261680c874c1d145", + "content-hash": "d5770340d17c7c145a2f78e3d22c25d8", "packages": [ { "name": "akaunting/firewall", @@ -998,16 +998,6 @@ "ssl", "tls" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-04-08T08:27:21+00:00" }, { @@ -2823,6 +2813,60 @@ ], "time": "2019-11-02T09:15:47+00:00" }, + { + "name": "intervention/imagecache", + "version": "2.4.2", + "source": { + "type": "git", + "url": "https://github.com/Intervention/imagecache.git", + "reference": "d3dadc8052702805ba2b8ffb11e0b05c1f5d2873" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Intervention/imagecache/zipball/d3dadc8052702805ba2b8ffb11e0b05c1f5d2873", + "reference": "d3dadc8052702805ba2b8ffb11e0b05c1f5d2873", + "shasum": "" + }, + "require": { + "illuminate/cache": "~4|~5|~6|~7", + "illuminate/filesystem": "~4|~5|~6|~7", + "intervention/image": "dev-master|~2,>=2.2.0", + "jeremeamia/superclosure": "~1|~2", + "nesbot/carbon": "^1.26.3 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.2", + "phpunit/phpunit": "3.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Intervention\\Image\\": "src/Intervention/Image" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Vogel", + "email": "oliver@olivervogel.net", + "homepage": "http://olivervogel.net/" + } + ], + "description": "Caching extension for the Intervention Image Class", + "homepage": "http://image.intervention.io", + "keywords": [ + "cache", + "gd", + "image", + "imagick", + "laravel" + ], + "time": "2020-07-05T18:27:20+00:00" + }, { "name": "jaybizzle/crawler-detect", "version": "v1.2.96", @@ -2951,6 +2995,65 @@ ], "time": "2020-06-13T08:05:20+00:00" }, + { + "name": "jeremeamia/superclosure", + "version": "2.4.0", + "source": { + "type": "git", + "url": "https://github.com/jeremeamia/super_closure.git", + "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/5707d5821b30b9a07acfb4d76949784aaa0e9ce9", + "reference": "5707d5821b30b9a07acfb4d76949784aaa0e9ce9", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^1.2|^2.0|^3.0|^4.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.4-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" + ], + "abandoned": "opis/closure", + "time": "2018-03-21T22:21:57+00:00" + }, { "name": "justinrainbow/json-schema", "version": "5.2.10", @@ -8145,6 +8248,80 @@ ], "time": "2020-06-06T08:46:27+00:00" }, + { + "name": "symfony/polyfill-php56", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/13df84e91cd168f247c2f2ec82cc0fa24901c011", + "reference": "13df84e91cd168f247c2f2ec82cc0fa24901c011", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-util": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "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" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" + }, { "name": "symfony/polyfill-php72", "version": "v1.17.0", @@ -8370,6 +8547,76 @@ ], "time": "2020-06-06T08:46:27+00:00" }, + { + "name": "symfony/polyfill-util", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-util.git", + "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/46b910c71e9828f8ec2aa7a0314de1130d9b295a", + "reference": "46b910c71e9828f8ec2aa7a0314de1130d9b295a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "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" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" + }, { "name": "symfony/process", "version": "v5.1.2", @@ -9359,12 +9606,6 @@ "flare", "reporting" ], - "funding": [ - { - "url": "https://www.patreon.com/spatie", - "type": "patreon" - } - ], "time": "2020-03-02T15:52:04+00:00" }, { @@ -9828,20 +10069,6 @@ "php", "symfony" ], - "funding": [ - { - "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", - "type": "custom" - }, - { - "url": "https://github.com/nunomaduro", - "type": "github" - }, - { - "url": "https://www.patreon.com/nunomaduro", - "type": "patreon" - } - ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -10421,12 +10648,6 @@ "highlight.php", "syntax" ], - "funding": [ - { - "url": "https://github.com/allejo", - "type": "github" - } - ], "time": "2020-03-02T05:59:21+00:00" }, { diff --git a/config/imagecache.php b/config/imagecache.php new file mode 100644 index 000000000..99a1cc8a2 --- /dev/null +++ b/config/imagecache.php @@ -0,0 +1,71 @@ + null, + + /* + |-------------------------------------------------------------------------- + | Storage paths + |-------------------------------------------------------------------------- + | + | The following paths will be searched for the image filename, submitted + | by URI. + | + | Define as many directories as you like. + | + */ + + 'paths' => array( + public_path('upload'), + public_path('images') + ), + + /* + |-------------------------------------------------------------------------- + | Manipulation templates + |-------------------------------------------------------------------------- + | + | Here you may specify your own manipulation filter templates. + | The keys of this array will define which templates + | are available in the URI: + | + | {route}/{template}/{filename} + | + | The values of this array will define which filter class + | will be applied, by its fully qualified name. + | + */ + + 'templates' => array( + 'small' => 'Intervention\Image\Templates\Small', + 'medium' => 'Intervention\Image\Templates\Medium', + 'large' => 'Intervention\Image\Templates\Large', + ), + + /* + |-------------------------------------------------------------------------- + | Image Cache Lifetime + |-------------------------------------------------------------------------- + | + | Lifetime in minutes of the images handled by the imagecache route. + | + */ + + 'lifetime' => 43200, + +); From 2b0c2e484603f366ab915c2d945408cbf5ea1afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 22 Jul 2020 13:57:27 +0300 Subject: [PATCH 134/208] removed category from core modules --- modules/OfflinePayments/module.json | 1 - modules/PaypalStandard/module.json | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/OfflinePayments/module.json b/modules/OfflinePayments/module.json index d7f0c61ca..391fec329 100644 --- a/modules/OfflinePayments/module.json +++ b/modules/OfflinePayments/module.json @@ -2,7 +2,6 @@ "alias": "offline-payments", "icon": "fas fa-credit-card", "version": "2.0.0", - "category": "payment-method", "active": 1, "providers": [ "Modules\\OfflinePayments\\Providers\\Event", diff --git a/modules/PaypalStandard/module.json b/modules/PaypalStandard/module.json index f486a9657..ec78a84fc 100644 --- a/modules/PaypalStandard/module.json +++ b/modules/PaypalStandard/module.json @@ -2,7 +2,6 @@ "alias": "paypal-standard", "icon": "fab fa-paypal", "version": "2.0.0", - "category": "payment-method", "active": 1, "providers": [ "Modules\\PaypalStandard\\Providers\\Event", From 010d0bb3fbd87175650ce371173da57efa73ae6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 22 Jul 2020 15:11:31 +0300 Subject: [PATCH 135/208] withholding tax --- app/Abstracts/DocumentModel.php | 13 +- app/Http/Controllers/Settings/Taxes.php | 3 + app/Jobs/Purchase/CreateBillItem.php | 18 +- .../Purchase/CreateBillItemsAndTotals.php | 5 +- app/Jobs/Sale/CreateInvoiceItem.php | 18 +- app/Jobs/Sale/CreateInvoiceItemsAndTotals.php | 4 +- app/Models/Setting/Tax.php | 44 + app/Reports/TaxSummary.php | 2 +- composer.lock | 787 ++++++++++++------ database/factories/Tax.php | 4 +- resources/assets/js/views/purchases/bills.js | 7 +- resources/assets/js/views/sales/invoices.js | 9 +- resources/lang/en-GB/taxes.php | 1 + 13 files changed, 635 insertions(+), 280 deletions(-) diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php index e95c1c258..4235a5822 100644 --- a/app/Abstracts/DocumentModel.php +++ b/app/Abstracts/DocumentModel.php @@ -3,8 +3,7 @@ namespace App\Abstracts; use App\Abstracts\Model; -use App\Models\Banking\Transaction; -use App\Models\Setting\Currency; +use App\Models\Setting\Tax; use App\Traits\Currencies; use App\Traits\DateTime; use App\Traits\Media; @@ -159,8 +158,14 @@ abstract class DocumentModel extends Model { $amount = $this->amount; - $this->totals->where('code', 'tax')->each(function ($tax) use(&$amount) { - $amount -= $tax->amount; + $this->totals->where('code', 'tax')->each(function ($total) use(&$amount) { + $tax = Tax::name($total->name)->first(); + + if (!empty($tax) && ($tax->type == 'withholding')) { + return; + } + + $amount -= $total->amount; }); return $amount; diff --git a/app/Http/Controllers/Settings/Taxes.php b/app/Http/Controllers/Settings/Taxes.php index 1ef48502c..d7b75c974 100644 --- a/app/Http/Controllers/Settings/Taxes.php +++ b/app/Http/Controllers/Settings/Taxes.php @@ -25,6 +25,7 @@ class Taxes extends Controller 'fixed' => trans('taxes.fixed'), 'normal' => trans('taxes.normal'), 'inclusive' => trans('taxes.inclusive'), + 'withholding' => trans('taxes.withholding'), 'compound' => trans('taxes.compound'), ]; @@ -52,6 +53,7 @@ class Taxes extends Controller 'fixed' => trans('taxes.fixed'), 'normal' => trans('taxes.normal'), 'inclusive' => trans('taxes.inclusive'), + 'withholding' => trans('taxes.withholding'), 'compound' => trans('taxes.compound'), ]; @@ -99,6 +101,7 @@ class Taxes extends Controller 'fixed' => trans('taxes.fixed'), 'normal' => trans('taxes.normal'), 'inclusive' => trans('taxes.inclusive'), + 'withholding' => trans('taxes.withholding'), 'compound' => trans('taxes.compound'), ]; diff --git a/app/Jobs/Purchase/CreateBillItem.php b/app/Jobs/Purchase/CreateBillItem.php index 68c49e7b2..f59348914 100644 --- a/app/Jobs/Purchase/CreateBillItem.php +++ b/app/Jobs/Purchase/CreateBillItem.php @@ -87,9 +87,23 @@ class CreateBillItem extends Job $item_tax_total += $tax_amount; + break; + case 'withholding': + $tax_amount = 0 - $item_discounted_amount * ($tax->rate / 100); + + $item_taxes[] = [ + 'company_id' => $this->bill->company_id, + 'bill_id' => $this->bill->id, + 'tax_id' => $tax_id, + 'name' => $tax->name, + 'amount' => $tax_amount, + ]; + + $item_tax_total += $tax_amount; + break; default: - $tax_amount = ($item_discounted_amount / 100) * $tax->rate; + $tax_amount = $item_discounted_amount * ($tax->rate / 100); $item_taxes[] = [ 'company_id' => $this->bill->company_id, @@ -167,7 +181,7 @@ class CreateBillItem extends Job foreach ($item_taxes as $item_tax) { $item_tax['bill_item_id'] = $bill_item->id; - $item_tax['amount'] = round($item_tax['amount'], $precision); + $item_tax['amount'] = round(abs($item_tax['amount']), $precision); BillItemTax::create($item_tax); } diff --git a/app/Jobs/Purchase/CreateBillItemsAndTotals.php b/app/Jobs/Purchase/CreateBillItemsAndTotals.php index 3335f7376..7a3693aad 100644 --- a/app/Jobs/Purchase/CreateBillItemsAndTotals.php +++ b/app/Jobs/Purchase/CreateBillItemsAndTotals.php @@ -3,7 +3,6 @@ namespace App\Jobs\Purchase; use App\Abstracts\Job; -use App\Models\Purchase\Bill; use App\Models\Purchase\BillTotal; use App\Traits\Currencies; use App\Traits\DateTime; @@ -96,7 +95,7 @@ class CreateBillItemsAndTotals extends Job 'bill_id' => $this->bill->id, 'code' => 'tax', 'name' => $tax['name'], - 'amount' => round($tax['amount'], $precision), + 'amount' => round(abs($total['amount']), $precision), 'sort_order' => $sort_order, ]); @@ -117,7 +116,7 @@ class CreateBillItemsAndTotals extends Job $total['code'] = 'extra'; } - $total['amount'] = round($total['amount'], $precision); + $total['amount'] = round(abs($total['amount']), $precision); BillTotal::create($total); diff --git a/app/Jobs/Sale/CreateInvoiceItem.php b/app/Jobs/Sale/CreateInvoiceItem.php index 3fd032b20..6fe80e573 100644 --- a/app/Jobs/Sale/CreateInvoiceItem.php +++ b/app/Jobs/Sale/CreateInvoiceItem.php @@ -87,9 +87,23 @@ class CreateInvoiceItem extends Job $item_tax_total += $tax_amount; + break; + case 'withholding': + $tax_amount = 0 - $item_discounted_amount * ($tax->rate / 100); + + $item_taxes[] = [ + 'company_id' => $this->invoice->company_id, + 'invoice_id' => $this->invoice->id, + 'tax_id' => $tax_id, + 'name' => $tax->name, + 'amount' => $tax_amount, + ]; + + $item_tax_total += $tax_amount; + break; default: - $tax_amount = ($item_discounted_amount / 100) * $tax->rate; + $tax_amount = $item_discounted_amount * ($tax->rate / 100); $item_taxes[] = [ 'company_id' => $this->invoice->company_id, @@ -167,7 +181,7 @@ class CreateInvoiceItem extends Job foreach ($item_taxes as $item_tax) { $item_tax['invoice_item_id'] = $invoice_item->id; - $item_tax['amount'] = round($item_tax['amount'], $precision); + $item_tax['amount'] = round(abs($item_tax['amount']), $precision); InvoiceItemTax::create($item_tax); } diff --git a/app/Jobs/Sale/CreateInvoiceItemsAndTotals.php b/app/Jobs/Sale/CreateInvoiceItemsAndTotals.php index a9a42063e..764e412e0 100644 --- a/app/Jobs/Sale/CreateInvoiceItemsAndTotals.php +++ b/app/Jobs/Sale/CreateInvoiceItemsAndTotals.php @@ -95,7 +95,7 @@ class CreateInvoiceItemsAndTotals extends Job 'invoice_id' => $this->invoice->id, 'code' => 'tax', 'name' => $tax['name'], - 'amount' => round($tax['amount'], $precision), + 'amount' => round(abs($tax['amount']), $precision), 'sort_order' => $sort_order, ]); @@ -116,7 +116,7 @@ class CreateInvoiceItemsAndTotals extends Job $total['code'] = 'extra'; } - $total['amount'] = round($total['amount'], $precision); + $total['amount'] = round(abs($total['amount']), $precision); InvoiceTotal::create($total); diff --git a/app/Models/Setting/Tax.php b/app/Models/Setting/Tax.php index e359ef18e..8f9f717bf 100644 --- a/app/Models/Setting/Tax.php +++ b/app/Models/Setting/Tax.php @@ -54,6 +54,50 @@ class Tax extends Model return $query->where('rate', '=', $rate); } + public function scopeNotRate($query, $rate) + { + return $query->where('rate', '<>', $rate); + } + + public function scopeType($query, $types) + { + if (empty($types)) { + return $query; + } + + return $query->whereIn($this->table . '.type', (array) $types); + } + + public function scopeFixed($query) + { + return $query->where($this->table . '.type', '=', 'fixed'); + } + + public function scopeNormal($query) + { + return $query->where($this->table . '.type', '=', 'normal'); + } + + public function scopeInclusive($query) + { + return $query->where($this->table . '.type', '=', 'inclusive'); + } + + public function scopeCompound($query) + { + return $query->where($this->table . '.type', '=', 'compound'); + } + + public function scopeWithholding($query) + { + return $query->where($this->table . '.type', '=', 'withholding'); + } + + public function scopeNotWithholding($query) + { + return $query->where($this->table . '.type', '<>', 'withholding'); + } + /** * Convert rate to double. * diff --git a/app/Reports/TaxSummary.php b/app/Reports/TaxSummary.php index f6ccd3a48..2bf703d0a 100644 --- a/app/Reports/TaxSummary.php +++ b/app/Reports/TaxSummary.php @@ -32,7 +32,7 @@ class TaxSummary extends Report public function setTables() { - $taxes = Tax::enabled()->where('rate', '<>', '0')->orderBy('name')->pluck('name')->toArray(); + $taxes = Tax::enabled()->notWithholding()->notRate(0)->orderBy('name')->pluck('name')->toArray(); $this->tables = array_combine($taxes, $taxes); } diff --git a/composer.lock b/composer.lock index 4bacf291e..e4b7e0eaa 100644 --- a/composer.lock +++ b/composer.lock @@ -129,16 +129,16 @@ }, { "name": "akaunting/menu", - "version": "1.0.10", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/akaunting/menu.git", - "reference": "6895de00f0d320545b4d64f7d255fffdf690e145" + "reference": "9ffdbee823eeba62347812380cac0522b569347f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/menu/zipball/6895de00f0d320545b4d64f7d255fffdf690e145", - "reference": "6895de00f0d320545b4d64f7d255fffdf690e145", + "url": "https://api.github.com/repos/akaunting/menu/zipball/9ffdbee823eeba62347812380cac0522b569347f", + "reference": "9ffdbee823eeba62347812380cac0522b569347f", "shasum": "" }, "require": { @@ -193,20 +193,20 @@ "navigation", "sidebar" ], - "time": "2020-06-04T21:15:59+00:00" + "time": "2020-07-10T13:32:45+00:00" }, { "name": "akaunting/module", - "version": "1.0.10", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/akaunting/module.git", - "reference": "ab24ced4d42716782424227002b670e29cffabbb" + "reference": "7df640d9556b098a427fcff84dc92879a272e8d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/module/zipball/ab24ced4d42716782424227002b670e29cffabbb", - "reference": "ab24ced4d42716782424227002b670e29cffabbb", + "url": "https://api.github.com/repos/akaunting/module/zipball/7df640d9556b098a427fcff84dc92879a272e8d6", + "reference": "7df640d9556b098a427fcff84dc92879a272e8d6", "shasum": "" }, "require": { @@ -258,7 +258,7 @@ "module", "rad" ], - "time": "2020-03-07T22:53:21+00:00" + "time": "2020-07-10T20:18:06+00:00" }, { "name": "akaunting/money", @@ -998,20 +998,30 @@ "ssl", "tls" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-04-08T08:27:21+00:00" }, { "name": "composer/composer", - "version": "1.10.8", + "version": "1.10.9", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "56e0e094478f30935e9128552188355fa9712291" + "reference": "83c3250093d5491600a822e176b107a945baf95a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/56e0e094478f30935e9128552188355fa9712291", - "reference": "56e0e094478f30935e9128552188355fa9712291", + "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a", + "reference": "83c3250093d5491600a822e176b107a945baf95a", "shasum": "" }, "require": { @@ -1092,7 +1102,7 @@ "type": "tidelift" } ], - "time": "2020-06-24T19:23:30+00:00" + "time": "2020-07-16T10:57:00+00:00" }, { "name": "composer/semver", @@ -1157,16 +1167,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.5.3", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "0c3e51e1880ca149682332770e25977c70cf9dae" + "reference": "6946f785871e2314c60b4524851f3702ea4f2223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae", - "reference": "0c3e51e1880ca149682332770e25977c70cf9dae", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223", + "reference": "6946f785871e2314c60b4524851f3702ea4f2223", "shasum": "" }, "require": { @@ -1213,7 +1223,21 @@ "spdx", "validator" ], - "time": "2020-02-14T07:44:31+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2020-07-15T15:35:07+00:00" }, { "name": "composer/xdebug-handler", @@ -1561,16 +1585,16 @@ }, { "name": "doctrine/cache", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3" + "reference": "13e3381b25847283a91948d04640543941309727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3", - "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3", + "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727", + "reference": "13e3381b25847283a91948d04640543941309727", "shasum": "" }, "require": { @@ -1653,20 +1677,20 @@ "type": "tidelift" } ], - "time": "2020-05-27T16:24:54+00:00" + "time": "2020-07-07T18:54:01+00:00" }, { "name": "doctrine/collections", - "version": "1.6.5", + "version": "1.6.6", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "fc0206348e17e530d09463fef07ba8968406cd6d" + "reference": "5f0470363ff042d0057006ae7acabc5d7b5252d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/fc0206348e17e530d09463fef07ba8968406cd6d", - "reference": "fc0206348e17e530d09463fef07ba8968406cd6d", + "url": "https://api.github.com/repos/doctrine/collections/zipball/5f0470363ff042d0057006ae7acabc5d7b5252d5", + "reference": "5f0470363ff042d0057006ae7acabc5d7b5252d5", "shasum": "" }, "require": { @@ -1732,7 +1756,7 @@ "type": "tidelift" } ], - "time": "2020-05-25T19:24:35+00:00" + "time": "2020-06-22T19:14:02+00:00" }, { "name": "doctrine/dbal", @@ -2367,16 +2391,16 @@ }, { "name": "genealabs/laravel-model-caching", - "version": "0.8.9", + "version": "0.8.10", "source": { "type": "git", "url": "https://github.com/GeneaLabs/laravel-model-caching.git", - "reference": "56581bbec6d491d6bfcffb8c077353b0c1098af5" + "reference": "f9be69e6937ef4bb4477deacf10e65c40d7df00f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/56581bbec6d491d6bfcffb8c077353b0c1098af5", - "reference": "56581bbec6d491d6bfcffb8c077353b0c1098af5", + "url": "https://api.github.com/repos/GeneaLabs/laravel-model-caching/zipball/f9be69e6937ef4bb4477deacf10e65c40d7df00f", + "reference": "f9be69e6937ef4bb4477deacf10e65c40d7df00f", "shasum": "" }, "require": { @@ -2429,12 +2453,16 @@ ], "description": "Automatic caching for Eloquent models.", "funding": [ + { + "url": "https://github.com/GeneaLabs", + "type": "github" + }, { "url": "https://github.com/mikebronner", "type": "github" } ], - "time": "2020-07-02T17:02:38+00:00" + "time": "2020-07-08T18:08:06+00:00" }, { "name": "genealabs/laravel-pivot-events", @@ -3278,16 +3306,16 @@ }, { "name": "laravel/framework", - "version": "v7.18.0", + "version": "v7.21.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "116b508bafd81de97b1c09744445d32a91076b60" + "reference": "3ccdb116524de408fdc00715b6f06a1031ddace9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/116b508bafd81de97b1c09744445d32a91076b60", - "reference": "116b508bafd81de97b1c09744445d32a91076b60", + "url": "https://api.github.com/repos/laravel/framework/zipball/3ccdb116524de408fdc00715b6f06a1031ddace9", + "reference": "3ccdb116524de408fdc00715b6f06a1031ddace9", "shasum": "" }, "require": { @@ -3431,20 +3459,20 @@ "framework", "laravel" ], - "time": "2020-06-30T13:52:36+00:00" + "time": "2020-07-21T14:26:42+00:00" }, { "name": "laravel/tinker", - "version": "v2.4.0", + "version": "v2.4.1", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "cde90a7335a2130a4488beb68f4b2141869241db" + "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/cde90a7335a2130a4488beb68f4b2141869241db", - "reference": "cde90a7335a2130a4488beb68f4b2141869241db", + "url": "https://api.github.com/repos/laravel/tinker/zipball/3c9ef136ca59366bc1b50b7f2500a946d5149c62", + "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62", "shasum": "" }, "require": { @@ -3495,7 +3523,7 @@ "laravel", "psysh" ], - "time": "2020-04-07T15:01:31+00:00" + "time": "2020-07-07T15:10:00+00:00" }, { "name": "laravel/ui", @@ -3622,16 +3650,16 @@ }, { "name": "league/commonmark", - "version": "1.5.1", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "6d74caf6abeed5fd85d6ec20da23d7269cd0b46f" + "reference": "2574454b97e4103dc4e36917bd783b25624aefcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6d74caf6abeed5fd85d6ec20da23d7269cd0b46f", - "reference": "6d74caf6abeed5fd85d6ec20da23d7269cd0b46f", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2574454b97e4103dc4e36917bd783b25624aefcd", + "reference": "2574454b97e4103dc4e36917bd783b25624aefcd", "shasum": "" }, "require": { @@ -3650,7 +3678,7 @@ "michelf/php-markdown": "~1.4", "mikehaertl/php-shellcommand": "^1.4", "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2", "scrutinizer/ocular": "^1.5", "symfony/finder": "^4.2" }, @@ -3713,7 +3741,7 @@ "type": "tidelift" } ], - "time": "2020-06-27T12:50:08+00:00" + "time": "2020-07-19T22:47:30+00:00" }, { "name": "league/flysystem", @@ -4991,6 +5019,51 @@ ], "time": "2020-06-17T14:59:55+00:00" }, + { + "name": "paragonie/random_compat", + "version": "v9.99.99", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95", + "shasum": "" + }, + "require": { + "php": "^7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "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", + "polyfill", + "pseudorandom", + "random" + ], + "time": "2018-07-02T15:55:56+00:00" + }, { "name": "phenx/php-font-lib", "version": "0.5.2", @@ -5070,29 +5143,29 @@ }, { "name": "php-http/discovery", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "9ab7668fee74a5ad61996095e50917bd50ee8bfe" + "reference": "64a18cc891957e05d91910b3c717d6bd11fbede9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/9ab7668fee74a5ad61996095e50917bd50ee8bfe", - "reference": "9ab7668fee74a5ad61996095e50917bd50ee8bfe", + "url": "https://api.github.com/repos/php-http/discovery/zipball/64a18cc891957e05d91910b3c717d6bd11fbede9", + "reference": "64a18cc891957e05d91910b3c717d6bd11fbede9", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "conflict": { "nyholm/psr7": "<1.0" }, "require-dev": { - "akeneo/phpspec-skip-example-extension": "^4.0", + "graham-campbell/phpspec-skip-example-extension": "^5.0", "php-http/httplug": "^1.0 || ^2.0", "php-http/message-factory": "^1.0", - "phpspec/phpspec": "^5.1", + "phpspec/phpspec": "^5.1 || ^6.1", "puli/composer-plugin": "1.0.0-beta10" }, "suggest": { @@ -5131,7 +5204,7 @@ "message", "psr7" ], - "time": "2020-07-02T11:43:45+00:00" + "time": "2020-07-13T15:44:45+00:00" }, { "name": "php-http/guzzle6-adapter", @@ -5198,27 +5271,27 @@ }, { "name": "php-http/httplug", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "72d2b129a48f0490d55b7f89be0d6aa0597ffb06" + "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/72d2b129a48f0490d55b7f89be0d6aa0597ffb06", - "reference": "72d2b129a48f0490d55b7f89be0d6aa0597ffb06", + "url": "https://api.github.com/repos/php-http/httplug/zipball/191a0a1b41ed026b717421931f8d3bd2514ffbf9", + "reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9", "shasum": "" }, "require": { - "php": "^7.0", - "php-http/promise": "^1.0", + "php": "^7.1 || ^8.0", + "php-http/promise": "^1.1", "psr/http-client": "^1.0", "psr/http-message": "^1.0" }, "require-dev": { "friends-of-phpspec/phpspec-code-coverage": "^4.1", - "phpspec/phpspec": "^4.3.4|^5.0|^6.0" + "phpspec/phpspec": "^5.1 || ^6.0" }, "type": "library", "extra": { @@ -5242,7 +5315,8 @@ }, { "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "HTTPlug, the HTTP client abstraction for PHP", @@ -5251,7 +5325,7 @@ "client", "http" ], - "time": "2019-12-27T10:07:11+00:00" + "time": "2020-07-13T15:43:23+00:00" }, { "name": "php-http/message", @@ -5377,21 +5451,24 @@ }, { "name": "php-http/promise", - "version": "v1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980" + "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980", + "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", "shasum": "" }, + "require": { + "php": "^7.1 || ^8.0" + }, "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2", + "phpspec/phpspec": "^5.1.2 || ^6.2" }, "type": "library", "extra": { @@ -5409,13 +5486,13 @@ "MIT" ], "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, { "name": "Joel Wurtz", "email": "joel.wurtz@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], "description": "Promise used for asynchronous HTTP requests", @@ -5423,7 +5500,7 @@ "keywords": [ "promise" ], - "time": "2016-01-26T13:27:02+00:00" + "time": "2020-07-07T09:29:14+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -5476,28 +5553,27 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.1.0", + "version": "5.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" + "reference": "3170448f5769fe19f456173d833734e0ff1b84df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", - "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df", + "reference": "3170448f5769fe19f456173d833734e0ff1b84df", "shasum": "" }, "require": { - "ext-filter": "^7.1", - "php": "^7.2", - "phpdocumentor/reflection-common": "^2.0", - "phpdocumentor/type-resolver": "^1.0", - "webmozart/assert": "^1" + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" }, "require-dev": { - "doctrine/instantiator": "^1", - "mockery/mockery": "^1" + "mockery/mockery": "~1.3.2" }, "type": "library", "extra": { @@ -5525,7 +5601,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-02-22T12:28:44+00:00" + "time": "2020-07-20T20:05:34+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -5574,16 +5650,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.13.0", + "version": "1.14.1", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1" + "reference": "2383aad5689778470491581442aab38cec41bf1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1", - "reference": "21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/2383aad5689778470491581442aab38cec41bf1d", + "reference": "2383aad5689778470491581442aab38cec41bf1d", "shasum": "" }, "require": { @@ -5600,10 +5676,12 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "maennchen/zipstream-php": "^2.0", + "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^1.4", "markbaker/matrix": "^1.2", "php": "^7.2", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", "psr/simple-cache": "^1.0" }, "require-dev": { @@ -5664,28 +5742,28 @@ "xls", "xlsx" ], - "time": "2020-05-31T13:49:28+00:00" + "time": "2020-07-19T09:51:35+00:00" }, { "name": "phpoption/phpoption", - "version": "1.7.4", + "version": "1.7.5", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3" + "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3", - "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525", + "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525", "shasum": "" }, "require": { "php": "^5.5.9 || ^7.0 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.3", - "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" + "bamarni/composer-bin-plugin": "^1.4.1", + "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { @@ -5729,7 +5807,7 @@ "type": "tidelift" } ], - "time": "2020-06-07T10:40:07+00:00" + "time": "2020-07-20T17:29:33+00:00" }, { "name": "plank/laravel-mediable", @@ -5994,6 +6072,58 @@ ], "time": "2020-06-29T06:28:15+00:00" }, + { + "name": "psr/http-factory", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "psr/http-message": "^1.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 interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "time": "2019-04-30T12:38:16+00:00" + }, { "name": "psr/http-message", "version": "1.0.1", @@ -6622,16 +6752,16 @@ }, { "name": "seld/phar-utils", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0" + "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0", - "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796", + "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796", "shasum": "" }, "require": { @@ -6662,7 +6792,7 @@ "keywords": [ "phar" ], - "time": "2020-02-14T15:25:33+00:00" + "time": "2020-07-07T18:42:57+00:00" }, { "name": "simshaun/recurr", @@ -7100,16 +7230,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337" + "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337", - "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14", + "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14", "shasum": "" }, "require": { @@ -7119,6 +7249,10 @@ "extra": { "branch-alias": { "dev-master": "2.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -7156,7 +7290,7 @@ "type": "tidelift" } ], - "time": "2020-05-27T08:34:37+00:00" + "time": "2020-06-06T08:49:21+00:00" }, { "name": "symfony/error-handler", @@ -7317,16 +7451,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "405952c4e90941a17e52ef7489a2bd94870bb290" + "reference": "f6f613d74cfc5a623fc36294d3451eb7fa5a042b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/405952c4e90941a17e52ef7489a2bd94870bb290", - "reference": "405952c4e90941a17e52ef7489a2bd94870bb290", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f6f613d74cfc5a623fc36294d3451eb7fa5a042b", + "reference": "f6f613d74cfc5a623fc36294d3451eb7fa5a042b", "shasum": "" }, "require": { @@ -7340,6 +7474,10 @@ "extra": { "branch-alias": { "dev-master": "2.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -7385,7 +7523,7 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/filesystem", @@ -7781,16 +7919,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", "shasum": "" }, "require": { @@ -7802,7 +7940,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7853,20 +7991,20 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035" + "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035", - "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36", + "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36", "shasum": "" }, "require": { @@ -7878,7 +8016,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7930,20 +8068,20 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846" + "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/6e4dbcf5e81eba86e36731f94fe56b1726835846", - "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5", + "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5", "shasum": "" }, "require": { @@ -7955,7 +8093,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8008,25 +8146,26 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a57f8161502549a742a63c09f0a604997bf47027" + "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027", - "reference": "a57f8161502549a742a63c09f0a604997bf47027", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", + "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php70": "^1.10", "symfony/polyfill-php72": "^1.10" }, "suggest": { @@ -8035,7 +8174,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8059,6 +8198,10 @@ "name": "Laurent Bassin", "email": "laurent@bassin.info" }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -8088,20 +8231,20 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "40309d1700e8f72447bb9e7b54af756eeea35620" + "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/40309d1700e8f72447bb9e7b54af756eeea35620", - "reference": "40309d1700e8f72447bb9e7b54af756eeea35620", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", + "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", "shasum": "" }, "require": { @@ -8113,7 +8256,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8169,20 +8312,20 @@ "type": "tidelift" } ], - "time": "2020-06-14T14:40:37+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7110338d81ce1cbc3e273136e4574663627037a7" + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", - "reference": "7110338d81ce1cbc3e273136e4574663627037a7", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { @@ -8194,7 +8337,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8246,7 +8389,7 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php56", @@ -8323,17 +8466,94 @@ "time": "2020-07-14T12:35:20+00:00" }, { - "name": "symfony/polyfill-php72", - "version": "v1.17.0", + "name": "symfony/polyfill-php70", + "version": "v1.18.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "f048e612a3905f34931127360bdd2def19a5e582" + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582", - "reference": "f048e612a3905f34931127360bdd2def19a5e582", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", + "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0|~9.99", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "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" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-14T12:35:20+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "639447d008615574653fb3bc60d1986d7172eaae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", + "reference": "639447d008615574653fb3bc60d1986d7172eaae", "shasum": "" }, "require": { @@ -8342,7 +8562,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -8389,20 +8613,20 @@ "type": "tidelift" } ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", - "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca", "shasum": "" }, "require": { @@ -8411,7 +8635,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8465,20 +8689,20 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", - "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", "shasum": "" }, "require": { @@ -8487,7 +8711,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -8545,7 +8769,7 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-util", @@ -8775,16 +8999,16 @@ }, { "name": "symfony/service-contracts", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b" + "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b", - "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442", + "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442", "shasum": "" }, "require": { @@ -8798,6 +9022,10 @@ "extra": { "branch-alias": { "dev-master": "2.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -8843,7 +9071,7 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/string", @@ -9024,16 +9252,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.1.2", + "version": "v2.1.3", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e" + "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/e5ca07c8f817f865f618aa072c2fe8e0e637340e", - "reference": "e5ca07c8f817f865f618aa072c2fe8e0e637340e", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/616a9773c853097607cf9dd6577d5b143ffdcd63", + "reference": "616a9773c853097607cf9dd6577d5b143ffdcd63", "shasum": "" }, "require": { @@ -9046,6 +9274,10 @@ "extra": { "branch-alias": { "dev-master": "2.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -9091,7 +9323,7 @@ "type": "tidelift" } ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/var-dumper", @@ -9185,26 +9417,26 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.2", + "version": "2.2.3", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15" + "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15", - "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5", + "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5 || ^7.0", + "php": "^5.5 || ^7.0 || ^8.0", "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5" }, "type": "library", "extra": { @@ -9230,26 +9462,26 @@ ], "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": "2019-10-24T08:53:34+00:00" + "time": "2020-07-13T06:12:54+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v4.1.7", + "version": "v4.1.8", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "db63b2ea280fdcf13c4ca392121b0b2450b51193" + "reference": "572af79d913627a9d70374d27a6f5d689a35de32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/db63b2ea280fdcf13c4ca392121b0b2450b51193", - "reference": "db63b2ea280fdcf13c4ca392121b0b2450b51193", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/572af79d913627a9d70374d27a6f5d689a35de32", + "reference": "572af79d913627a9d70374d27a6f5d689a35de32", "shasum": "" }, "require": { "php": "^5.5.9 || ^7.0 || ^8.0", "phpoption/phpoption": "^1.7.3", - "symfony/polyfill-ctype": "^1.16" + "symfony/polyfill-ctype": "^1.17" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", @@ -9304,7 +9536,7 @@ "type": "tidelift" } ], - "time": "2020-06-07T18:25:35+00:00" + "time": "2020-07-14T19:22:52+00:00" }, { "name": "voku/portable-ascii", @@ -9374,20 +9606,20 @@ }, { "name": "webmozart/assert", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "9dc4f203e36f2b486149058bade43c851dd97451" + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451", - "reference": "9dc4f203e36f2b486149058bade43c851dd97451", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", + "php": "^5.3.3 || ^7.0 || ^8.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { @@ -9419,7 +9651,7 @@ "check", "validate" ], - "time": "2020-06-16T10:16:42+00:00" + "time": "2020-07-08T17:02:28+00:00" } ], "packages-dev": [ @@ -9556,16 +9788,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.3.2", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004" + "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/db1e03426e7f9472c9ecd1092aff00f56aa6c004", - "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/0eeb0de4fc1078433f0915010bd8f41e998adcb4", + "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4", "shasum": "" }, "require": { @@ -9573,9 +9805,11 @@ "illuminate/pipeline": "^5.5|^6.0|^7.0", "php": "^7.1", "symfony/http-foundation": "^3.3|^4.1|^5.0", + "symfony/mime": "^3.4|^4.0|^5.1", "symfony/var-dumper": "^3.4|^4.0|^5.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", "larapack/dd": "^1.1", "phpunit/phpunit": "^7.5.16", "spatie/phpunit-snapshot-assertions": "^2.0" @@ -9606,20 +9840,26 @@ "flare", "reporting" ], - "time": "2020-03-02T15:52:04+00:00" + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2020-07-13T23:25:57+00:00" }, { "name": "facade/ignition", - "version": "2.0.7", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "e6bedc1e74507d584fbcb041ebe0f7f215109cf2" + "reference": "cc7df15806aad8a9915148ea4daf7f0dd0be45b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/e6bedc1e74507d584fbcb041ebe0f7f215109cf2", - "reference": "e6bedc1e74507d584fbcb041ebe0f7f215109cf2", + "url": "https://api.github.com/repos/facade/ignition/zipball/cc7df15806aad8a9915148ea4daf7f0dd0be45b5", + "reference": "cc7df15806aad8a9915148ea4daf7f0dd0be45b5", "shasum": "" }, "require": { @@ -9638,7 +9878,8 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "mockery/mockery": "^1.3", - "orchestra/testbench": "5.0" + "orchestra/testbench": "5.0", + "psalm/plugin-laravel": "^1.2" }, "suggest": { "laravel/telescope": "^3.1" @@ -9677,25 +9918,30 @@ "laravel", "page" ], - "time": "2020-06-08T09:14:08+00:00" + "time": "2020-07-14T11:34:42+00:00" }, { "name": "facade/ignition-contracts", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/facade/ignition-contracts.git", - "reference": "f445db0fb86f48e205787b2592840dd9c80ded28" + "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28", - "reference": "f445db0fb86f48e205787b2592840dd9c80ded28", + "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b", + "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b", "shasum": "" }, "require": { "php": "^7.1" }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", + "phpunit/phpunit": "^7.5|^8.0", + "vimeo/psalm": "^3.12" + }, "type": "library", "autoload": { "psr-4": { @@ -9721,7 +9967,7 @@ "flare", "ignition" ], - "time": "2019-08-30T14:06:08+00:00" + "time": "2020-07-14T10:10:28+00:00" }, { "name": "filp/whoops", @@ -9836,20 +10082,20 @@ }, { "name": "hamcrest/hamcrest-php", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/hamcrest/hamcrest-php.git", - "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad" + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad", - "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad", + "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", + "reference": "8c3d0a3f6af734494ad8f6fbbee0ba92422859f3", "shasum": "" }, "require": { - "php": "^5.3|^7.0" + "php": "^5.3|^7.0|^8.0" }, "replace": { "cordoval/hamcrest-php": "*", @@ -9857,14 +10103,13 @@ "kodova/hamcrest-php": "*" }, "require-dev": { - "phpunit/php-file-iterator": "1.3.3", - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "^1.0" + "phpunit/php-file-iterator": "^1.4 || ^2.0", + "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -9874,35 +10119,35 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD" + "BSD-3-Clause" ], "description": "This is the PHP port of Hamcrest Matchers", "keywords": [ "test" ], - "time": "2016-01-20T08:20:44+00:00" + "time": "2020-07-09T08:09:16+00:00" }, { "name": "mockery/mockery", - "version": "1.3.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be" + "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", - "reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", + "url": "https://api.github.com/repos/mockery/mockery/zipball/9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", + "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", "shasum": "" }, "require": { - "hamcrest/hamcrest-php": "~2.0", + "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" + "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0|~9.0" }, "type": "library", "extra": { @@ -9945,7 +10190,7 @@ "test double", "testing" ], - "time": "2019-12-26T09:49:15+00:00" + "time": "2020-07-09T08:23:05+00:00" }, { "name": "myclabs/deep-copy", @@ -10069,6 +10314,20 @@ "php", "symfony" ], + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -10175,33 +10434,33 @@ }, { "name": "phpspec/prophecy", - "version": "v1.10.3", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "451c3cd1418cf640de218914901e51b064abb093" + "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093", - "reference": "451c3cd1418cf640de218914901e51b064abb093", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160", + "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", - "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0", - "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0" + "doctrine/instantiator": "^1.2", + "php": "^7.2", + "phpdocumentor/reflection-docblock": "^5.0", + "sebastian/comparator": "^3.0 || ^4.0", + "sebastian/recursion-context": "^3.0 || ^4.0" }, "require-dev": { - "phpspec/phpspec": "^2.5 || ^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1" + "phpspec/phpspec": "^6.0", + "phpunit/phpunit": "^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10.x-dev" + "dev-master": "1.11.x-dev" } }, "autoload": { @@ -10234,7 +10493,7 @@ "spy", "stub" ], - "time": "2020-03-05T15:02:03+00:00" + "time": "2020-07-08T12:44:21+00:00" }, { "name": "phpunit/php-code-coverage", @@ -10648,6 +10907,12 @@ "highlight.php", "syntax" ], + "funding": [ + { + "url": "https://github.com/allejo", + "type": "github" + } + ], "time": "2020-03-02T05:59:21+00:00" }, { @@ -11267,23 +11532,23 @@ }, { "name": "theseer/tokenizer", - "version": "1.1.3", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + "reference": "75a63c33a8577608444246075ea0af0d052e452a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", + "reference": "75a63c33a8577608444246075ea0af0d052e452a", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -11303,7 +11568,13 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-06-13T22:48:21+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2020-07-12T23:59:07+00:00" } ], "aliases": [], diff --git a/database/factories/Tax.php b/database/factories/Tax.php index 7a6f3d30d..0777fabe9 100644 --- a/database/factories/Tax.php +++ b/database/factories/Tax.php @@ -10,7 +10,7 @@ $company = $user->companies()->first(); $factory->define(Tax::class, function (Faker $faker) use ($company) { setting()->setExtraColumns(['company_id' => $company->id]); - $types = ['normal', 'inclusive', 'compound', 'fixed']; + $types = ['normal', 'inclusive', 'compound', 'fixed', 'withholding']; return [ 'company_id' => $company->id, @@ -32,3 +32,5 @@ $factory->state(Tax::class, 'inclusive', ['type' => 'inclusive']); $factory->state(Tax::class, 'compound', ['type' => 'compound']); $factory->state(Tax::class, 'fixed', ['type' => 'fixed']); + +$factory->state(Tax::class, 'withholding', ['type' => 'withholding']); diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js index d6bf0b4be..1a91af63c 100644 --- a/resources/assets/js/views/purchases/bills.js +++ b/resources/assets/js/views/purchases/bills.js @@ -176,10 +176,11 @@ const app = new Vue({ case 'fixed': item_tax_total += tax.rate * item.quantity; break; + case 'withholding': + item_tax_total += 0 - item_discounted_total * (tax.rate / 100); + break; default: - let item_tax_amount = (item_discounted_total / 100) * tax.rate; - - item_tax_total += item_tax_amount; + item_tax_total += item_discounted_total * (tax.rate / 100); break; } } diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js index 136b97785..a3b5a8928 100644 --- a/resources/assets/js/views/sales/invoices.js +++ b/resources/assets/js/views/sales/invoices.js @@ -177,10 +177,11 @@ const app = new Vue({ case 'fixed': item_tax_total += tax.rate * item.quantity; break; + case 'withholding': + item_tax_total += 0 - item_discounted_total * (tax.rate / 100); + break; default: - let item_tax_amount = (item_discounted_total / 100) * tax.rate; - - item_tax_total += item_tax_amount; + item_tax_total += item_discounted_total * (tax.rate / 100); break; } } @@ -225,7 +226,7 @@ const app = new Vue({ // set global total variable. this.totals.sub = sub_total; - this.totals.tax = tax_total; + this.totals.tax = Math.abs(tax_total); this.totals.item_discount = line_item_discount_total; // Apply discount to total diff --git a/resources/lang/en-GB/taxes.php b/resources/lang/en-GB/taxes.php index 486376c3a..d3ada489c 100644 --- a/resources/lang/en-GB/taxes.php +++ b/resources/lang/en-GB/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inclusive', 'compound' => 'Compound', 'fixed' => 'Fixed', + 'withholding' => 'Withholding', ]; From b96a2296360ad46fdf85ed6708dd1647d5a0b1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 22 Jul 2020 15:33:43 +0300 Subject: [PATCH 136/208] fixed typo --- app/Jobs/Purchase/CreateBillItemsAndTotals.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/Purchase/CreateBillItemsAndTotals.php b/app/Jobs/Purchase/CreateBillItemsAndTotals.php index 7a3693aad..e9ab8d46d 100644 --- a/app/Jobs/Purchase/CreateBillItemsAndTotals.php +++ b/app/Jobs/Purchase/CreateBillItemsAndTotals.php @@ -95,7 +95,7 @@ class CreateBillItemsAndTotals extends Job 'bill_id' => $this->bill->id, 'code' => 'tax', 'name' => $tax['name'], - 'amount' => round(abs($total['amount']), $precision), + 'amount' => round(abs($tax['amount']), $precision), 'sort_order' => $sort_order, ]); From 4366506b482e01601feedca9a1495aa35077bfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 23 Jul 2020 08:57:23 +0300 Subject: [PATCH 137/208] refs #1504 use report, module pages.. --- resources/views/common/reports/edit.blade.php | 2 +- resources/views/partials/reports/fields.blade.php | 2 +- resources/views/settings/modules/edit.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php index 2dbee43ed..8a57a73e4 100644 --- a/resources/views/common/reports/edit.blade.php +++ b/resources/views/common/reports/edit.blade.php @@ -57,7 +57,7 @@ $field['attributes']) ) }} @elseif ($type == 'checkboxGroup') - {{ Form::$type($field['name'], $field['title'], $field['items'], $report->settings->{$field['name']}, $field['id'], array_merge([ + {{ Form::$type($field['name'], $field['title'], $field['items'], $report->settings->{$field['name']}, $field['id'], $report->settings->{$field['name']}, array_merge([ 'data-field' => 'settings' ], $field['attributes']) diff --git a/resources/views/partials/reports/fields.blade.php b/resources/views/partials/reports/fields.blade.php index de8bb3417..7cd807a25 100644 --- a/resources/views/partials/reports/fields.blade.php +++ b/resources/views/partials/reports/fields.blade.php @@ -28,7 +28,7 @@ $field['attributes']) ) }} @elseif ($type == 'checkboxGroup') - {{ Form::$type($field['name'], $field['title'], $field['items'], $field['value'], $field['id'], array_merge([ + {{ Form::$type($field['name'], $field['title'], $field['items'], $field['value'], $field['id'], $field['selected'], array_merge([ 'data-field' => 'settings' ], $field['attributes']) diff --git a/resources/views/settings/modules/edit.blade.php b/resources/views/settings/modules/edit.blade.php index 24ca180d8..0b9799502 100644 --- a/resources/views/settings/modules/edit.blade.php +++ b/resources/views/settings/modules/edit.blade.php @@ -30,7 +30,7 @@ @elseif ($type == 'radioGroup') {{ Form::$type($field['name'], trans($field['title']), isset($setting[$field['name']]) ? $setting[$field['name']] : 1, trans($field['enable']), trans($field['disable']), $field['attributes']) }} @elseif ($type == 'checkboxGroup') - {{ Form::$type($field['name'], trans($field['title']), $field['items'], $field['value'], $field['id'], $field['attributes']) }} + {{ Form::$type($field['name'], trans($field['title']), $field['items'], $field['value'], $field['id'], $field['selected'], $field['attributes']) }} @elseif ($type == 'fileGroup') {{ Form::$type($field['name'], trans($field['title']), $field['attributes']) }} @elseif ($type == 'dateGroup') From 2575c5d0c5ddecf027952f420efa09e96de4932f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 23 Jul 2020 11:04:25 +0300 Subject: [PATCH 138/208] close #1526 Fixed: Reconciliation form input values are not set --- resources/assets/js/mixins/global.js | 14 ++++++++++++++ .../assets/js/views/banking/reconciliations.js | 4 ++-- resources/views/partials/admin/head.blade.php | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index 2cd91dac3..dc4ee782b 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -56,6 +56,10 @@ export default { mounted() { this.checkNotify(); + + if (aka_currency) { + this.currency = aka_currency; + } }, methods: { @@ -308,5 +312,15 @@ export default { // always executed }); }, + + clickTab(id) { + let event = new document.window.KeyboardEvent('keydown', { keyCode: 9 }); // Tab key + + document.window.dispatchEvent(event); + + let e = $.Event('keyup'); + e.keyCode= 9; // tab + $('#' + id).trigger(e); + } } } diff --git a/resources/assets/js/views/banking/reconciliations.js b/resources/assets/js/views/banking/reconciliations.js index 2985c9953..c36be9c83 100644 --- a/resources/assets/js/views/banking/reconciliations.js +++ b/resources/assets/js/views/banking/reconciliations.js @@ -91,9 +91,9 @@ const app = new Vue({ } if (cleared_amount > 0) { - difference = parseFloat(this.form.closing_balance) - parseFloat(cleared_amount); + difference = (parseFloat(this.form.closing_balance) - parseFloat(cleared_amount)).toFixed(this.currency.precision); } else { - difference = parseFloat(this.form.closing_balance) + parseFloat(cleared_amount); + difference = (parseFloat(this.form.closing_balance) + parseFloat(cleared_amount)).toFixed(this.currency.precision); } if (difference != 0) { diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php index 391d2811b..f598424f1 100644 --- a/resources/views/partials/admin/head.blade.php +++ b/resources/views/partials/admin/head.blade.php @@ -34,6 +34,7 @@ @stack('js') From 0019022d9b8d5b19d75f10b19c755e88e1b83667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Thu, 23 Jul 2020 11:13:30 +0300 Subject: [PATCH 139/208] close #1540 Fixed: Incorrect amount when precision is 0 --- resources/assets/js/views/purchases/bills.js | 8 ++++---- resources/assets/js/views/sales/invoices.js | 8 ++++---- resources/views/partials/auth/head.blade.php | 1 + resources/views/partials/modules/head.blade.php | 1 + resources/views/partials/portal/head.blade.php | 1 + resources/views/partials/signed/head.blade.php | 1 + resources/views/partials/wizard/head.blade.php | 1 + 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js index 1a91af63c..73a85b2f0 100644 --- a/resources/assets/js/views/purchases/bills.js +++ b/resources/assets/js/views/purchases/bills.js @@ -73,11 +73,11 @@ const app = new Vue({ currency: currency_code, item_id: item.item_id, name: item.name, - price: (item.price).toFixed(2), + price: (item.price).toFixed(this.currency.precision), quantity: item.quantity, tax_id: item.tax_id, discount: item.discount_rate, - total: (item.total).toFixed(2) + total: (item.total).toFixed(this.currency.precision) }); }); @@ -288,10 +288,10 @@ const app = new Vue({ this.form.items[index].item_id = item.id; this.form.items[index].name = item.name; - this.form.items[index].price = (item.purchase_price).toFixed(2); + this.form.items[index].price = (item.purchase_price).toFixed(this.currency.precision); this.form.items[index].quantity = 1; this.form.items[index].tax_id = tax_id; - this.form.items[index].total = (item.purchase_price).toFixed(2); + this.form.items[index].total = (item.purchase_price).toFixed(this.currency.precision); }, // remove bill item row => row_id = index diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js index a3b5a8928..6eafabdde 100644 --- a/resources/assets/js/views/sales/invoices.js +++ b/resources/assets/js/views/sales/invoices.js @@ -74,11 +74,11 @@ const app = new Vue({ currency: currency_code, item_id: item.item_id, name: item.name, - price: (item.price).toFixed(2), + price: (item.price).toFixed(this.currency.precision), quantity: item.quantity, tax_id: item.tax_id, discount: item.discount_rate, - total: (item.total).toFixed(2) + total: (item.total).toFixed(this.currency.precision) }); }); @@ -289,10 +289,10 @@ const app = new Vue({ this.form.items[index].item_id = item.id; this.form.items[index].name = item.name; - this.form.items[index].price = (item.sale_price).toFixed(2); + this.form.items[index].price = (item.sale_price).toFixed(this.currency.precision); this.form.items[index].quantity = 1; this.form.items[index].tax_id = tax_id; - this.form.items[index].total = (item.sale_price).toFixed(2); + this.form.items[index].total = (item.sale_price).toFixed(this.currency.precision); }, // remove invocie item row => row_id = index diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php index 35aa6f139..bef41a346 100644 --- a/resources/views/partials/auth/head.blade.php +++ b/resources/views/partials/auth/head.blade.php @@ -29,6 +29,7 @@ @stack('js') diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php index 6dc963fe6..cdab49732 100644 --- a/resources/views/partials/modules/head.blade.php +++ b/resources/views/partials/modules/head.blade.php @@ -32,6 +32,7 @@ var url = '{{ url("/") }}'; var app_home = '{{ route("apps.home.index") }}'; var app_url = '{{ config("app.url") }}'; + var aka_currency = {!! !empty($currency) ? $currency : 'false' !!}; //--> @stack('js') diff --git a/resources/views/partials/portal/head.blade.php b/resources/views/partials/portal/head.blade.php index 5e0fac33d..6ffcb90c5 100644 --- a/resources/views/partials/portal/head.blade.php +++ b/resources/views/partials/portal/head.blade.php @@ -31,6 +31,7 @@ @stack('js') diff --git a/resources/views/partials/signed/head.blade.php b/resources/views/partials/signed/head.blade.php index 5e0fac33d..6ffcb90c5 100644 --- a/resources/views/partials/signed/head.blade.php +++ b/resources/views/partials/signed/head.blade.php @@ -31,6 +31,7 @@ @stack('js') diff --git a/resources/views/partials/wizard/head.blade.php b/resources/views/partials/wizard/head.blade.php index c73198260..fd15b8fd1 100644 --- a/resources/views/partials/wizard/head.blade.php +++ b/resources/views/partials/wizard/head.blade.php @@ -31,6 +31,7 @@ @stack('js') From f0a4fe0776f51b7ce4f8c9f17dea39985d81a319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 23 Jul 2020 15:36:51 +0300 Subject: [PATCH 140/208] es-AR translation --- config/language.php | 5 +- resources/lang/es-AR/accounts.php | 14 ++ resources/lang/es-AR/auth.php | 41 +++++ resources/lang/es-AR/bills.php | 69 ++++++++ resources/lang/es-AR/bulk_actions.php | 21 +++ resources/lang/es-AR/companies.php | 14 ++ resources/lang/es-AR/currencies.php | 18 ++ resources/lang/es-AR/customers.php | 12 ++ resources/lang/es-AR/dashboards.php | 11 ++ resources/lang/es-AR/demo.php | 34 ++++ resources/lang/es-AR/email_templates.php | 50 ++++++ resources/lang/es-AR/errors.php | 23 +++ resources/lang/es-AR/footer.php | 10 ++ resources/lang/es-AR/general.php | 206 +++++++++++++++++++++++ resources/lang/es-AR/header.php | 16 ++ resources/lang/es-AR/import.php | 9 + resources/lang/es-AR/install.php | 46 +++++ resources/lang/es-AR/invoices.php | 77 +++++++++ resources/lang/es-AR/items.php | 8 + resources/lang/es-AR/maintenance.php | 11 ++ resources/lang/es-AR/messages.php | 37 ++++ resources/lang/es-AR/modules.php | 83 +++++++++ resources/lang/es-AR/notifications.php | 10 ++ resources/lang/es-AR/pagination.php | 10 ++ resources/lang/es-AR/passwords.php | 23 +++ resources/lang/es-AR/reconciliations.php | 16 ++ resources/lang/es-AR/recurring.php | 20 +++ resources/lang/es-AR/reports.php | 30 ++++ resources/lang/es-AR/settings.php | 129 ++++++++++++++ resources/lang/es-AR/taxes.php | 12 ++ resources/lang/es-AR/transfers.php | 12 ++ resources/lang/es-AR/updates.php | 15 ++ resources/lang/es-AR/validation.php | 123 ++++++++++++++ resources/lang/es-AR/widgets.php | 23 +++ 34 files changed, 1236 insertions(+), 2 deletions(-) create mode 100644 resources/lang/es-AR/accounts.php create mode 100644 resources/lang/es-AR/auth.php create mode 100644 resources/lang/es-AR/bills.php create mode 100644 resources/lang/es-AR/bulk_actions.php create mode 100644 resources/lang/es-AR/companies.php create mode 100644 resources/lang/es-AR/currencies.php create mode 100644 resources/lang/es-AR/customers.php create mode 100644 resources/lang/es-AR/dashboards.php create mode 100644 resources/lang/es-AR/demo.php create mode 100644 resources/lang/es-AR/email_templates.php create mode 100644 resources/lang/es-AR/errors.php create mode 100644 resources/lang/es-AR/footer.php create mode 100644 resources/lang/es-AR/general.php create mode 100644 resources/lang/es-AR/header.php create mode 100644 resources/lang/es-AR/import.php create mode 100644 resources/lang/es-AR/install.php create mode 100644 resources/lang/es-AR/invoices.php create mode 100644 resources/lang/es-AR/items.php create mode 100644 resources/lang/es-AR/maintenance.php create mode 100644 resources/lang/es-AR/messages.php create mode 100644 resources/lang/es-AR/modules.php create mode 100644 resources/lang/es-AR/notifications.php create mode 100644 resources/lang/es-AR/pagination.php create mode 100644 resources/lang/es-AR/passwords.php create mode 100644 resources/lang/es-AR/reconciliations.php create mode 100644 resources/lang/es-AR/recurring.php create mode 100644 resources/lang/es-AR/reports.php create mode 100644 resources/lang/es-AR/settings.php create mode 100644 resources/lang/es-AR/taxes.php create mode 100644 resources/lang/es-AR/transfers.php create mode 100644 resources/lang/es-AR/updates.php create mode 100644 resources/lang/es-AR/validation.php create mode 100644 resources/lang/es-AR/widgets.php diff --git a/config/language.php b/config/language.php index 1dc99e48f..326c5326a 100644 --- a/config/language.php +++ b/config/language.php @@ -122,7 +122,7 @@ return [ | This options indicates the allowed languages. | */ - 'allowed' => ['ar-SA', 'bg-BG', 'bn-BD', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-GB', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'he-IL', 'hi-IN', 'hr-HR', 'id-ID', 'is-IS', 'it-IT', 'ja-JP', 'ka-GE', 'ko-KR', 'lt-LT', 'lv-LV', 'mk-MK', 'ms-MY', 'nb-NO', 'ne-NP', 'nl-NL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'sq-AL', 'sv-SE', 'th-TH', 'tr-TR', 'uk-UA', 'ur-PK', 'uz-UZ', 'vi-VN', 'zh-CN', 'zh-TW'], + 'allowed' => ['ar-SA', 'bg-BG', 'bn-BD', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-GB', 'es-AR', 'es-ES', 'es-MX', 'fa-IR', 'fr-FR', 'he-IL', 'hi-IN', 'hr-HR', 'id-ID', 'is-IS', 'it-IT', 'ja-JP', 'ka-GE', 'ko-KR', 'lt-LT', 'lv-LV', 'mk-MK', 'ms-MY', 'nb-NO', 'ne-NP', 'nl-NL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sk-SK', 'sr-RS', 'sq-AL', 'sv-SE', 'th-TH', 'tr-TR', 'uk-UA', 'ur-PK', 'uz-UZ', 'vi-VN', 'zh-CN', 'zh-TW'], /* |-------------------------------------------------------------------------- @@ -143,6 +143,7 @@ return [ ['short' => 'de', 'long' => 'de-AT', 'english' => 'Austrian', 'native' => 'Österreichisches Deutsch'], ['short' => 'fi', 'long' => 'fi-FI', 'english' => 'Finnish', 'native' => 'Suomi'], ['short' => 'fr', 'long' => 'fr-FR', 'english' => 'French', 'native' => 'Français'], + ['short' => 'ea', 'long' => 'es-AR', 'english' => 'Spanish (Argentina)', 'native' => 'Español de Argentina'], ['short' => 'el', 'long' => 'el-GR', 'english' => 'Greek', 'native' => 'Ελληνικά'], ['short' => 'en', 'long' => 'en-AU', 'english' => 'English (AU)', 'native' => 'English (AU)'], ['short' => 'en', 'long' => 'en-CA', 'english' => 'English (CA)', 'native' => 'English (CA)'], @@ -166,7 +167,7 @@ return [ ['short' => 'lv', 'long' => 'lv-LV', 'english' => 'Latvian', 'native' => 'Latviešu valoda'], ['short' => 'mk', 'long' => 'mk-MK', 'english' => 'Macedonian', 'native' => 'Македонски јазик'], ['short' => 'ms', 'long' => 'ms-MY', 'english' => 'Malay', 'native' => 'Bahasa Melayu'], - ['short' => 'mx', 'long' => 'es-MX', 'english' => 'Mexico', 'native' => 'Español de México'], + ['short' => 'mx', 'long' => 'es-MX', 'english' => 'Spanish (Mexico)', 'native' => 'Español de México'], ['short' => 'nb', 'long' => 'nb-NO', 'english' => 'Norwegian', 'native' => 'Norsk Bokmål'], ['short' => 'ne', 'long' => 'ne-NP', 'english' => 'Nepali', 'native' => 'नेपाली'], ['short' => 'nl', 'long' => 'nl-NL', 'english' => 'Dutch', 'native' => 'Nederlands'], diff --git a/resources/lang/es-AR/accounts.php b/resources/lang/es-AR/accounts.php new file mode 100644 index 000000000..754fbddb9 --- /dev/null +++ b/resources/lang/es-AR/accounts.php @@ -0,0 +1,14 @@ + 'Nombre de cuenta', + 'number' => 'Número', + 'opening_balance' => 'Saldo de apertura', + 'current_balance' => 'Saldo actual', + 'bank_name' => 'Nombre del banco', + 'bank_phone' => 'Teléfono del banco', + 'bank_address' => 'Dirección del banco', + 'default_account' => 'Cuenta predeterminada', + +]; diff --git a/resources/lang/es-AR/auth.php b/resources/lang/es-AR/auth.php new file mode 100644 index 000000000..1a1ab0619 --- /dev/null +++ b/resources/lang/es-AR/auth.php @@ -0,0 +1,41 @@ + 'Perfil', + 'logout' => 'Cerrar sesión', + 'login' => 'Ingresar', + 'login_to' => 'Inicia sesión para empezar', + 'remember_me' => 'Recordarme', + 'forgot_password' => 'Olvidé mi contraseña', + 'reset_password' => 'Restablecer contraseña', + 'enter_email' => 'Introduce tu dirección de correo', + 'current_email' => 'Correo electrónico actual', + 'reset' => 'Restablecer', + 'never' => 'nunca', + 'landing_page' => 'Página de destino', + + 'password' => [ + 'current' => 'Contraseña', + 'current_confirm' => 'Confirmar contraseña', + 'new' => 'Nueva contraseña', + 'new_confirm' => 'Confirmar contraseña', + ], + + 'error' => [ + 'self_delete' => 'Error: No puede eliminarse usted mismo!', + 'self_disable' => 'Error: ¡No puedes desactivarte a ti mismo!', + 'no_company' => 'Error: Ninguna empresa asignada a su cuenta. Por favor, póngase en contacto con el administrador del sistema.', + ], + + 'failed' => 'Estas credenciales no coinciden con nuestros registros.', + 'disabled' => 'Esta cuenta está inhabilitada. Por favor, póngase en contacto con el administrador del sistema.', + 'throttle' => 'Demasiados intentos fallidos de inicio de sesión. Por favor vuelva a intentarlo después de %s segundos.', + + 'notification' => [ + 'message_1' => 'Ha recibido este correo porque hemos recibido una solicitud de recuperación de contraseña para su cuenta.', + 'message_2' => 'Si no solicitó un restablecimiento de contraseña, no es necesaria ninguna acción de su parte.', + 'button' => 'Restablecer contraseña', + ], + +]; diff --git a/resources/lang/es-AR/bills.php b/resources/lang/es-AR/bills.php new file mode 100644 index 000000000..b8bba9131 --- /dev/null +++ b/resources/lang/es-AR/bills.php @@ -0,0 +1,69 @@ + 'Número de factura', + 'bill_date' => 'Fecha de factura', + 'total_price' => 'Precio total', + 'due_date' => 'Fecha de vencimiento', + 'order_number' => 'Número de pedido', + 'bill_from' => 'Factura de', + + 'quantity' => 'Cantidad', + 'price' => 'Precio', + 'sub_total' => 'Subtotal', + 'discount' => 'Descuento', + 'item_discount' => 'Descuento de línea', + 'tax_total' => 'Total de impuestos', + 'total' => 'Total ', + + 'item_name' => 'Nombre del artículo | Nombres de artículo', + + 'show_discount' => ':discount% de descuento', + 'add_discount' => 'Agregar descuento', + 'discount_desc' => 'de subtotal', + + 'payment_due' => 'Vencimiento del pago', + 'amount_due' => 'Importe vencido', + 'paid' => 'Pagado', + 'histories' => 'Historial', + 'payments' => 'Pagos', + 'add_payment' => 'Añadir pago', + 'mark_paid' => 'Marcar como pagada', + 'mark_received' => 'Marcar como recibida', + 'mark_cancelled' => 'Marcar como cancelada', + 'download_pdf' => 'Descargar PDF', + 'send_mail' => 'Enviar Email', + 'create_bill' => 'Crear factura', + 'receive_bill' => 'Recibir factura', + 'make_payment' => 'Realizar pago', + + 'statuses' => [ + 'draft' => 'Borrador', + 'received' => 'Recibido', + 'partial' => 'Pago parcial', + 'paid' => 'Pagada', + 'overdue' => 'Vencida', + 'unpaid' => 'No pagada', + 'cancelled' => 'Cancelada', + ], + + 'messages' => [ + 'marked_received' => '¡Factura marcada como recibida!', + 'marked_paid' => '¡Factura marcada como pagada!', + 'marked_cancelled' => '¡Factura marcada como cancelada!', + 'draft' => 'Este es unBORRADOR de factura y se reflejará en los gráficos luego de que sea enviada.', + + 'status' => [ + 'created' => 'Creada el :date', + 'receive' => [ + 'draft' => 'Sin enviar', + 'received' => 'Recibida el :date', + ], + 'paid' => [ + 'await' => 'Pendiente de pago', + ], + ], + ], + +]; diff --git a/resources/lang/es-AR/bulk_actions.php b/resources/lang/es-AR/bulk_actions.php new file mode 100644 index 000000000..076d4a3cc --- /dev/null +++ b/resources/lang/es-AR/bulk_actions.php @@ -0,0 +1,21 @@ + 'Acción masiva|Acciones masivas', + 'selected' => 'seleccionado', + 'no_action' => 'Ninguna acción disponible', + + 'message' => [ + 'duplicate' => '¿Está seguro que desea duplicar el registro seleccionado?', + 'delete' => '¿Está seguro que desea eliminar el registro seleccionado?|¿Está seguro que desea eliminar los registros seleccionados?', + 'export' => '¿Está seguro que desea exportar el registro seleccionado?|¿Está seguro que desea exportar los registros seleccionados?', + 'enable' => '¿Está seguro que desea habilitar el registro seleccionado?|¿Está seguro que desea habilitar los registros seleccionados?', + 'disable' => '¿Está seguro que desea deshabilitar el registro seleccionado?|¿Está seguro que desea deshabilitar los registros seleccionados?', + 'paid' => '¿Está seguro de que desea marcar la factura seleccionada como pagada? ¿Está seguro que desea marcar las facturas seleccionadas como pagadas?', + 'sent' => '¿Está seguro que desea marcar la factura seleccionada como enviada? ¿Está seguro que desea marcar las facturas seleccionadas como enviadas?', + 'received' => '¿Está seguro de que desea marcar la factura seleccionada como recibida? ¿Está seguro que desea marcar las facturas seleccionadas como recibidas?', + 'cancelled' => '¿Está seguro que desea cancelar la factura seleccionada?|¿Está seguro que desea cancelar las facturas seleccionadas?', + ], + +]; diff --git a/resources/lang/es-AR/companies.php b/resources/lang/es-AR/companies.php new file mode 100644 index 000000000..7e581ec1e --- /dev/null +++ b/resources/lang/es-AR/companies.php @@ -0,0 +1,14 @@ + 'Dominio', + 'logo' => 'Logo', + + 'error' => [ + 'not_user_company' => 'Error: ¡No tiene permiso para cambiar esta empresa!', + 'delete_active' => 'Error: No se puede eliminar la empresa activa. Por favor, cambie a otra primero!', + 'disable_active' => 'Error: No se puede desactivar la empresa activa. ¡Por favor, cambie a otra primero!', + ], + +]; diff --git a/resources/lang/es-AR/currencies.php b/resources/lang/es-AR/currencies.php new file mode 100644 index 000000000..1cb64be34 --- /dev/null +++ b/resources/lang/es-AR/currencies.php @@ -0,0 +1,18 @@ + 'Código', + 'rate' => 'Cotización', + 'default' => 'Moneda predeterminada', + 'decimal_mark' => 'Punto decimal', + 'thousands_separator' => 'Separador de miles', + 'precision' => 'Precisión', + 'symbol' => [ + 'symbol' => 'Símbolo', + 'position' => 'Posición del símbolo', + 'before' => 'Antes del importe', + 'after' => 'Despues del importe', + ] + +]; diff --git a/resources/lang/es-AR/customers.php b/resources/lang/es-AR/customers.php new file mode 100644 index 000000000..6e32c8906 --- /dev/null +++ b/resources/lang/es-AR/customers.php @@ -0,0 +1,12 @@ + '¿Puede iniciar sesión?', + 'user_created' => 'Usuario creado', + + 'error' => [ + 'email' => 'El correo electrónico ya está en uso.', + ], + +]; diff --git a/resources/lang/es-AR/dashboards.php b/resources/lang/es-AR/dashboards.php new file mode 100644 index 000000000..e6d174926 --- /dev/null +++ b/resources/lang/es-AR/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'Error: No tiene permiso para cambiar este panel!', + 'delete_last' => 'Error: No se puede eliminar el último tablero. ¡Por favor, crea uno nuevo primero!', + 'disable_last' => 'Error: No se puede desactivar el último tablero. ¡Por favor, crea uno nuevo primero!', + ], + +]; diff --git a/resources/lang/es-AR/demo.php b/resources/lang/es-AR/demo.php new file mode 100644 index 000000000..84f4a0f11 --- /dev/null +++ b/resources/lang/es-AR/demo.php @@ -0,0 +1,34 @@ + [ + 'cash' => 'Efectivo', + ], + + 'categories' => [ + 'deposit' => 'Depósito', + 'sales' => 'Ventas', + ], + + 'currencies' => [ + 'usd' => 'Dólar EEUU', + 'eur' => 'Euro', + 'gbp' => 'Libra esterlina', + 'try' => 'Lira turca', + ], + + 'offline_payments' => [ + 'cash' => 'Efectivo', + 'bank' => 'Transferencia bancaria', + ], + + 'reports' => [ + 'income' => 'Resumen mensual de ingresos por categoría.', + 'expense' => 'Resumen mensual de gastos por categoría.', + 'income_expense' => 'Ingresos mensuales vs gastos por categoría.', + 'tax' => 'Resumen trimestral de impuestos.', + 'profit_loss' => 'Ganancias y pérdidas trimestrales por categoría.', + ], + +]; diff --git a/resources/lang/es-AR/email_templates.php b/resources/lang/es-AR/email_templates.php new file mode 100644 index 000000000..0a9d619f2 --- /dev/null +++ b/resources/lang/es-AR/email_templates.php @@ -0,0 +1,50 @@ + [ + 'subject' => '{invoice_number} factura creada', + 'body' => 'Estimado {customer_name},

    Le hemos preparado la siguiente factura: {invoice_number}.

    Puede ver los detalles de la factura y proceder con el pago desde el siguiente enlace:     {invoice_number}.

    Ponte en contacto con nosotros para cualquier pregunta.

    Saludos cordiales,
    {company_name}', + ], + + 'invoice_remind_customer' => [ + 'subject' => '{invoice_number} notificación de factura vencida', + 'body' => 'Estimado {customer_name},

    Este es un aviso de factura vencida para {invoice_number}.

    El total de la factura es {invoice_total} y venció el {invoice_due_date}.

    Puede ver los detalles de la factura y proceder con el pago desde el siguiente enlace: {invoice_number}.

    Saludos cordiales,
    {company_name}', + ], + + 'invoice_remind_admin' => [ + 'subject' => '{invoice_number} notificación de factura vencida', + 'body' => 'Hola,

    {customer_name} ha recibido un aviso de vencimiento por la factura {invoice_number}.

    El total de la factura es {invoice_total} y venció el {invoice_due_date}.

    Puede ver los detalles de la factura desde el siguiente enlace: {invoice_number}.

    Saludos cordiales,
    {company_name}', + ], + + 'invoice_recur_customer' => [ + 'subject' => '{invoice_number} factura recurrente creada', + 'body' => 'Estimado {customer_name},

    Basado en su círculo recurrente, le hemos preparado la siguiente factura: {invoice_number}.

    Puede ver los detalles de la factura y proceder con el pago desde el siguiente enlace: {invoice_number}.

    Ponte en contacto con nosotros para cualquier pregunta.

    Saludos cordiales,
    {company_name}', + ], + + 'invoice_recur_admin' => [ + 'subject' => '{invoice_number} factura recurrente creada', + 'body' => 'Hola,

    Basado en el círculo recurrente de {customer_name}, la factura {invoice_number} ha sido creada automáticamente.

    Puede ver los detalles de la factura desde el siguiente enlace: {invoice_number}.

    Saludos cordiales,
    {company_name}', + ], + + 'invoice_payment_customer' => [ + 'subject' => 'Pago recibido por factura {invoice_number}', + 'body' => 'Estimado {customer_name},

    Gracias por el pago. Encuentre los detalles de pago a continuación:

    -------------------------------------------------

    Monto: {transaction_total}
    Fecha: {transaction_paid_date}
    Número de factura: {invoice_number}

    -------------------------------------------------

    Siempre puede ver los detalles de la factura desde el siguiente enlace: {invoice_number}.

    Ponte en contacto con nosotros para cualquier pregunta.

    Saludos cordiales,
    {company_name}', + ], + + 'invoice_payment_admin' => [ + 'subject' => 'Pago recibido por factura {invoice_number}', + 'body' => 'Hola,

    {customer_name} registró un pago por la factura {invoice_number}.

    Puede ver los detalles de la factura desde el siguiente enlace: {invoice_number}.

    Saludos cordiales,
    {company_name}', + ], + + 'bill_remind_admin' => [ + 'subject' => 'Aviso recordatorio de factura {bill_number}', + 'body' => 'Hola,

    {customer_name} ha recibido un aviso de vencimiento por la factura {invoice_number}.

    El total de la factura es {invoice_total} y venció el {invoice_due_date}.

    Puede ver los detalles de la factura desde el siguiente enlace: {invoice_number}.

    Saludos cordiales,
    {company_name}', + ], + + 'bill_recur_admin' => [ + 'subject' => '{invoice_number} factura recurrente creada', + 'body' => 'Hola,

    Basado en el círculo recurrente de {customer_name}, la factura {invoice_number} ha sido creada automáticamente.

    Puede ver los detalles de la factura desde el siguiente enlace: {invoice_number}.

    Saludos cordiales,
    {company_name}', + ], + +]; diff --git a/resources/lang/es-AR/errors.php b/resources/lang/es-AR/errors.php new file mode 100644 index 000000000..2348d1f1d --- /dev/null +++ b/resources/lang/es-AR/errors.php @@ -0,0 +1,23 @@ + [ + '403' => '¡Ups! Acceso prohibido', + '404' => '¡Ups! Página no encontrada', + '500' => '¡Ups! Algo salió mal', + ], + + 'header' => [ + '403' => '403 Prohibido', + '404' => '404 Página no encontrada', + '500' => '500 Error interno del servidor', + ], + + 'message' => [ + '403' => 'No puede acceder a esta página.', + '404' => 'No pudimos encontrar la página que estaba buscando.', + '500' => 'Trabajaremos para arreglarlo de inmediato.', + ], + +]; diff --git a/resources/lang/es-AR/footer.php b/resources/lang/es-AR/footer.php new file mode 100644 index 000000000..2b541c945 --- /dev/null +++ b/resources/lang/es-AR/footer.php @@ -0,0 +1,10 @@ + 'Versión', + 'powered' => 'Desarrollado por Akaunting', + 'link' => 'https://akaunting.com', + 'software' => 'Software de Contabilidad Libre', + +]; diff --git a/resources/lang/es-AR/general.php b/resources/lang/es-AR/general.php new file mode 100644 index 000000000..cae32bd42 --- /dev/null +++ b/resources/lang/es-AR/general.php @@ -0,0 +1,206 @@ + 'Tablero|Tableros', + 'items' => 'Producto/Servicio|Productos/Servicios', + 'incomes' => 'Ingresos|Ingresos', + 'invoices' => 'Factura|Facturas', + 'revenues' => 'Ingresos|Ingresos', + 'customers' => 'Cliente|Clientes', + 'expenses' => 'Gastos|Gastos', + 'bills' => 'Factura|Facturas', + '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', + 'modules' => 'App|Apps', + 'companies' => 'Empresa|Empresas', + 'profits' => 'Ganancia|Ganancias', + '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', + 'contacts' => 'Contacto|Contactos', + 'reconciliations' => 'Conciliación|Conciliaciones', + 'developers' => 'Desarrollador|Desarrolladores', + 'schedules' => 'Horario|Horarios', + 'groups' => 'Grupo|Grupos', + 'charts' => 'Gráfico|Gráficos', + 'localisations' => 'Localización|Localizaciones', + 'defaults' => 'Por defecto|Por defecto', + 'widgets' => 'Widget|Widgets', + 'templates' => 'Plantilla|Plantillas', + 'sales' => 'Venta|Ventas', + 'purchases' => 'Compra|Compras', + + 'welcome' => 'Bienvenido/a', + 'banking' => 'Bancos', + 'general' => 'General', + 'no_records' => 'No hay registros.', + 'date' => 'Fecha', + 'amount' => 'Importe', + 'enabled' => 'Activo', + 'disabled' => 'Inhabilitado', + 'yes' => 'Sí', + 'no' => 'No', + 'na' => 'N/A', + 'daily' => 'Diario', + 'weekly' => 'Semanal', + 'monthly' => 'Mensual', + 'quarterly' => 'Trimestral', + 'yearly' => 'Anual', + 'add' => 'Añadir', + 'add_new' => 'Agregar nuevo', + 'add_income' => 'Agregar Ingreso', + 'add_expense' => 'Agregar Gasto', + 'show' => 'Mostrar', + 'edit' => 'Editar', + 'delete' => 'Borrar', + 'send' => 'Enviar', + 'share' => 'Compartir', + 'download' => 'Descargar', + 'delete_confirm' => 'Confirma el borrado de :name :type?', + 'name' => 'Nombre', + 'email' => 'Correo electrónico', + 'tax_number' => 'CUIT', + 'phone' => 'Teléfono', + 'address' => 'Dirección', + 'website' => 'Página web', + 'actions' => 'Acciones', + 'description' => 'Descripción', + 'manage' => 'Administrar', + 'code' => 'Código', + 'alias' => 'Alias', + 'balance' => 'Saldo', + 'reference' => 'Referencia', + 'attachment' => 'Adjunto', + 'change' => 'Cambiar', + 'change_type' => 'Cambiar :type', + 'switch' => 'Cambiar', + 'color' => 'Color', + 'save' => 'Guardar', + 'confirm' => 'Confirmar', + 'cancel' => 'Cancelar', + 'loading' => 'Cargando...', + 'from' => 'De ', + 'to' => 'Para', + 'print' => 'Imprimir', + 'search' => 'Buscar', + 'search_placeholder' => 'Escriba para buscar..', + 'filter' => 'Filtrar', + 'help' => 'Ayuda', + 'all' => 'Todos', + 'all_type' => 'Todos :type', + 'upcoming' => 'Próximos', + 'created' => 'Creado', + 'id' => 'ID', + 'more_actions' => 'Más acciones', + 'duplicate' => 'Duplicar', + 'unpaid' => 'No Pagado', + 'paid' => 'Pagado', + 'overdue' => 'Vencido', + 'partially' => 'Parcialmente', + 'partially_paid' => 'Parcialmente pagado', + 'export' => 'Exportar', + 'finish' => 'Terminar', + 'wizard' => 'Asistente', + 'skip' => 'Omitir', + 'enable' => 'Habilitar', + 'disable' => 'Deshabilitar', + 'select_all' => 'Seleccionar todo', + 'unselect_all' => 'Deseleccionar todo', + 'created_date' => 'Fecha de creación', + 'period' => 'Período', + 'frequency' => 'Frecuencia', + 'start' => 'Inicio', + 'end' => 'Fin', + 'clear' => 'Limpiar', + 'difference' => 'Diferencia', + 'footer' => 'Pie de página', + 'start_date' => 'Fecha de inicio', + 'end_date' => 'Fecha de fin', + 'basis' => 'Base', + 'accrual' => 'Devengado', + 'cash' => 'Efectivo', + 'group_by' => 'Agrupar por', + 'accounting' => 'Contabilidad', + 'sort' => 'Ordenar', + 'width' => 'Ancho', + 'month' => 'Mes', + 'year' => 'Año', + 'type_item_name' => 'Escriba un nombre de artículo', + 'no_data' => 'Sin datos', + 'no_matching_data' => 'No hay datos coincidentes', + 'clear_cache' => 'Limpiar caché', + 'go_to_dashboard' => 'Ir al panel de control', + + 'card' => [ + 'name' => 'Nombre del titular', + 'number' => 'Número de tarjeta', + 'expiration_date' => 'Fecha de vencimiento', + 'cvv' => 'CVV de tarjeta', + ], + + 'title' => [ + 'new' => 'Nuevo :type', + 'edit' => 'Editar :type', + 'delete' => 'Eliminar :type', + 'create' => 'Crear :type', + 'send' => 'Enviar :type', + 'get' => 'Obtener :type', + 'add' => 'Agregar :type', + 'manage' => 'Administrar :type', + ], + + 'form' => [ + 'enter' => 'Ingrese :field', + 'select' => [ + 'field' => '- Seleccione :field -', + 'file' => 'Seleccionar archivo', + ], + 'add_new' => 'Agregar Nuevo :field', + 'no_file_selected' => 'Ningún archivo seleccionado...', + ], + + 'date_range' => [ + 'today' => 'Hoy', + 'yesterday' => 'Ayer', + 'last_days' => 'Últimos :day Días', + 'this_month' => 'Este mes', + 'last_month' => 'Mes anterior', + ], + + 'empty' => [ + 'documentation' => 'Revisa la documentación para más detalles.', + 'items' => 'Los artículos pueden ser productos o servicios. Puede utilizar artículos al crear facturas para poblar los campos precio, impuestos, etc.', + 'invoices' => 'Las facturas pueden ser una vez o recurrentes. Puedes enviarlas a los clientes y empezar a aceptar pagos en línea.', + 'revenues' => 'El ingreso es una transacción de ingreso de pago. Puede ser un registro independiente (es decir, depósito) o adjunto a una factura.', + 'customers' => 'Los clientes son necesarios si desea crear facturas. También pueden iniciar sesión en el Portal del Cliente y ver su balance de saldo.', + 'bills' => 'Las facturas pueden ser una vez o recurrentes. Indican lo que debe a sus proveedores por los productos o servicios que compra.', + 'payments' => 'El pago es una transacción de gastos pagados. Puede ser un registro independiente (por ejemplo, recibo de alimento) o adjunto a una factura.', + 'vendors' => 'Los proveedores son necesarios si desea crear facturas. Puede ver el saldo que debe y filtrar los informes por proveedor.', + 'transfers' => 'Las transferencias te permiten pasar dinero de una cuenta a otra, tanto si utilizan la misma moneda como si no.', + 'taxes' => 'Los impuestos se utilizan para aplicar cargos adicionales a facturas. Sus finanzas se ven afectadas por estos impuestos regulatorios.', + 'reconciliations' => 'La conciliación bancaria es un proceso realizado para asegurar que los registros bancarios de su empresa también sean correctos.', + ], + +]; diff --git a/resources/lang/es-AR/header.php b/resources/lang/es-AR/header.php new file mode 100644 index 000000000..41890dc46 --- /dev/null +++ b/resources/lang/es-AR/header.php @@ -0,0 +1,16 @@ + 'Cambiar idioma', + 'last_login' => 'Último ingreso :time', + 'notifications' => [ + 'counter' => '{0} No tiene notificaciones |{1} Tiene :count notificación | [2,*] Tiene :count notificaciones', + 'overdue_invoices' => '{1} :count factura vencida | [2,*] :count facturas vencidas', + 'upcoming_bills' => '{1} :count factura por vencer|[2,*] :count facturas por vencer', + 'view_all' => 'Ver todas' + ], + 'docs_link' => 'https://akaunting.com/docs', + 'support_link' => 'https://akaunting.com/support', + +]; diff --git a/resources/lang/es-AR/import.php b/resources/lang/es-AR/import.php new file mode 100644 index 000000000..38e8db01f --- /dev/null +++ b/resources/lang/es-AR/import.php @@ -0,0 +1,9 @@ + 'Importar', + 'title' => 'Importar :type', + 'message' => 'Formatos permitidos: XLS, XLSX. Por favor, descargue el archivo de ejemplo.', + +]; diff --git a/resources/lang/es-AR/install.php b/resources/lang/es-AR/install.php new file mode 100644 index 000000000..476044c0f --- /dev/null +++ b/resources/lang/es-AR/install.php @@ -0,0 +1,46 @@ + 'Siguiente', + 'refresh' => 'Actualizar', + + 'steps' => [ + 'requirements' => 'Por favor, pregúntele a su proveedor de hosting para corregir los errores!', + 'language' => 'Paso 1/3: Selección de idioma', + 'database' => 'Paso 2/3: Configuración de la base de datos', + 'settings' => 'Paso 3/3: Detalles de la empresa y del administrador', + ], + + 'language' => [ + 'select' => 'Seleccione el idioma', + ], + + 'requirements' => [ + 'enabled' => ':feature debe estar habilitado!', + 'disabled' => ':feature debe estar deshabilitado!', + 'extension' => 'La extensión :extension necesita ser instalada y cargada!', + 'directory' => 'El directorio :directorio necesita tener permiso de escritura!', + 'executable' => '¡El archivo ejecutable PHP CLI no está definido/funcionando o su versión no es :php_version o superior! Por favor, pida a su compañía de hosting que configure correctamente la variable de entorno PHP_BINARY o PHP_PATH.', + ], + + 'database' => [ + 'hostname' => 'Nombre del servidor', + 'username' => 'Usuario', + 'password' => 'Contraseña', + 'name' => 'Base de datos', + ], + + 'settings' => [ + 'company_name' => 'Nombre de la empresa', + 'company_email' => 'Correo electrónico de la Empresa', + 'admin_email' => 'Correo electrónico del Administrador', + 'admin_password' => 'Contraseña de Administrador', + ], + + 'error' => [ + 'php_version' => 'Error: Pídele a su proveedor de alojamiento que utilice PHP :php_version o superior tanto para HTTP como para CLI.', + 'connection' => 'Error: No se pudo conectar a la base de datos! Por favor, asegúrese de que los datos son correctos.', + ], + +]; diff --git a/resources/lang/es-AR/invoices.php b/resources/lang/es-AR/invoices.php new file mode 100644 index 000000000..6499d080f --- /dev/null +++ b/resources/lang/es-AR/invoices.php @@ -0,0 +1,77 @@ + 'Número de factura', + 'invoice_date' => 'Fecha de factura', + 'total_price' => 'Precio total', + 'due_date' => 'Fecha de vencimiento', + 'order_number' => 'Número de pedido', + 'bill_to' => 'Facturar a', + + 'quantity' => 'Cantidad', + 'price' => 'Precio', + 'sub_total' => 'Subtotal', + 'discount' => 'Descuento', + 'item_discount' => 'Descuento de línea', + 'tax_total' => 'Total de impuestos', + 'total' => 'Total ', + + 'item_name' => 'Nombre del artículo | Nombres de artículo', + + 'show_discount' => ':discount% de descuento', + 'add_discount' => 'Agregar descuento', + 'discount_desc' => 'de subtotal', + + 'payment_due' => 'Vencimiento de pago', + 'paid' => 'Pagado', + 'histories' => 'Historial', + 'payments' => 'Pagos', + 'add_payment' => 'Añadir pago', + 'mark_paid' => 'Marcar como pagada', + 'mark_sent' => 'Marcar Como Enviada', + 'mark_viewed' => 'Marcar como vista', + 'mark_cancelled' => 'Marcar como cancelada', + 'download_pdf' => 'Descargar PDF', + 'send_mail' => 'Enviar Email', + 'all_invoices' => 'Inicie sesión para ver todas las facturas', + 'create_invoice' => 'Crear factura', + 'send_invoice' => 'Enviar factura', + 'get_paid' => 'Recibir Pago', + 'accept_payments' => 'Aceptar pagos online', + + 'statuses' => [ + 'draft' => 'Borrador', + 'sent' => 'Enviada', + 'viewed' => 'Vista', + 'approved' => 'Aprobada', + 'partial' => 'Pago parcial', + 'paid' => 'Pagada', + 'overdue' => 'Vencida', + 'unpaid' => 'No pagada', + 'cancelled' => 'Cancelada', + ], + + 'messages' => [ + 'email_sent' => '¡El correo electrónico de la factura ha sido enviado!', + 'marked_sent' => '¡Factura marcada como enviada!', + 'marked_paid' => '¡Factura marcada como pagada!', + 'marked_viewed' => '¡Factura marcada como vista!', + 'marked_cancelled' => '¡Factura marcada como cancelada!', + 'email_required' => '¡No hay dirección de correo electrónico para este cliente!', + 'draft' => 'Esta es una factura BORRADOR y se reflejará en gráficos después de ser enviada.', + + 'status' => [ + 'created' => 'Creada el :date', + 'viewed' => 'Vista', + 'send' => [ + 'draft' => 'Sin enviar', + 'sent' => 'Enviada el :date', + ], + 'paid' => [ + 'await' => 'Pendiente de pago', + ], + ], + ], + +]; diff --git a/resources/lang/es-AR/items.php b/resources/lang/es-AR/items.php new file mode 100644 index 000000000..7b1a18543 --- /dev/null +++ b/resources/lang/es-AR/items.php @@ -0,0 +1,8 @@ + 'Precio de venta', + 'purchase_price' => 'Precio de compra', + +]; diff --git a/resources/lang/es-AR/maintenance.php b/resources/lang/es-AR/maintenance.php new file mode 100644 index 000000000..0e736e17c --- /dev/null +++ b/resources/lang/es-AR/maintenance.php @@ -0,0 +1,11 @@ + 'En Mantenimiento', + + 'message' => 'Lo sentimos, estamos en mantenimiento. Por favor, inténtalo de nuevo más tarde!', + + 'last-updated' => 'Este mensaje fue actualizado por última vez el :timestamp.', + +]; diff --git a/resources/lang/es-AR/messages.php b/resources/lang/es-AR/messages.php new file mode 100644 index 000000000..54cd1d27c --- /dev/null +++ b/resources/lang/es-AR/messages.php @@ -0,0 +1,37 @@ + [ + 'added' => ':type creado!', + 'updated' => ':type actualizado!', + 'deleted' => ':type borrado!', + 'duplicated' => ': type duplicado!', + 'imported' => ':type importado!', + 'exported' => ':type exportado!', + 'enabled' => ':type habilitado!', + 'disabled' => ':type deshabilitado!', + ], + + 'error' => [ + 'over_payment' => 'Error: ¡Pago no añadido! La cantidad que ingresó pasa el total: :amount', + 'not_user_company' => 'Error: ¡No tiene permiso para gestionar esta empresa!', + '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 se puede eliminar la última :type categoría!', + 'change_type' => 'Error: No se puede cambiar el tipo porque tiene :text relacionado!', + 'invalid_apikey' => 'Error: ¡La clave de API introducida no es válida!', + 'import_column' => 'Error: :message Nombre de la hoja: :sheet. Número de línea: :line.', + 'import_sheet' => 'Error: El nombre de la hoja no es válido. Por favor, verifique el archivo de ejemplo.', + ], + + 'warning' => [ + 'deleted' => 'Advertencia: No puede borrar :name porque tiene :text relacionado.', + 'disabled' => 'Advertencia: No se permite desactivar :name porque tiene :text relacionado.', + 'reconciled_tran' => 'Advertencia: No puedes cambiar/eliminar la transacción porque está conciliada!', + 'reconciled_doc' => 'Advertencia: No puedes cambiar/eliminar la transacción porque está conciliada!', + 'disable_code' => 'Advertencia: No puede desactivar o cambiar la moneda :name porque tiene :text relacionado.', + 'payment_cancel' => 'Advertencia: Ha cancelado su reciente pago de :method!', + ], + +]; diff --git a/resources/lang/es-AR/modules.php b/resources/lang/es-AR/modules.php new file mode 100644 index 000000000..0abdbb095 --- /dev/null +++ b/resources/lang/es-AR/modules.php @@ -0,0 +1,83 @@ + 'Clave API', + 'my_apps' => 'Mis aplicaciones', + 'pre_sale' => 'Preventa', + 'top_paid' => 'Top de pago', + 'new' => 'Nuevo', + 'top_free' => 'Top gratis', + 'free' => 'GRATIS', + 'install' => 'Instalar', + 'buy_now' => 'Comprar ahora', + 'get_api_key' => 'Haga clic aquí para obtener su clave API.', + 'no_apps' => 'No hay aplicaciones en esta categoría, aún.', + 'become_developer' => '¿Eres un desarrollador? Aquí puedes aprender cómo crear una aplicación y empezar a vender hoy!', + 'recommended_apps' => 'Aplicaciones recomendadas', + + 'about' => 'Acerca de', + + 'added' => 'Agregado', + 'updated' => 'Actualizado', + 'compatibility' => 'Compatibilidad', + 'documentation' => 'Documentación', + 'view' => 'Ver', + 'back' => 'Atrás', + + 'installed' => ':module instalado', + 'uninstalled' => ':module desinstalado', + //'updated' => ':module updated', + 'enabled' => ':module habilitado', + 'disabled' => ':module deshabilitado', + + 'tab' => [ + 'installation' => 'Instalación', + 'faq' => 'Preguntas frecuentes', + 'changelog' => 'Historial de cambios', + 'reviews' => 'Reseñas', + ], + + 'installation' => [ + 'header' => 'Instalación de Aplicación', + 'download' => 'Descargando :module', + 'unzip' => 'Extrayendo archivos de :module', + 'file_copy' => 'Copiando archivos de :module', + 'finish' => 'Finalizando la instalación de :module', + 'redirect' => ':module instalado, redirigiendo a la página de actualizaciones', + 'install' => 'Instalando :module', + ], + + 'errors' => [ + 'download' => 'No se puede descargar :module', + 'zip' => 'No se puede crear el archivo zip :module', + 'unzip' => 'No se puede descomprimir :module', + 'file_copy' => 'No se pueden copiar los archivos de :module', + 'finish' => 'No se puede finalizar la instalación de :module', + ], + + 'badge' => [ + 'installed' => 'Instalado', + 'pre_sale' => 'Preventa', + ], + + 'button' => [ + 'uninstall' => 'Desinstalar', + 'disable' => 'Deshabilitar', + 'enable' => 'Habilitar', + ], + + 'my' => [ + 'purchased' => 'Comprado', + 'installed' => 'Instalado', + ], + + 'reviews' => [ + 'button' => [ + 'add' => 'Añadir una reseña' + ], + + 'na' => 'No hay comentarios.' + ], + +]; diff --git a/resources/lang/es-AR/notifications.php b/resources/lang/es-AR/notifications.php new file mode 100644 index 000000000..95a542ce2 --- /dev/null +++ b/resources/lang/es-AR/notifications.php @@ -0,0 +1,10 @@ + '¡Ups!', + 'hello' => '¡Hola!', + 'salutation' => 'Saludos,
    :company_name', + 'subcopy' => 'Si tiene problemas haciendo clic en el boton “:text”, copie y pegue la dirección URL en su navegador: [:url] (:url)', + +]; diff --git a/resources/lang/es-AR/pagination.php b/resources/lang/es-AR/pagination.php new file mode 100644 index 000000000..23893b7c1 --- /dev/null +++ b/resources/lang/es-AR/pagination.php @@ -0,0 +1,10 @@ + 'Anterior', + 'next' => 'Siguiente', + 'showing' => ':first-:last de :total registros.', + 'page' => 'por página.', + +]; diff --git a/resources/lang/es-AR/passwords.php b/resources/lang/es-AR/passwords.php new file mode 100644 index 000000000..bc6eed2b0 --- /dev/null +++ b/resources/lang/es-AR/passwords.php @@ -0,0 +1,23 @@ + 'Las contraseñas deben tener al menos seis caracteres y coincidir con la confirmación.', + 'reset' => 'Se restableció tu contraseña.', + 'sent' => 'Hemos enviado un enlace para resetear su contraseña!', + 'token' => 'Este token de restablecimiento de contraseña no es válido.', + 'user' => "No podemos encontrar un usuario con esa dirección de correo electrónico.", + 'throttle' => 'Por favor, espere antes de reintentar.', + +]; diff --git a/resources/lang/es-AR/reconciliations.php b/resources/lang/es-AR/reconciliations.php new file mode 100644 index 000000000..1f8dc2d3a --- /dev/null +++ b/resources/lang/es-AR/reconciliations.php @@ -0,0 +1,16 @@ + 'Conciliar', + 'reconciled' => 'Conciliado', + 'closing_balance' => 'Balance de cierre', + 'unreconciled' => 'Sin conciliar', + 'transactions' => 'Transacciones', + 'start_date' => 'Fecha de inicio', + 'end_date' => 'Fecha de fin', + 'cleared_amount' => 'Monto', + 'deposit' => 'Depósito', + 'withdrawal' => 'Retiro', + +]; diff --git a/resources/lang/es-AR/recurring.php b/resources/lang/es-AR/recurring.php new file mode 100644 index 000000000..c0d38913d --- /dev/null +++ b/resources/lang/es-AR/recurring.php @@ -0,0 +1,20 @@ + 'Repetitivo', + 'every' => 'Cada', + 'period' => 'Período', + 'times' => 'Veces', + 'daily' => 'Diario', + 'weekly' => 'Semanal', + 'monthly' => 'Mensual', + 'yearly' => 'Anual', + '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-AR/reports.php b/resources/lang/es-AR/reports.php new file mode 100644 index 000000000..414fc1f9c --- /dev/null +++ b/resources/lang/es-AR/reports.php @@ -0,0 +1,30 @@ + 'Este año', + 'previous_year' => 'Año Anterior', + 'this_quarter' => 'Este trimestre', + 'previous_quarter' => 'Trimestre anterior', + 'last_12_months' => 'Últimos 12 meses', + 'profit_loss' => 'Resultados', + 'gross_profit' => 'Ganancia Bruta', + 'net_profit' => 'Ganancia Neta', + 'total_expenses' => 'Gastos totales', + 'net' => 'Neto', + 'income_expense' => 'Ingresos y Gastos', + + 'summary' => [ + 'income' => 'Resumen de ingresos', + 'expense' => 'Resumen de gastos', + 'income_expense' => 'Ingresos vs Gastos', + 'tax' => 'Resumen de impuestos', + ], + + 'charts' => [ + 'line' => 'Línea', + 'bar' => 'Barra', + 'pie' => 'Torta', + ], + +]; diff --git a/resources/lang/es-AR/settings.php b/resources/lang/es-AR/settings.php new file mode 100644 index 000000000..434867348 --- /dev/null +++ b/resources/lang/es-AR/settings.php @@ -0,0 +1,129 @@ + [ + 'description' => 'Cambiar el nombre de la empresa, correo electrónico, dirección, CUIT, etc', + 'name' => 'Nombre', + 'email' => 'Correo electrónico', + 'phone' => 'Teléfono', + 'address' => 'Dirección', + 'logo' => 'Logo', + ], + + 'localisation' => [ + 'description' => 'Establecer año fiscal, zona horaria, formato de fecha y más locales', + 'financial_start' => 'Inicio del ejercicio financiero', + 'timezone' => 'Zona horaria', + 'date' => [ + 'format' => 'Formato de fecha', + 'separator' => 'Separador de fecha', + 'dash' => 'Guión (-)', + 'dot' => 'Punto (.)', + 'comma' => 'Coma (,)', + 'slash' => 'Barra (/)', + 'space' => 'Espacio ( )', + ], + 'percent' => [ + 'title' => 'Posición Porcentaje (%)', + 'before' => 'Antes del número', + 'after' => 'Después del número', + ], + 'discount_location' => [ + 'name' => 'Ubicación del descuento', + 'item' => 'En línea', + 'total' => 'En total', + 'both' => 'Línea y total', + ], + ], + + 'invoice' => [ + 'description' => 'Personalizar prefijo de factura, número, términos, pie de página etc', + 'prefix' => 'Prefijo de número', + 'digit' => 'Número de dígitos', + 'next' => 'Siguiente número', + 'logo' => 'Logo', + 'custom' => 'Personalizado', + 'item_name' => 'Nombre del ítem', + 'item' => 'Items', + 'product' => 'Productos', + 'service' => 'Servicios', + 'price_name' => 'Nombre de precio', + 'price' => 'Precio', + 'rate' => 'Tasa', + 'quantity_name' => 'Nombre de cantidad', + 'quantity' => 'Cantidad', + 'payment_terms' => 'Condiciones de pago', + 'title' => 'Título', + 'subheading' => 'Subtítulo', + 'due_receipt' => 'Vence a la recepción', + 'due_days' => 'Vencimiento dentro de :days días', + 'choose_template' => 'Elegir plantilla de factura', + 'default' => 'Por defecto', + 'classic' => 'Clásica', + 'modern' => 'Moderna', + ], + + 'default' => [ + 'description' => 'Cuenta, moneda, idioma por defecto de su empresa', + 'list_limit' => 'Registros por página', + 'use_gravatar' => 'Usar Gravatar', + ], + + 'email' => [ + 'description' => 'Cambiar el protocolo de envío y plantillas de correo electrónico', + 'protocol' => 'Protocolo', + 'php' => 'PHP Mail', + 'smtp' => [ + 'name' => 'SMTP', + 'host' => 'Servidor SMTP', + 'port' => 'Puerto SMTP', + 'username' => 'Usuario SMTP', + 'password' => 'Contraseña SMTP', + 'encryption' => 'Seguridad SMTP', + 'none' => 'Ninguna', + ], + 'sendmail' => 'Sendmail', + 'sendmail_path' => 'Ruta de acceso de sendmail', + 'log' => 'Registrar Correos', + + 'templates' => [ + 'subject' => 'Asunto', + 'body' => 'Cuerpo', + 'tags' => 'Etiquetas disponibles: :tag_list', + 'invoice_new_customer' => 'Nueva plantilla de factura (enviada al cliente)', + 'invoice_remind_customer' => 'Plantilla de recordatorio de factura (enviado al cliente)', + 'invoice_remind_admin' => 'Plantilla de recordatorio de factura (enviada al administrador)', + 'invoice_recur_customer' => 'Plantilla recurrente de factura (enviada al cliente)', + 'invoice_recur_admin' => 'Plantilla de factura recurrente (enviada al administrador)', + 'invoice_payment_customer' => 'Plantilla de pago recibido (enviada al cliente)', + 'invoice_payment_admin' => 'Plantilla de pago recibido (enviada al administrador)', + 'bill_remind_admin' => 'Plantilla de recordatorio de factura (enviada a administrador)', + 'bill_recur_admin' => 'Plantilla de factura recurrente (enviada al administrador)', + ], + ], + + 'scheduling' => [ + 'name' => 'Programación', + 'description' => 'Recordatorios y comandos automáticos para repetir', + 'send_invoice' => 'Enviar recordatorio de factura', + 'invoice_days' => 'Enviar después del vencimiento', + 'send_bill' => 'Enviar recordatorio de factura', + 'bill_days' => 'Enviar antes del vencimiento', + 'cron_command' => 'Comando Cron', + 'schedule_time' => 'Hora de ejecución', + ], + + 'categories' => [ + 'description' => 'Categorías ilimitadas para ingresos, gastos e items', + ], + + 'currencies' => [ + 'description' => 'Crear y administrar monedas y establecer sus tasas', + ], + + 'taxes' => [ + 'description' => 'Tasas de impuestos fijas, normales, inclusivas y compuestas', + ], + +]; diff --git a/resources/lang/es-AR/taxes.php b/resources/lang/es-AR/taxes.php new file mode 100644 index 000000000..9cd92c762 --- /dev/null +++ b/resources/lang/es-AR/taxes.php @@ -0,0 +1,12 @@ + 'Tasa', + 'rate_percent' => 'Tasa (%)', + 'normal' => 'Normal', + 'inclusive' => 'Incluido', + 'compound' => 'Compuesto', + 'fixed' => 'Fijo', + 'withholding' => 'Withholding', +]; diff --git a/resources/lang/es-AR/transfers.php b/resources/lang/es-AR/transfers.php new file mode 100644 index 000000000..e2c8bf23d --- /dev/null +++ b/resources/lang/es-AR/transfers.php @@ -0,0 +1,12 @@ + 'De cuenta', + 'to_account' => 'A cuenta', + + 'messages' => [ + 'delete' => ':de a :to (:amount)', + ], + +]; diff --git a/resources/lang/es-AR/updates.php b/resources/lang/es-AR/updates.php new file mode 100644 index 000000000..1ded34b93 --- /dev/null +++ b/resources/lang/es-AR/updates.php @@ -0,0 +1,15 @@ + 'Versión instalada', + 'latest_version' => 'Última versión', + 'update' => 'Actualizar Akaunting a versión :version', + 'changelog' => 'Historial de cambios', + 'check' => 'Comprobar', + 'new_core' => 'Una versión actualizada de Akaunting está disponible.', + 'latest_core' => '¡Felicidades! Tienes la última versión de Akaunting. Las actualizaciones de seguridad futuras se aplicarán automáticamente.', + 'success' => 'El proceso de actualización se ha completado con éxito.', + 'error' => 'El proceso de actualización ha fallado, por favor inténtelo de nuevo.', + +]; diff --git a/resources/lang/es-AR/validation.php b/resources/lang/es-AR/validation.php new file mode 100644 index 000000000..88328c05c --- /dev/null +++ b/resources/lang/es-AR/validation.php @@ -0,0 +1,123 @@ + 'El campo :attribute debe ser aceptado.', + 'active_url' => ':attribute no es una URL correcta.', + 'after' => ':attribute debe ser posterior a :date.', + 'after_or_equal' => ':attribute debe ser una fecha posterior o igual a :date.', + 'alpha' => ':attribute sólo puede contener letras.', + 'alpha_dash' => ':attribute sólo puede contener letras, números y guiones.', + 'alpha_num' => ':attribute solo acepta letras y números.', + 'array' => ':attribute debe ser un array.', + 'before' => ':attribute debe ser una fecha anterior a :date.', + 'before_or_equal' => ':attribute debe ser anterior o igual a :date.', + 'between' => [ + 'numeric' => ':attribute debe estar entre :min y :max.', + 'file' => ':attribute debe estar entre :min - :max kilobytes.', + 'string' => ':attribute debe estar entre :min - :max caracteres.', + 'array' => ':attribute debe tener entre :min y :max items.', + ], + 'boolean' => ':attribute debe ser verdadero o falso.', + 'confirmed' => ':attribute la confirmación no coincide.', + 'date' => ':attribute no es una fecha válida.', + 'date_format' => ':attribute no cumple el formato :format.', + 'different' => ':attribute y :other deben ser diferentes.', + 'digits' => ':attribute debe tener :digits dígitos.', + 'digits_between' => ':attribute debe tener entre :min y :max dígitos.', + 'dimensions' => 'El campo :attribute tiene dimensiones de imagen inválidas.', + 'distinct' => 'El campo :attribute tiene un valor duplicado.', + 'email' => ':attribute debe ser una dirección de correo electrónico válida.', + 'ends_with' => ':attribute debe terminar con uno de los siguientes: :values', + 'exists' => 'El :attribute seleccionado no es válido.', + 'file' => ':attribute debe ser un archivo.', + 'filled' => ':attribute debe tener un valor.', + 'image' => ':attribute debe ser una imagen.', + 'in' => 'El :attribute seleccionado es inválido.', + 'in_array' => 'El campo :attribute no existe en :other.', + 'integer' => 'El atributo :attribute debe ser un entero.', + 'ip' => ':attribute debe ser una dirección IP válida.', + 'json' => ':attribute debe ser una cadena JSON válida.', + 'max' => [ + 'numeric' => ':attribute no puede ser mayor que :max.', + 'file' => ':attribute no puede ser mayor que :max kilobytes.', + 'string' => ':attribute no puede ser mayor que :max caracteres.', + 'array' => ':attribute no debe tener más de :max items.', + ], + 'mimes' => ':attribute debe ser un archivo del tipo: :values.', + 'mimetypes' => 'El campo :attribute debe ser un archivo de tipo: :values.', + 'min' => [ + 'numeric' => ':attribute debe ser al menos :min.', + 'file' => ':attribute debe ser como mínimo de :min kilobytes.', + 'string' => ':attribute debe contener como mínimo :min caracteres.', + 'array' => ':attribute debe tener al menos :min items.', + ], + 'not_in' => 'El :attribute seleccionado no es válido.', + 'numeric' => ':attribute debe ser un número.', + 'present' => ':attribute debe estar presente.', + 'regex' => 'El formato de :attribute es inválido.', + 'required' => 'El campo :attribute es obligatorio.', + 'required_if' => ':attribute es obligatorio cuando :other es :value.', + 'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.', + 'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.', + 'required_with_all' => 'El campo :attribute es obligatorio cuando :values está presente.', + 'required_without' => 'El campo :attribute es obligatorio cuando :values no está presente.', + 'required_without_all' => 'El campo :attribute es obligatorio cuando ninguno de :values están presentes.', + 'same' => ':attribute y :other deben coincidir.', + 'size' => [ + 'numeric' => ':attribute debe ser :size.', + 'file' => ':attribute debe tener :size kilobytes.', + 'string' => ':attribute debe tener :size caracteres.', + 'array' => ':attribute debe tener al menos :size items.', + ], + 'string' => 'El campo :attribute debe ser una cadena .', + 'timezone' => ':attribute debe ser una zona válida.', + 'unique' => ':attribute ya ha sido tomado.', + 'uploaded' => 'El atributo :attribute falló al subir.', + 'url' => 'El formato de :attribute es inválido.', + + /* + |-------------------------------------------------------------------------- + | 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' => 'mensaje personalizado', + ], + 'invalid_currency' => 'El código de :attribute es incorrecto.', + 'invalid_amount' => 'El monto :attribute es inválido.', + 'invalid_extension' => 'La extensión del archivo no es válida.', + ], + + /* + |-------------------------------------------------------------------------- + | 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' => [], + +]; diff --git a/resources/lang/es-AR/widgets.php b/resources/lang/es-AR/widgets.php new file mode 100644 index 000000000..18d5547e4 --- /dev/null +++ b/resources/lang/es-AR/widgets.php @@ -0,0 +1,23 @@ + 'Ingresos totales', + 'receivables' => 'Cuentas por cobrar', + 'open_invoices' => 'Facturas pendientes', + 'overdue_invoices' => 'Facturas vencidas', + 'total_expenses' => 'Gastos totales', + 'payables' => 'Cuentas por pagar', + 'open_bills' => 'Facturas pendientes', + 'overdue_bills' => 'Facturas vencidas', + 'total_profit' => 'Ganancias Totales', + 'open_profit' => 'Ganancias Pendientes', + 'overdue_profit' => 'Ganancias vencidas', + 'cash_flow' => 'Flujo de efectivo', + 'no_profit_loss' => 'No hay pérdidas ganancias', + 'income_by_category' => 'Ingresos por categoría', + 'expenses_by_category' => 'Gastos por categoría', + 'account_balance' => 'Saldo de la cuenta', + 'latest_income' => 'Últimos ingresos', + 'latest_expenses' => 'Últimos gastos', +]; From 3dc969665e1fd5c9528868215a56a00e7ac809c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 23 Jul 2020 15:45:23 +0300 Subject: [PATCH 141/208] updated translations --- resources/lang/ar-SA/bills.php | 6 +++--- resources/lang/ar-SA/install.php | 4 +++- resources/lang/ar-SA/invoices.php | 10 +++++----- resources/lang/ar-SA/messages.php | 4 ++-- resources/lang/ar-SA/modules.php | 1 - resources/lang/ar-SA/settings.php | 8 ++++---- resources/lang/ar-SA/taxes.php | 1 + resources/lang/ar-SA/validation.php | 2 +- resources/lang/bn-BD/install.php | 1 + resources/lang/bn-BD/taxes.php | 1 + resources/lang/da-DK/install.php | 2 +- resources/lang/da-DK/taxes.php | 1 + resources/lang/de-DE/install.php | 3 ++- resources/lang/de-DE/modules.php | 1 - resources/lang/de-DE/taxes.php | 1 + resources/lang/fr-FR/auth.php | 4 ++-- resources/lang/fr-FR/general.php | 10 +++++----- resources/lang/fr-FR/install.php | 1 + resources/lang/fr-FR/taxes.php | 1 + resources/lang/hi-IN/install.php | 2 ++ resources/lang/hi-IN/taxes.php | 1 + resources/lang/id-ID/install.php | 9 +++++---- resources/lang/id-ID/taxes.php | 1 + resources/lang/nl-NL/install.php | 1 + resources/lang/nl-NL/taxes.php | 1 + resources/lang/tr-TR/taxes.php | 1 + 26 files changed, 47 insertions(+), 31 deletions(-) diff --git a/resources/lang/ar-SA/bills.php b/resources/lang/ar-SA/bills.php index a61546b03..f9a9907fd 100644 --- a/resources/lang/ar-SA/bills.php +++ b/resources/lang/ar-SA/bills.php @@ -45,13 +45,13 @@ return [ 'paid' => 'مدفوع', 'overdue' => 'متأخر', 'unpaid' => 'غير مدفوع', - 'cancelled' => 'Cancelled', + 'cancelled' => 'ملغى', ], 'messages' => [ - 'marked_received' => 'Bill marked as received!', + 'marked_received' => 'تم وضع علامة الاستلام على الفاتورة!', 'marked_paid' => 'الفاتورة عُلّمت كمدفوعة!', - 'marked_cancelled' => 'Bill marked as cancelled!', + 'marked_cancelled' => 'تم وضع علامة الإلغاء على الفاتورة!', 'draft' => 'هذة فاتورة شراء عبارة عن مسودة و سوف يتم اظهارها بالنظام بعد ان يتم استحقاقها.', 'status' => [ diff --git a/resources/lang/ar-SA/install.php b/resources/lang/ar-SA/install.php index f49145474..3d8c2abbc 100644 --- a/resources/lang/ar-SA/install.php +++ b/resources/lang/ar-SA/install.php @@ -21,7 +21,8 @@ return [ 'disabled' => 'يجب تعطيل :feature!', 'extension' => 'يجب تثبيت وتشغيل ملحق :extension!', 'directory' => 'يجب منح صلاحية الكتابة على مجلد :directory!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', + 'executable' => 'ان الملف التنفيذى ل PHP CLI غير معرف او لا يعمل او ان اصداره ليس :php_version او اعلى منه, من فضلك اطلب من شركه الاستضافه تعيين متغير بيئة PHP_BINARY أو PHP_PATH بشكل صحيح. +', ], 'database' => [ @@ -39,6 +40,7 @@ return [ ], 'error' => [ + 'php_version' => 'حدث خطأ: اطلب من المتعهد مزود الخدمه ان يستخدم PHP :php_version او اعلى منه لكلا من HTTP و CLI', 'connection' => 'خطأ: لا يمكن الاتصال بقاعدة البيانات! من فضلك، تأكد من صحة المعلومات.', ], diff --git a/resources/lang/ar-SA/invoices.php b/resources/lang/ar-SA/invoices.php index fea76da7a..ea6a0aa0e 100644 --- a/resources/lang/ar-SA/invoices.php +++ b/resources/lang/ar-SA/invoices.php @@ -13,7 +13,7 @@ return [ 'price' => 'السعر', 'sub_total' => 'المجموع الجزئي', 'discount' => 'الخصم', - 'item_discount' => 'Line Discount', + 'item_discount' => 'خصم على هذه المنتجات', 'tax_total' => 'إجمالي الضريبة', 'total' => 'الإجمالي', @@ -31,7 +31,7 @@ return [ 'mark_paid' => 'التحديد كمدفوع', 'mark_sent' => 'التحديد كمرسل', 'mark_viewed' => 'وضع علامة مشاهدة', - 'mark_cancelled' => 'Mark Cancelled', + 'mark_cancelled' => 'العلامه ألغيت', 'download_pdf' => 'تحميل PDF', 'send_mail' => 'إرسال بريد إلكتروني', 'all_invoices' => 'سجّل الدخول لعرض جميع الفواتير', @@ -49,15 +49,15 @@ return [ 'paid' => 'مدفوع', 'overdue' => 'متأخر', 'unpaid' => 'غير مدفوع', - 'cancelled' => 'Cancelled', + 'cancelled' => 'تم الإلغاء', ], 'messages' => [ 'email_sent' => 'تم إرسال الفاتورة عبر البريد اﻹلكتروني!', 'marked_sent' => 'الفاتورة عُلّمت كمرسلة!', 'marked_paid' => 'الفاتورة عُلّمت كمدفوع!', - 'marked_viewed' => 'Invoice marked as viewed!', - 'marked_cancelled' => 'Invoice marked as cancelled!', + 'marked_viewed' => 'تم رأيت الفاتورة', + 'marked_cancelled' => 'تم الغاء الفاتورة', 'email_required' => 'لا يوجد عنوان البريد إلكتروني لهذا العميل!', 'draft' => 'هذه مسودة الفاتورة و سوف تظهر في النظام بعد ارسالها.', diff --git a/resources/lang/ar-SA/messages.php b/resources/lang/ar-SA/messages.php index ef3388a92..4fea16b82 100644 --- a/resources/lang/ar-SA/messages.php +++ b/resources/lang/ar-SA/messages.php @@ -28,8 +28,8 @@ return [ 'warning' => [ 'deleted' => 'تنبيه: لا يمكنك حذف :name لأنه لديه :text مرتبط به.', 'disabled' => 'تنبيه: لا يمكنك تعطيل :name لأنه لديه :text مرتبط به.', - 'reconciled_tran' => 'Warning: You are not allowed to change/delete transaction because it is reconciled!', - 'reconciled_doc' => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!', + 'reconciled_tran' => 'تحذير: غير مسموح لك تغيير او حذف الصفقة لان هذا ما تم التوفيق به', + 'reconciled_doc' => 'تحذير: غير مسموح لك تغيير او حذف :type لانه يمتلك صفقه متوافق عليها ', 'disable_code' => 'تنبيه: لا يمكنك تعطيل او تغير عملة :name بسبب ارتباطه ب :text.', 'payment_cancel' => 'تنبيه: قمت بالغاء اخر طريقة :method دفع!', ], diff --git a/resources/lang/ar-SA/modules.php b/resources/lang/ar-SA/modules.php index ce0892220..57dc52d13 100644 --- a/resources/lang/ar-SA/modules.php +++ b/resources/lang/ar-SA/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'جديد', 'top_free' => 'أعلى مجانيات ', 'free' => 'مجاناً', - 'search' => 'بحث', 'install' => 'تثبيت', 'buy_now' => 'الشراء الآن', 'get_api_key' => 'إضغط هناللحصول على مفتاح API الخاص بك.', diff --git a/resources/lang/ar-SA/settings.php b/resources/lang/ar-SA/settings.php index 62c0ed242..33caac300 100644 --- a/resources/lang/ar-SA/settings.php +++ b/resources/lang/ar-SA/settings.php @@ -30,10 +30,10 @@ return [ 'after' => 'بعد الرقم', ], 'discount_location' => [ - 'name' => 'Discount Location', - 'item' => 'At line', - 'total' => 'At total', - 'both' => 'Both line and total', + 'name' => 'خصم على الموقع', + 'item' => 'فى السطر', + 'total' => 'ف الاجمالى', + 'both' => 'كلا من الخط و الاجمالى', ], ], diff --git a/resources/lang/ar-SA/taxes.php b/resources/lang/ar-SA/taxes.php index 932518b49..440a77ef5 100644 --- a/resources/lang/ar-SA/taxes.php +++ b/resources/lang/ar-SA/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'شامل', 'compound' => 'مُركب', 'fixed' => 'ثابت', + 'withholding' => 'Withholding', ]; diff --git a/resources/lang/ar-SA/validation.php b/resources/lang/ar-SA/validation.php index d05ba02fd..c5f0066dd 100644 --- a/resources/lang/ar-SA/validation.php +++ b/resources/lang/ar-SA/validation.php @@ -104,7 +104,7 @@ return [ ], 'invalid_currency' => 'رمز خانة :attribute غير صحيحة.', 'invalid_amount' => 'خانة المبلغ :attribute غير صالحة.', - 'invalid_extension' => 'هذا الملف غير صالح.', + 'invalid_extension' => 'امتداد الملف غير صالح.', ], /* diff --git a/resources/lang/bn-BD/install.php b/resources/lang/bn-BD/install.php index 8922a3366..2fd10d58f 100644 --- a/resources/lang/bn-BD/install.php +++ b/resources/lang/bn-BD/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'সমস্যাঃ HTTP এবং CLI উভয়েরই জন্য PHP :php_version অথবা তদুর্দ্ধ ব্যবহার করার জন্য আপনার হোস্টিং প্রোভাইডারকে অনুরোধ করুন।', 'connection' => 'সমস্যাঃ ডেটাবেজের সাথে সংযুক্ত হওয়া সম্ভবপর হলো না! দয়া করে দেখে নিন যে প্রদত্ত বিবরণ সঠিক কি না।', ], diff --git a/resources/lang/bn-BD/taxes.php b/resources/lang/bn-BD/taxes.php index 78a5a0fdb..90d827844 100644 --- a/resources/lang/bn-BD/taxes.php +++ b/resources/lang/bn-BD/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'অন্তর্ভুক্তি', 'compound' => 'যৌগিক', 'fixed' => 'স্থায়ী', + 'withholding' => 'Withholding', ]; diff --git a/resources/lang/da-DK/install.php b/resources/lang/da-DK/install.php index 918f39e6b..221780421 100644 --- a/resources/lang/da-DK/install.php +++ b/resources/lang/da-DK/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature skal være deaktiveret!', 'extension' => ':extension udvidelse skal være indlæst!', 'directory' => ':directory folderen skal være skrivbar!', - 'executable' => 'The PHP CLI executable file is not defined/working or its version is not :php_version or higher! Please, ask your hosting company to set PHP_BINARY or PHP_PATH environment variable correctly.', + 'executable' => 'PHP CLI eksekverbar file virker ikke! Venligst anmod din host om at sætte PHP_BINARY eller PHP_PATH miljøvariablen korrekt.', ], 'database' => [ diff --git a/resources/lang/da-DK/taxes.php b/resources/lang/da-DK/taxes.php index 8f2445cf5..16e36e3f2 100644 --- a/resources/lang/da-DK/taxes.php +++ b/resources/lang/da-DK/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inklusiv', 'compound' => 'Sammensatte', 'fixed' => 'Fast', + 'withholding' => 'Withholding', ]; diff --git a/resources/lang/de-DE/install.php b/resources/lang/de-DE/install.php index 77e7078c9..59eaa01dc 100644 --- a/resources/lang/de-DE/install.php +++ b/resources/lang/de-DE/install.php @@ -21,7 +21,7 @@ return [ 'disabled' => ':feature muss deaktiviert sein!', 'extension' => ':extension Erweiterung muss installiert und geladen sein!', 'directory' => ':directory Verzeichnis muss schreibbar sein!', - 'executable' => 'Die ausführbare PHP-CLI-Datei ist nicht definiert oder funktioniert nicht oder ihre Version ist nicht :php_version oder höher! Bitten Sie Ihre Hosting-Firma, PHP_BINARY oder PHP_PATH Umgebungsvariable korrekt zu setzen.', + 'executable' => 'Die ausführbare PHP-CLI-Datei ist nicht definiert/funktioniert nicht oder die PHP-Version entspricht nicht :php_version oder höher! Bitten Sie Ihre Hosting-Firma, die Umgebungsvariablen PHP_BINARY oder PHP_PATH korrekt zu setzen.', ], 'database' => [ @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Fehler: Bitten Sie Ihren Hosting-Provider, PHP :php_version oder höher für HTTP und CLI zu verwenden.', '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/modules.php b/resources/lang/de-DE/modules.php index 3e9093394..13427a0a2 100644 --- a/resources/lang/de-DE/modules.php +++ b/resources/lang/de-DE/modules.php @@ -9,7 +9,6 @@ return [ 'new' => 'Neu', 'top_free' => 'Top kostenlos', 'free' => 'Kostenlos', - 'search' => 'Suchen', 'install' => 'Installieren', 'buy_now' => 'Jetzt kaufen', 'get_api_key' => 'Klicke hier um Ihren API-Schlüssel zu erhalten.', diff --git a/resources/lang/de-DE/taxes.php b/resources/lang/de-DE/taxes.php index e89a03e2a..00ebc96ea 100644 --- a/resources/lang/de-DE/taxes.php +++ b/resources/lang/de-DE/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inklusive', 'compound' => 'zusammengesetzt', 'fixed' => 'Fest', + 'withholding' => 'Withholding', ]; diff --git a/resources/lang/fr-FR/auth.php b/resources/lang/fr-FR/auth.php index a4b6ff1a1..2d0d47a8f 100644 --- a/resources/lang/fr-FR/auth.php +++ b/resources/lang/fr-FR/auth.php @@ -5,7 +5,7 @@ return [ 'profile' => 'Profil', 'logout' => 'Déconnexion', 'login' => 'Connexion', - 'login_to' => 'Connexion pour démarrer votre session', + 'login_to' => 'Connectez-vous pour démarrer votre session', 'remember_me' => 'Se souvenir de moi', 'forgot_password' => 'J\'ai oublié mon mot de passe', 'reset_password' => 'Réinitialiser le mot de passe', @@ -24,7 +24,7 @@ return [ 'error' => [ 'self_delete' => 'Erreur : Vous ne pouvez pas vous supprimer vous-même !', - 'self_disable' => 'Erreur : Vous ne pouvez pas vous supprimer vous-même !', + 'self_disable' => 'Erreur : Vous ne pouvez pas vous désactiver vous-même !', 'no_company' => 'Erreur : Aucune entreprise associée à votre compte. Veuillez contacter votre administrateur système.', ], diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php index db44f9a48..fc271caa8 100644 --- a/resources/lang/fr-FR/general.php +++ b/resources/lang/fr-FR/general.php @@ -48,9 +48,9 @@ return [ 'localisations' => 'Localisation|Localisations', 'defaults' => 'Défaut|Défauts', 'widgets' => 'Widget|Widgets', - 'templates' => 'Modèle\Modèles', - 'sales' => 'Vente\Ventes', - 'purchases' => 'Achat\Achats', + 'templates' => 'Modèle|Modèles', + 'sales' => 'Vente|Ventes', + 'purchases' => 'Achat|Achats', 'welcome' => 'Bienvenue', 'banking' => 'Banque', @@ -143,11 +143,11 @@ return [ 'cash' => 'Liquidités', 'group_by' => 'Regrouper par', 'accounting' => 'Comptabilité', - 'sort' => 'Tri', + 'sort' => 'Trier', 'width' => 'Largeur', 'month' => 'Mois', 'year' => 'Année ', - 'type_item_name' => 'Tapez un nom d\'élément', + 'type_item_name' => 'Nom article', 'no_data' => 'Aucune donnée', 'no_matching_data' => 'Aucune donnée correspondante', 'clear_cache' => 'Vider le cache', diff --git a/resources/lang/fr-FR/install.php b/resources/lang/fr-FR/install.php index 86cdc5523..32738515c 100644 --- a/resources/lang/fr-FR/install.php +++ b/resources/lang/fr-FR/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Erreur: Demandez à votre hébergeur d\'utiliser PHP :php_version ou supérieure pour HTTP et CLI.', 'connection' => 'Erreur : Impossible de se connecter à la base de données ! S’il vous plaît, assurez-vous que les informations sont correctes.', ], diff --git a/resources/lang/fr-FR/taxes.php b/resources/lang/fr-FR/taxes.php index 8f94d2172..9acf4e008 100644 --- a/resources/lang/fr-FR/taxes.php +++ b/resources/lang/fr-FR/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inclus', 'compound' => 'Composé', 'fixed' => 'Fixé', + 'withholding' => 'Retenue', ]; diff --git a/resources/lang/hi-IN/install.php b/resources/lang/hi-IN/install.php index 2071ff424..567ffdd1b 100644 --- a/resources/lang/hi-IN/install.php +++ b/resources/lang/hi-IN/install.php @@ -39,6 +39,8 @@ return [ ], 'error' => [ + 'php_version' => 'त्रुटि: HTTP और CLI दोनों के लिए PHP नवीनतम संस्करण(:php_version) का उपयोग करने के लिए अपने होस्टिंग प्रदाता से पूछें/बताएं. +', 'connection' => 'त्रुटि: डेटाबेस से कनेक्ट नहीं हो सका! कृपया, सुनिश्चित करें कि विवरण सही हैं।', ], diff --git a/resources/lang/hi-IN/taxes.php b/resources/lang/hi-IN/taxes.php index 22ec3dd7b..51edb828e 100644 --- a/resources/lang/hi-IN/taxes.php +++ b/resources/lang/hi-IN/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'सम्मिलित', 'compound' => 'यौगिक', 'fixed' => 'निश्चित', + 'withholding' => 'रोक', ]; diff --git a/resources/lang/id-ID/install.php b/resources/lang/id-ID/install.php index be9ca5d66..c5d728d69 100644 --- a/resources/lang/id-ID/install.php +++ b/resources/lang/id-ID/install.php @@ -2,11 +2,11 @@ return [ - 'next' => 'Berikutnya', - 'refresh' => 'Muat Ulang', + 'next' => 'Selanjutnya', + 'refresh' => 'Perbarui', 'steps' => [ - 'requirements' => 'Silakan meminta penyedia hosting Anda untuk memperbaiki kesalahan!', + 'requirements' => 'Silakan meminta ke penyedia hosting Anda untuk memperbaiki kesalahan!', 'language' => 'Langkah 1/3 : Seleksi Bahasa', 'database' => 'Langkah 2/3 : Setup basis data', 'settings' => 'Langkah 3/3: Detail Perusahaan dan Admin', @@ -39,7 +39,8 @@ return [ ], 'error' => [ - 'connection' => 'Kesalahan: Tidak dapat terhubung ke database! Tolong, pastikan detilnya benar.', + 'php_version' => 'Terjadi Kesalahan: Minta ke penyedia hosting Anda untuk menggunakan PHP: php_version atau lebih tinggi untuk HTTP dan CLI.', + 'connection' => 'Terjadi Kesalahan: Tidak dapat terhubung ke database! Tolong, pastikan detilnya benar.', ], ]; diff --git a/resources/lang/id-ID/taxes.php b/resources/lang/id-ID/taxes.php index 1c66a265d..6f3fa01d0 100644 --- a/resources/lang/id-ID/taxes.php +++ b/resources/lang/id-ID/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inklusif', 'compound' => 'Campuran', 'fixed' => 'Diperbaiki', + 'withholding' => 'Withholding', ]; diff --git a/resources/lang/nl-NL/install.php b/resources/lang/nl-NL/install.php index fd43553ee..43483d345 100644 --- a/resources/lang/nl-NL/install.php +++ b/resources/lang/nl-NL/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Fout: Vraag uw hostingprovider om PHP :php_version of hoger te gebruiken voor zowel HTTP als CLI.', 'connection' => 'Fout: Kan geen verbinding met de database! Controleer of alle gegevens juist zijn.', ], diff --git a/resources/lang/nl-NL/taxes.php b/resources/lang/nl-NL/taxes.php index 047bf5907..e41a30a72 100644 --- a/resources/lang/nl-NL/taxes.php +++ b/resources/lang/nl-NL/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inclusief', 'compound' => 'Samenstelling', 'fixed' => 'Vast', + 'withholding' => 'Achterhouden', ]; diff --git a/resources/lang/tr-TR/taxes.php b/resources/lang/tr-TR/taxes.php index 7ad978dd8..03106f2e1 100644 --- a/resources/lang/tr-TR/taxes.php +++ b/resources/lang/tr-TR/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Dahil', 'compound' => 'Bileşik', 'fixed' => 'Sabit', + 'withholding' => 'Stopaj', ]; From 9c9970eafb1e96e46944d041919dfd42324d360a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 23 Jul 2020 18:26:22 +0300 Subject: [PATCH 142/208] added missing tax types --- app/Http/Controllers/Modals/Taxes.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/Modals/Taxes.php b/app/Http/Controllers/Modals/Taxes.php index 661d212cc..e407e88f6 100644 --- a/app/Http/Controllers/Modals/Taxes.php +++ b/app/Http/Controllers/Modals/Taxes.php @@ -28,8 +28,10 @@ class Taxes extends Controller public function create() { $types = [ + 'fixed' => trans('taxes.fixed'), 'normal' => trans('taxes.normal'), 'inclusive' => trans('taxes.inclusive'), + 'withholding' => trans('taxes.withholding'), 'compound' => trans('taxes.compound'), ]; From a57751081cd584a514ae1b1b4d78622e5a10779a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Jul 2020 12:46:44 +0300 Subject: [PATCH 143/208] close #1521 Fixed: Can't edit revenue when there's an attachment --- app/Http/Controllers/Common/Uploads.php | 17 ++++- resources/assets/js/mixins/global.js | 74 +++++++++++++++++++ resources/views/partials/media/file.blade.php | 24 ++---- 3 files changed, 96 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Common/Uploads.php b/app/Http/Controllers/Common/Uploads.php index 9715e3d0d..f0f897156 100644 --- a/app/Http/Controllers/Common/Uploads.php +++ b/app/Http/Controllers/Common/Uploads.php @@ -121,10 +121,21 @@ class Uploads extends Controller */ public function destroy($id, Request $request) { + $return = back(); + + if ($request->has('ajax') && $request->get('ajax')) { + $return = [ + 'success' => true, + 'errors' => false, + 'message' => '', + 'redirect' => $request->get('redirect') + ]; + } + try { $media = Media::find($id); } catch (\Exception $e) { - return back(); + return $return; } // Get file path @@ -133,7 +144,7 @@ class Uploads extends Controller flash($message)->warning(); - return back(); + return $return; } $media->delete(); //will not delete files @@ -150,7 +161,7 @@ class Uploads extends Controller } } - return back(); + return $return; } /** diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js index dc4ee782b..1afbc2bb6 100644 --- a/resources/assets/js/mixins/global.js +++ b/resources/assets/js/mixins/global.js @@ -313,6 +313,80 @@ export default { }); }, + // Delete attachment file + onDeleteFile(file_id, url, title, message, button_cancel, button_delete) { + let file_data = { + page: null, + key: null, + value: null, + ajax: true, + redirect: window.location.href + }; + + if (this.form['page' + file_id]) { + file_data.page = this.form['page' + file_id]; + } + + if (this.form['key' + file_id]) { + file_data.key = this.form['key' + file_id]; + } + + if (this.form['value' + file_id]) { + file_data.value = this.form['value' + file_id]; + } + + let confirm = { + url: url, + title: title, + message: message, + button_cancel: button_cancel, + button_delete: button_delete, + file_data: file_data, + show: true + }; + + this.component = Vue.component('add-new-component', (resolve, reject) => { + resolve({ + template : '
    ', + + components: { + AkauntingModal, + }, + + data: function () { + return { + confirm: confirm, + } + }, + + methods: { + // Delete action post + async onDelete() { + let promise = Promise.resolve(axios({ + method: 'DELETE', + url: this.confirm.url, + data: file_data + })); + + promise.then(response => { + if (response.data.redirect) { + window.location.href = response.data.redirect; + } + }) + .catch(error => { + this.success = false; + }); + }, + + // Close modal empty default value + cancelDelete() { + this.confirm.show = false; + }, + } + }) + }); + }, + clickTab(id) { let event = new document.window.KeyboardEvent('keydown', { keyCode: 9 }); // Tab key diff --git a/resources/views/partials/media/file.blade.php b/resources/views/partials/media/file.blade.php index 14be5bba4..1eb5b6dd8 100644 --- a/resources/views/partials/media/file.blade.php +++ b/resources/views/partials/media/file.blade.php @@ -26,23 +26,15 @@
    @permission('delete-common-uploads') - {!! Form::open([ - 'id' => $column_name. '-' . $file->id, - 'method' => 'DELETE', - 'url' => [url('uploads/' . $file->id)], - 'class' => 'd-inline' - ]) !!} + + + - - - - - @if ($options) - - - - @endif - {!! Form::close() !!} + @if ($options) + + + + @endif @endpermission From ef3648b5c3b5e854edefc417beaf39424dac2af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Jul 2020 13:05:44 +0300 Subject: [PATCH 144/208] update composer.lock file --- composer.lock | 934 +++++--------------------------------------------- 1 file changed, 93 insertions(+), 841 deletions(-) diff --git a/composer.lock b/composer.lock index e4b7e0eaa..96a47faa5 100644 --- a/composer.lock +++ b/composer.lock @@ -601,12 +601,6 @@ "profiler", "webprofiler" ], - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-05-05T10:53:32+00:00" }, { @@ -734,12 +728,6 @@ "phpstorm", "sublime" ], - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-04-22T09:57:26+00:00" }, { @@ -998,16 +986,6 @@ "ssl", "tls" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-04-08T08:27:21+00:00" }, { @@ -1088,20 +1066,6 @@ "dependency", "package" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-07-16T10:57:00+00:00" }, { @@ -1223,20 +1187,6 @@ "spdx", "validator" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-07-15T15:35:07+00:00" }, { @@ -1281,20 +1231,6 @@ "Xdebug", "performance" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-06-04T11:16:35+00:00" }, { @@ -1663,20 +1599,6 @@ "redis", "xcache" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", - "type": "tidelift" - } - ], "time": "2020-07-07T18:54:01+00:00" }, { @@ -1742,20 +1664,6 @@ "iterators", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", - "type": "tidelift" - } - ], "time": "2020-06-22T19:14:02+00:00" }, { @@ -1991,20 +1899,6 @@ "uppercase", "words" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" - } - ], "time": "2020-05-29T15:13:26+00:00" }, { @@ -2067,20 +1961,6 @@ "parser", "php" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -2381,12 +2261,6 @@ "crossdomain", "laravel" ], - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-04-28T08:47:37+00:00" }, { @@ -2452,16 +2326,6 @@ } ], "description": "Automatic caching for Eloquent models.", - "funding": [ - { - "url": "https://github.com/GeneaLabs", - "type": "github" - }, - { - "url": "https://github.com/mikebronner", - "type": "github" - } - ], "time": "2020-07-08T18:08:06+00:00" }, { @@ -3011,16 +2875,6 @@ "user agent", "useragent" ], - "funding": [ - { - "url": "https://github.com/jenssegers", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/jenssegers/agent", - "type": "tidelift" - } - ], "time": "2020-06-13T08:05:20+00:00" }, { @@ -3715,32 +3569,6 @@ "md", "parser" ], - "funding": [ - { - "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", - "type": "custom" - }, - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - }, - { - "url": "https://www.patreon.com/colinodell", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/commonmark", - "type": "tidelift" - } - ], "time": "2020-07-19T22:47:30+00:00" }, { @@ -3825,12 +3653,6 @@ "sftp", "storage" ], - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], "time": "2020-05-18T15:13:39+00:00" }, { @@ -3997,29 +3819,27 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.19", + "version": "3.1.20", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c" + "reference": "39545fa96b84d5a90f702239659c49a5d7b1edea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", - "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/39545fa96b84d5a90f702239659c49a5d7b1edea", + "reference": "39545fa96b84d5a90f702239659c49a5d7b1edea", "shasum": "" }, "require": { "ext-json": "*", "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0", "php": "^7.0", - "phpoffice/phpspreadsheet": "^1.10" + "phpoffice/phpspreadsheet": "^1.14" }, "require-dev": { - "mockery/mockery": "^1.1", - "orchestra/database": "^4.0", - "orchestra/testbench": "^4.0", - "phpunit/phpunit": "^8.0", + "orchestra/database": "^5.0", + "orchestra/testbench": "^5.0", "predis/predis": "^1.1" }, "type": "library", @@ -4060,7 +3880,7 @@ "php", "phpspreadsheet" ], - "time": "2020-02-28T15:47:45+00:00" + "time": "2020-07-17T20:39:28+00:00" }, { "name": "maennchen/zipstream-php", @@ -4121,12 +3941,6 @@ "stream", "zip" ], - "funding": [ - { - "url": "https://opencollective.com/zipstream", - "type": "open_collective" - } - ], "time": "2020-05-30T13:11:16+00:00" }, { @@ -4545,16 +4359,16 @@ }, { "name": "monolog/monolog", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1" + "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1", - "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9eee5cec93dfb313a38b6b288741e84e53f02d5", + "reference": "f9eee5cec93dfb313a38b6b288741e84e53f02d5", "shasum": "" }, "require": { @@ -4622,17 +4436,7 @@ "logging", "psr-3" ], - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], - "time": "2020-05-22T08:12:19+00:00" + "time": "2020-07-23T08:41:23+00:00" }, { "name": "monooso/unobserve", @@ -4812,16 +4616,6 @@ "datetime", "time" ], - "funding": [ - { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" - }, - { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", - "type": "tidelift" - } - ], "time": "2020-07-04T12:29:56+00:00" }, { @@ -5797,16 +5591,6 @@ "php", "type" ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", - "type": "tidelift" - } - ], "time": "2020-07-20T17:29:33+00:00" }, { @@ -6738,16 +6522,6 @@ "parser", "validator" ], - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", - "type": "tidelift" - } - ], "time": "2020-04-30T19:05:18+00:00" }, { @@ -6999,16 +6773,16 @@ }, { "name": "symfony/console", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "34ac555a3627e324b660e318daa07572e1140123" + "reference": "2226c68009627934b8cfc01260b4d287eab070df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/34ac555a3627e324b660e318daa07572e1140123", - "reference": "34ac555a3627e324b660e318daa07572e1140123", + "url": "https://api.github.com/repos/symfony/console/zipball/2226c68009627934b8cfc01260b4d287eab070df", + "reference": "2226c68009627934b8cfc01260b4d287eab070df", "shasum": "" }, "require": { @@ -7074,25 +6848,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-06-15T12:59:21+00:00" + "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/css-selector", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -7141,34 +6901,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/debug", - "version": "v4.4.10", + "version": "v4.4.11", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6" + "reference": "47aa9064d75db36389692dd4d39895a0820f00f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/28f92d08bb6d1fddf8158e02c194ad43870007e6", - "reference": "28f92d08bb6d1fddf8158e02c194ad43870007e6", + "url": "https://api.github.com/repos/symfony/debug/zipball/47aa9064d75db36389692dd4d39895a0820f00f2", + "reference": "47aa9064d75db36389692dd4d39895a0820f00f2", "shasum": "" }, "require": { @@ -7212,21 +6958,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-05-24T08:33:35+00:00" + "time": "2020-07-23T08:31:43+00:00" }, { "name": "symfony/deprecation-contracts", @@ -7276,34 +7008,20 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-06-06T08:49:21+00:00" }, { "name": "symfony/error-handler", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896" + "reference": "4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896", - "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b", + "reference": "4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b", "shasum": "" }, "require": { @@ -7347,34 +7065,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-07-23T08:36:24+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7" + "reference": "7827d55911f91c070fc293ea51a06eec80797d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7", - "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7827d55911f91c070fc293ea51a06eec80797d76", + "reference": "7827d55911f91c070fc293ea51a06eec80797d76", "shasum": "" }, "require": { @@ -7433,21 +7137,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-05-20T17:43:50+00:00" + "time": "2020-06-18T18:24:02+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -7509,25 +7199,11 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/filesystem", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -7573,25 +7249,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-05-30T20:35:19+00:00" }, { "name": "symfony/finder", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -7636,34 +7298,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-05-20T17:43:50+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f93055171b847915225bd5b0a5792888419d8d75" + "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75", - "reference": "f93055171b847915225bd5b0a5792888419d8d75", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1f0d6627e680591c61e9176f04a0dc887b4e6702", + "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702", "shasum": "" }, "require": { @@ -7711,34 +7359,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-06-15T06:52:54+00:00" + "time": "2020-07-23T10:04:31+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a" + "reference": "d6dd8f6420e377970ddad0d6317d4ce4186fc6b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a18c27ace1ef344ffcb129a5b089bad7643b387a", - "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d6dd8f6420e377970ddad0d6317d4ce4186fc6b3", + "reference": "d6dd8f6420e377970ddad0d6317d4ce4186fc6b3", "shasum": "" }, "require": { @@ -7824,34 +7458,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-06-15T13:51:38+00:00" + "time": "2020-07-24T04:22:56+00:00" }, { "name": "symfony/mime", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "c0c418f05e727606e85b482a8591519c4712cf45" + "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45", - "reference": "c0c418f05e727606e85b482a8591519c4712cf45", + "url": "https://api.github.com/repos/symfony/mime/zipball/149fb0ad35aae3c7637b496b38478797fa6a7ea6", + "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6", "shasum": "" }, "require": { @@ -7901,21 +7521,7 @@ "mime", "mime-type" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-06-09T15:07:35+00:00" + "time": "2020-07-23T10:04:31+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7977,20 +7583,6 @@ "polyfill", "portable" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8054,20 +7646,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8132,20 +7710,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8217,20 +7781,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8298,20 +7848,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8375,20 +7911,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8449,20 +7971,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8526,20 +8034,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8599,20 +8093,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8675,20 +8155,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8755,20 +8221,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8825,34 +8277,20 @@ "polyfill", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/process", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1" + "reference": "1864216226af21eb76d9477f691e7cbf198e0402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1", - "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1", + "url": "https://api.github.com/repos/symfony/process/zipball/1864216226af21eb76d9477f691e7cbf198e0402", + "reference": "1864216226af21eb76d9477f691e7cbf198e0402", "shasum": "" }, "require": { @@ -8889,34 +8327,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-07-23T08:36:24+00:00" }, { "name": "symfony/routing", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "bbd0ba121d623f66d165a55a108008968911f3eb" + "reference": "08c9a82f09d12ee048f85e76e0d783f82844eb5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/bbd0ba121d623f66d165a55a108008968911f3eb", - "reference": "bbd0ba121d623f66d165a55a108008968911f3eb", + "url": "https://api.github.com/repos/symfony/routing/zipball/08c9a82f09d12ee048f85e76e0d783f82844eb5d", + "reference": "08c9a82f09d12ee048f85e76e0d783f82844eb5d", "shasum": "" }, "require": { @@ -8981,21 +8405,7 @@ "uri", "url" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-06-10T11:49:58+00:00" + "time": "2020-06-18T18:24:02+00:00" }, { "name": "symfony/service-contracts", @@ -9057,34 +8467,20 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/string", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298" + "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ac70459db781108db7c6d8981dd31ce0e29e3298", - "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298", + "url": "https://api.github.com/repos/symfony/string/zipball/f629ba9b611c76224feb21fe2bcbf0b6f992300b", + "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b", "shasum": "" }, "require": { @@ -9142,34 +8538,20 @@ "utf-8", "utf8" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-06-11T12:16:36+00:00" + "time": "2020-07-08T08:27:49+00:00" }, { "name": "symfony/translation", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2" + "reference": "4b9bf719f0fa5b05253c37fc7b335337ec7ec427" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2", - "reference": "d387f07d4c15f9c09439cf3f13ddbe0b2c5e8be2", + "url": "https://api.github.com/repos/symfony/translation/zipball/4b9bf719f0fa5b05253c37fc7b335337ec7ec427", + "reference": "4b9bf719f0fa5b05253c37fc7b335337ec7ec427", "shasum": "" }, "require": { @@ -9234,21 +8616,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-06-30T17:42:22+00:00" }, { "name": "symfony/translation-contracts", @@ -9309,34 +8677,20 @@ "interoperability", "standards" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-07-06T13:23:11+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.1.2", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "46a942903059b0b05e601f00eb64179e05578c0f" + "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46a942903059b0b05e601f00eb64179e05578c0f", - "reference": "46a942903059b0b05e601f00eb64179e05578c0f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2ebe1c7bb52052624d6dc1250f4abe525655d75a", + "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a", "shasum": "" }, "require": { @@ -9399,21 +8753,7 @@ "debug", "dump" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-05-30T20:35:19+00:00" + "time": "2020-06-24T13:36:18+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -9526,30 +8866,20 @@ "env", "environment" ], - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", - "type": "tidelift" - } - ], "time": "2020-07-14T19:22:52+00:00" }, { "name": "voku/portable-ascii", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "618631dc601d8eb6ea0a9fbf654ec82f066c4e97" + "reference": "25bcbf01678930251fd572891447d9e318a6e2b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/618631dc601d8eb6ea0a9fbf654ec82f066c4e97", - "reference": "618631dc601d8eb6ea0a9fbf654ec82f066c4e97", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/25bcbf01678930251fd572891447d9e318a6e2b8", + "reference": "25bcbf01678930251fd572891447d9e318a6e2b8", "shasum": "" }, "require": { @@ -9584,25 +8914,7 @@ "clean", "php" ], - "funding": [ - { - "url": "https://www.paypal.me/moelleken", - "type": "custom" - }, - { - "url": "https://github.com/voku", - "type": "github" - }, - { - "url": "https://www.patreon.com/voku", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", - "type": "tidelift" - } - ], - "time": "2020-06-15T23:49:30+00:00" + "time": "2020-07-22T23:32:04+00:00" }, { "name": "webmozart/assert", @@ -9770,20 +9082,6 @@ "constructor", "instantiate" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-05-29T17:27:14+00:00" }, { @@ -9840,12 +9138,6 @@ "flare", "reporting" ], - "funding": [ - { - "url": "https://github.com/spatie", - "type": "github" - } - ], "time": "2020-07-13T23:25:57+00:00" }, { @@ -10129,30 +9421,33 @@ }, { "name": "mockery/mockery", - "version": "1.3.2", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283" + "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", - "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", + "url": "https://api.github.com/repos/mockery/mockery/zipball/1404386ca3410b04fe58b9517e85d702ab33b2c6", + "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": ">=5.6.0" + "php": "^7.3 || ^8.0" + }, + "conflict": { + "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0|~9.0" + "phpunit/phpunit": "^8.5 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -10190,7 +9485,7 @@ "test double", "testing" ], - "time": "2020-07-09T08:23:05+00:00" + "time": "2020-07-09T08:31:54+00:00" }, { "name": "myclabs/deep-copy", @@ -10238,12 +9533,6 @@ "object", "object graph" ], - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], "time": "2020-06-29T13:22:24+00:00" }, { @@ -10314,20 +9603,6 @@ "php", "symfony" ], - "funding": [ - { - "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", - "type": "custom" - }, - { - "url": "https://github.com/nunomaduro", - "type": "github" - }, - { - "url": "https://www.patreon.com/nunomaduro", - "type": "patreon" - } - ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -10828,16 +10103,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-06-22T07:06:58+00:00" }, { @@ -10907,12 +10172,6 @@ "highlight.php", "syntax" ], - "funding": [ - { - "url": "https://github.com/allejo", - "type": "github" - } - ], "time": "2020-03-02T05:59:21+00:00" }, { @@ -11568,12 +10827,6 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], "time": "2020-07-12T23:59:07+00:00" } ], @@ -11586,6 +10839,5 @@ "php": "^7.2.5", "ext-bcmath": "*" }, - "platform-dev": [], - "plugin-api-version": "1.1.0" + "platform-dev": [] } From 549cfbfff819f528ed2c4c922fbca77f0f924652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Jul 2020 13:28:10 +0300 Subject: [PATCH 145/208] version update 2.0.16 to 2.0.17 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index 6f67dd2a2..9d843d699 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '0', - 'patch' => '16', + 'patch' => '17', 'build' => '', 'status' => 'Stable', - 'date' => '6-July-2020', + 'date' => '24-July-2020', - 'time' => '10:00', + 'time' => '13:00', 'zone' => 'GMT +3', From fe6deb787b1bcd726b227e2e7f4aa896e13472b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 24 Jul 2020 23:38:01 +0300 Subject: [PATCH 146/208] close #1547 Fixed: Invoice/bill edit item issue --- resources/assets/js/views/purchases/bills.js | 5 +++-- resources/assets/js/views/sales/invoices.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js index 73a85b2f0..8436bc9ca 100644 --- a/resources/assets/js/views/purchases/bills.js +++ b/resources/assets/js/views/purchases/bills.js @@ -64,6 +64,7 @@ const app = new Vue({ let items = []; let item_backup = this.form.item_backup[0]; let currency_code = this.form.currency_code; + let currency = this.currency; this.edit.status = true; @@ -73,11 +74,11 @@ const app = new Vue({ currency: currency_code, item_id: item.item_id, name: item.name, - price: (item.price).toFixed(this.currency.precision), + price: (item.price).toFixed(currency.precision), quantity: item.quantity, tax_id: item.tax_id, discount: item.discount_rate, - total: (item.total).toFixed(this.currency.precision) + total: (item.total).toFixed(currency.precision) }); }); diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js index 6eafabdde..580ec7884 100644 --- a/resources/assets/js/views/sales/invoices.js +++ b/resources/assets/js/views/sales/invoices.js @@ -65,6 +65,7 @@ const app = new Vue({ let items = []; let item_backup = this.form.item_backup[0]; let currency_code = this.form.currency_code; + let currency = this.currency; this.edit.status = true; @@ -74,11 +75,11 @@ const app = new Vue({ currency: currency_code, item_id: item.item_id, name: item.name, - price: (item.price).toFixed(this.currency.precision), + price: (item.price).toFixed(currency.precision), quantity: item.quantity, tax_id: item.tax_id, discount: item.discount_rate, - total: (item.total).toFixed(this.currency.precision) + total: (item.total).toFixed(currency.precision) }); }); From d8ea08643aece2078b89c8573fcb5e34658f59e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 25 Jul 2020 00:00:42 +0300 Subject: [PATCH 147/208] version update 2.0.17 to 2.0.18 --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 9d843d699..2d78add6d 100644 --- a/config/version.php +++ b/config/version.php @@ -10,7 +10,7 @@ return [ 'minor' => '0', - 'patch' => '17', + 'patch' => '18', 'build' => '', @@ -18,7 +18,7 @@ return [ 'date' => '24-July-2020', - 'time' => '13:00', + 'time' => '23:30', 'zone' => 'GMT +3', From a3077d445dc4b23e3579ae11e4219187ee09ae59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 25 Jul 2020 17:22:50 +0300 Subject: [PATCH 148/208] added more db asserts --- app/Http/Middleware/DateFormat.php | 6 ++++- database/factories/Bill.php | 4 +-- database/factories/Invoice.php | 4 +-- database/factories/Transaction.php | 4 +-- tests/Feature/Purchases/BillsTest.php | 33 ++++++++++++++++++++--- tests/Feature/Purchases/PaymentsTest.php | 18 ++++++++++--- tests/Feature/Purchases/VendorsTest.php | 24 ++++++++++++++--- tests/Feature/Sales/CustomersTest.php | 32 +++++++++++++++------- tests/Feature/Sales/InvoicesTest.php | 33 ++++++++++++++++++++--- tests/Feature/Sales/RevenuesTest.php | 18 ++++++++++--- tests/Feature/Settings/CategoriesTest.php | 18 ++++++++++--- tests/Feature/Settings/CurrenciesTest.php | 18 ++++++++++--- tests/Feature/Settings/TaxesTest.php | 18 ++++++++++--- tests/Feature/Wizard/CurrenciesTest.php | 14 ++++++++-- tests/Feature/Wizard/TaxesTest.php | 14 ++++++++-- 15 files changed, 211 insertions(+), 47 deletions(-) diff --git a/app/Http/Middleware/DateFormat.php b/app/Http/Middleware/DateFormat.php index df0676bd6..27d342193 100644 --- a/app/Http/Middleware/DateFormat.php +++ b/app/Http/Middleware/DateFormat.php @@ -26,7 +26,11 @@ class DateFormat continue; } - $new_date = Date::parse($date)->format('Y-m-d') . ' ' . Date::now()->format('H:i:s'); + if (Date::parse($date)->format('H:i:s') == '00:00:00') { + $new_date = Date::parse($date)->format('Y-m-d') . ' ' . Date::now()->format('H:i:s'); + } else { + $new_date = Date::parse($date)->toDateTimeString(); + } $request->request->set($field, $new_date); } diff --git a/database/factories/Bill.php b/database/factories/Bill.php index 3392bdee7..968455fc8 100644 --- a/database/factories/Bill.php +++ b/database/factories/Bill.php @@ -20,8 +20,8 @@ $factory->define(Bill::class, function (Faker $faker) use ($company) { session(['company_id' => $company->id]); setting()->setExtraColumns(['company_id' => $company->id]); - $billed_at = $faker->dateTimeBetween(now()->startOfYear(), now()->endOfYear())->format('Y-m-d'); - $due_at = Date::parse($billed_at)->addDays(10)->format('Y-m-d'); + $billed_at = $faker->dateTimeBetween(now()->startOfYear(), now()->endOfYear())->format('Y-m-d H:i:s'); + $due_at = Date::parse($billed_at)->addDays(10)->format('Y-m-d H:i:s'); $contacts = Contact::vendor()->enabled()->get(); diff --git a/database/factories/Invoice.php b/database/factories/Invoice.php index 78e09ad33..38aaa1b17 100644 --- a/database/factories/Invoice.php +++ b/database/factories/Invoice.php @@ -21,8 +21,8 @@ $factory->define(Invoice::class, function (Faker $faker) use ($company) { session(['company_id' => $company->id]); setting()->setExtraColumns(['company_id' => $company->id]); - $invoiced_at = $faker->dateTimeBetween(now()->startOfYear(), now()->endOfYear())->format('Y-m-d'); - $due_at = Date::parse($invoiced_at)->addDays(setting('invoice.payment_terms'))->format('Y-m-d'); + $invoiced_at = $faker->dateTimeBetween(now()->startOfYear(), now()->endOfYear())->format('Y-m-d H:i:s'); + $due_at = Date::parse($invoiced_at)->addDays(setting('invoice.payment_terms'))->format('Y-m-d H:i:s'); $contacts = Contact::customer()->enabled()->get(); diff --git a/database/factories/Transaction.php b/database/factories/Transaction.php index 2bdc0c6ff..d0b6e3bcc 100644 --- a/database/factories/Transaction.php +++ b/database/factories/Transaction.php @@ -17,10 +17,10 @@ $factory->define(Transaction::class, function (Faker $faker) use ($company) { 'company_id' => $company->id, 'type' => $type, 'account_id' => setting('default.account'), - 'paid_at' => $faker->dateTimeBetween(now()->startOfYear(), now()->endOfYear())->format('Y-m-d'), + 'paid_at' => $faker->dateTimeBetween(now()->startOfYear(), now()->endOfYear())->format('Y-m-d H:i:s'), 'amount' => $faker->randomFloat(2, 1, 1000), 'currency_code' => setting('default.currency'), - 'currency_rate' => '1', + 'currency_rate' => '1.0', 'description' => $faker->text(5), 'category_id' => $company->categories()->type($type)->get()->random(1)->pluck('id')->first(), 'reference' => $faker->text(5), diff --git a/tests/Feature/Purchases/BillsTest.php b/tests/Feature/Purchases/BillsTest.php index 51abdab5f..69c7199b4 100644 --- a/tests/Feature/Purchases/BillsTest.php +++ b/tests/Feature/Purchases/BillsTest.php @@ -26,25 +26,39 @@ class BillsTest extends FeatureTestCase public function testItShouldCreateBill() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('bills.store'), $this->getRequest()) + ->post(route('bills.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('bills', [ + 'bill_number' => $request['bill_number'], + ]); } public function testItShouldCreateBillWithRecurring() { + $request = $this->getRequest(true); + $this->loginAs() - ->post(route('bills.store'), $this->getRequest(true)) + ->post(route('bills.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('bills', [ + 'bill_number' => $request['bill_number'], + ]); } public function testItShouldSeeBillUpdatePage() { - $bill = $this->dispatch(new CreateBill($this->getRequest())); + $request = $this->getRequest(); + + $bill = $this->dispatch(new CreateBill($request)); $this->loginAs() ->get(route('bills.edit', $bill->id)) @@ -66,17 +80,28 @@ class BillsTest extends FeatureTestCase ->assertSee($request['contact_email']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('bills', [ + 'bill_number' => $request['bill_number'], + 'contact_email' => $request['contact_email'], + ]); } public function testItShouldDeleteBill() { - $bill = $this->dispatch(new CreateBill($this->getRequest())); + $request = $this->getRequest(); + + $bill = $this->dispatch(new CreateBill($request)); $this->loginAs() ->delete(route('bills.destroy', $bill->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('bills', [ + 'bill_number' => $request['bill_number'], + ]); } public function getRequest($recurring = false) diff --git a/tests/Feature/Purchases/PaymentsTest.php b/tests/Feature/Purchases/PaymentsTest.php index 0a64b37ea..34b3cf8c8 100644 --- a/tests/Feature/Purchases/PaymentsTest.php +++ b/tests/Feature/Purchases/PaymentsTest.php @@ -26,16 +26,22 @@ class PaymentsTest extends FeatureTestCase public function testItShouldCreatePayment() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('payments.store'), $this->getRequest()) + ->post(route('payments.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('transactions', $request); } public function testItShouldSeePaymentUpdatePage() { - $payment = $this->dispatch(new CreateTransaction($this->getRequest())); + $request = $this->getRequest(); + + $payment = $this->dispatch(new CreateTransaction($request)); $this->loginAs() ->get(route('payments.edit', $payment->id)) @@ -57,17 +63,23 @@ class PaymentsTest extends FeatureTestCase ->assertSee($request['amount']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('transactions', $request); } public function testItShouldDeletePayment() { - $payment = $this->dispatch(new CreateTransaction($this->getRequest())); + $request = $this->getRequest(); + + $payment = $this->dispatch(new CreateTransaction($request)); $this->loginAs() ->delete(route('payments.destroy', $payment->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('transactions', $request); } public function getRequest() diff --git a/tests/Feature/Purchases/VendorsTest.php b/tests/Feature/Purchases/VendorsTest.php index f9bdebfc7..ef2c297c0 100644 --- a/tests/Feature/Purchases/VendorsTest.php +++ b/tests/Feature/Purchases/VendorsTest.php @@ -26,16 +26,22 @@ class VendorsTest extends FeatureTestCase public function testItShouldCreateVendor() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('vendors.store'), $this->getRequest()) + ->post(route('vendors.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('contacts', $request); } public function testItShouldSeeVendorDetailPage() { - $vendor = $this->dispatch(new CreateContact($this->getRequest())); + $request = $this->getRequest(); + + $vendor = $this->dispatch(new CreateContact($request)); $this->loginAs() ->get(route('vendors.show', $vendor->id)) @@ -45,12 +51,16 @@ class VendorsTest extends FeatureTestCase public function testItShouldSeeVendorUpdatePage() { - $vendor = $this->dispatch(new CreateContact($this->getRequest())); + $request = $this->getRequest(); + + $vendor = $this->dispatch(new CreateContact($request)); $this->loginAs() ->get(route('vendors.edit', $vendor->id)) ->assertStatus(200) ->assertSee($vendor->email); + + $this->assertDatabaseHas('contacts', $request); } public function testItShouldUpdateVendor() @@ -67,17 +77,23 @@ class VendorsTest extends FeatureTestCase ->assertSee($request['email']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('contacts', $request); } public function testItShouldDeleteVendor() { - $vendor = $this->dispatch(new CreateContact($this->getRequest())); + $request = $this->getRequest(); + + $vendor = $this->dispatch(new CreateContact($request)); $this->loginAs() ->delete(route('vendors.destroy', $vendor->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('contacts', $request); } public function getRequest() diff --git a/tests/Feature/Sales/CustomersTest.php b/tests/Feature/Sales/CustomersTest.php index fa8f88816..38172d946 100644 --- a/tests/Feature/Sales/CustomersTest.php +++ b/tests/Feature/Sales/CustomersTest.php @@ -25,34 +25,40 @@ class CustomersTest extends FeatureTestCase ->assertSeeText(trans('general.title.new', ['type' => trans_choice('general.customers', 1)])); } - public function testItShouldCreateOnlyCustomerWithoutUser() + public function testItShouldCreateCustomer() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('customers.store'), $this->getRequest()) + ->post(route('customers.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('contacts', $request); } public function testItShouldCreateCustomerWithUser() { - $customer = $this->getRequestWithUser(); + $request = $this->getRequestWithUser(); $this->loginAs() - ->post(route('customers.store'), $customer) + ->post(route('customers.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); - $user = User::where('email', $customer['email'])->first(); + $user = User::where('email', $request['email'])->first(); $this->assertNotNull($user); - $this->assertEquals($customer['email'], $user->email); + $this->assertEquals($request['email'], $user->email); } public function testItShouldSeeCustomerDetailPage() { - $customer = $this->dispatch(new CreateContact($this->getRequest())); + $request = $this->getRequest(); + + $customer = $this->dispatch(new CreateContact($request)); $this->loginAs() ->get(route('customers.show', $customer->id)) @@ -62,7 +68,9 @@ class CustomersTest extends FeatureTestCase public function testItShouldSeeCustomerUpdatePage() { - $customer = $this->dispatch(new CreateContact($this->getRequest())); + $request = $this->getRequest(); + + $customer = $this->dispatch(new CreateContact($request)); $this->loginAs() ->get(route('customers.edit', $customer->id)) @@ -84,11 +92,15 @@ class CustomersTest extends FeatureTestCase ->assertSee($request['email']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('contacts', $request); } public function testItShouldDeleteCustomer() { - $customer = $this->dispatch(new CreateContact($this->getRequest())); + $request = $this->getRequest(); + + $customer = $this->dispatch(new CreateContact($request)); $this->loginAs() ->delete(route('customers.destroy', $customer->id)) @@ -96,6 +108,8 @@ class CustomersTest extends FeatureTestCase $this->assertFlashLevel('success'); + $this->assertSoftDeleted('contacts', $request); + } public function testItShouldNotDeleteCustomerIfHasRelations() diff --git a/tests/Feature/Sales/InvoicesTest.php b/tests/Feature/Sales/InvoicesTest.php index 5f34926e1..3997706d3 100644 --- a/tests/Feature/Sales/InvoicesTest.php +++ b/tests/Feature/Sales/InvoicesTest.php @@ -26,25 +26,39 @@ class InvoicesTest extends FeatureTestCase public function testItShouldCreateInvoice() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('invoices.store'), $this->getRequest()) + ->post(route('invoices.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('invoices', [ + 'invoice_number' => $request['invoice_number'], + ]); } public function testItShouldCreateInvoiceWithRecurring() { + $request = $this->getRequest(true); + $this->loginAs() - ->post(route('invoices.store'), $this->getRequest(true)) + ->post(route('invoices.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('invoices', [ + 'invoice_number' => $request['invoice_number'], + ]); } public function testItShouldSeeInvoiceUpdatePage() { - $invoice = $this->dispatch(new CreateInvoice($this->getRequest())); + $request = $this->getRequest(); + + $invoice = $this->dispatch(new CreateInvoice($request)); $this->loginAs() ->get(route('invoices.edit', $invoice->id)) @@ -66,17 +80,28 @@ class InvoicesTest extends FeatureTestCase ->assertSee($request['contact_email']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('invoices', [ + 'invoice_number' => $request['invoice_number'], + 'contact_email' => $request['contact_email'], + ]); } public function testItShouldDeleteInvoice() { - $invoice = $this->dispatch(new CreateInvoice($this->getRequest())); + $request = $this->getRequest(); + + $invoice = $this->dispatch(new CreateInvoice($request)); $this->loginAs() ->delete(route('invoices.destroy', $invoice->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('invoices', [ + 'invoice_number' => $request['invoice_number'], + ]); } public function getRequest($recurring = false) diff --git a/tests/Feature/Sales/RevenuesTest.php b/tests/Feature/Sales/RevenuesTest.php index 2c8d32c9c..147aeca6e 100644 --- a/tests/Feature/Sales/RevenuesTest.php +++ b/tests/Feature/Sales/RevenuesTest.php @@ -26,16 +26,22 @@ class RevenuesTest extends FeatureTestCase public function testItShouldCreateRevenue() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('revenues.store'), $this->getRequest()) + ->post(route('revenues.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('transactions', $request); } public function testItShouldSeeRevenueUpdatePage() { - $revenue = $this->dispatch(new CreateTransaction($this->getRequest())); + $request = $this->getRequest(); + + $revenue = $this->dispatch(new CreateTransaction($request)); $this->loginAs() ->get(route('revenues.edit', $revenue->id)) @@ -57,17 +63,23 @@ class RevenuesTest extends FeatureTestCase ->assertSee($request['amount']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('transactions', $request); } public function testItShouldDeleteRevenue() { - $revenue = $this->dispatch(new CreateTransaction($this->getRequest())); + $request = $this->getRequest(); + + $revenue = $this->dispatch(new CreateTransaction($request)); $this->loginAs() ->delete(route('revenues.destroy', $revenue->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('transactions', $request); } public function getRequest() diff --git a/tests/Feature/Settings/CategoriesTest.php b/tests/Feature/Settings/CategoriesTest.php index a905d7647..b7346e260 100644 --- a/tests/Feature/Settings/CategoriesTest.php +++ b/tests/Feature/Settings/CategoriesTest.php @@ -26,16 +26,22 @@ class CategoriesTest extends FeatureTestCase public function testItShouldCreateCategory() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('categories.store'), $this->getRequest()) + ->post(route('categories.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('categories', $request); } public function testItShouldSeeCategoryUpdatePage() { - $category = $this->dispatch(new CreateCategory($this->getRequest())); + $request = $this->getRequest(); + + $category = $this->dispatch(new CreateCategory($request)); $this->loginAs() ->get(route('categories.edit', $category->id)) @@ -57,17 +63,23 @@ class CategoriesTest extends FeatureTestCase ->assertSee($request['name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('categories', $request); } public function testItShouldDeleteCategory() { - $category = $this->dispatch(new CreateCategory($this->getRequest())); + $request = $this->getRequest(); + + $category = $this->dispatch(new CreateCategory($request)); $this->loginAs() ->delete(route('categories.destroy', $category->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('categories', $request); } public function getRequest() diff --git a/tests/Feature/Settings/CurrenciesTest.php b/tests/Feature/Settings/CurrenciesTest.php index 5a88f8dc0..45ac0af97 100644 --- a/tests/Feature/Settings/CurrenciesTest.php +++ b/tests/Feature/Settings/CurrenciesTest.php @@ -26,16 +26,22 @@ class CurrenciesTest extends FeatureTestCase public function testItShouldCreateCurrency() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('currencies.store'), $this->getRequest()) + ->post(route('currencies.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('currencies', $request); } public function testItShouldSeeCurrencyUpdatePage() { - $currency = $this->dispatch(new CreateCurrency($this->getRequest())); + $request = $this->getRequest(); + + $currency = $this->dispatch(new CreateCurrency($request)); $this->loginAs() ->get(route('currencies.edit', $currency->id)) @@ -57,17 +63,23 @@ class CurrenciesTest extends FeatureTestCase ->assertSee($request['name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('currencies', $request); } public function testItShouldDeleteCurrency() { - $currency = $this->dispatch(new CreateCurrency($this->getRequest())); + $request = $this->getRequest(); + + $currency = $this->dispatch(new CreateCurrency($request)); $this->loginAs() ->delete(route('currencies.destroy', $currency->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('currencies', $request); } public function getRequest() diff --git a/tests/Feature/Settings/TaxesTest.php b/tests/Feature/Settings/TaxesTest.php index fec81c8fc..319a56e69 100644 --- a/tests/Feature/Settings/TaxesTest.php +++ b/tests/Feature/Settings/TaxesTest.php @@ -26,16 +26,22 @@ class TaxesTest extends FeatureTestCase public function testItShouldCreateTax() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('taxes.store'), $this->getRequest()) + ->post(route('taxes.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('taxes', $request); } public function testItShouldSeeTaxUpdatePage() { - $tax = $this->dispatch(new CreateTax($this->getRequest())); + $request = $this->getRequest(); + + $tax = $this->dispatch(new CreateTax($request)); $this->loginAs() ->get(route('taxes.edit', $tax->id)) @@ -57,17 +63,23 @@ class TaxesTest extends FeatureTestCase ->assertSee($request['name']); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('taxes', $request); } public function testItShouldDeleteTax() { - $tax = $this->dispatch(new CreateTax($this->getRequest())); + $request = $this->getRequest(); + + $tax = $this->dispatch(new CreateTax($request)); $this->loginAs() ->delete(route('taxes.destroy', $tax->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('taxes', $request); } public function getRequest() diff --git a/tests/Feature/Wizard/CurrenciesTest.php b/tests/Feature/Wizard/CurrenciesTest.php index 8f12337c8..2214e5d4a 100644 --- a/tests/Feature/Wizard/CurrenciesTest.php +++ b/tests/Feature/Wizard/CurrenciesTest.php @@ -17,11 +17,15 @@ class CurrenciesTest extends FeatureTestCase public function testItShouldCreateCurrency() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('wizard.currencies.store'), $this->getRequest()) + ->post(route('wizard.currencies.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('currencies', $request); } public function testItShouldUpdateCurrency() @@ -37,17 +41,23 @@ class CurrenciesTest extends FeatureTestCase ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('currencies', $request); } public function testItShouldDeleteCurrency() { - $currency = $this->dispatch(new CreateCurrency($this->getRequest())); + $request = $this->getRequest(); + + $currency = $this->dispatch(new CreateCurrency($request)); $this->loginAs() ->delete(route('wizard.currencies.destroy', $currency->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertSoftDeleted('currencies', $request); } public function getRequest() diff --git a/tests/Feature/Wizard/TaxesTest.php b/tests/Feature/Wizard/TaxesTest.php index 4ea5afc7e..ab8fabf7a 100644 --- a/tests/Feature/Wizard/TaxesTest.php +++ b/tests/Feature/Wizard/TaxesTest.php @@ -17,11 +17,15 @@ class TaxesTest extends FeatureTestCase public function testItShouldCreateTax() { + $request = $this->getRequest(); + $this->loginAs() - ->post(route('wizard.taxes.store'), $this->getRequest()) + ->post(route('wizard.taxes.store'), $request) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('taxes', $request); } public function testItShouldUpdateTax() @@ -37,17 +41,23 @@ class TaxesTest extends FeatureTestCase ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('taxes', $request); } public function testItShouldDeleteTax() { - $tax = $this->dispatch(new CreateTax($this->getRequest())); + $request = $this->getRequest(); + + $tax = $this->dispatch(new CreateTax($request)); $this->loginAs() ->delete(route('wizard.taxes.destroy', $tax->id)) ->assertStatus(200); $this->assertFlashLevel('success'); + + $this->assertDatabaseHas('taxes', $request); } public function getRequest() From 73d9a1ba30abde0168766b0a16714fbd9484146c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 25 Jul 2020 17:31:12 +0300 Subject: [PATCH 149/208] fixed composer lock --- composer.lock | 796 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 778 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 96a47faa5..83f3dafe5 100644 --- a/composer.lock +++ b/composer.lock @@ -601,6 +601,12 @@ "profiler", "webprofiler" ], + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], "time": "2020-05-05T10:53:32+00:00" }, { @@ -728,6 +734,12 @@ "phpstorm", "sublime" ], + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], "time": "2020-04-22T09:57:26+00:00" }, { @@ -986,6 +998,16 @@ "ssl", "tls" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-04-08T08:27:21+00:00" }, { @@ -1066,6 +1088,20 @@ "dependency", "package" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-07-16T10:57:00+00:00" }, { @@ -1187,6 +1223,20 @@ "spdx", "validator" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-07-15T15:35:07+00:00" }, { @@ -1231,6 +1281,20 @@ "Xdebug", "performance" ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], "time": "2020-06-04T11:16:35+00:00" }, { @@ -1599,6 +1663,20 @@ "redis", "xcache" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", + "type": "tidelift" + } + ], "time": "2020-07-07T18:54:01+00:00" }, { @@ -1664,6 +1742,20 @@ "iterators", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], "time": "2020-06-22T19:14:02+00:00" }, { @@ -1899,6 +1991,20 @@ "uppercase", "words" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], "time": "2020-05-29T15:13:26+00:00" }, { @@ -1961,6 +2067,20 @@ "parser", "php" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -2261,6 +2381,12 @@ "crossdomain", "laravel" ], + "funding": [ + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], "time": "2020-04-28T08:47:37+00:00" }, { @@ -2326,6 +2452,16 @@ } ], "description": "Automatic caching for Eloquent models.", + "funding": [ + { + "url": "https://github.com/GeneaLabs", + "type": "github" + }, + { + "url": "https://github.com/mikebronner", + "type": "github" + } + ], "time": "2020-07-08T18:08:06+00:00" }, { @@ -2875,6 +3011,16 @@ "user agent", "useragent" ], + "funding": [ + { + "url": "https://github.com/jenssegers", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/jenssegers/agent", + "type": "tidelift" + } + ], "time": "2020-06-13T08:05:20+00:00" }, { @@ -3569,6 +3715,32 @@ "md", "parser" ], + "funding": [ + { + "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", + "type": "custom" + }, + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + }, + { + "url": "https://www.patreon.com/colinodell", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/commonmark", + "type": "tidelift" + } + ], "time": "2020-07-19T22:47:30+00:00" }, { @@ -3653,6 +3825,12 @@ "sftp", "storage" ], + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], "time": "2020-05-18T15:13:39+00:00" }, { @@ -3880,6 +4058,16 @@ "php", "phpspreadsheet" ], + "funding": [ + { + "url": "https://laravel-excel.com/commercial-support", + "type": "custom" + }, + { + "url": "https://github.com/patrickbrouwers", + "type": "github" + } + ], "time": "2020-07-17T20:39:28+00:00" }, { @@ -3941,6 +4129,12 @@ "stream", "zip" ], + "funding": [ + { + "url": "https://opencollective.com/zipstream", + "type": "open_collective" + } + ], "time": "2020-05-30T13:11:16+00:00" }, { @@ -4436,6 +4630,16 @@ "logging", "psr-3" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], "time": "2020-07-23T08:41:23+00:00" }, { @@ -4616,20 +4820,30 @@ "datetime", "time" ], + "funding": [ + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], "time": "2020-07-04T12:29:56+00:00" }, { "name": "nikic/php-parser", - "version": "v4.6.0", + "version": "v4.7.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c346bbfafe2ff60680258b631afb730d186ed864" + "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c346bbfafe2ff60680258b631afb730d186ed864", - "reference": "c346bbfafe2ff60680258b631afb730d186ed864", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", + "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", "shasum": "" }, "require": { @@ -4646,7 +4860,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.7-dev" } }, "autoload": { @@ -4668,7 +4882,7 @@ "parser", "php" ], - "time": "2020-07-02T17:12:47+00:00" + "time": "2020-07-25T13:18:53+00:00" }, { "name": "omnipay/common", @@ -5591,6 +5805,16 @@ "php", "type" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", + "type": "tidelift" + } + ], "time": "2020-07-20T17:29:33+00:00" }, { @@ -6522,6 +6746,16 @@ "parser", "validator" ], + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], "time": "2020-04-30T19:05:18+00:00" }, { @@ -6848,6 +7082,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-06T13:23:11+00:00" }, { @@ -6901,6 +7149,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -6958,6 +7220,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-23T08:31:43+00:00" }, { @@ -7008,6 +7284,20 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-06T08:49:21+00:00" }, { @@ -7065,6 +7355,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-23T08:36:24+00:00" }, { @@ -7137,6 +7441,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-18T18:24:02+00:00" }, { @@ -7199,6 +7517,20 @@ "interoperability", "standards" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-06T13:23:11+00:00" }, { @@ -7249,6 +7581,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-30T20:35:19+00:00" }, { @@ -7298,6 +7644,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-05-20T17:43:50+00:00" }, { @@ -7359,6 +7719,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-23T10:04:31+00:00" }, { @@ -7458,6 +7832,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-24T04:22:56+00:00" }, { @@ -7521,6 +7909,20 @@ "mime", "mime-type" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-23T10:04:31+00:00" }, { @@ -7583,6 +7985,20 @@ "polyfill", "portable" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7646,6 +8062,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7710,6 +8140,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7781,6 +8225,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7848,6 +8306,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7911,6 +8383,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -7971,6 +8457,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8034,6 +8534,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8093,6 +8607,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8155,6 +8683,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8221,6 +8763,20 @@ "portable", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8277,6 +8833,20 @@ "polyfill", "shim" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-14T12:35:20+00:00" }, { @@ -8327,6 +8897,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-23T08:36:24+00:00" }, { @@ -8405,6 +8989,20 @@ "uri", "url" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-18T18:24:02+00:00" }, { @@ -8467,6 +9065,20 @@ "interoperability", "standards" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-06T13:23:11+00:00" }, { @@ -8538,6 +9150,20 @@ "utf-8", "utf8" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-08T08:27:49+00:00" }, { @@ -8616,6 +9242,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-30T17:42:22+00:00" }, { @@ -8677,6 +9317,20 @@ "interoperability", "standards" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-07-06T13:23:11+00:00" }, { @@ -8753,6 +9407,20 @@ "debug", "dump" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-06-24T13:36:18+00:00" }, { @@ -8866,6 +9534,16 @@ "env", "environment" ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", + "type": "tidelift" + } + ], "time": "2020-07-14T19:22:52+00:00" }, { @@ -8914,6 +9592,28 @@ "clean", "php" ], + "funding": [ + { + "url": "https://www.paypal.me/moelleken", + "type": "custom" + }, + { + "url": "https://github.com/voku", + "type": "github" + }, + { + "url": "https://opencollective.com/portable-ascii", + "type": "open_collective" + }, + { + "url": "https://www.patreon.com/voku", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", + "type": "tidelift" + } + ], "time": "2020-07-22T23:32:04+00:00" }, { @@ -9082,6 +9782,20 @@ "constructor", "instantiate" ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], "time": "2020-05-29T17:27:14+00:00" }, { @@ -9138,6 +9852,12 @@ "flare", "reporting" ], + "funding": [ + { + "url": "https://github.com/spatie", + "type": "github" + } + ], "time": "2020-07-13T23:25:57+00:00" }, { @@ -9421,33 +10141,30 @@ }, { "name": "mockery/mockery", - "version": "1.4.1", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6" + "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1404386ca3410b04fe58b9517e85d702ab33b2c6", - "reference": "1404386ca3410b04fe58b9517e85d702ab33b2c6", + "url": "https://api.github.com/repos/mockery/mockery/zipball/9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", + "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": "^7.3 || ^8.0" - }, - "conflict": { - "phpunit/phpunit": "<8.0" + "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.0" + "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0|~9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -9485,7 +10202,7 @@ "test double", "testing" ], - "time": "2020-07-09T08:31:54+00:00" + "time": "2020-07-09T08:23:05+00:00" }, { "name": "myclabs/deep-copy", @@ -9533,6 +10250,12 @@ "object", "object graph" ], + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], "time": "2020-06-29T13:22:24+00:00" }, { @@ -9603,6 +10326,20 @@ "php", "symfony" ], + "funding": [ + { + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://www.patreon.com/nunomaduro", + "type": "patreon" + } + ], "time": "2020-04-04T19:56:08+00:00" }, { @@ -10103,6 +10840,16 @@ "testing", "xunit" ], + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], "time": "2020-06-22T07:06:58+00:00" }, { @@ -10172,6 +10919,12 @@ "highlight.php", "syntax" ], + "funding": [ + { + "url": "https://github.com/allejo", + "type": "github" + } + ], "time": "2020-03-02T05:59:21+00:00" }, { @@ -10827,6 +11580,12 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], "time": "2020-07-12T23:59:07+00:00" } ], @@ -10839,5 +11598,6 @@ "php": "^7.2.5", "ext-bcmath": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From 3573215f0bfffcea5c999e75a259f93db0eabc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 26 Jul 2020 10:04:52 +0300 Subject: [PATCH 150/208] assert currency by code --- tests/Feature/Settings/CurrenciesTest.php | 12 +++++++++--- tests/Feature/Wizard/CurrenciesTest.php | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/Feature/Settings/CurrenciesTest.php b/tests/Feature/Settings/CurrenciesTest.php index 45ac0af97..af995fdad 100644 --- a/tests/Feature/Settings/CurrenciesTest.php +++ b/tests/Feature/Settings/CurrenciesTest.php @@ -34,7 +34,9 @@ class CurrenciesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('currencies', $request); + $this->assertDatabaseHas('currencies', [ + 'code' => $request['code'], + ]); } public function testItShouldSeeCurrencyUpdatePage() @@ -64,7 +66,9 @@ class CurrenciesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('currencies', $request); + $this->assertDatabaseHas('currencies', [ + 'code' => $request['code'], + ]); } public function testItShouldDeleteCurrency() @@ -79,7 +83,9 @@ class CurrenciesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertSoftDeleted('currencies', $request); + $this->assertSoftDeleted('currencies', [ + 'code' => $request['code'], + ]); } public function getRequest() diff --git a/tests/Feature/Wizard/CurrenciesTest.php b/tests/Feature/Wizard/CurrenciesTest.php index 2214e5d4a..cd1ce2cc4 100644 --- a/tests/Feature/Wizard/CurrenciesTest.php +++ b/tests/Feature/Wizard/CurrenciesTest.php @@ -25,7 +25,9 @@ class CurrenciesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('currencies', $request); + $this->assertDatabaseHas('currencies', [ + 'code' => $request['code'], + ]); } public function testItShouldUpdateCurrency() @@ -42,7 +44,9 @@ class CurrenciesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertDatabaseHas('currencies', $request); + $this->assertDatabaseHas('currencies', [ + 'code' => $request['code'], + ]); } public function testItShouldDeleteCurrency() @@ -57,7 +61,9 @@ class CurrenciesTest extends FeatureTestCase $this->assertFlashLevel('success'); - $this->assertSoftDeleted('currencies', $request); + $this->assertSoftDeleted('currencies', [ + 'code' => $request['code'], + ]); } public function getRequest() From 7feb9e9081ec409420f547f523e0ea48f902ed73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 26 Jul 2020 19:44:28 +0300 Subject: [PATCH 151/208] formatting --- app/Listeners/Auth/Login.php | 7 +++---- app/Listeners/Auth/Logout.php | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/Listeners/Auth/Login.php b/app/Listeners/Auth/Login.php index e73bdd9d0..6a6e8769f 100644 --- a/app/Listeners/Auth/Login.php +++ b/app/Listeners/Auth/Login.php @@ -3,18 +3,17 @@ namespace App\Listeners\Auth; use App\Utilities\Date; -use Illuminate\Auth\Events\Login as ILogin; +use Illuminate\Auth\Events\Login as Event; class Login { - /** * Handle the event. * - * @param ILogin $event + * @param Event $event * @return void */ - public function handle(ILogin $event) + public function handle(Event $event) { // Get first company $company = $event->user->companies()->enabled()->first(); diff --git a/app/Listeners/Auth/Logout.php b/app/Listeners/Auth/Logout.php index 48799f87a..732359997 100644 --- a/app/Listeners/Auth/Logout.php +++ b/app/Listeners/Auth/Logout.php @@ -2,19 +2,18 @@ namespace App\Listeners\Auth; -use Illuminate\Auth\Events\Logout as ILogout; +use Illuminate\Auth\Events\Logout as Event; class Logout { - /** * Handle the event. * - * @param ILogout $event + * @param Event $event * @return void */ - public function handle(ILogout $event) + public function handle(Event $event) { session()->forget('company_id'); } -} \ No newline at end of file +} From dd9e95f57edd07798a351eba0bc15d0f6d15fcfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 26 Jul 2020 19:47:23 +0300 Subject: [PATCH 152/208] added landing page event --- app/Events/Auth/LandingPageShowing.php | 22 ++++++++ app/Http/Controllers/Auth/Users.php | 55 +++++-------------- app/Listeners/Auth/AddLandingPages.php | 42 ++++++++++++++ app/Providers/Event.php | 3 + .../Listeners/AddLandingPage.php | 19 +++++++ .../Listeners/AddLandingPage.php | 19 +++++++ resources/views/auth/users/create.blade.php | 2 +- resources/views/auth/users/edit.blade.php | 2 +- 8 files changed, 122 insertions(+), 42 deletions(-) create mode 100644 app/Events/Auth/LandingPageShowing.php create mode 100644 app/Listeners/Auth/AddLandingPages.php create mode 100644 modules/OfflinePayments/Listeners/AddLandingPage.php create mode 100644 modules/PaypalStandard/Listeners/AddLandingPage.php diff --git a/app/Events/Auth/LandingPageShowing.php b/app/Events/Auth/LandingPageShowing.php new file mode 100644 index 000000000..c76df2b39 --- /dev/null +++ b/app/Events/Auth/LandingPageShowing.php @@ -0,0 +1,22 @@ +user = $user; + } +} diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index cc8d259c2..1d4459182 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Auth; use App\Abstracts\Http\Controller; +use App\Events\Auth\LandingPageShowing; use App\Http\Requests\Auth\User as Request; use App\Jobs\Auth\CreateUser; use App\Jobs\Auth\DeleteUser; @@ -46,25 +47,12 @@ class Users extends Controller */ public function create() { - $routes = [ - 'dashboard' => trans_choice('general.dashboards', 1), - 'items.index' => trans_choice('general.items', 2), - 'invoices.index' => trans_choice('general.invoices', 2), - 'revenues.index' => trans_choice('general.revenues', 2), - 'customers.index' => trans_choice('general.customers', 2), - 'bills.index' => trans_choice('general.bills', 2), - 'payments.index' => trans_choice('general.payments', 2), - 'vendors.index' => trans_choice('general.vendors', 2), - 'accounts.index' => trans_choice('general.accounts', 2), - 'transfers.index' => trans_choice('general.transfers', 2), - 'transactions.index' => trans_choice('general.transactions', 2), - 'reconciliations.index' => trans_choice('general.reconciliations', 2), - 'reports.index' => trans_choice('general.reports', 2), - 'settings.index' => trans_choice('general.settings', 2), - 'categories.index' => trans_choice('general.categories', 2), - 'currencies.index' => trans_choice('general.currencies', 2), - 'taxes.index' => trans_choice('general.taxes', 2), - ]; + $u = new \stdClass(); + $u->landing_pages = []; + + event(new LandingPageShowing($u)); + + $landing_pages = $u->landing_pages; $roles = Role::all()->reject(function ($r) { return $r->hasPermission('read-client-portal'); @@ -72,7 +60,7 @@ class Users extends Controller $companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id'); - return view('auth.users.create', compact('roles', 'companies', 'routes')); + return view('auth.users.create', compact('roles', 'companies', 'landing_pages')); } /** @@ -116,25 +104,12 @@ class Users extends Controller abort(403); } - $routes = [ - 'dashboard' => trans_choice('general.dashboards', 1), - 'items.index' => trans_choice('general.items', 2), - 'invoices.index' => trans_choice('general.invoices', 2), - 'revenues.index' => trans_choice('general.revenues', 2), - 'customers.index' => trans_choice('general.customers', 2), - 'bills.index' => trans_choice('general.bills', 2), - 'payments.index' => trans_choice('general.payments', 2), - 'vendors.index' => trans_choice('general.vendors', 2), - 'accounts.index' => trans_choice('general.accounts', 2), - 'transfers.index' => trans_choice('general.transfers', 2), - 'transactions.index' => trans_choice('general.transactions', 2), - 'reconciliations.index' => trans_choice('general.reconciliations', 2), - 'reports.index' => trans_choice('general.reports', 2), - 'settings.index' => trans_choice('general.settings', 2), - 'categories.index' => trans_choice('general.categories', 2), - 'currencies.index' => trans_choice('general.currencies', 2), - 'taxes.index' => trans_choice('general.taxes', 2), - ]; + $u = new \stdClass(); + $u->landing_pages = []; + + event(new LandingPageShowing($u)); + + $landing_pages = $u->landing_pages; if ($user->can('read-client-portal')) { // Show only roles with customer permission @@ -150,7 +125,7 @@ class Users extends Controller $companies = user()->companies()->take(10)->get()->sortBy('name')->pluck('name', 'id'); - return view('auth.users.edit', compact('user', 'companies', 'roles', 'routes')); + return view('auth.users.edit', compact('user', 'companies', 'roles', 'landing_pages')); } /** diff --git a/app/Listeners/Auth/AddLandingPages.php b/app/Listeners/Auth/AddLandingPages.php new file mode 100644 index 000000000..cbdcf2112 --- /dev/null +++ b/app/Listeners/Auth/AddLandingPages.php @@ -0,0 +1,42 @@ + trans_choice('general.dashboards', 1), + 'items.index' => trans_choice('general.items', 2), + 'invoices.index' => trans_choice('general.invoices', 2), + 'revenues.index' => trans_choice('general.revenues', 2), + 'customers.index' => trans_choice('general.customers', 2), + 'bills.index' => trans_choice('general.bills', 2), + 'payments.index' => trans_choice('general.payments', 2), + 'vendors.index' => trans_choice('general.vendors', 2), + 'accounts.index' => trans_choice('general.accounts', 2), + 'transfers.index' => trans_choice('general.transfers', 2), + 'transactions.index' => trans_choice('general.transactions', 2), + 'reconciliations.index' => trans_choice('general.reconciliations', 2), + 'reports.index' => trans_choice('general.reports', 2), + 'settings.index' => trans_choice('general.settings', 2), + 'categories.index' => trans_choice('general.categories', 2), + 'currencies.index' => trans_choice('general.currencies', 2), + 'taxes.index' => trans_choice('general.taxes', 2), + 'users.index' => trans_choice('general.users', 2), + ]; + + foreach($routes as $key => $value) { + $event->user->landing_pages[$key] = $value; + } + } +} diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 52175a0bb..6b4ea6517 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -29,6 +29,9 @@ class Event extends Provider 'Illuminate\Auth\Events\Logout' => [ 'App\Listeners\Auth\Logout', ], + 'App\Events\Auth\LandingPageShowing' => [ + 'App\Listeners\Auth\AddLandingPages', + ], 'App\Events\Purchase\BillCreated' => [ 'App\Listeners\Purchase\CreateBillCreatedHistory', 'App\Listeners\Purchase\IncreaseNextBillNumber', diff --git a/modules/OfflinePayments/Listeners/AddLandingPage.php b/modules/OfflinePayments/Listeners/AddLandingPage.php new file mode 100644 index 000000000..87306294a --- /dev/null +++ b/modules/OfflinePayments/Listeners/AddLandingPage.php @@ -0,0 +1,19 @@ +user->landing_pages['offline-payments.settings.edit'] = trans('offline-payments::general.name'); + } +} diff --git a/modules/PaypalStandard/Listeners/AddLandingPage.php b/modules/PaypalStandard/Listeners/AddLandingPage.php new file mode 100644 index 000000000..c84f6ca91 --- /dev/null +++ b/modules/PaypalStandard/Listeners/AddLandingPage.php @@ -0,0 +1,19 @@ +user->landing_pages['paypal-standard.settings.edit'] = trans('paypal-standard::general.name'); + } +} diff --git a/resources/views/auth/users/create.blade.php b/resources/views/auth/users/create.blade.php index 06ba5e40e..df59b55de 100644 --- a/resources/views/auth/users/create.blade.php +++ b/resources/views/auth/users/create.blade.php @@ -27,7 +27,7 @@ {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), setting('default.locale')) }} - {{ Form::selectGroup('landing_page', trans('auth.landing_page'), 'sign-in-alt', $routes, 'dashboard') }} + {{ Form::selectGroup('landing_page', trans('auth.landing_page'), 'sign-in-alt', $landing_pages, 'dashboard') }} @if (setting('default.use_gravatar', '0') == '1') @stack('picture_input_start') diff --git a/resources/views/auth/users/edit.blade.php b/resources/views/auth/users/edit.blade.php index 2d631d8a0..cb8a09f93 100644 --- a/resources/views/auth/users/edit.blade.php +++ b/resources/views/auth/users/edit.blade.php @@ -28,7 +28,7 @@ {{ Form::selectGroup('locale', trans_choice('general.languages', 1), 'flag', language()->allowed(), $user->locale) }} - {{ Form::selectGroup('landing_page', trans('auth.landing_page'), 'sign-in-alt', $routes, $user->landing_page) }} + {{ Form::selectGroup('landing_page', trans('auth.landing_page'), 'sign-in-alt', $landing_pages, $user->landing_page) }} @if (setting('default.use_gravatar', '0') == '1') @stack('picture_input_start') From 330aee0dde11f3ecc4020a3ee5a6d5007bfca2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sun, 26 Jul 2020 20:07:07 +0300 Subject: [PATCH 153/208] allow multi-line invoice notes/footer --- resources/views/portal/invoices/show.blade.php | 2 +- resources/views/portal/invoices/signed.blade.php | 2 +- resources/views/sales/invoices/print_classic.blade.php | 4 ++-- resources/views/sales/invoices/print_default.blade.php | 4 ++-- resources/views/sales/invoices/print_modern.blade.php | 4 ++-- resources/views/sales/invoices/show.blade.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php index cdc985bbc..193435737 100644 --- a/resources/views/portal/invoices/show.blade.php +++ b/resources/views/portal/invoices/show.blade.php @@ -222,7 +222,7 @@
    		@if ($invoice->notes)

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

    -

    {{ $invoice->notes }}

    +

    {!! nl2br($invoice->notes) !!}

    @endif
    @if ($invoice->notes)

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

    -

    {{ $invoice->notes }}

    +

    {!! nl2br($invoice->notes) !!}

    @endif

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

    -

    {{ $invoice->notes }}

    +

    {!! nl2br($invoice->notes) !!}
    {{ trans($total->title) }}:@money($total->amount, $invoice->currency_code, true)
    {{ trans($total->title) }}:@money($total->amount, $invoice->currency_code, true)
    {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
    {{ trans($total->name) }}:@money($total->amount - $invoice->paid, $invoice->currency_code, true)
    {{ trans($total->name) }}:@money($total->amount - $invoice->paid, $invoice->currency_code, true)
    {{ trans($total['name']) }}: @money($total->amount, $invoice->currency_code, true)
    {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
    {{ trans($total['name']) }}: @money($total->amount - $invoice->paid, $invoice->currency_code, true)
    {{ trans($total->title) }}:@money($total->amount, $bill->currency_code, true)
    {{ trans($total->title) }}:@money($total->amount, $bill->currency_code, true)
    {{ trans('bills.paid') }}: - @money($bill->paid, $bill->currency_code, true)
    {{ trans($total->name) }}:@money($total->amount - $bill->paid, $bill->currency_code, true)
    {{ trans($total->name) }}:@money($total->amount - $bill->paid, $bill->currency_code, true)
    {{ trans($total->title) }}:@money($total->amount, $invoice->currency_code, true)
    {{ trans($total->title) }}:@money($total->amount, $invoice->currency_code, true)
    {{ trans('invoices.paid') }}: - @money($invoice->paid, $invoice->currency_code, true)
    {{ trans($total->name) }}:@money($total->amount - $invoice->paid, $invoice->currency_code, true)
    {{ trans($total->name) }}:@money($total->amount - $invoice->paid, $invoice->currency_code, true)
    - {!! nl2br(setting('company.address')) !!} -
    - @if (setting('company.tax_number')) + @if (setting('company.address')) +
    + {!! nl2br(setting('company.address')) !!} +
    {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} - @endif -
    - @if (setting('company.phone')) +
    {{ setting('company.phone') }} - @endif -
    {{ setting('company.email') }} @@ -261,38 +263,50 @@ @stack('name_input_end')
    - @stack('address_input_start') - {!! nl2br($invoice->contact_address) !!} - @stack('address_input_end') -
    - @stack('tax_number_input_start') - @if ($invoice->contact_tax_number) - {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }} - @endif - @stack('tax_number_input_end') -
    - @stack('phone_input_start') - @if ($invoice->contact_phone) - {{ $invoice->contact_phone }} - @endif - @stack('phone_input_end') -
    - @stack('email_start') - {{ $invoice->contact_email }} - @stack('email_input_end') -
    + @stack('address_input_start') + @if ($invoice->contact_address) + {!! nl2br($invoice->contact_address) !!} + @endif + @stack('address_input_end') +
    + @stack('tax_number_input_start') + @if ($invoice->contact_tax_number) + {{ trans('general.tax_number') }}: {{ $invoice->contact_tax_number }} + @endif + @stack('tax_number_input_end') +
    + @stack('phone_input_start') + @if ($invoice->contact_phone) + {{ $invoice->contact_phone }} + @endif + @stack('phone_input_end') +
    + @stack('email_start') + @if ($invoice->contact_email) + {{ $invoice->contact_email }} + @endif + @stack('email_input_end') +
    From 0117849245c1c56cfbda9b7a31934e10cab305a8 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Mon, 10 Aug 2020 00:46:06 +0000 Subject: [PATCH 173/208] new crowdin translations --- resources/lang/da-DK/reconciliations.php | 1 + resources/lang/pt-PT/reconciliations.php | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/lang/da-DK/reconciliations.php b/resources/lang/da-DK/reconciliations.php index c6aa0c11d..5c9a67f54 100644 --- a/resources/lang/da-DK/reconciliations.php +++ b/resources/lang/da-DK/reconciliations.php @@ -4,6 +4,7 @@ return [ 'reconcile' => 'Afstemme', 'reconciled' => 'Afstemt', + 'opening_balance' => 'Åbningsbalance', 'closing_balance' => 'Primo saldo', 'unreconciled' => 'Uafstemt', 'transactions' => 'Transaktioner', diff --git a/resources/lang/pt-PT/reconciliations.php b/resources/lang/pt-PT/reconciliations.php index f99990725..b1c05138f 100644 --- a/resources/lang/pt-PT/reconciliations.php +++ b/resources/lang/pt-PT/reconciliations.php @@ -4,6 +4,7 @@ return [ 'reconcile' => 'Reconciliar', 'reconciled' => 'Reconciliado', + 'opening_balance' => 'Saldo Inicial', 'closing_balance' => 'Balanço Final', 'unreconciled' => 'Não Reconciliado', 'transactions' => 'Transações', From 004020705d2f1091b8d9cd3da25e2b8a5e6e8a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 10 Aug 2020 09:52:38 +0300 Subject: [PATCH 174/208] refs #1564 for bill show page.. --- .../views/purchases/bills/show.blade.php | 126 ++++++++++-------- 1 file changed, 70 insertions(+), 56 deletions(-) diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index f0027869c..c74c3b7fd 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -199,25 +199,27 @@ {{ setting('company.name') }} - - - {!! nl2br(setting('company.address')) !!} - - - - - @if (setting('company.tax_number')) + @if (setting('company.address')) + + + {!! nl2br(setting('company.address')) !!} + + + @endif + @if (setting('company.tax_number')) + + {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} - @endif - - - - - @if (setting('company.phone')) + + + @endif + @if (setting('company.phone')) + + {{ setting('company.phone') }} - @endif - - + + + @endif {{ setting('company.email') }} @@ -244,38 +246,50 @@ @stack('name_input_end') - - - @stack('address_input_start') - {!! nl2br($bill->contact_address) !!} - @stack('address_input_end') - - - - - @stack('tax_number_input_start') - @if ($bill->contact_tax_number) - {{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }} - @endif - @stack('tax_number_input_end') - - - - - @stack('phone_input_start') - @if ($bill->contact_phone) - {{ $bill->contact_phone }} - @endif - @stack('phone_input_end') - - - - - @stack('email_start') - {{ $bill->contact_email }} - @stack('email_input_end') - - + @if ($invoice->contact_address || $__env->hasStack('address_input_start', 'address_input_end')) + + + @stack('address_input_start') + @if ($bill->contact_address) + {!! nl2br($bill->contact_address) !!} + @endif + @stack('address_input_end') + + + @endif + @if ($invoice->contact_tax_number || $__env->hasStack('tax_number_input_start', 'tax_number_input_end')) + + + @stack('tax_number_input_start') + @if ($bill->contact_tax_number) + {{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }} + @endif + @stack('tax_number_input_end') + + + @endif + @if ($invoice->contact_phone || $__env->hasStack('phone_input_start', 'phone_input_end')) + + + @stack('phone_input_start') + @if ($bill->contact_phone) + {{ $bill->contact_phone }} + @endif + @stack('phone_input_end') + + + @endif + @if ($invoice->contact_email || $__env->hasStack('email_start', 'email_input_end')) + + + @stack('email_start') + @if ($bill->contact_email) + {{ $bill->contact_email }} + @endif + @stack('email_input_end') + + + @endif
    @@ -370,7 +384,7 @@

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

    -

    {{ $bill->notes }}

    +

    {!! nl2br($bill->notes) !!}

    @endif @@ -431,9 +445,9 @@
    @stack('button_edit_start') @if(!$bill->reconciled) - -   {{ trans('general.edit') }} - + +   {{ trans('general.edit') }} + @endif @stack('button_edit_end') @@ -449,13 +463,13 @@ diff --git a/resources/views/wizard/companies/edit.blade.php b/resources/views/wizard/companies/edit.blade.php index d61931da6..a93c4c280 100644 --- a/resources/views/wizard/companies/edit.blade.php +++ b/resources/views/wizard/companies/edit.blade.php @@ -67,7 +67,7 @@ '
    ' . ' ' . trans('general.save') . '', [':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!} - + {{ trans('general.skip') }} diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php index 02fcace59..145c8b3ca 100644 --- a/resources/views/wizard/currencies/index.blade.php +++ b/resources/views/wizard/currencies/index.blade.php @@ -123,13 +123,13 @@
    - + {{ trans('pagination.previous') }}
    - + {{ trans('pagination.next') }} diff --git a/resources/views/wizard/finish/index.blade.php b/resources/views/wizard/finish/index.blade.php index 9a6767650..0edf9c72c 100644 --- a/resources/views/wizard/finish/index.blade.php +++ b/resources/views/wizard/finish/index.blade.php @@ -50,13 +50,13 @@
    - + {{ trans('pagination.previous') }}
    - + {{ trans('general.go_to_dashboard') }} diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php index 846b99998..5648f588d 100644 --- a/resources/views/wizard/taxes/index.blade.php +++ b/resources/views/wizard/taxes/index.blade.php @@ -106,13 +106,13 @@
    - + {{ trans('pagination.previous') }}
    - + {{ trans('pagination.next') }} From d415cd6ae8a9c4ad69899e75b0660dd6104c5206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 12 Aug 2020 02:33:40 +0300 Subject: [PATCH 181/208] catch process exceptions --- app/Console/Commands/UpdateAll.php | 2 +- app/Utilities/Console.php | 35 +++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/app/Console/Commands/UpdateAll.php b/app/Console/Commands/UpdateAll.php index df4fc26b3..e69419beb 100644 --- a/app/Console/Commands/UpdateAll.php +++ b/app/Console/Commands/UpdateAll.php @@ -61,7 +61,7 @@ class UpdateAll extends Command $command = "update {$alias} {$company_id}"; - if (true !== $result = Console::run($command, true)) { + if (true !== $result = Console::run($command)) { $message = !empty($result) ? $result : trans('modules.errors.finish', ['module' => $alias]); $this->error($message); diff --git a/app/Utilities/Console.php b/app/Utilities/Console.php index 1ed13c947..dccab67f1 100644 --- a/app/Utilities/Console.php +++ b/app/Utilities/Console.php @@ -3,29 +3,48 @@ namespace App\Utilities; use Illuminate\Console\Application; +use Illuminate\Support\Str; +use Symfony\Component\Process\Exception\InvalidArgumentException; +use Symfony\Component\Process\Exception\LogicException; +use Symfony\Component\Process\Exception\ProcessFailedException; +use Symfony\Component\Process\Exception\RuntimeException; use Symfony\Component\Process\Process; class Console { - public static function run($string, $all_output = false, $timeout = 0) + public static function run($string, $timeout = 0) { $command = Application::formatCommandString($string); logger('Console command:: ' . $command); - $process = Process::fromShellCommandline($command, base_path()); - $process->setTimeout($timeout); + try { + $process = Process::fromShellCommandline($command, base_path()); + $process->setTimeout($timeout); - $process->run(); + $process->mustRun(); - if ($process->isSuccessful()) { - return true; + $output = $process->getOutput(); + + if (static::isValidOutput($output)) { + return true; + } + } catch (InvalidArgumentException | LogicException | ProcessFailedException | RuntimeException $e) { + $output = $e->getMessage(); } - $output = $all_output ? $process->getOutput() : $process->getErrorOutput(); - logger('Console output:: ' . $output); return $output; } + + public static function isValidOutput($output) + { + $errors = [ + 'Content-Type: application/json', + 'CSRF token mismatch', + ]; + + return !Str::contains($output, $errors); + } } From 8646d3a2a423afbecc854b63dffb066f1e1d6374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 12 Aug 2020 11:06:41 +0300 Subject: [PATCH 182/208] use laravel function --- resources/views/partials/admin/pagination.blade.php | 2 +- resources/views/partials/portal/pagination.blade.php | 2 +- resources/views/partials/wizard/pagination.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/admin/pagination.blade.php b/resources/views/partials/admin/pagination.blade.php index 22aa3699c..727c218c9 100644 --- a/resources/views/partials/admin/pagination.blade.php +++ b/resources/views/partials/admin/pagination.blade.php @@ -10,7 +10,7 @@
    @else diff --git a/resources/views/partials/portal/pagination.blade.php b/resources/views/partials/portal/pagination.blade.php index 77cdc0523..8507249f1 100644 --- a/resources/views/partials/portal/pagination.blade.php +++ b/resources/views/partials/portal/pagination.blade.php @@ -13,7 +13,7 @@
    @else diff --git a/resources/views/partials/wizard/pagination.blade.php b/resources/views/partials/wizard/pagination.blade.php index 9a366c4d0..78fdcd35b 100644 --- a/resources/views/partials/wizard/pagination.blade.php +++ b/resources/views/partials/wizard/pagination.blade.php @@ -4,7 +4,7 @@ {{ trans('pagination.showing', ['first' => $items->firstItem(), 'last' => $items->lastItem(), 'total' => $items->total(), 'type' => strtolower(trans_choice('general.' . $type, 2))]) }}
    - {!! $items->withPath(request()->url())->appends(request()->except('page'))->links() !!} + {!! $items->withPath(request()->url())->withQueryString()->links() !!}
    @else
    From c55cf2939c30a3c35212d069945982b6ec42ed18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 12 Aug 2020 12:53:57 +0300 Subject: [PATCH 183/208] refs #1568 github action issue solved. --- resources/views/wizard/currencies/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/wizard/currencies/index.blade.php b/resources/views/wizard/currencies/index.blade.php index 145c8b3ca..72fe26951 100644 --- a/resources/views/wizard/currencies/index.blade.php +++ b/resources/views/wizard/currencies/index.blade.php @@ -123,7 +123,7 @@
    - + {{ trans('pagination.previous') }} From 2fb9ec666f803ea0db387125335753615179558c Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 14 Aug 2020 00:27:40 +0000 Subject: [PATCH 184/208] new crowdin translations --- resources/lang/el-GR/bills.php | 10 +++++++++- resources/lang/nb-NO/install.php | 1 + resources/lang/nb-NO/reconciliations.php | 1 + resources/lang/nb-NO/taxes.php | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/lang/el-GR/bills.php b/resources/lang/el-GR/bills.php index fb69d8724..768868cd1 100644 --- a/resources/lang/el-GR/bills.php +++ b/resources/lang/el-GR/bills.php @@ -13,6 +13,7 @@ return [ 'price' => 'Τιμή', 'sub_total' => 'Μερικό Σύνολο', 'discount' => 'Έκπτωση', + 'item_discount' => 'Έκπτωση', 'tax_total' => 'Συνολικό ΦΠΑ', 'total' => 'Σύνολο', @@ -28,7 +29,9 @@ return [ 'histories' => 'Ιστορικό', 'payments' => 'Πληρωμές', 'add_payment' => 'Προσθήκη πληρωμής', + 'mark_paid' => 'Πληρώθηκε', 'mark_received' => 'Ειλημμένη σημείωση', + 'mark_cancelled' => 'Ακύρωση', 'download_pdf' => 'Λήψη PDF', 'send_mail' => 'Αποστολή Email', 'create_bill' => 'Δημιουργία Λογαριασμού', @@ -40,10 +43,15 @@ return [ 'received' => 'Ληφθέντα', 'partial' => 'Μερική', 'paid' => 'Πληρωμένο', + 'overdue' => 'Εκπρόθεσμο', + 'unpaid' => 'Απλήρωτο', + 'cancelled' => 'Άκυρο', ], 'messages' => [ - 'received' => 'Λογαριασμός που σημειώθηκε ότι ελήφθη επιτυχώς!', + 'marked_received' => 'Ο λογαριασμός επισημάνθηκε ως παραληφθείς!', + 'marked_paid' => 'Ο λογαριασμός επισημάνθηκε ως πληρωμένος!', + 'marked_cancelled' => 'Ο λογαριασμός επισημάνθηκε ως ακυρωμένος!', 'draft' => 'Αυτός ο λογαριασμός είναι ΠΡΟΧΕΙΡΟΣ και θα εμφανιστεί στα γραφήματα μετά την παραλαβή του.', 'status' => [ diff --git a/resources/lang/nb-NO/install.php b/resources/lang/nb-NO/install.php index 51fb2859a..31a28bba7 100644 --- a/resources/lang/nb-NO/install.php +++ b/resources/lang/nb-NO/install.php @@ -39,6 +39,7 @@ return [ ], 'error' => [ + 'php_version' => 'Feil: Be din tjenesteleverandør om å bruke PHP :php_version eller høyere for både HTTP og CLI.', 'connection' => 'Feil: Kunne ikke koble til databasen. Påse at opplysningene er riktig.', ], diff --git a/resources/lang/nb-NO/reconciliations.php b/resources/lang/nb-NO/reconciliations.php index 43636cdb9..a19feb2c7 100644 --- a/resources/lang/nb-NO/reconciliations.php +++ b/resources/lang/nb-NO/reconciliations.php @@ -4,6 +4,7 @@ return [ 'reconcile' => 'Avstem', 'reconciled' => 'Avstemt', + 'opening_balance' => 'Åpningsbalanse', 'closing_balance' => 'Sluttbalanse', 'unreconciled' => 'Uavstemt', 'transactions' => 'Transaksjoner', diff --git a/resources/lang/nb-NO/taxes.php b/resources/lang/nb-NO/taxes.php index 13f260603..8d675f1e6 100644 --- a/resources/lang/nb-NO/taxes.php +++ b/resources/lang/nb-NO/taxes.php @@ -8,4 +8,5 @@ return [ 'inclusive' => 'Inklusiv', 'compound' => 'Tillegg', 'fixed' => 'Fastsatt', + 'withholding' => 'Kildeskatt', ]; From 0d8f524faddf0eb4e544615415aac12ae42cb6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 14 Aug 2020 22:56:22 +0300 Subject: [PATCH 185/208] more stacks --- .../views/purchases/bills/show.blade.php | 32 ++++++++++++++----- resources/views/sales/invoices/show.blade.php | 32 ++++++++++++++----- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php index c74c3b7fd..9c626a04d 100644 --- a/resources/views/purchases/bills/show.blade.php +++ b/resources/views/purchases/bills/show.blade.php @@ -523,7 +523,7 @@ @stack('row_footer_start')
    - @stack('row_footer_history_start') + @stack('row_footer_histories_start')
    @@ -534,20 +534,28 @@
    + @stack('row_footer_histories_head_tr_start') - + @stack('row_footer_histories_head_td_start') + - + + @stack('row_footer_histories_head_td_end') + @stack('row_footer_histories_head_tr_end') + @stack('row_footer_histories_body_tr_start') @foreach($bill->histories as $history) - + @stack('row_footer_histories_body_td_start') + - + + @stack('row_footer_histories_body_td_end') @endforeach + @stack('row_footer_histories_body_tr_end')
    {{ trans('general.date') }}{{ trans('general.date') }} {{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}{{ trans('general.description') }}
    @date($history->created_at)@date($history->created_at) {{ trans('bills.statuses.' . $history->status) }}{{ $history->description }}{{ $history->description }}
    @@ -555,9 +563,9 @@
    - @stack('row_footer_history_end') + @stack('row_footer_histories_end') - @stack('row_footer_transaction_start') + @stack('row_footer_transactions_start')
    @@ -568,17 +576,23 @@
    + @stack('row_footer_transactions_head_tr_start') + @stack('row_footer_transactions_head_td_start') + @stack('row_footer_transactions_head_td_end') + @stack('row_footer_transactions_head_tr_end') + @stack('row_footer_transactions_body_tr_start') @if ($bill->transactions->count()) @foreach($bill->transactions as $transaction) + @stack('row_footer_transactions_body_td_start') @@ -602,6 +616,7 @@ )) !!} @endif + @stack('row_footer_transactions_body_td_end') @endforeach @else @@ -613,6 +628,7 @@ @endif + @stack('row_footer_transactions_body_tr_end')
    {{ trans('general.date') }} {{ trans('general.amount') }} {{ trans_choice('general.accounts', 1) }} {{ trans('general.actions') }}
    @date($transaction->paid_at) @money($transaction->amount, $transaction->currency_code, true) {{ $transaction->account->name }}
    @@ -620,7 +636,7 @@
    - @stack('row_footer_transaction_end') + @stack('row_footer_transactions_end')
    @stack('row_footer_end') diff --git a/resources/views/sales/invoices/show.blade.php b/resources/views/sales/invoices/show.blade.php index c96c48deb..a57843b54 100644 --- a/resources/views/sales/invoices/show.blade.php +++ b/resources/views/sales/invoices/show.blade.php @@ -558,7 +558,7 @@ @stack('row_footer_start')
    - @stack('row_footer_history_start') + @stack('row_footer_histories_start')
    @@ -569,20 +569,28 @@
    + @stack('row_footer_histories_head_tr_start') - + @stack('row_footer_histories_head_start') + - + + @stack('row_footer_histories_head_end') + @stack('row_footer_histories_head_tr_end') + @stack('row_footer_histories_body_tr_start') @foreach($invoice->histories as $history) - + @stack('row_footer_histories_body_td_start') + - + + @stack('row_footer_histories_body_td_end') @endforeach + @stack('row_footer_histories_body_tr_end')
    {{ trans('general.date') }}{{ trans('general.date') }} {{ trans_choice('general.statuses', 1) }}{{ trans('general.description') }}{{ trans('general.description') }}
    @date($history->created_at)@date($history->created_at) {{ trans('invoices.statuses.' . $history->status) }}{{ $history->description }}{{ $history->description }}
    @@ -590,9 +598,9 @@
    - @stack('row_footer_history_end') + @stack('row_footer_histories_end') - @stack('row_footer_transaction_start') + @stack('row_footer_transactions_start')
    @@ -603,17 +611,23 @@
    + @stack('row_footer_transactions_head_tr_start') + @stack('row_footer_transactions_head_td_start') + @stack('row_footer_transactions_head_td_end') + @stack('row_footer_transactions_head_tr_end') + @stack('row_footer_transactions_body_tr_start') @if ($invoice->transactions->count()) @foreach($invoice->transactions as $transaction) + @stack('row_footer_transactions_body_td_start') @@ -637,6 +651,7 @@ )) !!} @endif + @stack('row_footer_transactions_body_td_end') @endforeach @else @@ -648,6 +663,7 @@ @endif + @stack('row_footer_transactions_body_tr_end')
    {{ trans('general.date') }} {{ trans('general.amount') }} {{ trans_choice('general.accounts', 1) }} {{ trans('general.actions') }}
    @date($transaction->paid_at) @money($transaction->amount, $transaction->currency_code, true) {{ $transaction->account->name }}
    @@ -655,7 +671,7 @@
    - @stack('row_footer_transaction_end') + @stack('row_footer_transactions_end')
    @stack('row_footer_end') From c63515c21cbd669d1bff3c7c4b1a0118eaaafabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 14 Aug 2020 23:15:54 +0300 Subject: [PATCH 186/208] added invoice paid calculation event --- app/Abstracts/DocumentModel.php | 9 ++++++++- app/Events/Sale/InvoicePaidCalculated.php | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app/Events/Sale/InvoicePaidCalculated.php diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php index 4235a5822..203151605 100644 --- a/app/Abstracts/DocumentModel.php +++ b/app/Abstracts/DocumentModel.php @@ -3,6 +3,7 @@ namespace App\Abstracts; use App\Abstracts\Model; +use App\Events\Sale\InvoicePaidCalculated; use App\Models\Setting\Tax; use App\Traits\Currencies; use App\Traits\DateTime; @@ -115,7 +116,13 @@ abstract class DocumentModel extends Model $this->setAttribute('reconciled', $reconciled); - return round($paid, $precision); + // TODO: find a cleaner way compatible with observer pattern + $i = new \stdClass(); + $i->paid = $paid; + + event(new InvoicePaidCalculated($i)); + + return round($i->paid, $precision); } /** * Get the status label. diff --git a/app/Events/Sale/InvoicePaidCalculated.php b/app/Events/Sale/InvoicePaidCalculated.php new file mode 100644 index 000000000..e092e077a --- /dev/null +++ b/app/Events/Sale/InvoicePaidCalculated.php @@ -0,0 +1,22 @@ +invoice = $invoice; + } +} From 87548609a6c7997579439b123087053160f3562c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Sat, 15 Aug 2020 17:48:37 +0300 Subject: [PATCH 187/208] send the document clone to event --- app/Abstracts/DocumentModel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php index 203151605..7cd722822 100644 --- a/app/Abstracts/DocumentModel.php +++ b/app/Abstracts/DocumentModel.php @@ -117,12 +117,12 @@ abstract class DocumentModel extends Model $this->setAttribute('reconciled', $reconciled); // TODO: find a cleaner way compatible with observer pattern - $i = new \stdClass(); - $i->paid = $paid; + $invoice = clone $this; + $invoice->paid_amount = $paid; - event(new InvoicePaidCalculated($i)); + event(new InvoicePaidCalculated($invoice)); - return round($i->paid, $precision); + return round($invoice->paid_amount, $precision); } /** * Get the status label. From 3eec900bc6c226412c2fbd501c1bd6380a92a5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 17 Aug 2020 11:18:41 +0300 Subject: [PATCH 188/208] included models to ide helper --- .gitignore | 1 + composer.json | 4 +- config/ide-helper.php | 103 ++++++++++++++++++++++++++++-------------- 3 files changed, 73 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 09039e51b..5d4800791 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,7 @@ npm-debug.log .env.example robots.txt _ide_helper.php +_ide_helper_models.php .phpstorm.meta.php /storage/debugbar/* .phpunit.result.cache diff --git a/composer.json b/composer.json index c16db87f3..ec7ba36e1 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "akaunting/version": "1.0.*", "barryvdh/laravel-debugbar": "3.3.*", "barryvdh/laravel-dompdf": "0.*", - "barryvdh/laravel-ide-helper": "2.7.*", + "barryvdh/laravel-ide-helper": "2.8.*", "bkwld/cloner": "3.7.*", "consoletvs/charts": "6.5.*", "dingo/api": "3.0.*", @@ -104,6 +104,7 @@ "Illuminate\\Foundation\\ComposerScripts::postInstall", "php artisan ide-helper:generate", "php artisan ide-helper:meta", + "php artisan ide-helper:models --nowrite", "php artisan clear-compiled", "composer dump-autoload" ], @@ -111,6 +112,7 @@ "Illuminate\\Foundation\\ComposerScripts::postUpdate", "php artisan ide-helper:generate", "php artisan ide-helper:meta", + "php artisan ide-helper:models --nowrite", "php artisan clear-compiled", "composer dump-autoload" ], diff --git a/config/ide-helper.php b/config/ide-helper.php index 16c87c06a..1d579eba0 100644 --- a/config/ide-helper.php +++ b/config/ide-helper.php @@ -1,6 +1,6 @@ '_ide_helper', 'format' => 'php', + /* + |-------------------------------------------------------------------------- + | Where to write the PhpStorm specific meta file + |-------------------------------------------------------------------------- + | + | PhpStorm also supports the directory `.phpstorm.meta.php/` with arbitrary + | files in it, should you need additional files for your project; e.g. + | `.phpstorm.meta.php/laravel_ide_Helper.php'. + | + */ 'meta_filename' => '.phpstorm.meta.php', /* @@ -23,6 +34,7 @@ return [ | Set to true to generate commonly used Fluent methods | */ + 'include_fluent' => true, /* @@ -34,6 +46,7 @@ return [ | method auto-completion. | */ + 'include_factory_builders' => false, /* @@ -44,7 +57,19 @@ return [ | Set to false to disable write magic methods of model | */ - 'write_model_magic_where' => true, + + 'write_model_magic_where' => false, + + /* + |-------------------------------------------------------------------------- + | Write Model relation count properties + |-------------------------------------------------------------------------- + | + | Set to false to disable writing of relation count properties to model DocBlocks. + | + */ + + 'write_model_relation_count_properties' => false, /* |-------------------------------------------------------------------------- @@ -58,6 +83,7 @@ return [ | Please be aware that this setting changes a file within the /vendor directory. | */ + 'write_eloquent_model_mixins' => false, /* @@ -69,11 +95,12 @@ return [ | -- helpers (-H) option. Extra helper files can be included. | */ + 'include_helpers' => false, - 'helper_files' => [ + 'helper_files' => array( base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php', - ], + ), /* |-------------------------------------------------------------------------- @@ -83,11 +110,28 @@ return [ | Define in which directories the ide-helper:models command should look | for models. | + | glob patterns are supported to easier reach models in sub-directories, + | e.g. `app/Services/* /Models` (without the space) + | */ - 'model_locations' => [ - 'app/Models', - ], + 'model_locations' => array( + 'app/Models', + 'modules/*/Models' + ), + + /* + |-------------------------------------------------------------------------- + | Models to ignore + |-------------------------------------------------------------------------- + | + | Define which models should be ignored. + | + */ + + 'ignored_models' => array( + + ), /* |-------------------------------------------------------------------------- @@ -97,23 +141,13 @@ return [ | These implementations are not really extended, but called with magic functions | */ - 'extra' => [ - 'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'], - 'Session' => ['Illuminate\Session\Store'], - ], - 'magic' => [ - 'Log' => [ - 'debug' => 'Monolog\Logger::addDebug', - 'info' => 'Monolog\Logger::addInfo', - 'notice' => 'Monolog\Logger::addNotice', - 'warning' => 'Monolog\Logger::addWarning', - 'error' => 'Monolog\Logger::addError', - 'critical' => 'Monolog\Logger::addCritical', - 'alert' => 'Monolog\Logger::addAlert', - 'emergency' => 'Monolog\Logger::addEmergency', - ], - ], + 'extra' => array( + 'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'), + 'Session' => array('Illuminate\Session\Store'), + ), + + 'magic' => array(), /* |-------------------------------------------------------------------------- @@ -124,9 +158,10 @@ return [ | are detected by the helpers, others can be listed below. | */ - 'interfaces' => [ - ], + 'interfaces' => array( + + ), /* |-------------------------------------------------------------------------- @@ -154,9 +189,9 @@ return [ | ), | */ - 'custom_db_types' => [ + 'custom_db_types' => array( - ], + ), /* |-------------------------------------------------------------------------- @@ -171,13 +206,13 @@ return [ | | For example, normally you would see this: | - | * @property \Carbon\Carbon $created_at - | * @property \Carbon\Carbon $updated_at + | * @property \Illuminate\Support\Carbon $created_at + | * @property \Illuminate\Support\Carbon $updated_at | | With this enabled, the properties will be this: | - | * @property \Carbon\Carbon $createdAt - | * @property \Carbon\Carbon $updatedAt + | * @property \Illuminate\Support\Carbon $createdAt + | * @property \Illuminate\Support\Carbon $updatedAt | | Note, it is currently an all-or-nothing option. | @@ -192,10 +227,10 @@ return [ | Cast the given "real type" to the given "type". | */ - 'type_overrides' => [ + 'type_overrides' => array( 'integer' => 'int', 'boolean' => 'bool', - ], + ), /* |-------------------------------------------------------------------------- @@ -208,4 +243,4 @@ return [ */ 'include_class_docblocks' => false, -]; +); From 909ad2da6d191130ef33081e55336fb7ab4ac706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 17 Aug 2020 11:19:11 +0300 Subject: [PATCH 189/208] composer lock --- composer.lock | 265 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 172 insertions(+), 93 deletions(-) diff --git a/composer.lock b/composer.lock index 852e14aa9..253d5b6c2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "bbdd9ace718fa625472523fd9e6982c9", + "content-hash": "c07529fd0a6749001793d3c806ecace5", "packages": [ { "name": "akaunting/firewall", @@ -667,39 +667,42 @@ }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.7.0", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc" + "reference": "ba95d18ef55c91295250ae8b7bfa73d8fb866b9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5f677edc14bdcfdcac36633e6eea71b2728a4dbc", - "reference": "5f677edc14bdcfdcac36633e6eea71b2728a4dbc", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/ba95d18ef55c91295250ae8b7bfa73d8fb866b9b", + "reference": "ba95d18ef55c91295250ae8b7bfa73d8fb866b9b", "shasum": "" }, "require": { "barryvdh/reflection-docblock": "^2.0.6", - "composer/composer": "^1.6", + "composer/composer": "^1.6 || ^2.0@dev", "doctrine/dbal": "~2.3", - "illuminate/console": "^5.5|^6|^7", - "illuminate/filesystem": "^5.5|^6|^7", - "illuminate/support": "^5.5|^6|^7", - "php": ">=7.2" + "illuminate/console": "^5.5 || ^6 || ^7", + "illuminate/filesystem": "^5.5 || ^6 || ^7", + "illuminate/support": "^5.5 || ^6 || ^7", + "php": ">=7.2", + "phpdocumentor/type-resolver": "^1.1.0" }, "require-dev": { - "illuminate/config": "^5.5|^6|^7", - "illuminate/view": "^5.5|^6|^7", + "illuminate/config": "^5.5 || ^6 || ^7", + "illuminate/view": "^5.5 || ^6 || ^7", "mockery/mockery": "^1.3", - "orchestra/testbench": "^3|^4|^5", - "phpro/grumphp": "^0.17.1", - "squizlabs/php_codesniffer": "^3" + "orchestra/testbench": "^3.5 || ^4 || ^5", + "phpro/grumphp": "^0.19.0", + "spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" }, "laravel": { "providers": [ @@ -740,7 +743,7 @@ "type": "github" } ], - "time": "2020-04-22T09:57:26+00:00" + "time": "2020-08-10T08:22:48+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -1343,6 +1346,50 @@ "description": "The laravel charting package", "time": "2020-03-03T23:16:14+00:00" }, + { + "name": "cweagans/composer-patches", + "version": "1.6.7", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "2e6f72a2ad8d59cd7e2b729f218bf42adb14f590" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/2e6f72a2ad8d59cd7e2b729f218bf42adb14f590", + "reference": "2e6f72a2ad8d59cd7e2b729f218bf42adb14f590", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "time": "2019-08-29T20:11:49+00:00" + }, { "name": "dingo/api", "version": "v3.0.0", @@ -1516,16 +1563,16 @@ }, { "name": "doctrine/annotations", - "version": "1.10.3", + "version": "1.10.4", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d" + "reference": "bfe91e31984e2ba76df1c1339681770401ec262f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d", - "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/bfe91e31984e2ba76df1c1339681770401ec262f", + "reference": "bfe91e31984e2ba76df1c1339681770401ec262f", "shasum": "" }, "require": { @@ -1535,7 +1582,8 @@ }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^7.5" + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^9.1.5" }, "type": "library", "extra": { @@ -1581,7 +1629,7 @@ "docblock", "parser" ], - "time": "2020-05-25T17:24:27+00:00" + "time": "2020-08-10T19:35:50+00:00" }, { "name": "doctrine/cache", @@ -2205,16 +2253,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.18", + "version": "2.1.19", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441" + "reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441", - "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/840d5603eb84cc81a6a0382adac3293e57c1c64c", + "reference": "840d5603eb84cc81a6a0382adac3293e57c1c64c", "shasum": "" }, "require": { @@ -2259,7 +2307,7 @@ "validation", "validator" ], - "time": "2020-06-16T20:11:17+00:00" + "time": "2020-08-08T21:28:19+00:00" }, { "name": "fideloper/proxy", @@ -3306,16 +3354,16 @@ }, { "name": "laravel/framework", - "version": "v7.24.0", + "version": "v7.25.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "71bfb1f2f89e4e31fba539d43fe287143e635e68" + "reference": "fdf3d4a40447eb286ba3820768306cae64bcc0b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/71bfb1f2f89e4e31fba539d43fe287143e635e68", - "reference": "71bfb1f2f89e4e31fba539d43fe287143e635e68", + "url": "https://api.github.com/repos/laravel/framework/zipball/fdf3d4a40447eb286ba3820768306cae64bcc0b3", + "reference": "fdf3d4a40447eb286ba3820768306cae64bcc0b3", "shasum": "" }, "require": { @@ -3459,20 +3507,20 @@ "framework", "laravel" ], - "time": "2020-08-07T15:13:57+00:00" + "time": "2020-08-11T13:43:10+00:00" }, { "name": "laravel/tinker", - "version": "v2.4.1", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62" + "reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/3c9ef136ca59366bc1b50b7f2500a946d5149c62", - "reference": "3c9ef136ca59366bc1b50b7f2500a946d5149c62", + "url": "https://api.github.com/repos/laravel/tinker/zipball/58424c24e8aec31c3a3ac54eb3adb15e8a0a067b", + "reference": "58424c24e8aec31c3a3ac54eb3adb15e8a0a067b", "shasum": "" }, "require": { @@ -3523,7 +3571,7 @@ "laravel", "psysh" ], - "time": "2020-07-07T15:10:00+00:00" + "time": "2020-08-11T19:28:08+00:00" }, { "name": "laravel/ui", @@ -4834,16 +4882,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.7.0", + "version": "v4.8.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300" + "reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", - "reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8c58eb4cd4f3883f82611abeac2efbc3dbed787e", + "reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e", "shasum": "" }, "require": { @@ -4851,8 +4899,8 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" + "ircmaxell/php-yacc": "^0.0.6", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -4860,7 +4908,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.7-dev" + "dev-master": "4.8-dev" } }, "autoload": { @@ -4882,7 +4930,7 @@ "parser", "php" ], - "time": "2020-07-25T13:18:53+00:00" + "time": "2020-08-09T10:23:20+00:00" }, { "name": "omnipay/common", @@ -4968,16 +5016,16 @@ }, { "name": "opis/closure", - "version": "3.5.5", + "version": "3.5.6", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c" + "reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/dec9fc5ecfca93f45cd6121f8e6f14457dff372c", - "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c", + "url": "https://api.github.com/repos/opis/closure/zipball/e8d34df855b0a0549a300cb8cb4db472556e8aa9", + "reference": "e8d34df855b0a0549a300cb8cb4db472556e8aa9", "shasum": "" }, "require": { @@ -5025,7 +5073,7 @@ "serialization", "serialize" ], - "time": "2020-06-17T14:59:55+00:00" + "time": "2020-08-11T08:46:50+00:00" }, { "name": "paragonie/random_compat", @@ -5561,16 +5609,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.0", + "version": "5.2.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "3170448f5769fe19f456173d833734e0ff1b84df" + "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df", - "reference": "3170448f5769fe19f456173d833734e0ff1b84df", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44", + "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44", "shasum": "" }, "require": { @@ -5609,7 +5657,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2020-07-20T20:05:34+00:00" + "time": "2020-08-15T11:14:08+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -5888,19 +5936,20 @@ }, { "name": "predis/predis", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", - "url": "https://github.com/nrk/predis.git", - "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1" + "url": "https://github.com/predis/predis.git", + "reference": "82eb18c6c3860849cb6e2ff34b0c4b39d5daee46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1", - "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1", + "url": "https://api.github.com/repos/predis/predis/zipball/82eb18c6c3860849cb6e2ff34b0c4b39d5daee46", + "reference": "82eb18c6c3860849cb6e2ff34b0c4b39d5daee46", "shasum": "" }, "require": { + "cweagans/composer-patches": "^1.6", "php": ">=5.3.9" }, "require-dev": { @@ -5911,6 +5960,18 @@ "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" }, "type": "library", + "extra": { + "composer-exit-on-patch-failure": true, + "patches": { + "phpunit/phpunit-mock-objects": { + "Fix PHP 7 and 8 compatibility": "./tests/phpunit_mock_objects.patch" + }, + "phpunit/phpunit": { + "Fix PHP 7 compatibility": "./tests/phpunit_php7.patch", + "Fix PHP 8 compatibility": "./tests/phpunit_php8.patch" + } + } + }, "autoload": { "psr-4": { "Predis\\": "src/" @@ -5934,7 +5995,17 @@ "predis", "redis" ], - "time": "2016-06-16T16:22:20+00:00" + "funding": [ + { + "url": "https://www.paypal.me/tillkruss", + "type": "custom" + }, + { + "url": "https://github.com/tillkruss", + "type": "github" + } + ], + "time": "2020-08-11T17:28:15+00:00" }, { "name": "psr/container", @@ -6391,35 +6462,38 @@ }, { "name": "ramsey/collection", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca" + "reference": "044184884e3c803e4cbb6451386cb71562939b18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca", - "reference": "925ad8cf55ba7a3fc92e332c58fd0478ace3e1ca", + "url": "https://api.github.com/repos/ramsey/collection/zipball/044184884e3c803e4cbb6451386cb71562939b18", + "reference": "044184884e3c803e4cbb6451386cb71562939b18", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.2 || ^8" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", + "captainhook/captainhook": "^5.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "ergebnis/composer-normalize": "^2.6", "fzaninotto/faker": "^1.5", - "jakub-onderka/php-parallel-lint": "^1", + "hamcrest/hamcrest-php": "^2", "jangregor/phpstan-prophecy": "^0.6", "mockery/mockery": "^1.3", "phpstan/extension-installer": "^1", - "phpstan/phpdoc-parser": "0.4.1", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-mockery": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", + "phpstan/phpstan": "^0.12.32", + "phpstan/phpstan-mockery": "^0.12.5", + "phpstan/phpstan-phpunit": "^0.12.11", "phpunit/phpunit": "^8.5", - "slevomat/coding-standard": "^6.0", - "squizlabs/php_codesniffer": "^3.5" + "psy/psysh": "^0.10.4", + "slevomat/coding-standard": "^6.3", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^3.12.2" }, "type": "library", "autoload": { @@ -6439,7 +6513,6 @@ } ], "description": "A PHP 7.2+ library for representing and manipulating collections.", - "homepage": "https://github.com/ramsey/collection", "keywords": [ "array", "collection", @@ -6448,7 +6521,13 @@ "queue", "set" ], - "time": "2020-01-05T00:22:59+00:00" + "funding": [ + { + "url": "https://github.com/ramsey", + "type": "github" + } + ], + "time": "2020-08-11T00:57:21+00:00" }, { "name": "ramsey/uuid", @@ -6707,16 +6786,16 @@ }, { "name": "seld/jsonlint", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1" + "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", - "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/3d5eb71705adfa34bd34b993400622932b2f62fd", + "reference": "3d5eb71705adfa34bd34b993400622932b2f62fd", "shasum": "" }, "require": { @@ -6762,7 +6841,7 @@ "type": "tidelift" } ], - "time": "2020-04-30T19:05:18+00:00" + "time": "2020-08-13T09:07:59+00:00" }, { "name": "seld/phar-utils", @@ -9868,16 +9947,16 @@ }, { "name": "facade/ignition", - "version": "2.3.5", + "version": "2.3.6", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7" + "reference": "d7d05dba5a0bdbf018a2cb7be268f22f5d73eb81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/58dc4a8df3d41174c677a370b6779b694e4539e7", - "reference": "58dc4a8df3d41174c677a370b6779b694e4539e7", + "url": "https://api.github.com/repos/facade/ignition/zipball/d7d05dba5a0bdbf018a2cb7be268f22f5d73eb81", + "reference": "d7d05dba5a0bdbf018a2cb7be268f22f5d73eb81", "shasum": "" }, "require": { @@ -9936,7 +10015,7 @@ "laravel", "page" ], - "time": "2020-08-01T21:20:01+00:00" + "time": "2020-08-10T13:50:38+00:00" }, { "name": "facade/ignition-contracts", @@ -10147,16 +10226,16 @@ }, { "name": "mockery/mockery", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283" + "reference": "60fa2f67f6e4d3634bb4a45ff3171fa52215800d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", - "reference": "9b6f117dd7d36dc3858d8d8ddf9b3d584fcae283", + "url": "https://api.github.com/repos/mockery/mockery/zipball/60fa2f67f6e4d3634bb4a45ff3171fa52215800d", + "reference": "60fa2f67f6e4d3634bb4a45ff3171fa52215800d", "shasum": "" }, "require": { @@ -10165,7 +10244,7 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0|~9.0" + "phpunit/phpunit": "^5.7.10|^6.5|^7.5|^8.5|^9.3" }, "type": "library", "extra": { @@ -10208,7 +10287,7 @@ "test double", "testing" ], - "time": "2020-07-09T08:23:05+00:00" + "time": "2020-08-11T18:10:21+00:00" }, { "name": "myclabs/deep-copy", From a221ca22a48cfeaa7d618f968b3b196293f82228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 18 Aug 2020 10:01:02 +0300 Subject: [PATCH 190/208] Module item show page added multi support categories. --- resources/views/modules/item/pre_sale.blade.php | 12 ++++++++---- resources/views/modules/item/show.blade.php | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php index 53afcd27e..ef69e2db8 100644 --- a/resources/views/modules/item/pre_sale.blade.php +++ b/resources/views/modules/item/pre_sale.blade.php @@ -124,10 +124,14 @@ {{ Date::parse($module->updated_at)->diffForHumans() }} @endif - @if ($module->category) - - {{ trans_choice('general.categories', 1) }} - {{ $module->category->name }} + @if ($module->categories) + + {{ trans_choice('general.categories', (count($module->categories) > 1) ? 2 : 1) }} + + @foreach ($module->categories as $module_category) + {{ $module_category->name }}
    + @endforeach + @endif diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php index 4cb13814f..967b3e456 100644 --- a/resources/views/modules/item/show.blade.php +++ b/resources/views/modules/item/show.blade.php @@ -108,7 +108,7 @@ @endif
    - @php + @php $reviews = $module->app_reviews; @endphp @@ -280,10 +280,14 @@ {{ Date::parse($module->updated_at)->diffForHumans() }} @endif - @if ($module->category) + @if ($module->categories) - {{ trans_choice('general.categories', 1) }} - {{ $module->category->name }} + {{ trans_choice('general.categories', (count($module->categories) > 1) ? 2 : 1) }} + + @foreach ($module->categories as $module_category) + {{ $module_category->name }}
    + @endforeach + @endif From d87c39225962e60b3120a68ebea9c48ad4a93809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Wed, 19 Aug 2020 17:46:48 +0300 Subject: [PATCH 191/208] Fix hardcoded customer role id in UpdateContact Job --- app/Jobs/Common/UpdateContact.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Jobs/Common/UpdateContact.php b/app/Jobs/Common/UpdateContact.php index 9c8c9531c..1bfa3d1ca 100644 --- a/app/Jobs/Common/UpdateContact.php +++ b/app/Jobs/Common/UpdateContact.php @@ -3,6 +3,7 @@ namespace App\Jobs\Common; use App\Abstracts\Job; +use App\Models\Auth\Role; use App\Models\Auth\User; use App\Models\Common\Contact; @@ -70,11 +71,14 @@ class UpdateContact extends Job $data = $this->request->all(); $data['locale'] = setting('default.locale', 'en-GB'); - $user = User::create($data); - $user->roles()->attach(['3']); - $user->companies()->attach([session('company_id')]); + $customer_role = Role::all()->filter(function ($role) { + return $role->hasPermission('read-client-portal'); + })->first(); + + $user = User::create($data); + $user->roles()->attach($customer_role); + $user->companies()->attach(session('company_id')); - // St user id to request $this->request['user_id'] = $user->id; } From 95f5c8cd73be94ef1fc2808673ab12c37e743ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Thu, 20 Aug 2020 12:55:59 +0300 Subject: [PATCH 192/208] fixed reconciliation actions --- app/BulkActions/Banking/Reconciliations.php | 68 ++++++++++--------- app/Jobs/Banking/DeleteReconciliation.php | 2 +- app/Models/Banking/Transaction.php | 1 - resources/lang/en-GB/bulk_actions.php | 2 + resources/lang/en-GB/reconciliations.php | 1 + .../banking/reconciliations/index.blade.php | 16 ++--- 6 files changed, 49 insertions(+), 41 deletions(-) diff --git a/app/BulkActions/Banking/Reconciliations.php b/app/BulkActions/Banking/Reconciliations.php index 024614715..b8d3916bd 100644 --- a/app/BulkActions/Banking/Reconciliations.php +++ b/app/BulkActions/Banking/Reconciliations.php @@ -11,14 +11,14 @@ class Reconciliations extends BulkAction public $model = Reconciliation::class; public $actions = [ - 'enable' => [ - 'name' => 'general.enable', - 'message' => 'bulk_actions.message.enable', + 'reconcile' => [ + 'name' => 'reconciliations.reconcile', + 'message' => 'bulk_actions.message.reconcile', 'permission' => 'update-banking-reconciliations', ], - 'disable' => [ - 'name' => 'general.disable', - 'message' => 'bulk_actions.message.disable', + 'unreconcile' => [ + 'name' => 'reconciliations.unreconcile', + 'message' => 'bulk_actions.message.unreconcile', 'permission' => 'update-banking-reconciliations', ], 'delete' => [ @@ -28,37 +28,41 @@ class Reconciliations extends BulkAction ], ]; - public function enable($request) + public function reconcile($request) { $reconciliations = $this->getSelectedRecords($request); foreach ($reconciliations as $reconciliation) { - $reconciliation->enabled = 1; - $reconciliation->save(); + \DB::transaction(function () use ($reconciliation) { + $reconciliation->reconciled = 1; + $reconciliation->save(); - Transaction::where('account_id', $reconciliation->account_id) - ->reconciled() - ->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) { - $item->reconciled = 1; - $item->save(); - }); + Transaction::where('account_id', $reconciliation->account_id) + ->isNotReconciled() + ->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) { + $item->reconciled = 1; + $item->save(); + }); + }); } } - public function disable($request) + public function unreconcile($request) { $reconciliations = $this->getSelectedRecords($request); foreach ($reconciliations as $reconciliation) { - $reconciliation->enabled = 0; - $reconciliation->save(); + \DB::transaction(function () use ($reconciliation) { + $reconciliation->reconciled = 0; + $reconciliation->save(); - Transaction::where('account_id', $reconciliation->account_id) - ->reconciled() - ->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) { - $item->reconciled = 0; - $item->save(); - }); + Transaction::where('account_id', $reconciliation->account_id) + ->isReconciled() + ->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) { + $item->reconciled = 0; + $item->save(); + }); + }); } } @@ -67,14 +71,16 @@ class Reconciliations extends BulkAction $reconciliations = $this->getSelectedRecords($request); foreach ($reconciliations as $reconciliation) { - $reconciliation->delete(); + \DB::transaction(function () use ($reconciliation) { + $reconciliation->delete(); - Transaction::where('account_id', $reconciliation->account_id) - ->reconciled() - ->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) { - $item->reconciled = 0; - $item->save(); - }); + Transaction::where('account_id', $reconciliation->account_id) + ->isReconciled() + ->whereBetween('paid_at', [$reconciliation->started_at, $reconciliation->ended_at])->each(function ($item) { + $item->reconciled = 0; + $item->save(); + }); + }); } } } diff --git a/app/Jobs/Banking/DeleteReconciliation.php b/app/Jobs/Banking/DeleteReconciliation.php index ca5ae50e0..98de26b5c 100644 --- a/app/Jobs/Banking/DeleteReconciliation.php +++ b/app/Jobs/Banking/DeleteReconciliation.php @@ -30,7 +30,7 @@ class DeleteReconciliation extends Job $this->reconciliation->delete(); Transaction::where('account_id', $this->reconciliation->account_id) - ->reconciled() + ->isReconciled() ->whereBetween('paid_at', [$this->reconciliation->started_at, $this->reconciliation->ended_at])->each(function ($transaction) { $transaction->reconciled = 0; $transaction->save(); diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index 7680e291c..40002fb37 100644 --- a/app/Models/Banking/Transaction.php +++ b/app/Models/Banking/Transaction.php @@ -4,7 +4,6 @@ namespace App\Models\Banking; use App\Abstracts\Model; use App\Models\Setting\Category; -use App\Models\Setting\Currency; use App\Traits\Currencies; use App\Traits\DateTime; use App\Traits\Media; diff --git a/resources/lang/en-GB/bulk_actions.php b/resources/lang/en-GB/bulk_actions.php index 4c420c141..3706b8f20 100644 --- a/resources/lang/en-GB/bulk_actions.php +++ b/resources/lang/en-GB/bulk_actions.php @@ -16,6 +16,8 @@ return [ 'sent' => 'Are you sure you want to mark selected invoice as sent?|Are you sure you want to mark selected invoices as sent?', 'received' => 'Are you sure you want to mark selected bill as received?|Are you sure you want to mark selected bills as received?', 'cancelled' => 'Are you sure you want to cancel selected invoice/bill?|Are you sure you want to cancel selected invoices/bills?', + 'reconcile' => 'Are you sure you want to reconcile selected record?|Are you sure you want to reconcile selected records?', + 'unreconcile' => 'Are you sure you want to unreconcile selected record?|Are you sure you want to unreconcile selected records?', ], ]; diff --git a/resources/lang/en-GB/reconciliations.php b/resources/lang/en-GB/reconciliations.php index 967621945..04dede8ec 100644 --- a/resources/lang/en-GB/reconciliations.php +++ b/resources/lang/en-GB/reconciliations.php @@ -3,6 +3,7 @@ return [ 'reconcile' => 'Reconcile', + 'unreconcile' => 'Unreconcile', 'reconciled' => 'Reconciled', 'opening_balance' => 'Opening Balance', 'closing_balance' => 'Closing Balance', diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php index 08cf8ec26..edc0cb5f1 100644 --- a/resources/views/banking/reconciliations/index.blade.php +++ b/resources/views/banking/reconciliations/index.blade.php @@ -35,11 +35,11 @@ {{ Form::bulkActionAllGroup() }} @sortablelink('created_at', trans('general.created_date'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) - @sortablelink('account_id', trans_choice('general.accounts', 1)) - {{ trans('general.period') }} + @sortablelink('account_id', trans_choice('general.accounts', 1)) + {{ trans('general.period') }} @sortablelink('closing_balance', trans('reconciliations.closing_balance')) - @sortablelink('status', trans_choice('general.statuses', 1)) - {{ trans('general.actions') }} + @sortablelink('status', trans_choice('general.statuses', 1)) + {{ trans('general.actions') }} @@ -48,17 +48,17 @@ {{ Form::bulkActionGroup($item->id, $item->account->name) }} @date($item->created_at) - {{ $item->account->name }} - @date($item->started_at) - @date($item->ended_at) + {{ $item->account->name }} + @date($item->started_at) - @date($item->ended_at) @money($item->closing_balance, $item->account->currency_code, true) - + @if ($item->reconciled) {{ trans('reconciliations.reconciled') }} @else {{ trans('reconciliations.unreconciled') }} @endif - +