From c2171e5f4f89dfdbc1a56b561878a76dc98b22dc Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 2 Jan 2017 13:58:51 +0200 Subject: [PATCH] Add post\state\city field to invoice design --- app/Models/Traits/PresentsInvoice.php | 3 +++ public/built.js | 2 +- public/built.js.map | 2 +- resources/assets/js/pdf.pdfmake.js | 12 ++++++++++++ resources/lang/en/texts.php | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Models/Traits/PresentsInvoice.php b/app/Models/Traits/PresentsInvoice.php index b76950c44366..5f9f5050caf4 100644 --- a/app/Models/Traits/PresentsInvoice.php +++ b/app/Models/Traits/PresentsInvoice.php @@ -96,6 +96,7 @@ trait PresentsInvoice 'client.address1', 'client.address2', 'client.city_state_postal', + 'client.postal_city_state', 'client.country', 'client.email', 'client.phone', @@ -114,6 +115,7 @@ trait PresentsInvoice 'account.address1', 'account.address2', 'account.city_state_postal', + 'account.postal_city_state', 'account.country', 'account.custom_value1', 'account.custom_value2', @@ -196,6 +198,7 @@ trait PresentsInvoice 'id_number', 'vat_number', 'city_state_postal', + 'postal_city_state', 'country', 'email', 'contact_name', diff --git a/public/built.js b/public/built.js index 8fc564e4c6a8..f1b79cbb6333 100644 --- a/public/built.js +++ b/public/built.js @@ -27,5 +27,5 @@ void(t._d=new Date(NaN));for(o=0;owindow.innerHeight&&(b.previousBodyPadding=document.body.style.paddingRight,document.body.style.paddingRight=H()+"px")}function e(){null!==b.previousBodyPadding&&(document.body.style.paddingRight=b.previousBodyPadding,b.previousBodyPadding=null)}function n(){var t=/iPad|iPhone|iPod/.test(navigator.userAgent)&&!window.MSStream;if(t&&!O(document.body,l.iosfix)){var e=document.body.scrollTop;document.body.style.top=e*-1+"px",L(document.body,l.iosfix)}}function i(){if(O(document.body,l.iosfix)){var t=parseInt(document.body.style.top,10);k(document.body,l.iosfix),document.body.scrollTop=t*-1}}function o(){if(void 0===arguments[0])return!1;var t=m({},U);switch(typeof arguments[0]){case"string":t.title=arguments[0],t.text=arguments[1]||"",t.type=arguments[2]||"";break;case"object":m(t,arguments[0]),t.extraParams=arguments[0].extraParams,"email"===t.input&&null===t.inputValidator&&(t.inputValidator=function(t){return new Promise(function(e,n){var i=/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/;i.test(t)?e():n("Invalid email address")})});break;default:return!1}V(t);var e=y();return new Promise(function(n,i){function o(e,n){for(var i=S(t.focusCancel),o=0;o