From dd9a10febdcf3ca2a26820c79408270a18ed2e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 30 May 2021 02:43:12 +0300 Subject: [PATCH 1/4] Changed api show and store method.. --- app/Http/Controllers/Api/Auth/Permissions.php | 4 ++-- app/Http/Controllers/Api/Auth/Roles.php | 4 ++-- app/Http/Controllers/Api/Auth/Users.php | 4 ++-- app/Http/Controllers/Api/Banking/Accounts.php | 4 ++-- app/Http/Controllers/Api/Banking/Reconciliations.php | 4 ++-- app/Http/Controllers/Api/Banking/Transactions.php | 4 ++-- app/Http/Controllers/Api/Banking/Transfers.php | 4 ++-- app/Http/Controllers/Api/Common/Companies.php | 4 ++-- app/Http/Controllers/Api/Common/Contacts.php | 4 ++-- app/Http/Controllers/Api/Common/Dashboards.php | 4 ++-- app/Http/Controllers/Api/Common/Items.php | 4 ++-- app/Http/Controllers/Api/Common/Reports.php | 4 ++-- app/Http/Controllers/Api/Document/DocumentTransactions.php | 4 ++-- app/Http/Controllers/Api/Document/Documents.php | 6 +++--- app/Http/Controllers/Api/Settings/Categories.php | 4 ++-- app/Http/Controllers/Api/Settings/Currencies.php | 4 ++-- app/Http/Controllers/Api/Settings/Settings.php | 6 +++--- app/Http/Controllers/Api/Settings/Taxes.php | 4 ++-- 18 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/Http/Controllers/Api/Auth/Permissions.php b/app/Http/Controllers/Api/Auth/Permissions.php index 530d24c2a..76b242ae5 100644 --- a/app/Http/Controllers/Api/Auth/Permissions.php +++ b/app/Http/Controllers/Api/Auth/Permissions.php @@ -32,7 +32,7 @@ class Permissions extends ApiController */ public function show(Permission $permission) { - return $this->response->item($permission, new Transformer()); + return $this->item($permission, new Transformer()); } /** @@ -45,7 +45,7 @@ class Permissions extends ApiController { $permission = $this->dispatch(new CreatePermission($request)); - return $this->response->created(route('api.permissions.show', $permission->id)); + return $this->response->created(route('api.permissions.show', $permission->id), $this->item($permission, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Auth/Roles.php b/app/Http/Controllers/Api/Auth/Roles.php index d9ad12c2c..fc88fc5ab 100644 --- a/app/Http/Controllers/Api/Auth/Roles.php +++ b/app/Http/Controllers/Api/Auth/Roles.php @@ -32,7 +32,7 @@ class Roles extends ApiController */ public function show(Role $role) { - return $this->response->item($role, new Transformer()); + return $this->item($role, new Transformer()); } /** @@ -45,7 +45,7 @@ class Roles extends ApiController { $role = $this->dispatch(new CreateRole($request)); - return $this->response->created(route('api.roles.show', $role->id)); + return $this->response->created(route('api.roles.show', $role->id), $this->item($role, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Auth/Users.php b/app/Http/Controllers/Api/Auth/Users.php index 6f4987b32..0610b6c64 100644 --- a/app/Http/Controllers/Api/Auth/Users.php +++ b/app/Http/Controllers/Api/Auth/Users.php @@ -39,7 +39,7 @@ class Users extends ApiController $user = User::with('companies', 'permissions', 'roles')->where('email', $id)->first(); } - return $this->response->item($user, new Transformer()); + return $this->item($user, new Transformer()); } /** @@ -52,7 +52,7 @@ class Users extends ApiController { $user = $this->dispatch(new CreateUser($request)); - return $this->response->created(route('api.users.show', $user->id)); + return $this->response->created(route('api.users.show', $user->id), $this->item($user, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Banking/Accounts.php b/app/Http/Controllers/Api/Banking/Accounts.php index 9b1490583..6471ef077 100644 --- a/app/Http/Controllers/Api/Banking/Accounts.php +++ b/app/Http/Controllers/Api/Banking/Accounts.php @@ -39,7 +39,7 @@ class Accounts extends ApiController $account = Account::where('number', $id)->first(); } - return $this->response->item($account, new Transformer()); + return $this->item($account, new Transformer()); } /** @@ -52,7 +52,7 @@ class Accounts extends ApiController { $account = $this->dispatch(new CreateAccount($request)); - return $this->response->created(route('api.accounts.show', $account->id)); + return $this->response->created(route('api.accounts.show', $account->id), $this->item($account, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Banking/Reconciliations.php b/app/Http/Controllers/Api/Banking/Reconciliations.php index e45d53d21..e4f2e2936 100644 --- a/app/Http/Controllers/Api/Banking/Reconciliations.php +++ b/app/Http/Controllers/Api/Banking/Reconciliations.php @@ -32,7 +32,7 @@ class Reconciliations extends ApiController */ public function show(Reconciliation $reconciliation) { - return $this->response->item($reconciliation, new Transformer()); + return $this->item($reconciliation, new Transformer()); } /** @@ -45,7 +45,7 @@ class Reconciliations extends ApiController { $reconciliation = $this->dispatch(new CreateReconciliation($request)); - return $this->response->created(route('api.reconciliations.show', $reconciliation->id)); + return $this->response->created(route('api.reconciliations.show', $reconciliation->id), $this->item($reconciliation, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Banking/Transactions.php b/app/Http/Controllers/Api/Banking/Transactions.php index 7ad0175d9..6861130ea 100644 --- a/app/Http/Controllers/Api/Banking/Transactions.php +++ b/app/Http/Controllers/Api/Banking/Transactions.php @@ -32,7 +32,7 @@ class Transactions extends ApiController */ public function show(Transaction $transaction) { - return $this->response->item($transaction, new Transformer()); + return $this->item($transaction, new Transformer()); } /** @@ -45,7 +45,7 @@ class Transactions extends ApiController { $transaction = $this->dispatch(new CreateTransaction($request)); - return $this->response->created(route('api.transactions.show', $transaction->id)); + return $this->response->created(route('api.transactions.show', $transaction->id), $this->item($transaction, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Banking/Transfers.php b/app/Http/Controllers/Api/Banking/Transfers.php index 41e41ce9e..841926940 100644 --- a/app/Http/Controllers/Api/Banking/Transfers.php +++ b/app/Http/Controllers/Api/Banking/Transfers.php @@ -62,7 +62,7 @@ class Transfers extends ApiController */ public function show(Transfer $transfer) { - return $this->response->item($transfer, new Transformer()); + return $this->item($transfer, new Transformer()); } /** @@ -75,7 +75,7 @@ class Transfers extends ApiController { $transfer = $this->dispatch(new CreateTransfer($request)); - return $this->response->created(route('api.transfers.show', $transfer->id)); + return $this->response->created(route('api.transfers.show', $transfer->id), $this->item($transfer, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Common/Companies.php b/app/Http/Controllers/Api/Common/Companies.php index 4f5b8a5a3..022b09842 100644 --- a/app/Http/Controllers/Api/Common/Companies.php +++ b/app/Http/Controllers/Api/Common/Companies.php @@ -40,7 +40,7 @@ class Companies extends ApiController // Check if user can access company $this->canAccess($company); - return $this->response->item($company, new Transformer()); + return $this->item($company, new Transformer()); } catch (\Exception $e) { $this->response->errorUnauthorized($e->getMessage()); } @@ -56,7 +56,7 @@ class Companies extends ApiController { $company = $this->dispatch(new CreateCompany($request)); - return $this->response->created(route('api.companies.show', $company->id)); + return $this->response->created(route('api.companies.show', $company->id), $this->item($company, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Common/Contacts.php b/app/Http/Controllers/Api/Common/Contacts.php index b8ea62159..8a5a00790 100644 --- a/app/Http/Controllers/Api/Common/Contacts.php +++ b/app/Http/Controllers/Api/Common/Contacts.php @@ -42,7 +42,7 @@ class Contacts extends ApiController $contact = Contact::where('email', $id)->first(); } - return $this->response->item($contact, new Transformer()); + return $this->item($contact, new Transformer()); } /** @@ -55,7 +55,7 @@ class Contacts extends ApiController { $contact = $this->dispatch(new CreateContact($request)); - return $this->response->created(route('api.contacts.show', $contact->id)); + return $this->response->created(route('api.contacts.show', $contact->id), $this->item($contact, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Common/Dashboards.php b/app/Http/Controllers/Api/Common/Dashboards.php index 4a50ec90f..0dba14271 100644 --- a/app/Http/Controllers/Api/Common/Dashboards.php +++ b/app/Http/Controllers/Api/Common/Dashboards.php @@ -42,7 +42,7 @@ class Dashboards extends ApiController // Check if user can access dashboard $this->canAccess($dashboard); - return $this->response->item($dashboard, new Transformer()); + return $this->item($dashboard, new Transformer()); } catch (\Exception $e) { $this->response->errorUnauthorized($e->getMessage()); } @@ -58,7 +58,7 @@ class Dashboards extends ApiController { $dashboard = $this->dispatch(new CreateDashboard($request)); - return $this->response->created(route('api.dashboards.show', $dashboard->id)); + return $this->response->created(route('api.dashboards.show', $dashboard->id), $this->item($dashboard, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Common/Items.php b/app/Http/Controllers/Api/Common/Items.php index 5910ac2b1..bbe05a16a 100644 --- a/app/Http/Controllers/Api/Common/Items.php +++ b/app/Http/Controllers/Api/Common/Items.php @@ -34,7 +34,7 @@ class Items extends ApiController { $item = Item::with('category', 'taxes')->find($id); - return $this->response->item($item, new Transformer()); + return $this->item($item, new Transformer()); } /** @@ -47,7 +47,7 @@ class Items extends ApiController { $item = $this->dispatch(new CreateItem($request)); - return $this->response->created(route('api.items.show', $item->id)); + return $this->response->created(route('api.items.show', $item->id), $this->item($item, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Common/Reports.php b/app/Http/Controllers/Api/Common/Reports.php index 162529be3..0a402e90b 100644 --- a/app/Http/Controllers/Api/Common/Reports.php +++ b/app/Http/Controllers/Api/Common/Reports.php @@ -32,7 +32,7 @@ class Reports extends ApiController */ public function show(Report $report) { - return $this->response->item($report, new Transformer()); + return $this->item($report, new Transformer()); } /** @@ -45,7 +45,7 @@ class Reports extends ApiController { $report = $this->dispatch(new CreateReport($request)); - return $this->response->created(route('api.reports.show', $report->id)); + return $this->response->created(route('api.reports.show', $report->id), $this->item($report, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Document/DocumentTransactions.php b/app/Http/Controllers/Api/Document/DocumentTransactions.php index 9ed91490a..59f61f372 100644 --- a/app/Http/Controllers/Api/Document/DocumentTransactions.php +++ b/app/Http/Controllers/Api/Document/DocumentTransactions.php @@ -48,7 +48,7 @@ class DocumentTransactions extends ApiController { $transaction = Transaction::documentId($document_id)->find($id); - return $this->response->item($transaction, new Transformer()); + return $this->item($transaction, new Transformer()); } /** @@ -64,7 +64,7 @@ class DocumentTransactions extends ApiController $transaction = $this->dispatch(new CreateBankingDocumentTransaction($document, $request)); - return $this->response->created(route('api.documents.transactions.show', [$document_id, $transaction->id])); + return $this->response->created(route('api.documents.transactions.show', [$document_id, $transaction->id]), $this->item($transaction, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Document/Documents.php b/app/Http/Controllers/Api/Document/Documents.php index f77fcdd5e..032934af8 100644 --- a/app/Http/Controllers/Api/Document/Documents.php +++ b/app/Http/Controllers/Api/Document/Documents.php @@ -39,7 +39,7 @@ class Documents extends ApiController $document = Document::where('document_number', $id)->first(); } - return $this->response->item($document, new Transformer()); + return $this->item($document, new Transformer()); } /** @@ -53,7 +53,7 @@ class Documents extends ApiController { $document = $this->dispatch(new CreateDocument($request)); - return $this->response->created(route('api.documents.show', $document->id)); + return $this->response->created(route('api.documents.show', $document->id), $this->item($document, new Transformer())); } /** @@ -68,7 +68,7 @@ class Documents extends ApiController { $document = $this->dispatch(new UpdateDocument($document, $request)); - return $this->response->item($document->fresh(), new Transformer()); + return $this->item($document->fresh(), new Transformer()); } /** diff --git a/app/Http/Controllers/Api/Settings/Categories.php b/app/Http/Controllers/Api/Settings/Categories.php index 5fb18c698..35fe3b831 100644 --- a/app/Http/Controllers/Api/Settings/Categories.php +++ b/app/Http/Controllers/Api/Settings/Categories.php @@ -32,7 +32,7 @@ class Categories extends ApiController */ public function show(Category $category) { - return $this->response->item($category, new Transformer()); + return $this->item($category, new Transformer()); } /** @@ -45,7 +45,7 @@ class Categories extends ApiController { $category = $this->dispatch(new CreateCategory($request)); - return $this->response->created(route('api.categories.show', $category->id)); + return $this->response->created(route('api.categories.show', $category->id), $this->item($category, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Settings/Currencies.php b/app/Http/Controllers/Api/Settings/Currencies.php index e867d9838..f518074c9 100644 --- a/app/Http/Controllers/Api/Settings/Currencies.php +++ b/app/Http/Controllers/Api/Settings/Currencies.php @@ -39,7 +39,7 @@ class Currencies extends ApiController $currency = Currency::where('code', $id)->first(); } - return $this->response->item($currency, new Transformer()); + return $this->item($currency, new Transformer()); } /** @@ -52,7 +52,7 @@ class Currencies extends ApiController { $currency = $this->dispatch(new CreateCurrency($request)); - return $this->response->created(route('api.currencies.show', $currency->id)); + return $this->response->created(route('api.currencies.show', $currency->id), $this->item($currency, new Transformer())); } /** diff --git a/app/Http/Controllers/Api/Settings/Settings.php b/app/Http/Controllers/Api/Settings/Settings.php index 6454bbb46..ebaa7f0a6 100644 --- a/app/Http/Controllers/Api/Settings/Settings.php +++ b/app/Http/Controllers/Api/Settings/Settings.php @@ -39,7 +39,7 @@ class Settings extends ApiController $setting = Setting::where('key', $id)->first(); } - return $this->response->item($setting, new Transformer()); + return $this->item($setting, new Transformer()); } /** @@ -52,7 +52,7 @@ class Settings extends ApiController { $setting = Setting::create($request->all()); - return $this->response->created(route('api.settings.show', $setting->id)); + return $this->response->created(route('api.settings.show', $setting->id), $this->item($setting, new Transformer())); } /** @@ -66,7 +66,7 @@ class Settings extends ApiController { $setting->update($request->all()); - return $this->response->item($setting->fresh(), new Transformer()); + return $this->item($setting->fresh(), new Transformer()); } /** diff --git a/app/Http/Controllers/Api/Settings/Taxes.php b/app/Http/Controllers/Api/Settings/Taxes.php index fcbba72b7..279768643 100644 --- a/app/Http/Controllers/Api/Settings/Taxes.php +++ b/app/Http/Controllers/Api/Settings/Taxes.php @@ -32,7 +32,7 @@ class Taxes extends ApiController */ public function show(Tax $tax) { - return $this->response->item($tax, new Transformer()); + return $this->item($tax, new Transformer()); } /** @@ -45,7 +45,7 @@ class Taxes extends ApiController { $tax = $this->dispatch(new CreateTax($request)); - return $this->response->created(route('api.taxes.show', $tax->id)); + return $this->response->created(route('api.taxes.show', $tax->id), $this->item($tax, new Transformer())); } /** From 61dcccd36d7e2bfb07d01d1eb3e77ef03ff955ef Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Sun, 30 May 2021 11:48:08 +0000 Subject: [PATCH 2/4] new crowdin translations --- resources/lang/et-EE/auth.php | 12 +-- resources/lang/et-EE/bills.php | 12 +-- resources/lang/et-EE/bulk_actions.php | 2 + resources/lang/et-EE/currencies.php | 1 + resources/lang/et-EE/dashboards.php | 11 +++ resources/lang/et-EE/demo.php | 34 +++++++ resources/lang/et-EE/documents.php | 54 +++++++++++ resources/lang/et-EE/import.php | 2 +- resources/lang/et-EE/items.php | 5 +- resources/lang/et-EE/maintenance.php | 9 ++ resources/lang/et-EE/passwords.php | 23 +++++ resources/lang/et-EE/recurring.php | 2 +- resources/lang/et-EE/reports.php | 31 +++++++ resources/lang/et-EE/updates.php | 15 ++++ resources/lang/et-EE/validation.php | 123 ++++++++++++++++++++++++++ resources/lang/tr-TR/general.php | 2 +- resources/lang/tr-TR/import.php | 4 +- 17 files changed, 323 insertions(+), 19 deletions(-) create mode 100644 resources/lang/et-EE/dashboards.php create mode 100644 resources/lang/et-EE/demo.php create mode 100644 resources/lang/et-EE/documents.php create mode 100644 resources/lang/et-EE/maintenance.php create mode 100644 resources/lang/et-EE/passwords.php create mode 100644 resources/lang/et-EE/reports.php create mode 100644 resources/lang/et-EE/updates.php create mode 100644 resources/lang/et-EE/validation.php diff --git a/resources/lang/et-EE/auth.php b/resources/lang/et-EE/auth.php index 615731884..3ee6fb321 100644 --- a/resources/lang/et-EE/auth.php +++ b/resources/lang/et-EE/auth.php @@ -7,19 +7,19 @@ return [ 'login' => 'Logi sisse', 'login_to' => 'Sessiooni alustamiseks logi sisse', 'remember_me' => 'Jäta mind meelde', - 'forgot_password' => 'Unustasin oma parooli', + 'forgot_password' => 'Ma unustasin oma parooli', 'reset_password' => 'Lähtesta parool', 'enter_email' => 'Sisesta oma e-posti aadress', - 'current_email' => 'Praegune e-mail', + 'current_email' => 'Praegune e-kiri', 'reset' => 'Lähesta', 'never' => 'mitte kunagi', 'landing_page' => 'Sihtleht', 'password' => [ 'current' => 'Parool', - 'current_confirm' => 'Parooli kinnitus', - 'new' => 'Uus parool', - 'new_confirm' => 'Uue parooli kinnitus', + 'current_confirm' => 'Salasõna kinnitus', + 'new' => 'Uus salasõna', + 'new_confirm' => 'Uue salasõna kinnitus', ], 'error' => [ @@ -28,7 +28,7 @@ return [ 'no_company' => 'Viga: teie kontole pole määratud ühtegi ettevõtet. Palun pöörduge süsteemiadministraatori poole.', ], - 'failed' => 'Need andmed ei klapi meie kirjetega.', + 'failed' => 'Andmed ei kattu.', 'disabled' => 'See konto on keelatud. Palun pöörduge süsteemiadministraatori poole.', 'throttle' => 'Liiga palju sisselogimise katseid. Palun proovi uuesti :seconds sekundi pärast.', diff --git a/resources/lang/et-EE/bills.php b/resources/lang/et-EE/bills.php index af961ad9e..aab9859f1 100644 --- a/resources/lang/et-EE/bills.php +++ b/resources/lang/et-EE/bills.php @@ -4,7 +4,7 @@ return [ 'bill_number' => 'Arve number', 'bill_date' => 'Arve kuupäev', - 'total_price' => 'Koguhind', + 'total_price' => 'Hind kokku', 'due_date' => 'Tähtaeg', 'order_number' => 'Tellimuse number', 'bill_from' => 'Arve saatja', @@ -14,17 +14,17 @@ return [ 'sub_total' => 'Vahesumma', 'discount' => 'Allahindlus', 'item_discount' => 'Rea soodustus', - 'tax_total' => 'Maksud kokku', + 'tax_total' => 'Käibemaks kokku', 'total' => 'Kokku', - 'item_name' => 'Kauba nimi | Kauba nimed', + 'item_name' => 'Kauba nimi|Kauba nimed', - 'show_discount' => 'Soodustus :discount%', + 'show_discount' => ':discount% allahindlus', 'add_discount' => 'Lisa allahindlus', 'discount_desc' => 'vahesummast', 'payment_due' => 'Makse tähtaeg', - 'amount_due' => 'Tasumisele kuuluv summa', + 'amount_due' => 'Maksmisele kuuluv summa', 'paid' => 'Makstud', 'histories' => 'Ajalood', 'payments' => 'Maksed', @@ -33,7 +33,7 @@ return [ 'mark_received' => 'Makse on saabunud', 'mark_cancelled' => 'Märgi tühistatuks', 'download_pdf' => 'Laadi alla PDF', - 'send_mail' => 'Saada kiri', + 'send_mail' => 'Saada e-kiri', 'create_bill' => 'Loo arve', 'receive_bill' => 'Arve vastuvõtmine', 'make_payment' => 'Tee makse', diff --git a/resources/lang/et-EE/bulk_actions.php b/resources/lang/et-EE/bulk_actions.php index 0c177b57d..9af33fc64 100644 --- a/resources/lang/et-EE/bulk_actions.php +++ b/resources/lang/et-EE/bulk_actions.php @@ -16,6 +16,8 @@ return [ '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?', + 'reconcile' => 'Kas soovite kindlasti valitud kirje lubada?|Kas soovite kindlasti valitud kirjed lubada?', + 'unreconcile' => 'Kas soovite kindlasti valitud kirje lubada?|Kas soovite kindlasti valitud kirjed lubada?', ], ]; diff --git a/resources/lang/et-EE/currencies.php b/resources/lang/et-EE/currencies.php index ed9e98ce3..efb83205a 100644 --- a/resources/lang/et-EE/currencies.php +++ b/resources/lang/et-EE/currencies.php @@ -8,6 +8,7 @@ return [ 'decimal_mark' => 'Kümnendmärk', 'thousands_separator' => 'Tuhandeliste eraldaja', 'precision' => 'Täpsus', + 'conversion' => 'Valuutavahetus: :price (:currency_code) :currency_rate', 'symbol' => [ 'symbol' => 'Sümbol', 'position' => 'Sümbol seisukoht', diff --git a/resources/lang/et-EE/dashboards.php b/resources/lang/et-EE/dashboards.php new file mode 100644 index 000000000..39c375ee9 --- /dev/null +++ b/resources/lang/et-EE/dashboards.php @@ -0,0 +1,11 @@ + [ + 'not_user_dashboard' => 'Viga: Teil pole lubatud seda töölaudet muuta!', + 'delete_last' => 'Viga: viimast töölaudet ei saa kustutada. Palun looge kõigepealt uus!', + 'disable_last' => 'Viga: viimast töölaudet ei saa keelata. Palun looge kõigepealt uus!', + ], + +]; diff --git a/resources/lang/et-EE/demo.php b/resources/lang/et-EE/demo.php new file mode 100644 index 000000000..ff6430bec --- /dev/null +++ b/resources/lang/et-EE/demo.php @@ -0,0 +1,34 @@ + [ + 'cash' => 'Sularaha', + ], + + 'categories' => [ + 'deposit' => 'Hoius', + 'sales' => 'Müük', + ], + + 'currencies' => [ + 'usd' => 'USA Dollar', + 'eur' => 'Euro', + 'gbp' => 'Inglise nael', + 'try' => 'Türgi liir', + ], + + 'offline_payments' => [ + 'cash' => 'Sularaha', + 'bank' => 'Pangaülekanne', + ], + + 'reports' => [ + 'income' => 'Kuu sissetuleku kokkuvõte kategooriate kaupa.', + 'expense' => 'Kuu kulude kokkuvõte kategooriate kaupa.', + 'income_expense' => 'Kuu sissetulek vs kulu kategooriate kaupa.', + 'tax' => 'Kvartaalne maksu kokkuvõte.', + 'profit_loss' => 'Kvartali kasum ja kahjum kategooriate kaupa.', + ], + +]; diff --git a/resources/lang/et-EE/documents.php b/resources/lang/et-EE/documents.php new file mode 100644 index 000000000..a436e6850 --- /dev/null +++ b/resources/lang/et-EE/documents.php @@ -0,0 +1,54 @@ + 'Redigeeri veerge', + 'empty_items' =>'Te pole midagi lisanud.', + + 'statuses' => [ + 'draft' => 'Mustand', + 'sent' => 'Saadetud', + 'expired' => 'Aegunud', + 'viewed' => 'Vaadatud', + 'approved' => 'Kinnitatud', + 'received' => 'Vastuvõetud', + 'refused' => 'Tagasi lükatud', + 'restored' => 'Taastatud', + 'reversed' => 'Tühistatud', + 'partial' => 'Osaline', + 'paid' => 'Makstud', + 'pending' => 'Ootel', + 'invoiced' => 'Arve esitatud', + 'overdue' => 'Tähtaja ületanud', + 'unpaid' => 'Maksmata', + 'cancelled' => 'Tühistatud', + 'voided' => 'Kehtetu', + 'completed' => 'Lõpetatud', + 'shipped' => 'Saadetud', + 'refunded' => 'Tagasi makstud', + 'failed' => 'Ebaõnnestus!', + 'denied' => 'Keelatud', + 'processed' => 'Töödeldud', + 'open' => 'Avatud', + 'closed' => 'Suletud ', + 'billed' => 'Arve esitatud', + 'delivered' => 'Kohaletoimetatud', + 'returned' => 'Tagastatud', + 'drawn' => 'Tõmmatud', + 'not_billed' => 'Arvet pole esitatud', + 'issued' => 'Väljastatud', + 'not_invoiced' => 'Arvet pole esitatud', + 'confirmed' => 'Kinnitatud', + 'not_confirmed' => 'Pole kinnitatud', + ], + + 'messages' => [ + 'email_sent' => ':type e-kiri oli saadetud!', + 'marked_as' => ':type märgitud kui :status!', + 'marked_sent' => ':type märgitud saadetuks!', + 'marked_paid' => ':type märgitud makstuks!', + 'marked_viewed' => ':type märgitud vaadatud!', + 'marked_cancelled' => ':type märgitud tühistatuks!', + 'marked_received' => ':type märgitud et kätte saanud!', + ], +]; diff --git a/resources/lang/et-EE/import.php b/resources/lang/et-EE/import.php index 997da7a02..fa3c338ab 100644 --- a/resources/lang/et-EE/import.php +++ b/resources/lang/et-EE/import.php @@ -3,7 +3,7 @@ return [ 'import' => 'Impordi', - 'title' => 'Import :liik', + 'title' => 'Import :type', '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 index 11f759d18..fad908560 100644 --- a/resources/lang/et-EE/items.php +++ b/resources/lang/et-EE/items.php @@ -2,7 +2,8 @@ return [ - 'sales_price' => 'Müügihind', - 'purchase_price' => 'Ostuhind', + 'sales_price' => 'Müügihind', + 'purchase_price' => 'Ostuhind', + 'enter_item_description' => 'Sisesta ühikku kirjeldus', ]; diff --git a/resources/lang/et-EE/maintenance.php b/resources/lang/et-EE/maintenance.php new file mode 100644 index 000000000..0cd5006ba --- /dev/null +++ b/resources/lang/et-EE/maintenance.php @@ -0,0 +1,9 @@ + 'Hoolduses', + + 'message' => 'Vabandust, me oleme hoolduseks maas. Palun proovi hiljem uuesti!', + +]; diff --git a/resources/lang/et-EE/passwords.php b/resources/lang/et-EE/passwords.php new file mode 100644 index 000000000..44898c70e --- /dev/null +++ b/resources/lang/et-EE/passwords.php @@ -0,0 +1,23 @@ + 'Parool peab olema vähemalt 6 tähemärki pikk ja vastama kinnitusele.', + 'reset' => 'Sinu parool on lähtestatud!', + 'sent' => 'Oleme saatnud sulle e-postiga parooli lähtestamise lingi!', + 'token' => 'See parooli lähtestamise tunnus on vigane.', + 'user' => "Ei suutnud leida sellise e-posti aadressiga kasutajat.", + 'throttle' => 'Palun oodake enne uuesti proovimist.', + +]; diff --git a/resources/lang/et-EE/recurring.php b/resources/lang/et-EE/recurring.php index fadc36c26..5a7850048 100644 --- a/resources/lang/et-EE/recurring.php +++ b/resources/lang/et-EE/recurring.php @@ -5,7 +5,7 @@ return [ 'recurring' => 'Korduv', 'every' => 'Iga', 'period' => 'Periood', - 'times' => 'Korda', + 'times' => 'Ajad', 'daily' => 'Iga päev', 'weekly' => 'Iganädalane', 'monthly' => 'Igakuine', diff --git a/resources/lang/et-EE/reports.php b/resources/lang/et-EE/reports.php new file mode 100644 index 000000000..91f1f10c7 --- /dev/null +++ b/resources/lang/et-EE/reports.php @@ -0,0 +1,31 @@ + 'Aasta | Aastad', + 'this_year' => 'Käesolev aasta', + 'previous_year' => 'Eelmine aasta', + 'this_quarter' => 'See kvartal', + 'previous_quarter' => 'Eelmine kvartal', + 'last_12_months' => 'Viimased 12 kuud', + 'profit_loss' => 'Kasum ja kahjum', + 'gross_profit' => 'Bruto', + 'net_profit' => 'Puhaskasum', + 'total_expenses' => 'Kulud kokku', + 'net' => 'Neto', + 'income_expense' => 'Sissetulekud ja kulud', + + 'summary' => [ + 'income' => 'Sissetulekute kokkuvõte', + 'expense' => 'Kulude kokkuvõte', + 'income_expense' => 'Sissetulekud versus kulud', + 'tax' => 'Maksude kokkuvõte', + ], + + 'charts' => [ + 'line' => 'Liin', + 'bar' => 'Riba', + 'pie' => 'Pie', + ], + +]; diff --git a/resources/lang/et-EE/updates.php b/resources/lang/et-EE/updates.php new file mode 100644 index 000000000..f569a5b0a --- /dev/null +++ b/resources/lang/et-EE/updates.php @@ -0,0 +1,15 @@ + 'Paigaldatud versioon', + 'latest_version' => 'Viimane versioon', + 'update' => 'Värskenda Akaunting :version versioonile', + 'changelog' => 'Muudatuste logi', + 'check' => 'Kontrolli', + 'new_core' => 'Saadaval on uuem Akaunting-u versioon.', + 'latest_core' => 'Õnnitlused! Kasutad juba viimast Akauntingu versiooni. Tulevased turvaparandused paigaldatakse automaatselt.', + 'success' => 'Värskendamine on lõpetatud.', + 'error' => 'Värskendamine ebaõnnestus. Palun proovi uuesti.', + +]; diff --git a/resources/lang/et-EE/validation.php b/resources/lang/et-EE/validation.php new file mode 100644 index 000000000..2c5f722e9 --- /dev/null +++ b/resources/lang/et-EE/validation.php @@ -0,0 +1,123 @@ + ':attribute tuleb aktsepteerida.', + 'active_url' => ':attribute ei ole kehtiv URL.', + 'after' => ':attribute peab olema kuupäev pärast :date.', + 'after_or_equal' => ':attribute peab olema kuupäev pärast või samastuma :date.', + 'alpha' => ':attribute võib sisaldada vaid tähemärke.', + 'alpha_dash' => ':attribute võib sisaldada vaid tähti, numbreid ja kriipse.', + 'alpha_num' => ':attribute võib sisaldada vaid tähti ja numbreid.', + 'array' => ':attribute peab olema massiiv.', + 'before' => ':attribute peab olema kuupäev enne :date.', + 'before_or_equal' => ':attribute peab olema kuupäev enne või samastuma :date.', + 'between' => [ + 'numeric' => ':attribute peab olema :min ja :max vahel.', + 'file' => ':attribute peab olema :min ja :max kilobaidi vahel.', + 'string' => ':attribute peab olema :min ja :max tähemärgi vahel.', + 'array' => ':attribute peab olema :min ja :max kirje vahel.', + ], + 'boolean' => ':attribute väli peab olema tõene või väär.', + 'confirmed' => ':attribute kinnitus ei vasta.', + 'date' => ':attribute pole kehtiv kuupäev.', + 'date_format' => ':attribute ei vasta formaadile :format.', + 'different' => ':attribute ja :other peavad olema erinevad.', + 'digits' => ':attribute peab olema :digits numbrit.', + 'digits_between' => ':attribute peab olema :min ja :max numbri vahel.', + 'dimensions' => ':attribute on valed pildi suurused.', + 'distinct' => ':attribute väljal on topeltväärtus.', + 'email' => ':attribute peab olema kehtiv e-posti aadress.', + 'ends_with' => ':attribute lubatud on failid laiendiga: :values', + 'exists' => 'Valitud :attribute on vigane.', + 'file' => ':attribute peab olema fail.', + 'filled' => ':attribute väli on nõutav.', + 'image' => ':attribute peab olema pilt.', + 'in' => 'Valitud :attribute on vigane.', + 'in_array' => ':attribute väli ei eksisteeri :other sees.', + 'integer' => ':attribute peab olema täisarv.', + 'ip' => ':attribute peab olema kehtiv IP aadress.', + 'json' => ':attribute peab olema kehtiv JSON string.', + 'max' => [ + 'numeric' => ':attribute ei tohi olla suurem kui :max.', + 'file' => ':attribute ei tohi olla suurem kui :max kilobaiti.', + 'string' => ':attribute ei tohi olla suurem kui :max tähemärki.', + 'array' => ':attribute ei tohi sisaldada rohkem kui :max kirjet.', + ], + 'mimes' => ':attribute peab olema :values tüüpi.', + 'mimetypes' => ':attribute peab olema :values tüüpi.', + 'min' => [ + 'numeric' => ':attribute peab olema vähemalt :min.', + 'file' => ':attribute peab olema vähemalt :min kilobaiti.', + 'string' => ':attribute peab olema vähemalt :min tähemärki.', + 'array' => ':attribute peab olema vähemalt :min kirjet.', + ], + 'not_in' => 'Valitud :attribute on vigane.', + 'numeric' => ':attribute peab olema number.', + 'present' => ':attribute väli peab olema esindatud.', + 'regex' => ':attribute vorming on vigane.', + 'required' => ':attribute väli on nõutud.', + 'required_if' => ':attribute väli on nõutud, kui :other on :value.', + 'required_unless' => ':attribute väli on nõutud, välja arvatud, kui :other on :values.', + 'required_with' => ':attribute väli on nõutud, kui :values on esindatud.', + 'required_with_all' => ':attribute väli on nõutud, kui :values on esindatud.', + 'required_without' => ':attribute väli on nõutud, kui :values ei ole esindatud.', + 'required_without_all' => ':attribute väli on nõutud, kui ükski :values pole esindatud.', + 'same' => ':attribute ja :other peavad sobima.', + 'size' => [ + 'numeric' => ':attribute peab olema :size.', + 'file' => ':attribute peab olema :size kilobaiti.', + 'string' => ':attribute peab olema :size tähemärki.', + 'array' => ':attribute peab sisaldama :size kirjet.', + ], + 'string' => ':attribute peab olema string.', + 'timezone' => ':attribute peab olema kehtiv tsoon.', + 'unique' => ':attribute on juba hõivatud.', + 'uploaded' => ':attribute ei õnnestunud laadida.', + 'url' => ':attribute vorming on vigane.', + + /* + |-------------------------------------------------------------------------- + | 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' => 'kohandatud-sõnum', + ], + 'invalid_currency' => ':attribute kood on vigane.', + 'invalid_amount' => 'Kogus :attribute on vigane.', + 'invalid_extension' => 'Faililaiend on lubamatu.', + ], + + /* + |-------------------------------------------------------------------------- + | 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/tr-TR/general.php b/resources/lang/tr-TR/general.php index 3c5d5e2ca..17306d87d 100644 --- a/resources/lang/tr-TR/general.php +++ b/resources/lang/tr-TR/general.php @@ -123,7 +123,7 @@ return [ 'overdue' => 'Gecikmiş', 'partially' => 'Kısmen', 'partially_paid' => 'Kısmen Ödenmiş', - 'export' => 'Dışa Aktar', + 'export' => 'Dışarı Aktar', 'finish' => 'Bitti', 'wizard' => 'Sihirbaz', 'skip' => 'Geç', diff --git a/resources/lang/tr-TR/import.php b/resources/lang/tr-TR/import.php index c45b70c3e..ddaefd8b9 100644 --- a/resources/lang/tr-TR/import.php +++ b/resources/lang/tr-TR/import.php @@ -2,8 +2,8 @@ return [ - 'import' => 'İçe Aktar', - 'title' => ':type İçe Aktar', + 'import' => 'İçeri Aktar', + 'title' => ':type İçeri Aktar', 'message' => 'İzin verilen dosya türleri: XLS, XLSX. Lütfen, örnek dosyayı indirin.', ]; From 1d3cbadcb5f761808646a76eed9a6cc81773b445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 30 May 2021 16:38:13 +0300 Subject: [PATCH 3/4] fixed wizard data issue.. --- app/Http/Controllers/Wizard/Data.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Wizard/Data.php b/app/Http/Controllers/Wizard/Data.php index fa3a43b9f..34bdac7a1 100644 --- a/app/Http/Controllers/Wizard/Data.php +++ b/app/Http/Controllers/Wizard/Data.php @@ -125,8 +125,8 @@ class Data extends Controller $company->api_key = setting('apps.api_key'); $company->financial_start = setting('localisation.financial_start'); - if ($company->logo) { - $logo = \Plank\Mediable\Media::find($company->logo); + if ($company->company_logo) { + $logo = $company->logo; $logo->path = route('uploads.get', $logo->id); From 03fce573943d6a03822bcd5fa6c5b9c4e9c49bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 30 May 2021 17:17:37 +0300 Subject: [PATCH 4/4] styling.. --- resources/assets/js/views/wizard/Company.vue | 243 +++++++++--------- .../assets/js/views/wizard/Currencies.vue | 229 +++++++++-------- resources/assets/js/views/wizard/Finish.vue | 100 +++---- resources/assets/js/views/wizard/Taxes.vue | 139 +++++----- 4 files changed, 371 insertions(+), 340 deletions(-) diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index fa9f484ec..c57573992 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -115,129 +115,140 @@ import AkauntingDate from "./../../components/AkauntingDate"; import WizardAction from "./../../mixins/wizardAction"; export default { - name: "Company", - mixins: [WizardAction], - components: { - [Step.name]: Step, - [Steps.name]: Steps, - AkauntingDropzoneFileUpload, - AkauntingDate, - }, - props: { - company: { - type: [Object, Array], - }, - translations: { - type: [Object, Array], - }, - url: { - type: String, - default: "text", - }, - }, - data() { - return { - active: 0, - logo: [], - real_date: "", - }; - }, - mounted() { - let company_data = this.company; - this.onDataWatch(company_data); - }, - watch: { - company: function (company) { - this.onDataWatch(company); - }, - }, - methods: { - onDataWatch(company) { - if (Object.keys(company).length) { - let logo_arr = [ - { - id: company.logo.id, - name: company.logo.filename + "." + company.logo.extension, - path: company.logo.path, - type: company.logo.mime_type, - size: company.logo.size, - downloadPath: false, - }, - ]; - this.logo.push(logo_arr); - this.real_date = company.financial_start; - } + name: "Company", + + mixins: [WizardAction], + + components: { + [Step.name]: Step, + [Steps.name]: Steps, + AkauntingDropzoneFileUpload, + AkauntingDate, }, - onEditSave() { - FormData.prototype.appendRecursive = function (data, wrapper = null) { - for (var name in data) { - if (name == "previewElement" || name == "previewTemplate") { - continue; - } - if (wrapper) { - if ( - (typeof data[name] == "object" || Array.isArray(data[name])) && - data[name] instanceof File != true && - data[name] instanceof Blob != true - ) { - this.appendRecursive(data[name], wrapper + "[" + name + "]"); - } else { - this.append(wrapper + "[" + name + "]", data[name]); - } - } else { - if ( - (typeof data[name] == "object" || Array.isArray(data[name])) && - data[name] instanceof File != true && - data[name] instanceof Blob != true - ) { - this.appendRecursive(data[name], name); - } else { - this.append(name, data[name]); - } - } - } - }; + props: { + company: { + type: [Object, Array], + }, - const formData = new FormData(this.$refs["form"]); - let data_name = {}; + translations: { + type: [Object, Array], + }, + + url: { + type: String, + default: "text", + }, + }, + + data() { + return { + active: 0, + logo: [], + real_date: "", + }; + }, + + mounted() { + let company_data = this.company; + + this.onDataWatch(company_data); + }, + + methods: { + onDataWatch(company) { + if (Object.keys(company).length) { + let logo_arr = [{ + id: company.logo.id, + name: company.logo.filename + "." + company.logo.extension, + path: company.logo.path, + type: company.logo.mime_type, + size: company.logo.size, + downloadPath: false, + }]; + + this.logo.push(logo_arr); + this.real_date = company.financial_start; + } + }, + + onEditSave() { + FormData.prototype.appendRecursive = function (data, wrapper = null) { + for (var name in data) { + if (name == "previewElement" || name == "previewTemplate") { + continue; + } + + if (wrapper) { + if ( + (typeof data[name] == "object" || Array.isArray(data[name])) && + data[name] instanceof File != true && + data[name] instanceof Blob != true + ) { + this.appendRecursive(data[name], wrapper + "[" + name + "]"); + } else { + this.append(wrapper + "[" + name + "]", data[name]); + } + } else { + if ( + (typeof data[name] == "object" || Array.isArray(data[name])) && + data[name] instanceof File != true && + data[name] instanceof Blob != true + ) { + this.appendRecursive(data[name], name); + } else { + this.append(name, data[name]); + } + } + } + }; + + const formData = new FormData(this.$refs["form"]); + + let data_name = {}; - for (let [key, val] of formData.entries()) { - Object.assign(data_name, { - [key]: val, - ["logo"]: this.$refs.dropzoneWizard.files[1] - ? this.$refs.dropzoneWizard.files[1] - : this.$refs.dropzoneWizard.files[0], - ["_prefix"]: "company", - ["_token"]: window.Laravel.csrfToken, - ["_method"]: "POST", - }); - } + for (let [key, val] of formData.entries()) { + Object.assign(data_name, { + [key]: val, + ["logo"]: this.$refs.dropzoneWizard.files[1] + ? this.$refs.dropzoneWizard.files[1] + : this.$refs.dropzoneWizard.files[0], + ["_prefix"]: "company", + ["_token"]: window.Laravel.csrfToken, + ["_method"]: "POST", + }); + } - formData.appendRecursive(data_name); - window - .axios({ - method: "POST", - url: url + "/wizard/companies", - data: formData, - headers: { - "X-CSRF-TOKEN": window.Laravel.csrfToken, - "X-Requested-With": "XMLHttpRequest", - "Content-Type": "multipart/form-data", - }, - }) - .then((response) => { - this.onSuccessMessage(response); - this.$router.push("/wizard/currencies"); - }, this) - .catch((error) => { - }, this); + formData.appendRecursive(data_name); + + window.axios({ + method: "POST", + url: url + "/wizard/companies", + data: formData, + headers: { + "X-CSRF-TOKEN": window.Laravel.csrfToken, + "X-Requested-With": "XMLHttpRequest", + "Content-Type": "multipart/form-data", + }, + }) + .then((response) => { + this.onSuccessMessage(response); + this.$router.push("/wizard/currencies"); + }, this) + .catch((error) => { + }, this); + }, + + next() { + if (this.active++ > 2); + this.$router.push("/wizard/currencies"); + }, }, - next() { - if (this.active++ > 2); - this.$router.push("/wizard/currencies"); + watch: { + company: function (company) { + this.onDataWatch(company); + }, }, - }, }; \ No newline at end of file diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue index 3323360c2..c99b49b85 100644 --- a/resources/assets/js/views/wizard/Currencies.vue +++ b/resources/assets/js/views/wizard/Currencies.vue @@ -299,124 +299,133 @@ import MixinsGlobal from "./../../mixins/global"; import WizardAction from "./../../mixins/wizardAction"; export default { - name: "Currencies", - mixins: [MixinsGlobal, WizardAction], - components: { - [Step.name]: Step, - [Steps.name]: Steps, - [Select.name]: Select, - [Option.name]: Option, - AkauntingRadioGroup, - }, - props: { - currencies: { - type: [Object, Array], - }, - currency_codes: { - type: [Object, Array], - }, - translations: { - type: [Object, Array], - }, - }, - data() { - return { - active: 1, - bulk_action: new BulkAction(url + "/settings/currencies"), - }; - }, - methods: { - onSwitchUpdate(item) { - this.onStatus(item.id, event); - this.onStatusControl(this.currencies, item.id, event); + name: "Currencies", + + mixins: [MixinsGlobal, WizardAction], + + components: { + [Step.name]: Step, + [Steps.name]: Steps, + [Select.name]: Select, + [Option.name]: Option, + AkauntingRadioGroup, }, - onClickDelete(item) { - this.confirmDelete( - `${ - new URL(url).protocol + - "//" + - location.host + - location.pathname + - "/" + - item.id - }`, - this.translations.currencies.title, - `Confirm Delete ${item.name} ${this.translations.currencies.title}?`, - this.translations.currencies.cancel, - this.translations.currencies.delete - ); + props: { + currencies: { + type: [Object, Array], + }, + + currency_codes: { + type: [Object, Array], + }, + + translations: { + type: [Object, Array], + }, }, - onDeleteCurrency(event) { - this.onEjetItem(event, this.currencies, event.currency_id); + data() { + return { + active: 1, + bulk_action: new BulkAction(url + "/settings/currencies"), + }; }, - onChangeCodeItem(code) { - const formData = new FormData(this.$refs["form"]); - const data = { - rate: "", - precision: "", - symbol: "", - symbol_first: "", - decimal_mark: "", - thousands_separator: "", - }; + methods: { + onSwitchUpdate(item) { + this.onStatus(item.id, event); - for (let [key, val] of formData.entries()) { - Object.assign(data, { - [key]: val, - }); - } + this.onStatusControl(this.currencies, item.id, event); + }, - window - .axios({ - method: "GET", - url: url + "/settings/currencies/config", - params: { - code: code, - }, - }) - .then((response) => { - data.rate = response.data.rate; - data.precision = response.data.precision; - data.symbol = response.data.symbol; - data.symbol_first = response.data.symbol_first; - data.decimal_mark = response.data.decimal_mark; - data.thousands_separator = response.data.thousands_separator; - this.model.rate = response.data.rate; - }, this); + onClickDelete(item) { + this.confirmDelete( + `${ + new URL(url).protocol + + "//" + + location.host + + location.pathname + + "/" + + item.id + }`, + this.translations.currencies.title, + `Confirm Delete ${item.name} ${this.translations.currencies.title}?`, + this.translations.currencies.cancel, + this.translations.currencies.delete + ); + }, + + onDeleteCurrency(event) { + this.onEjetItem(event, this.currencies, event.currency_id); + }, + + onChangeCodeItem(code) { + const formData = new FormData(this.$refs["form"]); + const data = { + rate: "", + precision: "", + symbol: "", + symbol_first: "", + decimal_mark: "", + thousands_separator: "", + }; + + for (let [key, val] of formData.entries()) { + Object.assign(data, { + [key]: val, + }); + } + + window.axios({ + method: "GET", + url: url + "/settings/currencies/config", + params: { + code: code, + }, + }) + .then((response) => { + data.rate = response.data.rate; + data.precision = response.data.precision; + data.symbol = response.data.symbol; + data.symbol_first = response.data.symbol_first; + data.decimal_mark = response.data.decimal_mark; + data.thousands_separator = response.data.thousands_separator; + + this.model.rate = response.data.rate; + }, this); + }, + + onEditForm(item) { + this.onSubmitEvent( + "PATCH", + url + "/wizard/currencies/" + item.id, + "", + this.currencies, + item.id + ); + }, + + onSubmitForm() { + this.onSubmitEvent( + "POST", + url + "/wizard/currencies", + "", + this.currencies + ); + }, + + prev() { + if (this.active-- > 2); + history.back() + + this.$router.push("/wizard/companies"); + }, + + next() { + if (this.active++ > 2); + this.$router.push("/wizard/taxes"); + }, }, - - onEditForm(item) { - this.onSubmitEvent( - "PATCH", - url + "/wizard/currencies/" + item.id, - "", - this.currencies, - item.id - ); - }, - - onSubmitForm() { - this.onSubmitEvent( - "POST", - url + "/wizard/currencies", - "", - this.currencies - ); - }, - - prev() { - if (this.active-- > 2); - history.back() - this.$router.push("/wizard/companies"); - }, - - next() { - if (this.active++ > 2); - this.$router.push("/wizard/taxes"); - }, - }, }; diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue index beaeb4868..4e1ab1c8e 100644 --- a/resources/assets/js/views/wizard/Finish.vue +++ b/resources/assets/js/views/wizard/Finish.vue @@ -1,5 +1,5 @@