From e9c4db679f2379fc6e431a28203b31a3e5a11ad6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 18 Mar 2015 16:34:33 +0200 Subject: [PATCH 1/5] Updated the readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index be9da430c5a8..dcb144534883 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ ### [https://www.invoiceninja.com](https://www.invoiceninja.com) +#### Note: please submit any pull requests against the [Laravel 5](https://github.com/hillelcoren/invoice-ninja/tree/laravel-5) branch + If you'd like to use our code to sell your own invoicing app we have an affiliate program. Get in touch for more details. ### Introduction @@ -33,6 +35,7 @@ Developed by [@hillelcoren](https://twitter.com/hillelcoren) | Designed by [kant ### Contributors * [Troels Liebe Bentsen](https://github.com/tlbdk) +* [Jeramy Simpson](https://github.com/JeramyMywork) - [MyWork](https://www.mywork.com.au) ### Steps to setup From 281b36b67c863cdfe7302e8c72999acde8f35e00 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 18 Mar 2015 16:55:22 +0200 Subject: [PATCH 2/5] Updated the readme --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dcb144534883..628553614448 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you'd like to use our code to sell your own invoicing app we have an affiliat Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies. -To setup the site you can either use this [zip file](http://hillelcoren.com/invoice-ninja/self-hosting/) (easier to setup) or checkout the code from GitHub following the instructions below (easier to stay up to date). There's also a more detailed setup guide [available here](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). +To setup the site you can either use this [zip file](http://www.invoiceninja.com/knowledgebase/self-host/) (easier to setup) or checkout the code from GitHub following the instructions below (easier to stay up to date). For a WAMP/MAMP/LAMP setup you can one-click install using Softaculous's [AMPPS](http://www.ampps.com/). To deploy the app with [Docker](http://www.docker.com/) you can use [this project](https://github.com/rollbrettler/Dockerfiles/tree/master/invoice-ninja). @@ -37,7 +37,13 @@ Developed by [@hillelcoren](https://twitter.com/hillelcoren) | Designed by [kant * [Troels Liebe Bentsen](https://github.com/tlbdk) * [Jeramy Simpson](https://github.com/JeramyMywork) - [MyWork](https://www.mywork.com.au) -### Steps to setup +### Documentation + +* [Self Host](http://www.invoiceninja.com/knowledgebase/self-host/) +* [API Documentation](http://www.invoiceninja.com/knowledgebase/api-documentation/) +* [Developer Guide](http://www.invoiceninja.com/knowledgebase/developer-guide/) + +### Steps to setup from GitHub If you plan on submitting changes it's best to [fork the repo](https://help.github.com/articles/fork-a-repo), otherwise you can just checkout the code. From 4e3e29a78e700d132ee379f22601342764970d25 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 20 Mar 2015 09:11:58 +0200 Subject: [PATCH 3/5] Bug fix for activity tracking --- app/models/Activity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/Activity.php b/app/models/Activity.php index 9fe82178c612..625e98ed36b9 100755 --- a/app/models/Activity.php +++ b/app/models/Activity.php @@ -188,10 +188,10 @@ class Activity extends Eloquent } } - if ($diff > 0 || $fieldChanged) { + if ($diff != 0 || $fieldChanged) { $backupInvoice = Invoice::with('invoice_items', 'client.account', 'client.contacts')->find($invoice->id); - if ($diff > 0 && !$invoice->is_quote && !$invoice->is_recurring) { + if ($diff != 0 && !$invoice->is_quote && !$invoice->is_recurring) { $client->balance = $client->balance + $diff; $client->save(); } From 09838a1b193c4b6b746ebef7453ba42028e84a55 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 20 Mar 2015 09:17:15 +0200 Subject: [PATCH 4/5] Bug fix for activity tracking --- app/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes.php b/app/routes.php index 3a621108c152..a403bed2ea3d 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.7.0'); +define('NINJA_VERSION', '1.7.1'); define('NINJA_DATE', '2000-01-01'); define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com'); define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/'); From b040b5e242273ee4f66808ade9e0569fa1288d65 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 22 Mar 2015 15:13:05 +0200 Subject: [PATCH 5/5] Fixed problem with line wrapping --- public/built.js | 4 ++-- public/js/script.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/built.js b/public/built.js index 4d3649814b04..a07bb5754085 100644 --- a/public/built.js +++ b/public/built.js @@ -31565,7 +31565,7 @@ function GetPdf(invoice, javascript){ footerLeft: 420, tablePadding: 12, tableTop: 250, - descriptionLeft: 162, + descriptionLeft: 150, unitCostRight: 410, qtyRight: 480, taxRight: 480, @@ -32752,7 +32752,7 @@ function displayInvoiceItems(doc, invoice, layout) { SetPdfColor('Black', doc); doc.setFontType('normal'); - var splitDescription = doc.splitTextToSize(notes, 180); + var splitDescription = doc.splitTextToSize(notes, 190); doc.text(layout.descriptionLeft, y+2, splitDescription); doc.text(costX, y+2, cost); if (!hideQuantity) { diff --git a/public/js/script.js b/public/js/script.js index 9c930d82300c..eecfa9302546 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -42,7 +42,7 @@ function GetPdf(invoice, javascript){ footerLeft: 420, tablePadding: 12, tableTop: 250, - descriptionLeft: 162, + descriptionLeft: 150, unitCostRight: 410, qtyRight: 480, taxRight: 480, @@ -1229,7 +1229,7 @@ function displayInvoiceItems(doc, invoice, layout) { SetPdfColor('Black', doc); doc.setFontType('normal'); - var splitDescription = doc.splitTextToSize(notes, 180); + var splitDescription = doc.splitTextToSize(notes, 190); doc.text(layout.descriptionLeft, y+2, splitDescription); doc.text(costX, y+2, cost); if (!hideQuantity) {