From 4eb56a8f8861ca32a997ef279041866894046c3f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Mar 2015 07:20:56 +0200 Subject: [PATCH 1/7] Updated version number and set new favicon --- app/routes.php | 2 +- app/views/master.blade.php | 6 +++--- public/favicon.gif | Bin 298 -> 0 bytes public/favicon.ico | Bin 1406 -> 0 bytes public/favicon.png | Bin 0 -> 1160 bytes 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 public/favicon.gif delete mode 100644 public/favicon.ico create mode 100755 public/favicon.png diff --git a/app/routes.php b/app/routes.php index fc436e177b86..3a621108c152 100755 --- a/app/routes.php +++ b/app/routes.php @@ -301,7 +301,7 @@ define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET); define('NINJA_GATEWAY_CONFIG', '{"apiLoginId":"626vWcD5","transactionKey":"4bn26TgL9r4Br4qJ","testMode":"","developerMode":""}'); define('NINJA_WEB_URL', 'https://www.invoiceninja.com'); define('NINJA_APP_URL', 'https://app.invoiceninja.com'); -define('NINJA_VERSION', '1.6.1'); +define('NINJA_VERSION', '1.7.0'); define('NINJA_DATE', '2000-01-01'); define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com'); define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/'); diff --git a/app/views/master.blade.php b/app/views/master.blade.php index d174c873917f..7485139798e2 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -18,9 +18,9 @@ - - - + + + diff --git a/public/favicon.gif b/public/favicon.gif deleted file mode 100644 index a4188938042f1d735af632a9f69cd29e5a6830a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmZ?wbhEHb6krfw_{z$lr>$+Mr)OvbQ%iGD=NKa)qi41(Mc6H7G|f! zC<7S*&Lqc;3?%r{8Qd+MTO3vfoDV*&+O%+1duvZx^79g#awmC(vNFX;-_EY? J9ydn@YXAzGRAK-C diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index 20bc39679617c667c4eccf36c4f70f91084f6956..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmZQzU<5(|0R|w+!H~hqz#zuJz@P!dKp_SNAO?wp0V9M$X8-^HpTXAFfnoRV-3<9kXE($3>o*v_ef!2>Vq(q^930AU;lf3RKY#u( z`1u7gBqgOXba(eK7#W!|Xlv^+{QC8a!QS49Av-&lAs`@#!O+lzAtfb^;o-wa469eK zVd&}UV<;>vW-vFmVtD@i1;fmlvymJ&${Y=W(GZ|l2#8P}NQlDRt{@3AoPmQ?8YIFg z#m@ld1KIM5j4~iG2%njUnSnt_4#t<|6Jg;M6BcCT0?V_rF#)9+7`Vj+z~+JUP!E7i HrUU>0^5I9f diff --git a/public/favicon.png b/public/favicon.png new file mode 100755 index 0000000000000000000000000000000000000000..8032c422badb4893fbaccca80191a3fc01f3544e GIT binary patch literal 1160 zcmaJ>O=uHY9G@g^ZPY+7uC}}4bIL+>O=c!(n#^p|e9WX8a7s4@8W#^vW?tK&osZ7E znrZP6yVgy15B9c#i?;<2%N}G|1Pdy}gQzSbUWDz6tR7UTK~UH&)HkuI9*hGs@BJVD z-|zqRds7=7ITYB|vyC8#K<==R$7`4Sc6Q+J-dF1qUb<1Xh>jZLs4Q8KNGnDOf}AEz zz&weXu`P?ZEZ z78PmHaK#YwY1YvAbbesy)L7L^F5snUnjfce1EM=U_3&R_+ zu$3Su5i&W7DwoTlawKF}6BNU;EJcT@a5#uPg7%z_Bqylby)6a-+OnmZNHuieGD;<5 z79~iW>AMm%bCXuLH`;_7Mmds6F(KM5spTk&pLW%>O>Z0J;ro0)N^BSAOi1OSZOmFS z9^81Z8_MK(3rfha3WhP=>f-36fed@nFagguy9WA1Nmh0DaDNjeid;^&k)+EoCnQMB z6H--$%SP!mPsi8{6N@lRwm(DjQGto~^XUjP9FOoVtYFBq8q`q>tGvgi+hScoXeN#< zKubLdm0`=!K(la8ZJ$f5E#C%KX`f5HEtbN`Q0{m?7?ob|&ae0yLwzg0@T1R{ zzTH~CoVpXJpQ{vo)kLMZwYu(YS`wN%-c=;boSTO@)y;=JdHiz;*R=Q z<^0ZSc6I2~Xh-3>Uy1l;4s`v0W4ZF>xxJMu-YVs5?7LLza< Date: Tue, 17 Mar 2015 12:45:48 +0200 Subject: [PATCH 2/7] Corrected link to the homepage --- app/views/header.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/header.blade.php b/app/views/header.blade.php index c34a53c62667..b458f925d119 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -37,7 +37,7 @@ - + From 392fd537cb509a5b4dcb3c953397591ca9a1cc36 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Mar 2015 13:07:33 +0200 Subject: [PATCH 3/7] Fixed issue if there are line breaks in the account invoice terms --- app/views/invoices/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index 93a6e3da8f7a..c94c0930dfbd 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -673,10 +673,10 @@ invoice.contact = _.findWhere(invoice.client.contacts, {send_invoice: true}); if (!invoice.terms) { - invoice.terms = "{{ $account->invoice_terms }}"; + invoice.terms = "{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_terms)) }}"; } if (!invoice.invoice_footer) { - invoice.invoice_footer = "{{ $account->invoice_footer }}"; + invoice.invoice_footer = "{{ str_replace(["\r\n","\r","\n"], '\n', addslashes($account->invoice_footer)) }}"; } @if (file_exists($account->getLogoPath())) From 35b1379f61a0e5d63e93255cbe3d771a437e5808 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Mar 2015 15:09:28 +0200 Subject: [PATCH 4/7] Fixed bug where stripe token billing was incorrectly shown --- app/models/Account.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/Account.php b/app/models/Account.php index bbe026266a64..b988a5e65b39 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -352,6 +352,10 @@ class Account extends Eloquent public function showTokenCheckbox() { + if (!$this->isGatewayConfigured(GATEWAY_STRIPE)) { + return false; + } + return $this->token_billing_type_id == TOKEN_BILLING_OPT_IN || $this->token_billing_type_id == TOKEN_BILLING_OPT_OUT; } From 8e238a2c7ad4414e3c180b86191237b6936e1b76 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Mar 2015 15:43:13 +0200 Subject: [PATCH 5/7] Fixed issue when saving recurring invoice --- app/ninja/repositories/InvoiceRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php index c364cb569b9c..83efff8bcd8a 100755 --- a/app/ninja/repositories/InvoiceRepository.php +++ b/app/ninja/repositories/InvoiceRepository.php @@ -346,7 +346,7 @@ class InvoiceRepository $invoiceItem = InvoiceItem::createNew(); $invoiceItem->product_id = isset($product) ? $product->id : null; - $invoiceItem->product_key = trim($invoice->is_recurring ? $item->product_key : Utils::processVariables($item['product_key'])); + $invoiceItem->product_key = trim($invoice->is_recurring ? $item['product_key'] : Utils::processVariables($item['product_key'])); $invoiceItem->notes = trim($invoice->is_recurring ? $item['notes'] : Utils::processVariables($item['notes'])); $invoiceItem->cost = Utils::parseFloat($item['cost']); $invoiceItem->qty = Utils::parseFloat($item['qty']); From 206d57ef6b86177256b895a27bc6a34ff31d14ac Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Mar 2015 16:25:53 +0200 Subject: [PATCH 6/7] Fixed analytics tag --- app/views/master.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/master.blade.php b/app/views/master.blade.php index 7485139798e2..1347591e4124 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -91,7 +91,7 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}'); + ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}', 'auto'); ga('send', 'pageview'); function trackUrl(url) { From e8193927d331ecc23de9bf560df93b2daaa563d9 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 17 Mar 2015 16:43:35 +0200 Subject: [PATCH 7/7] Fix for license payment --- app/models/Account.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/Account.php b/app/models/Account.php index b988a5e65b39..22fb3ecd1cfc 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -99,7 +99,7 @@ class Account extends Eloquent public function getGatewayByType($type = PAYMENT_TYPE_ANY) { foreach ($this->account_gateways as $gateway) { - if ($type == PAYMENT_TYPE_ANY) { + if (!$type || $type == PAYMENT_TYPE_ANY) { return $gateway; } elseif ($gateway->isPayPal() && $type == PAYMENT_TYPE_PAYPAL) { return $gateway;