diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php index b9bd450a291d..8850c3467a09 100644 --- a/app/lang/de/texts.php +++ b/app/lang/de/texts.php @@ -258,7 +258,7 @@ return array( 'email_salutation' => 'Sehr geehrte/r :name,', 'email_signature' => 'Freundliche Grüße,', 'email_from' => 'Das InvoiceNinja Team', - 'user_email_footer' => 'Um deine E-Mail Benachrichtigungen anzupassen besuche bitte http://www.invoiceninja.com/company/notifications', + 'user_email_footer' => 'Um deine E-Mail Benachrichtigungen anzupassen besuche bitte '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'Um deine Kundenrechnung anzuschauen, klicke auf den folgenden Link:', 'notification_paid_subject' => 'Die Rechnung :invoice wurde von :client bezahlt', 'notification_sent_subject' => 'Die Rechnung :invoice wurde an :client versendet', diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index aa60b8b6c85f..9fc4a67358f3 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -260,7 +260,7 @@ return array( 'email_salutation' => 'Dear :name,', 'email_signature' => 'Regards,', 'email_from' => 'The InvoiceNinja Team', - 'user_email_footer' => 'To adjust your email notification settings please visit http://' . $_SERVER['SERVER_NAME'] . '/company/notifications', + 'user_email_footer' => 'To adjust your email notification settings please visit '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'To view your client invoice click the link below:', 'notification_paid_subject' => 'Invoice :invoice was paid by :client', 'notification_sent_subject' => 'Invoice :invoice was sent to :client', diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php index 7b56bb8f8888..b79e23eeb930 100644 --- a/app/lang/es/texts.php +++ b/app/lang/es/texts.php @@ -259,7 +259,7 @@ return array( 'email_salutation' => 'Dear :name,', 'email_signature' => 'Regards,', 'email_from' => 'The InvoiceNinja Team', - 'user_email_footer' => 'To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications', + 'user_email_footer' => 'To adjust your email notification settings please visit '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'To view your client invoice click the link below:', 'notification_paid_subject' => 'Invoice :invoice was paid by :client', 'notification_sent_subject' => 'Invoice :invoice was sent to :client', diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php index d48a8eb4dddd..55549733eea6 100644 --- a/app/lang/fr/texts.php +++ b/app/lang/fr/texts.php @@ -260,7 +260,7 @@ return array( 'email_salutation' => 'Cher :name,', 'email_signature' => 'Cordialement,', 'email_from' => 'L\'équipe InvoiceNinja', - 'user_email_footer' => 'Pour modifier vos paramètres de notification par email, veuillez visiter http://www.invoiceninja.com/company/notifications', + 'user_email_footer' => 'Pour modifier vos paramètres de notification par email, veuillez visiter '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'Pour voir la facture de votre client cliquez sur le lien ci-après :', 'notification_paid_subject' => 'La facture :invoice a été payée par le client :client', 'notification_sent_subject' => 'La facture :invoice a été envoyée au client :client', diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index 12c013488ab8..c7bc93202d53 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -260,7 +260,7 @@ return array( 'email_salutation' => 'Caro :name,', 'email_signature' => 'Distinti saluti,', 'email_from' => 'Il Team di InvoiceNinja', - 'user_email_footer' => 'Per modificare le impostazioni di notifiche via email per favore accedi a: http://www.invoiceninja.com/company/notifications', + 'user_email_footer' => 'Per modificare le impostazioni di notifiche via email per favore accedi a: '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'Per visualizzare la tua fattura del cliente clicca sul link qui sotto:', 'notification_paid_subject' => 'La fattura :invoice è stata pagata da :client', 'notification_sent_subject' => 'La fattura :invoice è stata inviata a :client', diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php index fee70efacd93..3696b00543db 100644 --- a/app/lang/nl/texts.php +++ b/app/lang/nl/texts.php @@ -258,7 +258,7 @@ return array( 'email_salutation' => 'Beste :name,', 'email_signature' => 'Met vriendelijke groeten,', 'email_from' => 'Het InvoiceNinja Team', - 'user_email_footer' => 'Ga alstublieft naar http://www.invoiceninja.com/company/notifications om je e-mail notificatie instellingen aan te passen ', + 'user_email_footer' => 'Ga alstublieft naar '.SITE_URL.'/company/notifications om je e-mail notificatie instellingen aan te passen ', 'invoice_link_message' => 'Klik op volgende link om de Factuur van je klant te bekijken:', 'notification_paid_subject' => 'Factuur :invoice is betaald door :client', 'notification_sent_subject' => 'Factuur :invoice is gezonden door :client', diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php index 34708c6a3900..e6a0fb30f69c 100644 --- a/app/lang/pt_BR/texts.php +++ b/app/lang/pt_BR/texts.php @@ -256,7 +256,7 @@ return array( 'email_salutation' => 'Caro :name,', 'email_signature' => 'Até mais,', 'email_from' => 'Equipe InvoiceNinja', - 'user_email_footer' => 'Para ajustar suas configurações de notificações de email acesse http://www.invoiceninja.com/company/notifications', + 'user_email_footer' => 'Para ajustar suas configurações de notificações de email acesse '.SITE_URL.'/company/notifications', 'invoice_link_message' => 'Para visualizar a fatura do seu cliente clique no link abaixo:', 'notification_paid_subject' => 'Fatura :invoice foi pago por :client', 'notification_sent_subject' => 'Fatura :invoice foi enviado por :client', diff --git a/app/ninja/mailers/UserMailer.php b/app/ninja/mailers/UserMailer.php index ab25f0426081..b66d07e3ae2e 100755 --- a/app/ninja/mailers/UserMailer.php +++ b/app/ninja/mailers/UserMailer.php @@ -40,7 +40,7 @@ class UserMailer extends Mailer { 'userName' => $user->getDisplayName(), 'invoiceAmount' => Utils::formatMoney($invoice->amount, $invoice->client->currency_id), 'invoiceNumber' => $invoice->invoice_number, - 'invoiceLink' => "http://".$_SERVER['SERVER_NAME']."/invoices/{$invoice->public_id}" + 'invoiceLink' => SITE_URL . "/invoices/{$invoice->public_id}" ]; if ($payment) diff --git a/app/routes.php b/app/routes.php index a50d77f6588d..d5a4fd5e23db 100755 --- a/app/routes.php +++ b/app/routes.php @@ -113,7 +113,8 @@ Route::group(array('before' => 'auth'), function() define('CONTACT_EMAIL', 'contact@invoiceninja.com'); define('CONTACT_NAME', 'Invoice Ninja'); -define('NINJA_URL', 'https://www.invoiceninja.com'); +define('SITE_URL', 'https://www.invoiceninja.com'); + define('ENV_DEVELOPMENT', 'local'); define('ENV_STAGING', 'staging'); @@ -194,6 +195,7 @@ define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN'); define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h'); define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET); define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}'); +define('NINJA_URL', 'https://www.invoiceninja.com'); /*