From edea8d0bc29da6bf9a308231b8d2bc628713a08a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 12 Oct 2014 22:36:35 +0300
Subject: [PATCH] Moved custom client and company fields to their respective
 sections on the PDF

---
 ...014_10_06_195330_add_invoice_design_table.php |  6 +++---
 app/views/accounts/user_management.blade.php     | 16 +++++++++-------
 app/views/invoices/pdf.blade.php                 |  1 -
 public/built.js                                  | 12 ++++++------
 public/js/script.js                              | 12 ++++++------
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php b/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php
index 628033735a..d97a063649 100644
--- a/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php
+++ b/app/database/migrations/2014_10_06_195330_add_invoice_design_table.php
@@ -224,9 +224,9 @@ class AddInvoiceDesignTable extends Migration {
 			  z=z+30;
 
 			  doc.setFontSize('8');        
-			  SetPdfColor('Black',doc);
-			  displayClient(doc, invoice, layout.marginLeft, z, layout);
-
+			  SetPdfColor('Black',doc);			  
+        var clientHeight = displayClient(doc, invoice, layout.marginLeft, z, layout);
+        layout.tableTop += Math.max(0, clientHeight - 75);
 			  marginLeft2=395;
 
 			  //publish left side information
diff --git a/app/views/accounts/user_management.blade.php b/app/views/accounts/user_management.blade.php
index 1bba993644..09e3f476f2 100644
--- a/app/views/accounts/user_management.blade.php
+++ b/app/views/accounts/user_management.blade.php
@@ -4,6 +4,15 @@
 	@parent
 	@include('accounts.nav_advanced')
 
+  {{ Former::open('users/delete')->addClass('user-form') }}
+  {{ Former::legend('user_management') }}
+
+  <div style="display:none">
+    {{ Former::text('userPublicId') }}
+  </div>
+  {{ Former::close() }}
+
+
   @if (Utils::isPro())
     {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }} 
   @endif
@@ -22,13 +31,6 @@
       ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[3]]])
       ->render('datatable') }}
 
-
-  {{ Former::open('users/delete')->addClass('user-form') }}
-  <div style="display:none">
-    {{ Former::text('userPublicId') }}
-  </div>
-  {{ Former::close() }}
-
   <script>
   window.onDatatableReady = function() {        
     $('tbody tr').mouseover(function() {
diff --git a/app/views/invoices/pdf.blade.php b/app/views/invoices/pdf.blade.php
index 1832a8739f..6369d0ca37 100644
--- a/app/views/invoices/pdf.blade.php
+++ b/app/views/invoices/pdf.blade.php
@@ -32,7 +32,6 @@
   var needsRefresh = false;
 
   function refreshPDF() {
-    console.log('refreshPDF');
     if ({{ Auth::check() && Auth::user()->force_pdfjs ? 'false' : 'true' }} && (isFirefox || (isChrome && !isChromium))) {
       var string = getPDFString();
       if (!string) return;
diff --git a/public/built.js b/public/built.js
index c741041895..29a6b85da8 100644
--- a/public/built.js
+++ b/public/built.js
@@ -46562,7 +46562,9 @@ function displayAccount(doc, invoice, x, y, layout) {
   data = [
     concatStrings(account.address1, account.address2),
     concatStrings(account.city, account.state, account.postal_code),    
-    account.country ? account.country.name : false
+    account.country ? account.country.name : false,
+    invoice.account.custom_value1 ? invoice.account['custom_label1'] + ' ' + invoice.account.custom_value1 : false, 
+    invoice.account.custom_value2 ? invoice.account['custom_label2'] + ' ' + invoice.account.custom_value2 : false,     
   ];
 
   var nameWidth = account.name ? (doc.getStringUnitWidth(account.name) * doc.internal.getFontSize() * 1.1) : 0;
@@ -46585,7 +46587,9 @@ function displayClient(doc, invoice, x, y, layout) {
     concatStrings(client.address1, client.address2),
     concatStrings(client.city, client.state, client.postal_code),
     client.country ? client.country.name : false,
-    client.contacts ? client.contacts[0].email : false
+    client.contacts ? client.contacts[0].email : false,
+    invoice.client.custom_value1 ? invoice.account['custom_client_label1'] + ' ' + invoice.client.custom_value1 : false, 
+    invoice.client.custom_value2 ? invoice.account['custom_client_label2'] + ' ' + invoice.client.custom_value2 : false, 
   ];
   return displayGrid(doc, invoice, data, x, y, layout, {hasheader:true});
 }
@@ -46610,10 +46614,6 @@ function getInvoiceDetails(invoice) {
     {'po_number': invoice.po_number},
     {'invoice_date': invoice.invoice_date},
     {'due_date': invoice.due_date},
-    {'custom_label1': invoice.account.custom_value1},
-    {'custom_label2': invoice.account.custom_value2},
-    {'custom_client_label1': invoice.client.custom_value1},
-    {'custom_client_label2': invoice.client.custom_value2},
     {'balance_due': formatMoney(invoice.balance_amount, invoice.client.currency_id)},
   ]; 
 }
diff --git a/public/js/script.js b/public/js/script.js
index 5b803f31b7..46719c57ae 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -637,7 +637,9 @@ function displayAccount(doc, invoice, x, y, layout) {
   data = [
     concatStrings(account.address1, account.address2),
     concatStrings(account.city, account.state, account.postal_code),    
-    account.country ? account.country.name : false
+    account.country ? account.country.name : false,
+    invoice.account.custom_value1 ? invoice.account['custom_label1'] + ' ' + invoice.account.custom_value1 : false, 
+    invoice.account.custom_value2 ? invoice.account['custom_label2'] + ' ' + invoice.account.custom_value2 : false,     
   ];
 
   var nameWidth = account.name ? (doc.getStringUnitWidth(account.name) * doc.internal.getFontSize() * 1.1) : 0;
@@ -660,7 +662,9 @@ function displayClient(doc, invoice, x, y, layout) {
     concatStrings(client.address1, client.address2),
     concatStrings(client.city, client.state, client.postal_code),
     client.country ? client.country.name : false,
-    client.contacts ? client.contacts[0].email : false
+    client.contacts ? client.contacts[0].email : false,
+    invoice.client.custom_value1 ? invoice.account['custom_client_label1'] + ' ' + invoice.client.custom_value1 : false, 
+    invoice.client.custom_value2 ? invoice.account['custom_client_label2'] + ' ' + invoice.client.custom_value2 : false, 
   ];
   return displayGrid(doc, invoice, data, x, y, layout, {hasheader:true});
 }
@@ -685,10 +689,6 @@ function getInvoiceDetails(invoice) {
     {'po_number': invoice.po_number},
     {'invoice_date': invoice.invoice_date},
     {'due_date': invoice.due_date},
-    {'custom_label1': invoice.account.custom_value1},
-    {'custom_label2': invoice.account.custom_value2},
-    {'custom_client_label1': invoice.client.custom_value1},
-    {'custom_client_label2': invoice.client.custom_value2},
     {'balance_due': formatMoney(invoice.balance_amount, invoice.client.currency_id)},
   ]; 
 }