diff --git a/README.md b/README.md index 99c2e354139c..00c2a5dc0da3 100644 --- a/README.md +++ b/README.md @@ -117,4 +117,5 @@ Add public/ to your web server root * [jashkenas/underscore](https://github.com/jashkenas/underscore) - JavaScript's utility _ belt * [caouecs/Laravel4-long](https://github.com/caouecs/Laravel4-lang) - List of languages ​​for Laravel4 * [calvinfroedge/PHP-Payments](https://github.com/calvinfroedge/PHP-Payments) - A uniform payments interface for PHP -* [bgrins/spectrum](https://github.com/bgrins/spectrum) - The No Hassle JavaScript Colorpicker \ No newline at end of file +* [bgrins/spectrum](https://github.com/bgrins/spectrum) - The No Hassle JavaScript Colorpicker +* [lokesh/lightbox2](https://github.com/lokesh/lightbox2/) - The original lightbox script \ No newline at end of file diff --git a/app/database/migrations/2014_10_13_054100_add_invoice_number_settings.php b/app/database/migrations/2014_10_13_054100_add_invoice_number_settings.php index 27abab49d1d8..377e9e013fa3 100644 --- a/app/database/migrations/2014_10_13_054100_add_invoice_number_settings.php +++ b/app/database/migrations/2014_10_13_054100_add_invoice_number_settings.php @@ -37,7 +37,7 @@ class AddInvoiceNumberSettings extends Migration { } DB::table('accounts')->where('id', $accountId)->update(['invoice_number_counter' => ++$max]); - } + } } /** diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php index 76067bbccb0e..ef72d252c27d 100644 --- a/app/lang/de/texts.php +++ b/app/lang/de/texts.php @@ -434,5 +434,21 @@ return array( 'invoice_issued_to' => 'Invoice issued to', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', 'mark_sent' => 'Mark sent', + + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + ); diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php index 2c1e9eea5711..2407d540caaa 100644 --- a/app/lang/es/texts.php +++ b/app/lang/es/texts.php @@ -103,13 +103,13 @@ return array( // recurring invoices 'recurring_invoices' => 'Facturas recurrentes', 'recurring_help' => '

Enviar facturas automáticamente a clientes semanalmente, bi-mensualmente, mensualmente, trimestral o anualmente.

-

Uso :MONTH, :QUARTER or :YEAR para fechas dinámicas. Matemáticas básicas también funcionan bien. Por ejemplo: :MONTH-1.

-

Ejemplos de variables dinámicas de factura:

- ', +

Uso :MONTH, :QUARTER or :YEAR para fechas dinámicas. Matemáticas básicas también funcionan bien. Por ejemplo: :MONTH-1.

+

Ejemplos de variables dinámicas de factura:

+ ', // dashboard 'in_total_revenue' => 'ingreso total', @@ -281,69 +281,69 @@ return array( 'password_forgot' => 'La información sobre el cambio de tu contraseña se ha enviado a tu dirección de correo electrónico.', 'password_reset' => 'Tu contraseña se ha cambiado con éxito.', 'wrong_password_reset' => 'Contraseña no válida. Inténtalo de nuevo', - ), + ), // Pro Plan 'pro_plan' => [ 'remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja', //Maybe incorrect for the context 'remove_logo_link' => 'Haz clic aquí', - ], - 'logout' => 'Cerrar sesión', - 'sign_up_to_save' => 'Registrate para guardar tu trabajo', - 'agree_to_terms' =>'Estoy de acuerdo con los términos de Invoice Ninja :terms', - 'terms_of_service' => 'Términos de servicio', - 'email_taken' => 'Esta dirección de correo electrónico ya se ha registrado', - 'working' => 'Procesando', - 'success' => 'Éxito', - 'success_message' => 'Te has registrado con éxito. Por favor, haz clic en el enlace de el correo de confirmación para verificar tu dirección de correo electrónico.', - 'erase_data' => 'Esta acción eliminará todos tus datos de forma permanente.', - 'password' => 'Contraseña', - - 'pro_plan_product' => 'Plan Pro', - 'pro_plan_description' => 'Un año de inscripción en el Plan Pro de Invoice Ninja.', - 'pro_plan_success' => '¡Gracias por unirte a Invoice Ninja! Al realizar el pago de tu factura, se iniciara tu PLAN PRO.', - 'unsaved_changes' => 'Tienes cambios no guardados', - 'custom_fields' => 'Campos a medida', - 'company_fields' => 'Campos de la empresa', - 'client_fields' => 'Campos del cliente', - 'field_label' => 'Etiqueta del campo', - 'field_value' => 'Valor del campo', - 'edit' => 'Editar', - 'view_as_recipient' => 'Ver como destinitario', + ], + 'logout' => 'Cerrar sesión', + 'sign_up_to_save' => 'Registrate para guardar tu trabajo', + 'agree_to_terms' =>'Estoy de acuerdo con los términos de Invoice Ninja :terms', + 'terms_of_service' => 'Términos de servicio', + 'email_taken' => 'Esta dirección de correo electrónico ya se ha registrado', + 'working' => 'Procesando', + 'success' => 'Éxito', + 'success_message' => 'Te has registrado con éxito. Por favor, haz clic en el enlace de el correo de confirmación para verificar tu dirección de correo electrónico.', + 'erase_data' => 'Esta acción eliminará todos tus datos de forma permanente.', + 'password' => 'Contraseña', + + 'pro_plan_product' => 'Plan Pro', + 'pro_plan_description' => 'Un año de inscripción en el Plan Pro de Invoice Ninja.', + 'pro_plan_success' => '¡Gracias por unirte a Invoice Ninja! Al realizar el pago de tu factura, se iniciara tu PLAN PRO.', + 'unsaved_changes' => 'Tienes cambios no guardados', + 'custom_fields' => 'Campos a medida', + 'company_fields' => 'Campos de la empresa', + 'client_fields' => 'Campos del cliente', + 'field_label' => 'Etiqueta del campo', + 'field_value' => 'Valor del campo', + 'edit' => 'Editar', + 'view_as_recipient' => 'Ver como destinitario', // product management - 'product_library' => 'Inventario de productos', - 'product' => 'Producto', - 'products' => 'Productos', - 'fill_products' => 'Auto-rellenar productos', - 'fill_products_help' => 'Seleccionar un producto automáticamente configurará la descripción y coste', - 'update_products' => 'Auto-actualizar productos', - 'update_products_help' => 'Actualizar una factura automáticamente actualizará los productos', - 'create_product' => 'Crear Producto', - 'edit_product' => 'Editar Producto', - 'archive_product' => 'Archivar Producto', - 'updated_product' => 'Producto actualizado con éxito', - 'created_product' => 'Producto creado con éxito', - 'archived_product' => 'Producto archivado con éxito', - 'pro_plan_custom_fields' => ':link haz click para para activar campos a medida', - 'advanced_settings' => 'Configuración Avanzada', - 'pro_plan_advanced_settings' => ':link haz click para para activar la configuración avanzada', - 'invoice_design' => 'Diseño de factura', - 'specify_colors' => 'Especificar colores', - 'specify_colors_label' => 'Seleccionar los colores para usar en las facturas', - 'chart_builder' => 'Constructor de graficos', - 'ninja_email_footer' => 'Usa :site para facturar a tus clientes y recibir pagos de forma gratuita!', - 'go_pro' => 'Hazte Pro', + 'product_library' => 'Inventario de productos', + 'product' => 'Producto', + 'products' => 'Productos', + 'fill_products' => 'Auto-rellenar productos', + 'fill_products_help' => 'Seleccionar un producto automáticamente configurará la descripción y coste', + 'update_products' => 'Auto-actualizar productos', + 'update_products_help' => 'Actualizar una factura automáticamente actualizará los productos', + 'create_product' => 'Crear Producto', + 'edit_product' => 'Editar Producto', + 'archive_product' => 'Archivar Producto', + 'updated_product' => 'Producto actualizado con éxito', + 'created_product' => 'Producto creado con éxito', + 'archived_product' => 'Producto archivado con éxito', + 'pro_plan_custom_fields' => ':link haz click para para activar campos a medida', + 'advanced_settings' => 'Configuración Avanzada', + 'pro_plan_advanced_settings' => ':link haz click para para activar la configuración avanzada', + 'invoice_design' => 'Diseño de factura', + 'specify_colors' => 'Especificar colores', + 'specify_colors_label' => 'Seleccionar los colores para usar en las facturas', + 'chart_builder' => 'Constructor de graficos', + 'ninja_email_footer' => 'Usa :site para facturar a tus clientes y recibir pagos de forma gratuita!', + 'go_pro' => 'Hazte Pro', // Quotes - 'quote' => 'Cotización', - 'quotes' => 'Cotizaciones', - 'quote_number' => 'Numero de cotización', - 'quote_number_short' => 'Cotización #', - 'quote_date' => 'Fecha cotización', - 'quote_total' => 'Total cotizado', - 'your_quote' => 'Tu cotización', - 'total' => 'Total', + 'quote' => 'Cotización', + 'quotes' => 'Cotizaciones', + 'quote_number' => 'Numero de cotización', + 'quote_number_short' => 'Cotización #', + 'quote_date' => 'Fecha cotización', + 'quote_total' => 'Total cotizado', + 'your_quote' => 'Tu cotización', + 'total' => 'Total', 'clone' => 'Clon', //Whats the context for this one 'new_quote' => 'Nueva cotización', 'create_quote' => 'Crear Cotización', @@ -415,4 +415,19 @@ return array( 'invalid_counter' => 'Para evitar posibles conflictos, por favor crea un prefijo de facturación y de cotización.', 'mark_sent' => 'Marcar como enviado', -); + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + + ); \ No newline at end of file diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php index d7444440bd07..190b72c4a522 100644 --- a/app/lang/fr/texts.php +++ b/app/lang/fr/texts.php @@ -435,6 +435,21 @@ return array( 'invoice_issued_to' => 'Invoice issued to', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', 'mark_sent' => 'Mark sent', - + + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + ); diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index a9720c5bf81b..869e6f83afcf 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -436,5 +436,21 @@ return array( 'mark_sent' => 'Mark sent', + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + + ); diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php index a6b66700898e..866bdb469d5c 100644 --- a/app/lang/lt/texts.php +++ b/app/lang/lt/texts.php @@ -444,6 +444,21 @@ return array( 'mark_sent' => 'Mark sent', + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + ); diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php index b292a6916df1..d8e9a138a6ee 100644 --- a/app/lang/nb_NO/texts.php +++ b/app/lang/nb_NO/texts.php @@ -442,7 +442,22 @@ return array( 'invoice_issued_to' => 'Invoice issued to', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', 'mark_sent' => 'Mark sent', - + + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + ); \ No newline at end of file diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php index 59f6d7b185c5..dd53eab43513 100644 --- a/app/lang/nl/texts.php +++ b/app/lang/nl/texts.php @@ -436,6 +436,21 @@ return array( 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', 'mark_sent' => 'Mark sent', - + + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + ); diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php index fe13583744c9..c00b25b6cf8c 100644 --- a/app/lang/pt_BR/texts.php +++ b/app/lang/pt_BR/texts.php @@ -423,7 +423,22 @@ return array( 'invoice_issued_to' => 'Invoice issued to', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', 'mark_sent' => 'Mark sent', - + + '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_23' => 'Note: use your secret API key, not your publishable API key.', + '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_cloud_text' => '', + 'more_designs_self_host_header' => 'Get 6 more invoice designs for just $20', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + ); diff --git a/app/routes.php b/app/routes.php index 5cab64889708..c37b46cc0960 100755 --- a/app/routes.php +++ b/app/routes.php @@ -1,6 +1,5 @@ -    Coming soon - @@ -119,6 +116,7 @@ } function showMoreDesigns() { + trackUrl('/view_more_designs'); $('#moreDesignsModal').modal('show'); }