From 6d02510bb3b8ce210ff6b406fa54f837587828b1 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 16 Nov 2014 23:09:18 +0200 Subject: [PATCH] Updated texts and resolved multi-contact bug --- app/lang/da/texts.php | 8 ++++++++ app/lang/de/texts.php | 6 ++++++ app/lang/en/texts.php | 5 ++--- app/lang/es/texts.php | 6 ++++++ app/lang/fr/texts.php | 7 +++++++ app/lang/it/texts.php | 7 +++++++ app/lang/lt/texts.php | 6 ++++++ app/lang/nb_NO/texts.php | 7 +++++++ app/lang/nl/texts.php | 7 +++++++ app/lang/pt_BR/texts.php | 7 +++++++ app/views/invoices/edit.blade.php | 8 ++++++-- 11 files changed, 69 insertions(+), 5 deletions(-) diff --git a/app/lang/da/texts.php b/app/lang/da/texts.php index 435b106ca8e7..a0b5aae3a827 100644 --- a/app/lang/da/texts.php +++ b/app/lang/da/texts.php @@ -469,5 +469,13 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', + 'id_number' => 'ID Number', + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', + + ); diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php index 3215bf58170c..fa5a784f1f35 100644 --- a/app/lang/de/texts.php +++ b/app/lang/de/texts.php @@ -459,6 +459,12 @@ return array( 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index 4a9884d31def..5d586edadf0c 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -459,9 +459,7 @@ return array( 'bought_designs' => 'Successfully added additional invoice designs', 'sent' => 'sent', - 'id_number' => 'ID Number', 'vat_number' => 'VAT Number', - 'timesheets' => 'Timesheets', 'payment_title' => 'Enter Your Billing Address and Credit Card information', @@ -469,10 +467,11 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', + 'id_number' => 'ID Number', 'white_label_link' => 'Purchase white label license', 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', 'white_label_header' => 'White Label', 'bought_white_label' => 'Successfully enabled white label license', - 'white_labeled' => 'White labeled' + 'white_labeled' => 'White labeled', ); diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php index 782619843605..ad847a751124 100644 --- a/app/lang/es/texts.php +++ b/app/lang/es/texts.php @@ -439,6 +439,12 @@ return array( 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', ); \ No newline at end of file diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php index cf154659e0fe..49b5968e8010 100644 --- a/app/lang/fr/texts.php +++ b/app/lang/fr/texts.php @@ -459,5 +459,12 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + + 'id_number' => 'ID Number', + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', ); \ No newline at end of file diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index ceee394de314..451ebfe010ed 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -460,6 +460,13 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php index 73384019ca9a..d8483f3c355d 100644 --- a/app/lang/lt/texts.php +++ b/app/lang/lt/texts.php @@ -469,7 +469,13 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', ); diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php index edc8a42e4857..8ce2ab40ac14 100644 --- a/app/lang/nb_NO/texts.php +++ b/app/lang/nb_NO/texts.php @@ -467,6 +467,13 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php index 8899a58b3b9b..3c7998aefd3b 100644 --- a/app/lang/nl/texts.php +++ b/app/lang/nl/texts.php @@ -461,6 +461,13 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php index 60ad50dde82e..604be613b8df 100644 --- a/app/lang/pt_BR/texts.php +++ b/app/lang/pt_BR/texts.php @@ -449,6 +449,13 @@ return array( 'payment_footer1' => '*Billing address must match address accociated with credit card.', 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', 'vat_number' => 'Vat Number', + 'id_number' => 'ID Number', + + 'white_label_link' => 'Purchase white label license', + 'white_label_text' => 'Purchase a white label license for $10.00 to remove the Invoice Ninja branding from the top of the client pages.', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index 359b1746af30..7cacdc5a746d 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -1245,7 +1245,9 @@ self.mapping = { 'contacts': { create: function(options) { - return new ContactModel(options.data); + var model = new ContactModel(options.data); + model.send_invoice(options.data.send_invoice == '1'); + return model; } } } @@ -1526,7 +1528,9 @@ var client = clients[i]; for (var j=0; j