From 960802827a21950fbc67e40d83fa969403fb73d8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 26 Apr 2016 15:16:25 +1000 Subject: [PATCH 01/11] Document Transformer --- .../Transformers/DocumentTransformer.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/Ninja/Transformers/DocumentTransformer.php diff --git a/app/Ninja/Transformers/DocumentTransformer.php b/app/Ninja/Transformers/DocumentTransformer.php new file mode 100644 index 000000000000..61d18506eba1 --- /dev/null +++ b/app/Ninja/Transformers/DocumentTransformer.php @@ -0,0 +1,21 @@ + (int) $document->public_id, + 'name' => $document->name, + 'account_key' => $this->account->account_key, + 'type' => $document->type, + 'invoice_id' => isset($document->invoice->public_id) ? (int) $document->invoice->public_id : null, + 'expense_id' => isset($document->expense->public_id) ? (int) $document->expense->public_id : null, + ]; + } +} \ No newline at end of file From 7cac31e7a64b1179ab4c2ec2e00d223756ff8b21 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 2 May 2016 19:40:54 +1000 Subject: [PATCH 02/11] Fix for cloning invoices from API --- app/Http/Controllers/InvoiceApiController.php | 10 ++++++++++ app/Http/routes.php | 1 + 2 files changed, 11 insertions(+) diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index ce5eaa1d72d6..6eb6df367e71 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -1,6 +1,7 @@ response($data); } + else if ($request->action == ACTION_CLONE) { + $invoice = Invoice::scope($publicId)->firstOrFail(); + $clonedInvoice = $this->invoiceRepo->cloneInvoice($invoice, null); + + $transformer = new InvoiceTransformer(\Auth::user()->account, Input::get('serializer')); + $data = $this->createItem($clonedInvoice, $transformer, 'invoice'); + + return $this->response($data); + } $data = $request->input(); $data['public_id'] = $publicId; $this->invoiceService->save($data); diff --git a/app/Http/routes.php b/app/Http/routes.php index 768c9c3d3d4c..bfeed103a99a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -380,6 +380,7 @@ if (!defined('CONTACT_EMAIL')) { define('ACTION_RESTORE', 'restore'); define('ACTION_ARCHIVE', 'archive'); + define('ACTION_CLONE', 'clone'); define('ACTION_CONVERT', 'convert'); define('ACTION_DELETE', 'delete'); From f6abdedfac247e48dd2e201a0f9bbea7ec8f0ebb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 9 May 2016 09:54:40 +1000 Subject: [PATCH 03/11] User Transformer permissions --- app/Ninja/Transformers/UserAccountTransformer.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php index e914a25c663d..2351fdf22b24 100644 --- a/app/Ninja/Transformers/UserAccountTransformer.php +++ b/app/Ninja/Transformers/UserAccountTransformer.php @@ -33,6 +33,8 @@ class UserAccountTransformer extends EntityTransformer 'account_key' => $user->account->account_key, 'name' => $user->account->present()->name, 'token' => $user->account->getToken($user->id, $this->tokenName), + 'is_admin' => (bool) $user->is_admin, + 'permissions' => $user->permissions, 'default_url' => SITE_URL ]; } From 985c4eda34549655f3079bdde3f3dc8ee9a17d8b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 9 May 2016 10:02:15 +1000 Subject: [PATCH 04/11] working with permissions --- app/Ninja/Transformers/UserAccountTransformer.php | 2 -- app/Ninja/Transformers/UserTransformer.php | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php index 2351fdf22b24..e914a25c663d 100644 --- a/app/Ninja/Transformers/UserAccountTransformer.php +++ b/app/Ninja/Transformers/UserAccountTransformer.php @@ -33,8 +33,6 @@ class UserAccountTransformer extends EntityTransformer 'account_key' => $user->account->account_key, 'name' => $user->account->present()->name, 'token' => $user->account->getToken($user->id, $this->tokenName), - 'is_admin' => (bool) $user->is_admin, - 'permissions' => $user->permissions, 'default_url' => SITE_URL ]; } diff --git a/app/Ninja/Transformers/UserTransformer.php b/app/Ninja/Transformers/UserTransformer.php index 532c1f6fa4f2..f6bab290b817 100644 --- a/app/Ninja/Transformers/UserTransformer.php +++ b/app/Ninja/Transformers/UserTransformer.php @@ -26,6 +26,8 @@ class UserTransformer extends EntityTransformer 'notify_viewed' => (bool) $user->notify_viewed, 'notify_paid' => (bool) $user->notify_paid, 'notify_approved' => (bool) $user->notify_approved, + 'is_admin' => (bool) $user->is_admin, + 'permissions' => $user->getPermissions, ]; } } \ No newline at end of file From 5233047ab103306f64578d1843f1cef49621d084 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 9 May 2016 10:09:51 +1000 Subject: [PATCH 05/11] working with permissions --- app/Ninja/Transformers/UserTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/UserTransformer.php b/app/Ninja/Transformers/UserTransformer.php index f6bab290b817..711d0723250e 100644 --- a/app/Ninja/Transformers/UserTransformer.php +++ b/app/Ninja/Transformers/UserTransformer.php @@ -27,7 +27,7 @@ class UserTransformer extends EntityTransformer 'notify_paid' => (bool) $user->notify_paid, 'notify_approved' => (bool) $user->notify_approved, 'is_admin' => (bool) $user->is_admin, - 'permissions' => $user->getPermissions, + 'permissions' => $user->permissions, ]; } } \ No newline at end of file From dbdd1ac15579ab8db92c17c29a1a1e265d362a10 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 9 May 2016 10:28:47 +1000 Subject: [PATCH 06/11] working with permissions --- app/Ninja/Transformers/UserTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/UserTransformer.php b/app/Ninja/Transformers/UserTransformer.php index 711d0723250e..32cd42d90476 100644 --- a/app/Ninja/Transformers/UserTransformer.php +++ b/app/Ninja/Transformers/UserTransformer.php @@ -27,7 +27,7 @@ class UserTransformer extends EntityTransformer 'notify_paid' => (bool) $user->notify_paid, 'notify_approved' => (bool) $user->notify_approved, 'is_admin' => (bool) $user->is_admin, - 'permissions' => $user->permissions, + 'permissions' => Auth()::user->permissions, ]; } } \ No newline at end of file From 050b79cc75ddfaeb71816536587a5135e1a35e2c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 10 May 2016 09:26:44 +1000 Subject: [PATCH 07/11] user transformer - add fields --- app/Ninja/Transformers/UserTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Ninja/Transformers/UserTransformer.php b/app/Ninja/Transformers/UserTransformer.php index 32cd42d90476..63428ed64bb6 100644 --- a/app/Ninja/Transformers/UserTransformer.php +++ b/app/Ninja/Transformers/UserTransformer.php @@ -27,7 +27,7 @@ class UserTransformer extends EntityTransformer 'notify_paid' => (bool) $user->notify_paid, 'notify_approved' => (bool) $user->notify_approved, 'is_admin' => (bool) $user->is_admin, - 'permissions' => Auth()::user->permissions, + 'permissions' => (int) $user->getOriginal('permissions'), ]; } } \ No newline at end of file From ae6d85bb494ed9c3e90ef857a5c57020b47b9d14 Mon Sep 17 00:00:00 2001 From: Bartlomiej Szala Date: Wed, 11 May 2016 20:59:40 +0200 Subject: [PATCH 08/11] Working on texts translations --- resources/lang/pl/texts.php | 262 ++++++++++++++++++------------------ 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/resources/lang/pl/texts.php b/resources/lang/pl/texts.php index 9b91d00cfdd6..5af1bdfb427b 100644 --- a/resources/lang/pl/texts.php +++ b/resources/lang/pl/texts.php @@ -291,21 +291,21 @@ $LANG = array( 'fill_products_help' => 'Selecting a product will automatically fill in the description and cost', 'update_products' => 'Auto-update products', 'update_products_help' => 'Updating an invoice will automatically update the product library', - 'create_product' => 'Add Product', - 'edit_product' => 'Edit Product', - 'archive_product' => 'Archive Product', - 'updated_product' => 'Successfully updated product', - 'created_product' => 'Successfully created product', - 'archived_product' => 'Successfully archived product', + 'create_product' => 'Dodaj produkt', + 'edit_product' => 'Edytuj produkt', + 'archive_product' => 'Zarchiwizuj produkt', + 'updated_product' => 'Produkt został zaktualizowany', + 'created_product' => 'Produkt został utworzony', + 'archived_product' => 'Produkt został zarchiwizowany', 'pro_plan_custom_fields' => ':link to enable custom fields by joining the Pro Plan', - 'advanced_settings' => 'Advanced Settings', + 'advanced_settings' => 'Ustawienia zaawansowane', 'pro_plan_advanced_settings' => ':link to enable the advanced settings by joining the Pro Plan', - 'invoice_design' => 'Invoice Design', + 'invoice_design' => 'Szablon faktury', 'specify_colors' => 'Specify colors', 'specify_colors_label' => 'Select the colors used in the invoice', 'chart_builder' => 'Chart Builder', 'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!', - 'go_pro' => 'Go Pro', + 'go_pro' => 'Wybierz Pro', 'quote' => 'Oferta', 'quotes' => 'Oferty', 'quote_number' => 'Numer oferty', @@ -314,7 +314,7 @@ $LANG = array( 'quote_total' => 'Suma oferty', 'your_quote' => 'Twoja oferta', 'total' => 'Suma', - 'clone' => 'Clone', + 'clone' => 'Klonuj', 'new_quote' => 'Nowa oferta', 'create_quote' => 'Stwórz ofertę', 'edit_quote' => 'Edytuj ofertę', @@ -327,81 +327,81 @@ $LANG = array( 'view_invoice' => 'Zobacz fakturę', 'view_client' => 'Zobacz klienta', 'view_quote' => 'Zobacz ofertę', - 'updated_quote' => 'Successfully updated quote', - 'created_quote' => 'Successfully created quote', - 'cloned_quote' => 'Successfully cloned quote', - 'emailed_quote' => 'Successfully emailed quote', - 'archived_quote' => 'Successfully archived quote', - 'archived_quotes' => 'Successfully archived :count quotes', - 'deleted_quote' => 'Successfully deleted quote', - 'deleted_quotes' => 'Successfully deleted :count quotes', - 'converted_to_invoice' => 'Successfully converted quote to invoice', - 'quote_subject' => 'New quote $quote from :account', + 'updated_quote' => 'Oferta została zaktualizowana', + 'created_quote' => 'Oferta została utworzona', + 'cloned_quote' => 'Oferta została sklonowana', + 'emailed_quote' => 'Oferta została wysłana', + 'archived_quote' => 'Oferta została zarchiwizowana', + 'archived_quotes' => 'Zarchiwizowano :count ofert', + 'deleted_quote' => 'Oferta została usunięta', + 'deleted_quotes' => 'Usunięto :count ofert', + 'converted_to_invoice' => 'Utworzono fakturę z oferty', + 'quote_subject' => 'Nowa oferta $quote z :account', 'quote_message' => 'To view your quote for :amount, click the link below.', 'quote_link_message' => 'To view your client quote click the link below:', 'notification_quote_sent_subject' => 'Quote :invoice was sent to :client', 'notification_quote_viewed_subject' => 'Quote :invoice was viewed by :client', 'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.', 'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.', - 'session_expired' => 'Your session has expired.', - 'invoice_fields' => 'Invoice Fields', - 'invoice_options' => 'Invoice Options', - 'hide_quantity' => 'Hide Quantity', + 'session_expired' => 'Twoja sesja wygasła.', + 'invoice_fields' => 'Pola faktury', + 'invoice_options' => 'Opcje faktury', + 'hide_quantity' => 'Ukryj ilość', 'hide_quantity_help' => 'If your line items quantities are always 1, then you can declutter invoices by no longer displaying this field.', - 'hide_paid_to_date' => 'Hide Paid to Date', + 'hide_paid_to_date' => 'Ukryj wypłacono do tej pory', 'hide_paid_to_date_help' => 'Only display the "Paid to Date" area on your invoices once a payment has been received.', 'charge_taxes' => 'Charge taxes', - 'user_management' => 'User Management', - 'add_user' => 'Add User', - 'send_invite' => 'Send invitation', - 'sent_invite' => 'Successfully sent invitation', - 'updated_user' => 'Successfully updated user', - 'invitation_message' => 'You\'ve been invited by :invitor. ', - 'register_to_add_user' => 'Please sign up to add a user', - 'user_state' => 'State', - 'edit_user' => 'Edit User', - 'delete_user' => 'Delete User', - 'active' => 'Active', - 'pending' => 'Pending', - 'deleted_user' => 'Successfully deleted user', - 'confirm_email_invoice' => 'Are you sure you want to email this invoice?', - 'confirm_email_quote' => 'Are you sure you want to email this quote?', - 'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?', - 'cancel_account' => 'Usuń konto', - 'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.', - 'go_back' => 'Go Back', - 'data_visualizations' => 'Data Visualizations', + 'user_management' => 'Zarządzaj użytkownikiem', + 'add_user' => 'Dodaj użytkownika', + 'send_invite' => 'Wyślij zaproszenie', + 'sent_invite' => 'Zaproszenie zostało wysłane', + 'updated_user' => 'Użytkownik został zaktualizowany', + 'invitation_message' => 'Zostałeś zaproszony przez :invitor. ', + 'register_to_add_user' => 'Zaloguj się, aby dodać użytkownika', + 'user_state' => 'Stan', + 'edit_user' => 'Edytuj użytkownika', + 'delete_user' => 'Usuń użytkownika', + 'active' => 'Aktywny', + 'pending' => 'Oczekuję', + 'deleted_user' => 'Użytkownik został usunięty', + 'confirm_email_invoice' => 'Czy na pewno chcesz wysłać tą fakturę?', + 'confirm_email_quote' => 'Czy na pewno chcesz wysłać tą ofertę?', + 'confirm_recurring_email_invoice' => 'Czy na pewno chcesz wysłać tą fakturę?', + 'cancel_account' => 'Anuluj konto', + 'cancel_account_message' => 'Ostrzeżenie: Nie można cofnąć tej operacji, wszystkie twoje dane zostaną usunięte.', + 'go_back' => 'cofnij', + 'data_visualizations' => 'Wizualizacje danych', 'sample_data' => 'Sample data shown', - 'hide' => 'Hide', + 'hide' => 'Ukryj', 'new_version_available' => 'A new version of :releases_link is available. You\'re running v:user_version, the latest is v:latest_version', - 'invoice_settings' => 'Invoice Settings', - 'invoice_number_prefix' => 'Invoice Number Prefix', - 'invoice_number_counter' => 'Invoice Number Counter', - 'quote_number_prefix' => 'Quote Number Prefix', - 'quote_number_counter' => 'Quote Number Counter', + 'invoice_settings' => 'Ustawienia faktury', + 'invoice_number_prefix' => 'Prefiks numeru faktury', + 'invoice_number_counter' => 'Licznik numeru faktury', + 'quote_number_prefix' => 'Prefiks numeru oferty', + 'quote_number_counter' => 'Licznik numeru oferty', 'share_invoice_counter' => 'Share invoice counter', - 'invoice_issued_to' => 'Invoice issued to', + 'invoice_issued_to' => 'Faktura wystawiona dla', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', - 'mark_sent' => 'Mark Sent', + 'mark_sent' => 'Oznacz jako wysłane', 'gateway_help_1' => ':link to sign up for Authorize.net.', 'gateway_help_2' => ':link to sign up for Authorize.net.', 'gateway_help_17' => ':link to get your PayPal API signature.', 'gateway_help_27' => ':link to sign up for TwoCheckout.', - 'more_designs' => 'More designs', - 'more_designs_title' => 'Additional Invoice Designs', - 'more_designs_cloud_header' => 'Go Pro for more invoice designs', + 'more_designs' => 'Więcej szablonów', + 'more_designs_title' => 'Dodatkowe szablony faktur', + 'more_designs_cloud_header' => 'Więcej szablonów faktur w wersji PRO', 'more_designs_cloud_text' => '', 'more_designs_self_host_text' => '', - 'buy' => 'Buy', - 'bought_designs' => 'Successfully added additional invoice designs', - 'sent' => 'sent', - 'vat_number' => 'VAT Number', + 'buy' => 'Kup', + 'bought_designs' => 'Dodatkowe szablony faktur zostały dodane', + 'sent' => 'wysłane', + 'vat_number' => 'NIP', 'timesheets' => 'Timesheets', 'payment_title' => 'Enter Your Billing Address and Credit Card information', 'payment_cvv' => '*This is the 3-4 digit number onthe back of your card', 'payment_footer1' => '*Billing address must match address associated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', - 'id_number' => 'ID Number', + 'id_number' => 'Numer ID', 'white_label_link' => 'White label', 'white_label_header' => 'White Label', 'bought_white_label' => 'Successfully enabled white label license', @@ -426,7 +426,7 @@ $LANG = array( 'select_version' => 'Wybierz wersję', 'view_history' => 'Zobacz historię', 'edit_payment' => 'Edytuj płatność', - 'updated_payment' => 'Successfully updated payment', + 'updated_payment' => 'Płatność została zaktualizowana', 'deleted' => 'Usunięte', 'restore_user' => 'Przywróć użytkownika', 'restored_user' => 'Użytkownik został przywrócony', @@ -443,7 +443,7 @@ $LANG = array( 'token_billing_2' => 'Opt-in - checkbox is shown but not selected', 'token_billing_3' => 'Opt-out - checkbox is shown and selected', 'token_billing_4' => 'Zawsze', - 'token_billing_checkbox' => 'Store credit card details', + 'token_billing_checkbox' => 'Zapisz dane karty kredytowej', 'view_in_stripe' => 'View in Stripe', 'use_card_on_file' => 'Use card on file', 'edit_payment_details' => 'Edit payment details', @@ -460,15 +460,15 @@ $LANG = array( 'click_once' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'invoice_footer' => 'Stopka faktury', 'save_as_default_footer' => 'Save as default footer', - 'token_management' => 'Token Management', - 'tokens' => 'Tokens', - 'add_token' => 'Add Token', - 'show_deleted_tokens' => 'Show deleted tokens', - 'deleted_token' => 'Successfully deleted token', - 'created_token' => 'Successfully created token', - 'updated_token' => 'Successfully updated token', - 'edit_token' => 'Edit Token', - 'delete_token' => 'Delete Token', + 'token_management' => 'Zarządanie tokenem', + 'tokens' => 'Tokeny', + 'add_token' => 'Dodaj token', + 'show_deleted_tokens' => 'Pokaż usunięte tokeny', + 'deleted_token' => 'Token został usunięty', + 'created_token' => 'Token został utworzony', + 'updated_token' => 'Token został zaktualizowany', + 'edit_token' => 'Edytuj token', + 'delete_token' => 'Usuń token', 'token' => 'Token', 'add_gateway' => 'Add Gateway', 'delete_gateway' => 'Delete Gateway', @@ -482,25 +482,25 @@ $LANG = array( 'current_password' => 'Aktualne hasło', 'new_password' => 'Nowe hasło', 'confirm_password' => 'Potwierdź hasło', - 'password_error_incorrect' => 'The current password is incorrect.', - 'password_error_invalid' => 'The new password is invalid.', - 'updated_password' => 'Successfully updated password', - 'api_tokens' => 'API Tokens', - 'users_and_tokens' => 'Users & Tokens', + 'password_error_incorrect' => 'Hasło jest nieprawidłowe.', + 'password_error_invalid' => 'Nowe hasło jest nieprawidłowe.', + 'updated_password' => 'Hasło zostało zaktualizowane', + 'api_tokens' => 'Tokeny API', + 'users_and_tokens' => 'Użytkownicy i tokeny', 'account_login' => 'Account Login', - 'recover_password' => 'Recover your password', + 'recover_password' => 'Przywróć swoje hasło', 'forgot_password' => 'Forgot your password?', - 'email_address' => 'Email address', + 'email_address' => 'Adres email', 'lets_go' => 'Let\'s go', - 'password_recovery' => 'Password Recovery', + 'password_recovery' => 'Przywracanie hasła', 'send_email' => 'Wyślij email', 'set_password' => 'Ustaw hasło', 'converted' => 'Converted', - 'email_approved' => 'Email me when a quote is approved', - 'notification_quote_approved_subject' => 'Quote :invoice was approved by :client', - 'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.', - 'resend_confirmation' => 'Resend confirmation email', - 'confirmation_resent' => 'The confirmation email was resent', + 'email_approved' => 'Wyślij email kiedy oferta będzie zatwierdzona', + 'notification_quote_approved_subject' => 'Oferta :invoice została zatwierdzona przez :client', + 'notification_quote_approved' => 'Klient :client zatwierdził ofertę :invoice na kwotę :amount.', + 'resend_confirmation' => 'Wyślij ponownie email potwierdzający', + 'confirmation_resent' => 'Email potwierdzający został wysłany', 'gateway_help_42' => ':link to sign up for BitPay.
Note: use a Legacy API Key, not an API token.', 'payment_type_credit_card' => 'Karta kredytowa', 'payment_type_paypal' => 'PayPal', @@ -508,14 +508,14 @@ $LANG = array( 'knowledge_base' => 'Baza wiedzy', 'partial' => 'Partial', 'partial_remaining' => ':partial of :balance', - 'more_fields' => 'More Fields', - 'less_fields' => 'Less Fields', + 'more_fields' => 'Więcej pól', + 'less_fields' => 'Mniej pól', 'client_name' => 'Nazwa klienta', 'pdf_settings' => 'Ustawienia PDF', 'product_settings' => 'Ustawienia produktu', - 'auto_wrap' => 'Auto Line Wrap', + 'auto_wrap' => 'Zawijaj wiersze', 'duplicate_post' => 'Warning: the previous page was submitted twice. The second submission had been ignored.', - 'view_documentation' => 'View Documentation', + 'view_documentation' => 'Zobacz dokumentację', 'app_title' => 'Free Open-Source Online Invoicing', 'app_description' => 'Invoice Ninja is a free, open-source solution for invoicing and billing customers. With Invoice Ninja, you can easily build and send beautiful invoices from any device that has access to the web. Your clients can print your invoices, download them as pdf files, and even pay you online from within the system.', 'rows' => 'wierszy', @@ -580,8 +580,8 @@ $LANG = array( 'stopped_task' => 'Successfully stopped task', 'invoice_task' => 'Invoice Task', 'invoice_labels' => 'Invoice Labels', - 'prefix' => 'Prefix', - 'counter' => 'Counter', + 'prefix' => 'Prefiks', + 'counter' => 'Licznik', 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla', 'partial_value' => 'Must be greater than zero and less than the total', @@ -727,7 +727,7 @@ $LANG = array( 'default_tax_rate_id' => 'Domyśłna stawka podatkowa', 'tax_rate' => 'Stawka podatkowa', 'recurring_hour' => 'Okresowa godzina', - 'pattern' => 'Pattern', + 'pattern' => 'Wzór', 'pattern_help_title' => 'Pattern Help', 'pattern_help_1' => 'Create custom invoice and quote numbers by specifying a pattern', 'pattern_help_2' => 'Available variables:', @@ -868,42 +868,42 @@ $LANG = array( 'expenses' => 'Wydatki', 'new_expense' => 'Nowy wydatek', 'enter_expense' => 'Dodaj wydatek', - 'vendors' => 'Vendors', - 'new_vendor' => 'New Vendor', + 'vendors' => 'Sprzedawcy', + 'new_vendor' => 'Nowy sprzedawca', 'payment_terms_net' => 'Net', - 'vendor' => 'Vendor', - 'edit_vendor' => 'Edit Vendor', - 'archive_vendor' => 'Archive Vendor', - 'delete_vendor' => 'Delete Vendor', - 'view_vendor' => 'View Vendor', - 'deleted_expense' => 'Successfully deleted expense', - 'archived_expense' => 'Successfully archived expense', - 'deleted_expenses' => 'Successfully deleted expenses', - 'archived_expenses' => 'Successfully archived expenses', - 'expense_amount' => 'Expense Amount', - 'expense_balance' => 'Expense Balance', - 'expense_date' => 'Expense Date', - 'expense_should_be_invoiced' => 'Should this expense be invoiced?', - 'public_notes' => 'Public Notes', - 'invoice_amount' => 'Invoice Amount', - 'exchange_rate' => 'Exchange Rate', - 'yes' => 'Yes', - 'no' => 'No', - 'should_be_invoiced' => 'Should be invoiced', - 'view_expense' => 'View expense # :expense', - 'edit_expense' => 'Edit Expense', - 'archive_expense' => 'Archive Expense', - 'delete_expense' => 'Delete Expense', - 'view_expense_num' => 'Expense # :expense', - 'updated_expense' => 'Successfully updated expense', - 'created_expense' => 'Successfully created expense', + 'vendor' => 'Sprzedawca', + 'edit_vendor' => 'Edytuj sprzedawcę', + 'archive_vendor' => 'Archiwizuj sprzedawcę', + 'delete_vendor' => 'Usuń sprzedawcę', + 'view_vendor' => 'Zobacz sprzedawcę', + 'deleted_expense' => 'Wydatki zostały usunięte', + 'archived_expense' => 'Wydatki zostały zarchiwizowane', + 'deleted_expenses' => 'Wydatki zostały usunięte', + 'archived_expenses' => 'Wydatki zostały zarchiwizowane', + 'expense_amount' => 'Wartość wydatków', + 'expense_balance' => 'Saldo wydatków', + 'expense_date' => 'Data obciążenia', + 'expense_should_be_invoiced' => 'Utwórz fakturę dla poniesionego kosztu?', + 'public_notes' => 'Notatki publiczne', + 'invoice_amount' => 'Kwota faktury', + 'exchange_rate' => 'Kurs wymiany', + 'yes' => 'Tak', + 'no' => 'Nie', + 'should_be_invoiced' => 'Utwórz fakturę', + 'view_expense' => 'Zobacz wydatek # :expense', + 'edit_expense' => 'Edytuj wydatek', + 'archive_expense' => 'Archiwizuj wydatek', + 'delete_expense' => 'Usuń wydatek', + 'view_expense_num' => 'Wydatek # :expense', + 'updated_expense' => 'Wydatek został zaktualizowany', + 'created_expense' => 'Wydatek został utworzony', 'enter_expense' => 'Dodaj wydatek', - 'view' => 'View', + 'view' => 'Podgląd', 'restore_expense' => 'Przywróć wydatek', 'invoice_expense' => 'Faktura na wydatek', - 'expense_error_multiple_clients' => 'The expenses can\'t belong to different clients', - 'expense_error_invoiced' => 'Expense has already been invoiced', - 'convert_currency' => 'Konwersja waluty', + 'expense_error_multiple_clients' => 'Wydatek nie może należeć do innych klientów', + 'expense_error_invoiced' => 'Faktura do wydatku została już utworzona', + 'convert_currency' => 'Konwertuj walutę', 'num_days' => 'Liczba dni', 'create_payment_term' => 'Utwórz warunki płatności', 'edit_payment_terms' => 'Edytuj warunki płatności', @@ -913,7 +913,7 @@ $LANG = array( 'recurring_due_date_help' => '

Automatycznie ustawia termin faktury.

Invoices on a monthly or yearly cycle set to be due on or before the day they are created will be due the next month. Invoices set to be due on the 29th or 30th in months that don\'t have that day will be due the last day of the month.

Invoices on a weekly cycle set to be due on the day of the week they are created will be due the next week.

-

For example:

+

Na przykład:

  • Today is the 15th, due date is 1st of the month. The due date should likely be the 1st of the next month.
  • Today is the 15th, due date is the last day of the month. The due date will be the last day of the this month. @@ -927,7 +927,7 @@ $LANG = array( 'next_due_on' => 'Następna opłata: :date', 'use_client_terms' => 'Use client terms', 'day_of_month' => ':ordinal day of month', - 'last_day_of_month' => 'Last day of month', + 'last_day_of_month' => 'Ostatni dzień miesiąca', 'day_of_week_after' => ':ordinal :day after', 'sunday' => 'Niedziela', 'monday' => 'Poniedziałek', @@ -1072,11 +1072,11 @@ $LANG = array( 'gateway_help_20' => ':link to sign up for Sage Pay.', 'gateway_help_21' => ':link to sign up for Sage Pay.', 'partial_due' => 'Partial Due', - 'restore_vendor' => 'Restore Vendor', - 'restored_vendor' => 'Successfully restored vendor', - 'restored_expense' => 'Successfully restored expense', - 'permissions' => 'Permissions', - 'create_all_help' => 'Allow user to create and modify records', + 'restore_vendor' => 'Przywróć sprzedawcę', + 'restored_vendor' => 'Sprzedawca został przywrócony', + 'restored_expense' => 'Wydatek został przywrócony', + 'permissions' => 'Uprawnienia', + 'create_all_help' => 'Pozwól urzytkownikowi tworzyć i aktualizować rekordy', 'view_all_help' => 'Allow user to view records they didn\'t create', 'edit_all_help' => 'Allow user to modify records they didn\'t create', 'view_payment' => 'Zobacz wpłatę', From 8185e87d0deaff277052bc3874c01af571621d6d Mon Sep 17 00:00:00 2001 From: Bartlomiej Szala Date: Wed, 11 May 2016 22:12:00 +0200 Subject: [PATCH 09/11] Add Polish currency into a CurrenciesSeeder --- database/seeds/CurrenciesSeeder.php | 1 + 1 file changed, 1 insertion(+) diff --git a/database/seeds/CurrenciesSeeder.php b/database/seeds/CurrenciesSeeder.php index 3b44d55d8d7f..857dbe628405 100644 --- a/database/seeds/CurrenciesSeeder.php +++ b/database/seeds/CurrenciesSeeder.php @@ -58,6 +58,7 @@ class CurrenciesSeeder extends Seeder ['name' => 'Maldivian Rufiyaa', 'code' => 'MVR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], ['name' => 'Costa Rican Colón', 'code' => 'CRC', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], ['name' => 'Pakistani Rupee', 'code' => 'PKR', 'symbol' => 'Rs ', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'], + ['name' => 'Polish Zloty', 'code' => 'PLN', 'symbol' => 'zł', 'precision' => '2', 'thousand_separator' => ' ', 'decimal_separator' => ','], ]; foreach ($currencies as $currency) { From 2b23a80fda15fef9469f97f1ae1d0fbc1cabd976 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 12 May 2016 08:27:21 +1000 Subject: [PATCH 10/11] rewind --- app/Http/Controllers/InvoiceApiController.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index 69149c6d5b1a..dca69d840862 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -316,16 +316,7 @@ class InvoiceApiController extends BaseAPIController } elseif ($request->action) { return $this->handleAction($request); } - else if ($request->action == ACTION_CLONE) { - - $invoice = Invoice::scope($publicId)->firstOrFail(); - $clonedInvoice = $this->invoiceRepo->cloneInvoice($invoice, null); - - $transformer = new InvoiceTransformer(\Auth::user()->account, Input::get('serializer')); - $data = $this->createItem($clonedInvoice, $transformer, 'invoice'); - - return $this->response($data); - } + $data = $request->input(); $data['public_id'] = $publicId; $this->invoiceService->save($data, $request->entity()); From 7c0e2f4420a62df9c60ceb15c047db691db03cc1 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 12 May 2016 08:28:49 +1000 Subject: [PATCH 11/11] added in additional fields for Invoice Transformer --- app/Http/Controllers/InvoiceApiController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index dca69d840862..983e8fa14d71 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -1,8 +1,6 @@ action) { return $this->handleAction($request); } - + $data = $request->input(); $data['public_id'] = $publicId; $this->invoiceService->save($data, $request->entity());