diff --git a/app/Http/routes.php b/app/Http/routes.php index b4d0d1a0332e..828e94b75d4a 100644 --- a/app/Http/routes.php +++ b/app/Http/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/'); diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 77e9acfdd85c..23c248de084f 100644 --- 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(); } 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) { diff --git a/readme.md b/readme.md index 48fdc6d208e2..cc3f0d059e63 100644 --- a/readme.md +++ b/readme.md @@ -3,13 +3,15 @@ ### [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 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). @@ -33,8 +35,15 @@ 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 +### 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.