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 pull request #1703 from zploskey/#1674-fix-opened-text

Browse Source 
Fix misspelling of opened for invitation status
This commit is contained in:
Hillel Coren 2017-10-13 01:40:07 +03:00 committed by GitHub
commit e42104bb10
16 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/InvoiceController.php
View File

@ -172,7 +172,7 @@ class InvoiceController extends BaseController
$contact->email_error = $invitation->email_error;
$contact->invitation_link = $invitation->getLink('view', $hasPassword, $hasPassword);
$contact->invitation_viewed = $invitation->viewed_date && $invitation->viewed_date != '0000-00-00 00:00:00' ? $invitation->viewed_date : false;
$contact->invitation_openend = $invitation->opened_date && $invitation->opened_date != '0000-00-00 00:00:00' ? $invitation->opened_date : false;
$contact->invitation_opened = $invitation->opened_date && $invitation->opened_date != '0000-00-00 00:00:00' ? $invitation->opened_date : false;
$contact->invitation_status = $contact->email_error ? false : $invitation->getStatus();
$contact->invitation_signature_svg = $invitation->signatureDiv();
}

2
resources/lang/ca/texts.php
View File

@ -1016,7 +1016,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/cs/texts.php
View File

@ -1018,7 +1018,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link pro odstranění loga Invoice Ninja připojením se k profi plánu',
'pro_plan_remove_logo_link' => 'Klikněte zde',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emaily nemohou být odeslány neaktivním klientům',
'email_error_inactive_contact' => 'Emaily nemohou být odeslány neaktivním kontaktům',

2
resources/lang/da/texts.php
View File

@ -1016,7 +1016,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link for at fjerne Invoice Ninja-logoet, opgrader til en Pro Plan',
'pro_plan_remove_logo_link' => 'Klik her',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/en/texts.php
View File

@ -1017,7 +1017,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/en_UK/texts.php
View File

@ -1014,7 +1014,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'Sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/es_ES/texts.php
View File

@ -1012,7 +1012,7 @@ Atención! tu password puede estar transmitida como texto plano, considera habil
'pro_plan_remove_logo' => ':link haz click para eliminar el logo de Invoice Ninja',
'pro_plan_remove_logo_link' => 'Haz click aquí',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'No se pueden enviar correos a Clientes inactivos',
'email_error_inactive_contact' => 'No se pueden enviar correos a Contactos inactivos',

2
resources/lang/fi/texts.php
View File

@ -1018,7 +1018,7 @@ Lasku poistettiin (if only one, alternative)',
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/hr/texts.php
View File

@ -1016,7 +1016,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/ja/texts.php
View File

@ -1016,7 +1016,7 @@ $LANG = array(
'pro_plan_remove_logo' => 'プロプランに加入して、Invoice Ninjaのロゴを消す。 :link',
'pro_plan_remove_logo_link' => 'こちらをクリック',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/lt/texts.php
View File

@ -1016,7 +1016,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/nb_NO/texts.php
View File

@ -1016,7 +1016,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link for å fjerne Invoice Ninja-logoen, oppgrader til en Pro Plan',
'pro_plan_remove_logo_link' => 'Klikk her',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/ro/texts.php
View File

@ -1018,7 +1018,7 @@ Atentie: Folosește Legacy API Key, nu Token API',
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

2
resources/lang/sq/texts.php
View File

@ -1013,7 +1013,7 @@ $LANG = array(
'pro_plan_remove_logo' => ':link për të larguar Invoice Ninja logo duke iu bashkangjitur Pro Planit',
'pro_plan_remove_logo_link' => 'Kliko këtu',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emailat nuk mund t\'i dërgohen klientëve joaktiv',
'email_error_inactive_contact' => 'Emailat nuk mund t\'i dërgohen kontakteve joaktiv',

2
resources/lang/tr_TR/texts.php
View File

@ -1015,7 +1015,7 @@ adresine gönderildi. Müthiş tüm özelliklerin kilidini açmak için lütfen
'pro_plan_remove_logo' => ':link to remove the Invoice Ninja logo by joining the Pro Plan',
'pro_plan_remove_logo_link' => 'Click here',
'invitation_status_sent' => 'sent',
'invitation_status_opened' => 'Openend',
'invitation_status_opened' => 'Opened',
'invitation_status_viewed' => 'Viewed',
'email_error_inactive_client' => 'Emails can not be sent to inactive clients',
'email_error_inactive_contact' => 'Emails can not be sent to inactive contacts',

4
resources/views/invoices/knockout.blade.php
View File

@ -710,7 +710,7 @@ function ContactModel(data) {
self.send_invoice = ko.observable(false);
self.invitation_link = ko.observable('');
self.invitation_status = ko.observable('');
self.invitation_openend = ko.observable(false);
self.invitation_opened = ko.observable(false);
self.invitation_viewed = ko.observable(false);
self.email_error = ko.observable('');
self.invitation_signature_svg = ko.observable('');
@ -770,7 +770,7 @@ function ContactModel(data) {
self.info_color = ko.computed(function() {
if (self.invitation_viewed()) {
return '#57D172';
} else if (self.invitation_openend()) {
} else if (self.invitation_opened()) {
return '#FFCC00';
} else {
return '#B1B5BA';