Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja

Browse Source
This commit is contained in:
Troels Liebe Bentsen 2014-10-20 19:10:04 +02:00
commit 68a53db5bb
23 changed files with 517 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/AccountController.php
View File

@ -65,6 +65,22 @@ class AccountController extends \BaseController {
} }
*/ */
public function demo()
{
$demoAccountId = Utils::getDemoAccountId();
if (!$demoAccountId) {
return Redirect::to('/');
}
$account = Account::find($demoAccountId);
$user = $account->users()->first();
Auth::login($user, true);
return Redirect::to('invoices/create');
}
public function getStarted() public function getStarted()
{ {
if (Auth::check()) if (Auth::check())

1
app/controllers/ClientApiController.php
View File

@ -1,7 +1,6 @@
<?php <?php
use ninja\repositories\ClientRepository; use ninja\repositories\ClientRepository;
use Client;
class ClientApiController extends Controller { class ClientApiController extends Controller {

1
app/controllers/InvoiceApiController.php
View File

@ -1,7 +1,6 @@
<?php <?php
use ninja\repositories\InvoiceRepository; use ninja\repositories\InvoiceRepository;
use Invoice;
class InvoiceApiController extends Controller { class InvoiceApiController extends Controller {

2
app/controllers/InvoiceController.php
View File

@ -357,7 +357,7 @@ class InvoiceController extends \BaseController {
} }
else if ($action == 'email') else if ($action == 'email')
{ {
if (Auth::user()->confirmed) if (Auth::user()->confirmed && !Auth::user()->isDemo())
{ {
$message = trans("texts.emailed_{$entityType}"); $message = trans("texts.emailed_{$entityType}");
$this->mailer->sendInvoice($invoice); $this->mailer->sendInvoice($invoice);

1
app/controllers/PaymentApiController.php
View File

@ -1,7 +1,6 @@
<?php <?php
use ninja\repositories\PaymentRepository; use ninja\repositories\PaymentRepository;
use Payment;
class PaymentApiController extends Controller { class PaymentApiController extends Controller {

1
app/controllers/QuoteApiController.php
View File

@ -1,7 +1,6 @@
<?php <?php
use ninja\repositories\InvoiceRepository; use ninja\repositories\InvoiceRepository;
use Invoice;
class QuoteApiController extends Controller { class QuoteApiController extends Controller {

8
app/database/migrations/2014_07_17_205900_support_hiding_quantity.php
View File

@ -26,11 +26,11 @@ class SupportHidingQuantity extends Migration {
Schema::table('invoices', function($table) Schema::table('invoices', function($table)
{ {
$table->decimal('custom_value1', 13, 2); $table->decimal('custom_value1', 13, 2)->default(0);
$table->decimal('custom_value2', 13, 2); $table->decimal('custom_value2', 13, 2)->default(0);
$table->boolean('custom_taxes1'); $table->boolean('custom_taxes1')->default(0);
$table->boolean('custom_taxes2'); $table->boolean('custom_taxes2')->default(0);
}); });
} }

4
app/database/seeds/PaymentLibrariesSeeder.php
View File

@ -20,14 +20,14 @@ class PaymentLibrariesSeeder extends Seeder
// check that moolah exists // check that moolah exists
if (!DB::table('gateways')->where('name', '=', 'moolah')->get()) { if (!DB::table('gateways')->where('name', '=', 'moolah')->get()) {
DB::table('gateways')->update(['recommended' => 0]); DB::table('gateways')->update(['recommended' => 0]);
DB::table('gateways')->insert([ Gateway::create(array(
'name' => 'moolah', 'name' => 'moolah',
'provider' => 'AuthorizeNet_AIM', 'provider' => 'AuthorizeNet_AIM',
'sort_order' => 1, 'sort_order' => 1,
'recommended' => 1, 'recommended' => 1,
'site_url' => 'https://invoiceninja.mymoolah.com/', 'site_url' => 'https://invoiceninja.mymoolah.com/',
'payment_library_id' => 1 'payment_library_id' => 1
]); ));
} }
/* /*

6
app/lang/en/texts.php
View File

@ -443,6 +443,10 @@ return array(
'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix',
'mark_sent' => 'Mark sent', '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.',
); );

813
app/lang/es/texts.php
View File

@ -1,437 +1,418 @@
<?php <?php
return array( return array(
// client
'organization' => 'Organización',
'name' => 'Nombre',
'website' => 'Página Web',
'work_phone' => 'Teléfono',
'address' => 'Dirección',
'address1' => 'Calle',
'address2' => 'Bloq/Pta',
'city' => 'Ciudad',
'state' => 'Región/Provincia',
'postal_code' => 'Código Postal',
'country_id' => 'País',
'contacts' => 'Contactos',
'first_name' => 'Nombre',
'last_name' => 'Apellidos',
'phone' => 'Teléfono',
'email' => 'Email',
'additional_info' => 'Información extra',
'payment_terms' => 'Términos de pago',
'currency_id' => 'Divisa',
'size_id' => 'Tamaño',
'industry_id' => 'Industria',
'private_notes' => 'Notas Privadas',
// invoice // client
'invoice' => 'Factura', 'organization' => 'Empresa',
'client' => 'Clienta', 'name' => 'Nombre', //Razon social-Colombia,
'invoice_date' => 'Fecha de factura', 'website' => 'Sitio Web',
'due_date' => 'Fecha de pago', 'work_phone' => 'Teléfono',
'invoice_number' => 'Número de Factura', 'address' => 'Dirección',
'invoice_number_short' => 'Nº de Factura', 'address1' => 'Calle',
'po_number' => 'Apartado de correos', 'address2' => 'Bloq/Pta',
'po_number_short' => 'Apdo.', 'city' => 'Ciudad',
'frequency_id' => 'Fracuencia', 'state' => 'Región/Provincia', //Departamento-Colombia, Comarca-Panama
'discount' => 'Descuento', 'postal_code' => 'Código Postal',
'taxes' => 'Impuestos', 'country_id' => 'País',
'tax' => 'Impuesto', 'contacts' => 'Contactos',
'item' => 'Elemento', 'first_name' => 'Nombres',
'description' => 'Descripción', 'last_name' => 'Apellidos',
'unit_cost' => 'Coste unitario', 'phone' => 'Teléfono',
'quantity' => 'Cantidad', 'email' => 'Email',
'line_total' => 'Total línea', 'additional_info' => 'Información adicional',
'subtotal' => 'Subtotal', 'payment_terms' => 'Plazos de pago', //
'paid_to_date' => 'Pagado', 'currency_id' => 'Divisa',
'balance_due' => 'Pendiente', 'size_id' => 'Tamaño',
'invoice_design_id' => 'Diseño', 'industry_id' => 'Industria',
'terms' => 'Términos', 'private_notes' => 'Notas Privadas',
'your_invoice' => 'Tu factura',
'remove_contact' => 'Remove contact', // invoice
'add_contact' => 'Add contact', 'invoice' => 'Factura de venta', //Factura de Venta-Colombia
'create_new_client' => 'Create new client', 'client' => 'Cliente',
'edit_client_details' => 'Edit client details', 'invoice_date' => 'Fecha de factura',
'enable' => 'Enable', 'due_date' => 'Fecha de pago',
'learn_more' => 'Learn more', 'invoice_number' => 'Número de Factura',
'manage_rates' => 'Manage rates', 'invoice_number_short' => 'Factura #',
'note_to_client' => 'Note to client', 'po_number' => 'Apartado de correo',
'invoice_terms' => 'Invoice terms', 'po_number_short' => 'Apdo.',
'save_as_default_terms' => 'Save as default terms', 'frequency_id' => 'Frecuencia',
'download_pdf' => 'Download PDF', 'discount' => 'Descuento',
'pay_now' => 'Pay Now', 'taxes' => 'Impuestos',
'save_invoice' => 'Save Invoice', 'tax' => 'Impuesto', //IVA for almost all latinamerica, ISV-Honduras, ITBMS-Panama, IV-Costa Rica, ITBIS- Republica Dominicana, IVU-Puerto Rico
'clone_invoice' => 'Clone Invoice', 'item' => 'Concepto',
'archive_invoice' => 'Archive Invoice', 'description' => 'Descripción',
'delete_invoice' => 'Delete Invoice', 'unit_cost' => 'Coste unitario',
'email_invoice' => 'Email Invoice', 'quantity' => 'Cantidad',
'enter_payment' => 'Enter Payment', 'line_total' => 'Total',
'tax_rates' => 'Tax Rates', 'subtotal' => 'Subtotal',
'rate' => 'Rate', 'paid_to_date' => 'Pagado',
'settings' => 'Settings', 'balance_due' => 'Pendiente',
'enable_invoice_tax' => 'Enable specifying an <b>invoice tax</b>', 'invoice_design_id' => 'Diseño',
'enable_line_item_tax' => 'Enable specifying <b>line item taxes</b>', 'terms' => 'Términos',
'your_invoice' => 'Tu factura',
'remove_contact' => 'Eliminar contacto',
'add_contact' => 'Añadir contacto',
'create_new_client' => 'Crear nuevo cliente',
'edit_client_details' => 'Editar detalles del cliente',
'enable' => 'Activar',
'learn_more' => 'Aprender más',
'manage_rates' => 'Gestionar tarifas',
'note_to_client' => 'Nota para el cliente',
'invoice_terms' => 'Términos de facturación',
'save_as_default_terms' => 'Guardar como términos por defecto',
'download_pdf' => 'Descargar PDF',
'pay_now' => 'Pagar ahora',
'save_invoice' => 'Guardar factura',
'clone_invoice' => 'Clonar factura',
'archive_invoice' => 'Archivar factura',
'delete_invoice' => 'Eliminar factura',
'email_invoice' => 'Enviar factura por correo',
'enter_payment' => 'Agregar pago',
'tax_rates' => 'Tasas de impuesto',
'rate' => 'Tasas',
'settings' => 'Configuración',
'enable_invoice_tax' => 'Activar impuesto <b>para la factura</b>',
'enable_line_item_tax' => 'Activar impuesto <b>por concepto</b>',
// navigation // navigation
'dashboard' => 'Dashboard', 'dashboard' => 'Inicio',
'clients' => 'Clients', 'clients' => 'Clientes',
'invoices' => 'Invoices', 'invoices' => 'Facturas',
'payments' => 'Payments', 'payments' => 'Pagos',
'credits' => 'Credits', 'credits' => 'Créditos',
'history' => 'History', 'history' => 'Historial',
'search' => 'Search', 'search' => 'Búsqueda',
'sign_up' => 'Sign Up', 'sign_up' => 'registrate',
'guest' => 'Guest', 'guest' => 'invitado',
'company_details' => 'Company Details', 'company_details' => 'Detalles de la empresa',
'online_payments' => 'Online Payments', 'online_payments' => 'Pagos en linea',
'notifications' => 'Notifications', 'notifications' => 'Notificaciones',
'import_export' => 'Import/Export', 'import_export' => 'Importar/Exportar',
'done' => 'Done', 'done' => 'Hecho',
'save' => 'Save', 'save' => 'Guardar',
'create' => 'Create', 'create' => 'Crear',
'upload' => 'Upload', 'upload' => 'Subir',
'import' => 'Import', 'import' => 'Importar',
'download' => 'Download', 'download' => 'Descargar',
'cancel' => 'Cancel', 'cancel' => 'Cancelar',
'close' => 'Close', 'close' => 'Cerrar',
'provide_email' => 'Please provide a valid email address', 'provide_email' => 'Por favor facilita una dirección de correo válida.',
'powered_by' => 'Powered by', 'powered_by' => 'Plataforma por ',
'no_items' => 'No items', 'no_items' => 'No hay data',
// recurring invoices // recurring invoices
'recurring_invoices' => 'Recurring Invoices', 'recurring_invoices' => 'Facturas recurrentes',
'recurring_help' => '<p>Automatically send clients the same invoices weekly, bi-monthly, monthly, quarterly or annually. </p> 'recurring_help' => '<p>Enviar facturas automáticamente a clientes semanalmente, bi-mensualmente, mensualmente, trimestral o anualmente. </p>
<p>Use :MONTH, :QUARTER or :YEAR for dynamic dates. Basic math works as well, for example :MONTH-1.</p> <p>Uso :MONTH, :QUARTER or :YEAR para fechas dinámicas. Matemáticas básicas también funcionan bien. Por ejemplo: :MONTH-1.</p>
<p>Examples of dynamic invoice variables:</p> <p>Ejemplos de variables dinámicas de factura:</p>
<ul> <ul>
<li>"Gym membership for the month of :MONTH" => "Gym membership for the month of July"</li> <li>"Afiliación de gimnasio para el mes de:MONTH" => Afiliación de gimnasio para el mes de julio"</li>
<li>":YEAR+1 yearly subscription" => "2015 Yearly Subscription"</li> <li>":YEAR+1 suscripción anual" => "2015 suscripción anual"</li>
<li>"Retainer payment for :QUARTER+1" => "Retainer payment for Q2"</li> <li>"Retainer payment for :QUARTER+1" => "Pago anticipo de pagos para T2"</li>
</ul>', </ul>',
// dashboard // dashboard
'in_total_revenue' => 'in total revenue', 'in_total_revenue' => 'ingreso total',
'billed_client' => 'billed client', 'billed_client' => 'cliente facturado',
'billed_clients' => 'billed clients', 'billed_clients' => 'clientes facturados',
'active_client' => 'active client', 'active_client' => 'cliente activo',
'active_clients' => 'active clients', 'active_clients' => 'clientes activos',
'invoices_past_due' => 'Invoices Past Due', 'invoices_past_due' => 'Facturas vencidas',
'upcoming_invoices' => 'Upcoming invoices', 'upcoming_invoices' => 'Próximas facturas',
'average_invoice' => 'Average invoice', 'average_invoice' => 'Promedio de facturación',
// list pages // list pages
'archive' => 'Archive', 'archive' => 'Archivar',
'delete' => 'Delete', 'delete' => 'Eliminar',
'archive_client' => 'Archive client', 'archive_client' => 'Archivar cliente',
'delete_client' => 'Delete client', 'delete_client' => 'Eliminar cliente',
'archive_payment' => 'Archive payment', 'archive_payment' => 'Archivar pago',
'delete_payment' => 'Delete payment', 'delete_payment' => 'Eliminar pago',
'archive_credit' => 'Archive credit', 'archive_credit' => 'Archivar crédito',
'delete_credit' => 'Delete credit', 'delete_credit' => 'Eliminar crédito',
'show_archived_deleted' => 'Show archived/deleted', 'show_archived_deleted' => 'Mostrar archivados/eliminados',
'filter' => 'Filter', 'filter' => 'Filtrar',
'new_client' => 'New Client', 'new_client' => 'Nuevo cliente',
'new_invoice' => 'New Invoice', 'new_invoice' => 'Nueva factura',
'new_payment' => 'New Payment', 'new_payment' => 'Nuevo pago',
'new_credit' => 'New Credit', 'new_credit' => 'Nuevo crédito',
'contact' => 'Contact', 'contact' => 'Contacto',
'date_created' => 'Date Created', 'date_created' => 'Fecha de creación',
'last_login' => 'Last Login', 'last_login' => 'Último acceso',
'balance' => 'Balance', 'balance' => 'Balance',
'action' => 'Action', 'action' => 'Acción',
'status' => 'Status', 'status' => 'Estado',
'invoice_total' => 'Invoice Total', 'invoice_total' => 'Total facturado',
'frequency' => 'Frequency', 'frequency' => 'Frequencia',
'start_date' => 'Start Date', 'start_date' => 'Fecha de inicio',
'end_date' => 'End Date', 'end_date' => 'Fecha de finalización',
'transaction_reference' => 'Transaction Reference', 'transaction_reference' => 'Referencia de transacción',
'method' => 'Method', 'method' => 'Método',
'payment_amount' => 'Payment Amount', 'payment_amount' => 'Valor del pago',
'payment_date' => 'Payment Date', 'payment_date' => 'Fecha de Pago',
'credit_amount' => 'Credit Amount', 'credit_amount' => 'Cantidad de Crédito',
'credit_balance' => 'Credit Balance', 'credit_balance' => 'Balance de Crédito',
'credit_date' => 'Credit Date', 'credit_date' => 'Fecha de Crédito',
'empty_table' => 'No data available in table', 'empty_table' => 'Tabla vacía',
'select' => 'Select', 'select' => 'Seleccionar',
'edit_client' => 'Edit Client', 'edit_client' => 'Editar Cliente',
'edit_invoice' => 'Edit Invoice', 'edit_invoice' => 'Editar Factura',
// client view page // client view page
'create_invoice' => 'Create Invoice', 'create_invoice' => 'Crear Factura',
'enter_credit' => 'Enter Credit', 'enter_credit' => 'Agregar Crédito',
'last_logged_in' => 'Last logged in', 'last_logged_in' => 'Último inicio de sesión',
'details' => 'Details', 'details' => 'Detalles',
'standing' => 'Standing', 'standing' => 'Standing', //What is this for, context of it's use
'credit' => 'Credit', 'credit' => 'Crédito',
'activity' => 'Activity', 'activity' => 'Actividad',
'date' => 'Date', 'date' => 'Fecha',
'message' => 'Message', 'message' => 'Mensaje',
'adjustment' => 'Adjustment', 'adjustment' => 'Ajustes',
'are_you_sure' => 'Are you sure?', 'are_you_sure' => '¿Estás seguro?',
// payment pages // payment pages
'payment_type_id' => 'Payment type', 'payment_type_id' => 'Tipo de pago',
'amount' => 'Amount', 'amount' => 'Cantidad',
// account/company pages // account/company pages
'work_email' => 'Email', 'work_email' => 'Correo electrónico de la empresa',
'language_id' => 'Language', 'language_id' => 'Idioma',
'timezone_id' => 'Timezone', 'timezone_id' => 'Zona horaria',
'date_format_id' => 'Date format', 'date_format_id' => 'Formato de fecha',
'datetime_format_id' => 'Date/Time Format', 'datetime_format_id' => 'Format de fecha/hora',
'users' => 'Users', 'users' => 'Usuarios',
'localization' => 'Localization', 'localization' => 'Localización',
'remove_logo' => 'Remove logo', 'remove_logo' => 'Eliminar logo',
'logo_help' => 'Supported: JPEG, GIF and PNG. Recommended height: 120px', 'logo_help' => 'Formatos aceptados: JPEG, GIF y PNG. Altura recomendada: 120px',
'payment_gateway' => 'Payment Gateway', 'payment_gateway' => 'Pasarela de pago',
'gateway_id' => 'Provider', 'gateway_id' => 'Proveedor',
'email_notifications' => 'Email Notifications', 'email_notifications' => 'Notificaciones de email',
'email_sent' => 'Email me when an invoice is <b>sent</b>', 'email_sent' => 'Avísame por email cuando una factura <b>se envía</b>',
'email_viewed' => 'Email me when an invoice is <b>viewed</b>', 'email_viewed' => 'Avísame por email cuando una factura <b>se visualiza</b>',
'email_paid' => 'Email me when an invoice is <b>paid</b>', 'email_paid' => 'Avísame por email cuando una factura <b>se paga</b>',
'site_updates' => 'Site Updates', 'site_updates' => 'Actualizaciones del sitio',
'custom_messages' => 'Custom Messages', 'custom_messages' => 'Mensajes a medida',
'default_invoice_terms' => 'Set default invoice terms', 'default_invoice_terms' => 'Configurar términos de factura por defecto',
'default_email_footer' => 'Set default email signature', 'default_email_footer' => 'Configurar firma de email por defecto',
'import_clients' => 'Import Client Data', 'import_clients' => 'Importar datos del cliente',
'csv_file' => 'Select CSV file', 'csv_file' => 'Seleccionar archivo CSV',
'export_clients' => 'Export Client Data', 'export_clients' => 'Exportar datos del cliente',
'select_file' => 'Please select a file', 'select_file' => 'Seleccionar archivo',
'first_row_headers' => 'Use first row as headers', 'first_row_headers' => 'Usar la primera fila como encabezados',
'column' => 'Column', 'column' => 'Columna',
'sample' => 'Sample', 'sample' => 'Ejemplo',
'import_to' => 'Import to', 'import_to' => 'Importar a',
'client_will_create' => 'client will be created', 'client_will_create' => 'cliente se creará', //What is this for, context of it's use
'clients_will_create' => 'clients will be created', 'clients_will_create' => 'clientes se crearan', //What is this for, context of it's use
// application messages // application messages
'created_client' => 'Successfully created client', 'created_client' => 'cliente creado con éxito',
'created_clients' => 'Successfully created :count clients', 'created_clients' => ':count clientes creados con éxito',
'updated_settings' => 'Successfully updated settings', 'updated_settings' => 'Configuración actualizada con éxito',
'removed_logo' => 'Successfully removed logo', 'removed_logo' => 'Logo eliminado con éxito',
'sent_message' => 'Successfully sent message', 'sent_message' => 'Mensaje enviado con éxito',
'invoice_error' => 'Please make sure to select a client and correct any errors', 'invoice_error' => 'Seleccionar cliente y corregir errores.',
'limit_clients' => 'Sorry, this will exceed the limit of :count clients', 'limit_clients' => 'Lo sentimos, se ha pasado del límite de :count clientes',
'payment_error' => 'There was an error processing your payment. Please try again later.', 'payment_error' => 'Ha habido un error en el proceso de tu pago. Inténtalo de nuevo más tarde.',
'registration_required' => 'Please sign up to email an invoice', 'registration_required' => 'Inscríbete para enviar una factura',
'confirmation_required' => 'Please confirm your email address', 'confirmation_required' => 'Por favor confirma tu dirección de correo electrónico',
'updated_client' => 'Cliente actualizado con éxito',
'created_client' => 'Cliente creado con éxito',
'archived_client' => 'Cliente archivado con éxito',
'archived_clients' => ':count clientes archivados con éxito',
'deleted_client' => 'Cliente eliminado con éxito',
'deleted_clients' => ':count clientes eliminados con éxito',
'updated_invoice' => 'Factura actualizada con éxito',
'created_invoice' => 'Factura creada con éxito',
'cloned_invoice' => 'Factura clonada con éxito',
'emailed_invoice' => 'Factura enviada con éxito',
'and_created_client' => 'y cliente creado ',
'archived_invoice' => 'Factura archivada con éxito',
'archived_invoices' => ':count facturas archivados con éxito',
'deleted_invoice' => 'Factura eliminada con éxito',
'deleted_invoices' => ':count facturas eliminadas con éxito',
'created_payment' => 'Pago creado con éxito',
'archived_payment' => 'Pago archivado con éxito',
'archived_payments' => ':count pagos archivados con éxito',
'deleted_payment' => 'Pago eliminado con éxito',
'deleted_payments' => ':count pagos eliminados con éxito',
'applied_payment' => 'Pago aplicado con éxito',
'created_credit' => 'Crédito creado con éxito',
'archived_credit' => 'Crédito archivado con éxito',
'archived_credits' => ':count creditos archivados con éxito',
'deleted_credit' => 'Créditos eliminados con éxito',
'deleted_credits' => ':count creditos eliminados con éxito',
// Emails
'confirmation_subject' => 'Corfimación de tu cuenta en Invoice Ninja',
'confirmation_header' => 'Confirmación de Cuenta',
'confirmation_message' => 'Por favor, haz clic en el enlace abajo para confirmar tu cuenta.',
'invoice_subject' => 'Nueva factura de :account',
'invoice_message' => 'Para visualizar tu factura por el valor de :amount, haz click en el enlace abajo.',
'payment_subject' => 'Pago recibido',
'payment_message' => 'Gracias por tu pago por valor de :amount.',
'email_salutation' => 'Estimado :name,',
'email_signature' => 'Un saludo cordial,',
'email_from' => 'El equipo de Invoice Ninja ',
'user_email_footer' => 'Para ajustar la configuración de las notificaciones de tu email, visita '.SITE_URL.'/company/notifications',
'invoice_link_message' => 'Para visualizar la factura de cliente, haz clic en el enlace abajo:',
'notification_invoice_paid_subject' => 'La factura :invoice ha sido pagada por el cliente :client',
'notification_invoice_sent_subject' => 'La factura :invoice ha sido enviada a el cliente :client',
'notification_invoice_viewed_subject' => 'La factura :invoice ha sido visualizado por el cliente:client',
'notification_invoice_paid' => 'Un pago por valor de :amount se ha realizado por el cliente :client a la factura :invoice.',
'notification_invoice_sent' => 'La factura :invoice por valor de :amount fue enviada al cliente :cliente.',
'notification_invoice_viewed' => 'La factura :invoice por valor de :amount fue visualizada por el cliente :client.',
'reset_password' => 'Puedes reconfigurar la contraseña de tu cuenta haciendo clic en el siguiente enlace:',
'reset_password_footer' => 'Si no has solicitado un cambio de contraseña, por favor contactate con nosostros: ' . CONTACT_EMAIL,
'updated_client' => 'Successfully updated client', // Payment page
'created_client' => 'Successfully created client', 'secure_payment' => 'Pago seguro',
'archived_client' => 'Successfully archived client', 'card_number' => 'Número de tarjeta',
'archived_clients' => 'Successfully archived :count clients', 'expiration_month' => 'Mes de caducidad',
'deleted_client' => 'Successfully deleted client', 'expiration_year' => 'Año de caducidad',
'deleted_clients' => 'Successfully deleted :count clients', 'cvv' => 'CVV',
'updated_invoice' => 'Successfully updated invoice', // Security alerts
'created_invoice' => 'Successfully created invoice', 'confide' => array(
'cloned_invoice' => 'Successfully cloned invoice', 'too_many_attempts' => 'Demasiados intentos fallidos. Inténtalo de nuevo en un par de minutos.',
'emailed_invoice' => 'Successfully emailed invoice', 'wrong_credentials' => 'Contraseña o email incorrecto.',
'and_created_client' => 'and created client', 'confirmation' => '¡Tu cuenta se ha confirmado!',
'archived_invoice' => 'Successfully archived invoice', 'wrong_confirmation' => 'Código de confirmación incorrecto.',
'archived_invoices' => 'Successfully archived :count invoices', 'password_forgot' => 'La información sobre el cambio de tu contraseña se ha enviado a tu dirección de correo electrónico.',
'deleted_invoice' => 'Successfully deleted invoice', 'password_reset' => 'Tu contraseña se ha cambiado con éxito.',
'deleted_invoices' => 'Successfully deleted :count invoices', 'wrong_password_reset' => 'Contraseña no válida. Inténtalo de nuevo',
),
'created_payment' => 'Successfully created payment', // Pro Plan
'archived_payment' => 'Successfully archived payment', 'pro_plan' => [
'archived_payments' => 'Successfully archived :count payments', 'remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja', //Maybe incorrect for the context
'deleted_payment' => 'Successfully deleted payment', 'remove_logo_link' => 'Haz clic aquí',
'deleted_payments' => 'Successfully deleted :count payments', ],
'applied_payment' => 'Successfully applied payment', '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',
'created_credit' => 'Successfully created credit', 'pro_plan_product' => 'Plan Pro',
'archived_credit' => 'Successfully archived credit', 'pro_plan_description' => 'Un año de inscripción en el Plan Pro de Invoice Ninja.',
'archived_credits' => 'Successfully archived :count credits', 'pro_plan_success' => '¡Gracias por unirte a Invoice Ninja! Al realizar el pago de tu factura, se iniciara tu PLAN PRO.',
'deleted_credit' => 'Successfully deleted credit', 'unsaved_changes' => 'Tienes cambios no guardados',
'deleted_credits' => 'Successfully deleted :count credits', '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',
// Emails // product management
'confirmation_subject' => 'Invoice Ninja Account Confirmation', 'product_library' => 'Inventario de productos',
'confirmation_header' => 'Account Confirmation', 'product' => 'Producto',
'confirmation_message' => 'Please access the link below to confirm your account.', 'products' => 'Productos',
'invoice_subject' => 'New invoice from :account', 'fill_products' => 'Auto-rellenar productos',
'invoice_message' => 'To view your invoice for :amount, click the link below.', 'fill_products_help' => 'Seleccionar un producto automáticamente <b>configurará la descripción y coste</b>',
'payment_subject' => 'Payment Received', 'update_products' => 'Auto-actualizar productos',
'payment_message' => 'Thank you for your payment of :amount.', 'update_products_help' => 'Actualizar una factura automáticamente <b>actualizará los productos</b>',
'email_salutation' => 'Dear :name,', 'create_product' => 'Crear Producto',
'email_signature' => 'Regards,', 'edit_product' => 'Editar Producto',
'email_from' => 'The InvoiceNinja Team', 'archive_product' => 'Archivar Producto',
'user_email_footer' => 'To adjust your email notification settings please visit '.SITE_URL.'/company/notifications', 'updated_product' => 'Producto actualizado con éxito',
'invoice_link_message' => 'To view your client invoice click the link below:', 'created_product' => 'Producto creado con éxito',
'notification_invoice_paid_subject' => 'Invoice :invoice was paid by :client', 'archived_product' => 'Producto archivado con éxito',
'notification_invoice_sent_subject' => 'Invoice :invoice was sent to :client', 'pro_plan_custom_fields' => ':link haz click para para activar campos a medida',
'notification_invoice_viewed_subject' => 'Invoice :invoice was viewed by :client', 'advanced_settings' => 'Configuración Avanzada',
'notification_invoice_paid' => 'A payment of :amount was made by client :client towards Invoice :invoice.', 'pro_plan_advanced_settings' => ':link haz click para para activar la configuración avanzada',
'notification_invoice_sent' => 'The following client :client was emailed Invoice :invoice for :amount.', 'invoice_design' => 'Diseño de factura',
'notification_invoice_viewed' => 'The following client :client viewed Invoice :invoice for :amount.', 'specify_colors' => 'Especificar colores',
'reset_password' => 'You can reset your account password by clicking the following link:', 'specify_colors_label' => 'Seleccionar los colores para usar en las facturas',
'reset_password_footer' => 'If you did not request this password reset please email our support: ' . CONTACT_EMAIL, 'chart_builder' => 'Constructor de graficos',
'ninja_email_footer' => 'Usa :site para facturar a tus clientes y recibir pagos de forma gratuita!',
// Payment page 'go_pro' => 'Hazte Pro',
'secure_payment' => 'Secure Payment',
'card_number' => 'Card number',
'expiration_month' => 'Expiration month',
'expiration_year' => 'Expiration year',
'cvv' => 'CVV',
// Security alerts
'confide' => array(
'too_many_attempts' => 'Too many attempts. Try again in few minutes.',
'wrong_credentials' => 'Incorrect email or password.',
'confirmation' => 'Your account has been confirmed!',
'wrong_confirmation' => 'Wrong confirmation code.',
'password_forgot' => 'The information regarding password reset was sent to your email.',
'password_reset' => 'Your password has been changed successfully.',
'wrong_password_reset' => 'Invalid password. Try again',
),
// Pro Plan
'pro_plan' => [
'remove_logo' => ':link to remove the Invoice Ninja logo by joining the pro plan',
'remove_logo_link' => 'Click here',
],
'logout' => 'Log Out',
'sign_up_to_save' => 'Sign up to save your work',
'agree_to_terms' =>'I agree to the Invoice Ninja :terms',
'terms_of_service' => 'Terms of Service',
'email_taken' => 'The email address is already regiestered',
'working' => 'Working',
'success' => 'Success',
'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
'erase_data' => 'This will permanently erase your data.',
'password' => 'Password',
'pro_plan_product' => 'Pro Plan',
'pro_plan_description' => 'One year enrollment in the Invoice Ninja Pro Plan.',
'pro_plan_success' => 'Thanks for joining! Once the invoice is paid your Pro Plan membership will begin.',
'unsaved_changes' => 'You have unsaved changes',
'custom_fields' => 'Custom fields',
'company_fields' => 'Company Fields',
'client_fields' => 'Client Fields',
'field_label' => 'Field Label',
'field_value' => 'Field Value',
'edit' => 'Edit',
'view_as_recipient' => 'View as recipient',
// product management
'product_library' => 'Product Library',
'product' => 'Product',
'products' => 'Products',
'fill_products' => 'Auto-fill products',
'fill_products_help' => 'Selecting a product will automatically <b>set the description and cost</b>',
'update_products' => 'Auto-update products',
'update_products_help' => 'Updating an invoice will automatically <b>update the products</b>',
'create_product' => 'Create Product',
'edit_product' => 'Edit Product',
'archive_product' => 'Archive Product',
'updated_product' => 'Successfully updated product',
'created_product' => 'Successfully created product',
'archived_product' => 'Successfully archived product',
'pro_plan_custom_fields' => ':link to enable custom fields by joining the Pro Plan',
'advanced_settings' => 'Advanced Settings',
'pro_plan_advanced_settings' => ':link to enable the advanced settings by joining the Pro Plan',
'invoice_design' => 'Invoice Design',
'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',
// Quotes
'quote' => 'Quote',
'quotes' => 'Quotes',
'quote_number' => 'Quote Number',
'quote_number_short' => 'Quote #',
'quote_date' => 'Quote Date',
'quote_total' => 'Quote Total',
'your_quote' => 'Your Quote',
'total' => 'Total',
'clone' => 'Clone',
'new_quote' => 'New Quote',
'create_quote' => 'Create Quote',
'edit_quote' => 'Edit Quote',
'archive_quote' => 'Archive Quote',
'delete_quote' => 'Delete Quote',
'save_quote' => 'Save Quote',
'email_quote' => 'Email Quote',
'clone_quote' => 'Clone Quote',
'convert_to_invoice' => 'Convert to Invoice',
'view_invoice' => 'View Invoice',
'view_quote' => 'View Quote',
'view_client' => 'View Client',
'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 from :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',
'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_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',
'limit_users' => 'Sorry, this will exceed the limit of ' . MAX_NUM_USERS . ' users',
'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' => 'Recurring is enabled, are you sure you want this invoice emailed?',
'cancel_account' => 'Cancel Account',
'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.',
'go_back' => 'Go Back',
'data_visualizations' => 'Data Visualizations',
'sample_data' => 'Sample data shown',
'hide' => 'Hide',
'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',
'share_invoice_counter' => 'Share invoice counter',
'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',
// 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',
'clone' => 'Clon', //Whats the context for this one
'new_quote' => 'Nueva cotización',
'create_quote' => 'Crear Cotización',
'edit_quote' => 'Editar Cotización',
'archive_quote' => 'Archivar Cotización',
'delete_quote' => 'Eliminar Cotización',
'save_quote' => 'Guardar Cotización',
'email_quote' => 'Enviar Cotización',
'clone_quote' => 'Clonar Cotización',
'convert_to_invoice' => 'Convertir a Factura',
'view_invoice' => 'Ver Factura',
'view_quote' => 'Ver Cotización',
'view_client' => 'Ver Cliente',
'updated_quote' => 'Cotización actualizada con éxito',
'created_quote' => 'Cotización creada con éxito',
'cloned_quote' => 'Cotización clonada con éxito',
'emailed_quote' => 'Cotización enviada con éxito',
'archived_quote' => 'Cotización archivada con éxito',
'archived_quotes' => ':count cotizaciones archivadas con exito',
'deleted_quote' => 'Cotizaciónes eliminadas con éxito',
'deleted_quotes' => ':count cotizaciones eliminadas con exito',
'converted_to_invoice' => 'Cotización convertida a factura con éxito',
'quote_subject' => 'Nueva cotización de :account',
'quote_message' => 'Para visualizar la cotización por valor de :amount, haz click en el enlace abajo.',
'quote_link_message' => 'Para visualizar tu cotización haz click en el enlace abajo:',
'notification_quote_sent_subject' => 'Cotización :invoice enviada a el cliente :client',
'notification_quote_viewed_subject' => 'Cotización :invoice visualizada por el cliente :client',
'notification_quote_sent' => 'La cotización :invoice por un valor de :amount, ha sido enviada al cliente :client.',
'notification_quote_viewed' => 'La cotizacion :invoice por un valor de :amount ha sido visualizada por el cliente :client.',
'session_expired' => 'Tu sesión ha caducado.',
'invoice_fields' => 'Campos de factura',
'invoice_options' => 'Opciones de factura',
'hide_quantity' => 'Ocultar cantidad',
'hide_quantity_help' => 'Si las cantidades de tus partidas siempre son 1, entonces puedes organizar tus facturas mejor al no mostrar este campo.',
'hide_paid_to_date' => 'Ocultar valor pagado a la fecha',
'hide_paid_to_date_help' => 'Solo mostrar la opción “Pagado a la fecha” en tus facturas en cuanto se ha recibido un pago.',
'charge_taxes' => 'Cargar impuestos',
'user_management' => 'Gestión de usario',
'add_user' => 'Añadir usario',
'send_invite' => 'Enviar invitación', //Context for its use
'sent_invite' => 'Invitación enviada con éxito',
'updated_user' => 'Usario actualizado con éxito',
'invitation_message' => ':invitor te ha invitado a unirte a su cuenta en Invoice Ninja.',
'register_to_add_user' => 'Regístrate para añadir usarios',
'user_state' => 'Estado',
'edit_user' => 'Editar Usario',
'delete_user' => 'Eliminar Usario',
'active' => 'Activar',
'pending' => 'Pendiente',
'deleted_user' => 'Usario eliminado con éxito',
'limit_users' => 'Lo sentimos, esta acción excederá el límite de ' . MAX_NUM_USERS . ' usarios',
'confirm_email_invoice' => '¿Estás seguro que quieres enviar esta factura?',
'confirm_email_quote' => '¿Estás seguro que quieres enviar esta cotización?',
'confirm_recurring_email_invoice' => 'Se ha marcado esta factura como recurrente, estás seguro que quieres enviar esta factura?',
'cancel_account' => 'Cancelar Cuenta',
'cancel_account_message' => 'AVISO: Esta acción eliminará todos tus datos de forma permanente.',
'go_back' => 'Atrás',
'data_visualizations' => 'Visualización de datos',
'sample_data' => 'Datos de ejemplo',
'hide' => 'Ocultar',
'new_version_available' => 'Una nueva versión de :releases_link disponible. Estás utilizando versión :user_version, la última versión es :latest_version',
'invoice_settings' => 'Configuración de facturas',
'invoice_number_prefix' => 'Prefijo de facturación',
'invoice_number_counter' => 'Numeración de facturación',
'quote_number_prefix' => 'Prejijo de cotizaciones',
'quote_number_counter' => 'Numeración de cotizaciones',
'share_invoice_counter' => 'Compartir la numeración para cotización y facturación',
'invoice_issued_to' => 'Factura emitida a',
'invalid_counter' => 'Para evitar posibles conflictos, por favor crea un prefijo de facturación y de cotización.',
'mark_sent' => 'Marcar como enviado',
); );

10
app/libraries/utils.php
View File

@ -46,6 +46,16 @@ class Utils
} }
} }
public static function getDemoAccountId()
{
return isset($_ENV[DEMO_ACCOUNT_ID]) ? $_ENV[DEMO_ACCOUNT_ID] : false;
}
public static function isDemo()
{
return Auth::check() && Auth::user()->isDemo();
}
public static function getNewsFeedResponse($userType = false) public static function getNewsFeedResponse($userType = false)
{ {
if (!$userType) { if (!$userType) {

19
app/models/Gateway.php
View File

@ -2,7 +2,7 @@
class Gateway extends Eloquent class Gateway extends Eloquent
{ {
public $timestamps = false; public $timestamps = true;
protected $softDelete = false; protected $softDelete = false;
public function paymentlibrary() public function paymentlibrary()
@ -15,6 +15,23 @@ class Gateway extends Eloquent
return '/images/gateways/logo_'.$this->provider.'.png'; return '/images/gateways/logo_'.$this->provider.'.png';
} }
public function getHelp()
{
$link = '';
if ($this->id == GATEWAY_AUTHORIZE_NET || $this->id == GATEWAY_AUTHORIZE_NET_SIM) {
$link = 'http://reseller.authorize.net/application/?id=5560364';
} else if ($this->id == GATEWAY_PAYPAL_EXPRESS) {
$link = 'https://www.paypal.com/us/cgi-bin/webscr?cmd=_login-api-run';
} else if ($this->id == GATEWAY_TWO_CHECKOUT) {
$link = 'https://www.2checkout.com/referral?r=2c37ac2298';
}
$key = 'texts.gateway_help_' . $this->id;
$str = trans($key, ['link' => "<a href='$link' target='_blank'>Click here</a>"]);
return $key != $str ? $str : '';
}
public function getFields() public function getFields()
{ {
$paymentLibrary = $this->paymentlibrary; $paymentLibrary = $this->paymentlibrary;

5
app/models/User.php
View File

@ -80,6 +80,11 @@ class User extends ConfideUser implements UserInterface, RemindableInterface
return $this->account->isPro(); return $this->account->isPro();
} }
public function isDemo()
{
return $this->account->id == Utils::getDemoAccountId();
}
public function getDisplayName() public function getDisplayName()
{ {
if ($this->getFullName()) if ($this->getFullName())

8
app/ninja/repositories/InvoiceRepository.php
View File

@ -207,7 +207,7 @@ class InvoiceRepository
$invoice->client_id = $data['client_id']; $invoice->client_id = $data['client_id'];
$invoice->discount = Utils::parseFloat($data['discount']); $invoice->discount = Utils::parseFloat($data['discount']);
$invoice->invoice_number = trim($data['invoice_number']); $invoice->invoice_number = trim($data['invoice_number']);
$invoice->is_recurring = $data['is_recurring'] ? true : false; $invoice->is_recurring = $data['is_recurring'] && !Utils::isDemo() ? true : false;
$invoice->invoice_date = Utils::toSqlDate($data['invoice_date']); $invoice->invoice_date = Utils::toSqlDate($data['invoice_date']);
if ($invoice->is_recurring) if ($invoice->is_recurring)
@ -336,8 +336,8 @@ class InvoiceRepository
$invoiceItem = InvoiceItem::createNew(); $invoiceItem = InvoiceItem::createNew();
$invoiceItem->product_id = isset($product) ? $product->id : null; $invoiceItem->product_id = isset($product) ? $product->id : null;
$invoiceItem->product_key = trim($item->product_key); $invoiceItem->product_key = trim($invoice->is_recurring ? $item->product_key : Utils::processVariables($item->product_key));
$invoiceItem->notes = trim($item->notes); $invoiceItem->notes = trim($invoice->is_recurring ? $item->notes : Utils::processVariables($item->notes));
$invoiceItem->cost = Utils::parseFloat($item->cost); $invoiceItem->cost = Utils::parseFloat($item->cost);
$invoiceItem->qty = Utils::parseFloat($item->qty); $invoiceItem->qty = Utils::parseFloat($item->qty);
$invoiceItem->tax_rate = 0; $invoiceItem->tax_rate = 0;
@ -367,7 +367,7 @@ class InvoiceRepository
$clone = Invoice::createNew($invoice); $clone = Invoice::createNew($invoice);
$clone->balance = $invoice->amount; $clone->balance = $invoice->amount;
$clone->invoice_number = $invoice->account->getNextInvoiceNumber($invoice->is_quote); $clone->invoice_number = $invoice->account->getNextInvoiceNumber();
foreach ([ foreach ([
'client_id', 'client_id',

6
app/ninja/repositories/PaymentRepository.php
View File

@ -76,11 +76,13 @@ class PaymentRepository
} }
$paymentTypeId = $input['payment_type_id'] ? $input['payment_type_id'] : null; $paymentTypeId = $input['payment_type_id'] ? $input['payment_type_id'] : null;
$clientId = Client::getPrivateId($input['client']);
$amount = Utils::parseFloat($input['amount']); $amount = Utils::parseFloat($input['amount']);
if ($paymentTypeId == PAYMENT_TYPE_CREDIT) if ($paymentTypeId == PAYMENT_TYPE_CREDIT)
{ {
$credits = Credit::scope()->where('balance', '>', 0)->orderBy('created_at')->get(); $credits = Credit::scope()->where('client_id', '=', $clientId)
->where('balance', '>', 0)->orderBy('created_at')->get();
$applied = 0; $applied = 0;
foreach ($credits as $credit) foreach ($credits as $credit)
@ -94,7 +96,7 @@ class PaymentRepository
} }
} }
$payment->client_id = Client::getPrivateId($input['client']); $payment->client_id = $clientId;
$payment->invoice_id = isset($input['invoice']) && $input['invoice'] != "-1" ? Invoice::getPrivateId($input['invoice']) : null; $payment->invoice_id = isset($input['invoice']) && $input['invoice'] != "-1" ? Invoice::getPrivateId($input['invoice']) : null;
$payment->payment_type_id = $paymentTypeId; $payment->payment_type_id = $paymentTypeId;
$payment->payment_date = Utils::toSqlDate($input['payment_date']); $payment->payment_date = Utils::toSqlDate($input['payment_date']);

5
app/routes.php
View File

@ -67,6 +67,7 @@ Route::get('logout', 'UserController@logout');
if (Utils::isNinja()) { if (Utils::isNinja()) {
Route::get('/news_feed/{user_type}/{version}/', 'HomeController@newsFeed'); Route::get('/news_feed/{user_type}/{version}/', 'HomeController@newsFeed');
Route::get('/demo', 'AccountController@demo');
} }
Route::group(array('before' => 'auth'), function() Route::group(array('before' => 'auth'), function()
@ -225,7 +226,10 @@ define('PAYMENT_LIBRARY_OMNIPAY', 1);
define('PAYMENT_LIBRARY_PHP_PAYMENTS', 2); define('PAYMENT_LIBRARY_PHP_PAYMENTS', 2);
define('GATEWAY_AUTHORIZE_NET', 1); define('GATEWAY_AUTHORIZE_NET', 1);
define('GATEWAY_AUTHORIZE_NET_SIM', 2);
define('GATEWAY_PAYPAL_EXPRESS', 17); define('GATEWAY_PAYPAL_EXPRESS', 17);
define('GATEWAY_STRIPE', 23);
define('GATEWAY_TWO_CHECKOUT', 27);
define('GATEWAY_BEANSTREAM', 29); define('GATEWAY_BEANSTREAM', 29);
define('GATEWAY_PSIGATE', 30); define('GATEWAY_PSIGATE', 30);
define('GATEWAY_MOOLAH', 31); define('GATEWAY_MOOLAH', 31);
@ -236,6 +240,7 @@ define('EVENT_CREATE_QUOTE', 3);
define('EVENT_CREATE_PAYMENT', 4); define('EVENT_CREATE_PAYMENT', 4);
define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN'); define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
define('DEMO_ACCOUNT_ID', 'DEMO_ACCOUNT_ID');
define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET); define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);
define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}'); define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}');

9
app/views/accounts/payments.blade.php
View File

@ -57,6 +57,15 @@
@endif @endif
@endforeach @endforeach
@if($gateway->getHelp())
<div class="form-group">
<label class="control-label col-lg-4 col-sm-4"></label>
<div class="col-lg-8 col-sm-8">
{{ $gateway->getHelp() }}
</div>
</div>
@endif
</div> </div>
@endforeach @endforeach

2
app/views/header.blade.php
View File

@ -15,7 +15,7 @@
/* Fix for header covering stuff when the screen is narrower */ /* Fix for header covering stuff when the screen is narrower */
@media screen and (min-width: 1200px) { @media screen and (min-width: 1200px) {
body { body {
padding-top: 50px; padding-top: 56px;
} }
} }

2
app/views/invoices/pdf.blade.php
View File

@ -17,9 +17,11 @@
logoImages.imageLogoHeight3 = 81/2; logoImages.imageLogoHeight3 = 81/2;
@if (file_exists($account->getLogoPath())) @if (file_exists($account->getLogoPath()))
if (window.invoice) {
invoice.image = "{{ HTML::image_data($account->getLogoPath()) }}"; invoice.image = "{{ HTML::image_data($account->getLogoPath()) }}";
invoice.imageWidth = {{ $account->getLogoWidth() }}; invoice.imageWidth = {{ $account->getLogoWidth() }};
invoice.imageHeight = {{ $account->getLogoHeight() }}; invoice.imageHeight = {{ $account->getLogoHeight() }};
}
@endif @endif
var NINJA = NINJA || {}; var NINJA = NINJA || {};

4
app/views/master.blade.php
View File

@ -1,8 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Invoice Ninja | {{ isset($title) ? $title : ' Free Online Invoice Templates & Generator' }}</title> <title>Invoice Ninja | {{ isset($title) ? $title : ' Free Open-Source Online Invoice Software' }}</title>
<meta name="description" content="{{ isset($description) ? $description : 'Create and generate custom invoices online for free using Invoice Ninja. Use our templates or customize your own today.' }}"></meta> <meta name="description" content="{{ isset($description) ? $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.' }}"></meta>
<!-- Source: https://github.com/hillelcoren/invoice-ninja --> <!-- Source: https://github.com/hillelcoren/invoice-ninja -->
<!-- Version: {{ NINJA_VERSION }} --> <!-- Version: {{ NINJA_VERSION }} -->

9
app/views/public/faq.blade.php
View File

@ -162,6 +162,15 @@
</p> </p>
</div> </div>
</div> </div>
@if (Utils::getDemoAccountId())
<div class="question">
<a class="expander" href="#">Can I see what the application looks like with sample data?</a>
<div class="content">
<p>Sure, <a href="https://www.invoiceninja.com/demo">click here</a> to try out our demo account.
</p>
</div>
</div>
@endif
<div class="question"> <div class="question">
<a class="expander" href="#">I hear that there's a version of Invoice Ninja <a class="expander" href="#">I hear that there's a version of Invoice Ninja
that I can install myself on my own servers? Where can I learn more about this? that I can install myself on my own servers? Where can I learn more about this?

9
public/built.js
View File

@ -31741,7 +31741,6 @@ function concatStrings() {
return data.length ? concatStr : false; return data.length ? concatStr : false;
} }
//function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, rightAlignTitleX) {
function displayGrid(doc, invoice, data, x, y, layout, options) { function displayGrid(doc, invoice, data, x, y, layout, options) {
var numLines = 0; var numLines = 0;
var origY = y; var origY = y;
@ -31792,6 +31791,8 @@ function displayGrid(doc, invoice, data, x, y, layout, options) {
if (key.substring(0, 6) === 'custom') { if (key.substring(0, 6) === 'custom') {
key = invoice.account[key]; key = invoice.account[key];
} else if (key === 'tax' && invoice.tax_rate) {
key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%';
} else { } else {
key = invoiceLabels[key]; key = invoiceLabels[key];
} }
@ -31986,10 +31987,8 @@ function displayInvoiceItems(doc, invoice, layout) {
shownItem = true; shownItem = true;
// process date variables // process date variables
if (invoice.is_recurring) { notes = processVariables(notes);
notes = processVariables(notes); productKey = processVariables(productKey);
productKey = processVariables(productKey);
}
var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
if (tax) { if (tax) {

9
public/js/script.js
View File

@ -782,7 +782,6 @@ function concatStrings() {
return data.length ? concatStr : false; return data.length ? concatStr : false;
} }
//function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, rightAlignTitleX) {
function displayGrid(doc, invoice, data, x, y, layout, options) { function displayGrid(doc, invoice, data, x, y, layout, options) {
var numLines = 0; var numLines = 0;
var origY = y; var origY = y;
@ -833,6 +832,8 @@ function displayGrid(doc, invoice, data, x, y, layout, options) {
if (key.substring(0, 6) === 'custom') { if (key.substring(0, 6) === 'custom') {
key = invoice.account[key]; key = invoice.account[key];
} else if (key === 'tax' && invoice.tax_rate) {
key = invoiceLabels[key] + ' ' + (invoice.tax_rate*1).toString() + '%';
} else { } else {
key = invoiceLabels[key]; key = invoiceLabels[key];
} }
@ -1027,10 +1028,8 @@ function displayInvoiceItems(doc, invoice, layout) {
shownItem = true; shownItem = true;
// process date variables // process date variables
if (invoice.is_recurring) { notes = processVariables(notes);
notes = processVariables(notes); productKey = processVariables(productKey);
productKey = processVariables(productKey);
}
var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty); var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
if (tax) { if (tax) {