Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding back fixes

Browse Source
This commit is contained in:
Hillel Coren 2016-07-21 16:04:23 +03:00
parent 498578cefc
commit 4795f33067
11 changed files with 110 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Commands/ChargeRenewalInvoices.php
View File

@ -69,6 +69,11 @@ class ChargeRenewalInvoices extends Command
// check if account has switched to free since the invoice was created // check if account has switched to free since the invoice was created
$account = Account::find($invoice->client->public_id); $account = Account::find($invoice->client->public_id);
if ( ! $account) {
continue;
}
$company = $account->company; $company = $account->company;
if ( ! $company->plan || $company->plan == PLAN_FREE) { if ( ! $company->plan || $company->plan == PLAN_FREE) {
continue; continue;

5
app/Providers/ComposerServiceProvider.php
View File

@ -17,6 +17,11 @@ class ComposerServiceProvider extends ServiceProvider
['accounts.details', 'clients.edit', 'payments.edit', 'invoices.edit', 'accounts.localization'], ['accounts.details', 'clients.edit', 'payments.edit', 'invoices.edit', 'accounts.localization'],
'App\Http\ViewComposers\TranslationComposer' 'App\Http\ViewComposers\TranslationComposer'
); );
view()->composer(
['header', 'tasks.edit'],
'App\Http\ViewComposers\AppLanguageComposer'
);
} }
/** /**

4
composer.json
View File

@ -13,6 +13,10 @@
} }
], ],
"require": { "require": {
"php": ">=5.5.9",
"ext-mcrypt": "*",
"ext-gmp": "*",
"ext-gd": "*",
"turbo124/laravel-push-notification": "dev-laravel5", "turbo124/laravel-push-notification": "dev-laravel5",
"omnipay/mollie": "dev-master#22956c1a62a9662afa5f5d119723b413770ac525", "omnipay/mollie": "dev-master#22956c1a62a9662afa5f5d119723b413770ac525",
"omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248", "omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",

145
composer.lock generated
View File

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "96184bcd2d0fb39c87a98b223efc5c1c", "hash": "5221e980b2241bf56d9393aac82dfa1f",
"content-hash": "361daf07da39682d74bdc2bfead14fb9", "content-hash": "da4f765b1dd362a4f4690cff06e20afc",
"packages": [ "packages": [
{ {
"name": "agmscode/omnipay-agms", "name": "agmscode/omnipay-agms",
@ -323,20 +323,20 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.18.27", "version": "3.18.31",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "8cc3d3231d9fb9da528205f3b905097a37ac3df3" "reference": "dad0b7db5fa8f3c7a3805efb2a1e86a50f11fe8b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8cc3d3231d9fb9da528205f3b905097a37ac3df3", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dad0b7db5fa8f3c7a3805efb2a1e86a50f11fe8b",
"reference": "8cc3d3231d9fb9da528205f3b905097a37ac3df3", "reference": "dad0b7db5fa8f3c7a3805efb2a1e86a50f11fe8b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1", "guzzlehttp/guzzle": "^5.3.1|^6.2.1",
"guzzlehttp/promises": "~1.0", "guzzlehttp/promises": "~1.0",
"guzzlehttp/psr7": "~1.3.1", "guzzlehttp/psr7": "~1.3.1",
"mtdowling/jmespath.php": "~2.2", "mtdowling/jmespath.php": "~2.2",
@ -399,7 +399,7 @@
"s3", "s3",
"sdk" "sdk"
], ],
"time": "2016-07-07 23:09:15" "time": "2016-07-19 17:25:45"
}, },
{ {
"name": "barracudanetworks/archivestream-php", "name": "barracudanetworks/archivestream-php",
@ -443,16 +443,16 @@
}, },
{ {
"name": "braintree/braintree_php", "name": "braintree/braintree_php",
"version": "3.14.0", "version": "3.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/braintree/braintree_php.git", "url": "https://github.com/braintree/braintree_php.git",
"reference": "0c13b6235bc99c287d18e8cfc02359e66abaa3fb" "reference": "1026b6cca5f2dd5dfdd5447843b920cc74d2b8ca"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/braintree/braintree_php/zipball/0c13b6235bc99c287d18e8cfc02359e66abaa3fb", "url": "https://api.github.com/repos/braintree/braintree_php/zipball/1026b6cca5f2dd5dfdd5447843b920cc74d2b8ca",
"reference": "0c13b6235bc99c287d18e8cfc02359e66abaa3fb", "reference": "1026b6cca5f2dd5dfdd5447843b920cc74d2b8ca",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -486,7 +486,7 @@
} }
], ],
"description": "Braintree PHP Client Library", "description": "Braintree PHP Client Library",
"time": "2016-06-23 15:36:49" "time": "2016-07-18 21:55:50"
}, },
{ {
"name": "cardgate/omnipay-cardgate", "name": "cardgate/omnipay-cardgate",
@ -1745,16 +1745,16 @@
}, },
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",
"version": "v4.7.0", "version": "v4.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ezyang/htmlpurifier.git", "url": "https://github.com/ezyang/htmlpurifier.git",
"reference": "ae1828d955112356f7677c465f94f7deb7d27a40" "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40", "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
"reference": "ae1828d955112356f7677c465f94f7deb7d27a40", "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1785,7 +1785,7 @@
"keywords": [ "keywords": [
"html" "html"
], ],
"time": "2015-08-05 01:03:42" "time": "2016-07-16 12:58:58"
}, },
{ {
"name": "fotografde/omnipay-checkoutcom", "name": "fotografde/omnipay-checkoutcom",
@ -2048,27 +2048,27 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.2.0", "version": "6.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "d094e337976dff9d8e2424e8485872194e768662" "reference": "3f808fba627f2c5b69e2501217bf31af349c1427"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427",
"reference": "d094e337976dff9d8e2424e8485872194e768662", "reference": "3f808fba627f2c5b69e2501217bf31af349c1427",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"guzzlehttp/promises": "~1.0", "guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "~1.1", "guzzlehttp/psr7": "^1.3.1",
"php": ">=5.5.0" "php": ">=5.5"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
"phpunit/phpunit": "~4.0", "phpunit/phpunit": "^4.0",
"psr/log": "~1.0" "psr/log": "^1.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -2106,7 +2106,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2016-03-21 20:02:09" "time": "2016-07-15 17:22:37"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@ -2765,16 +2765,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.2.39", "version": "5.2.41",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a" "reference": "29ba2e310cfeb42ab6545bcd81ff4c2ec1f6b5c2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a", "url": "https://api.github.com/repos/laravel/framework/zipball/29ba2e310cfeb42ab6545bcd81ff4c2ec1f6b5c2",
"reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a", "reference": "29ba2e310cfeb42ab6545bcd81ff4c2ec1f6b5c2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2831,7 +2831,8 @@
"illuminate/support": "self.version", "illuminate/support": "self.version",
"illuminate/translation": "self.version", "illuminate/translation": "self.version",
"illuminate/validation": "self.version", "illuminate/validation": "self.version",
"illuminate/view": "self.version" "illuminate/view": "self.version",
"tightenco/collect": "self.version"
}, },
"require-dev": { "require-dev": {
"aws/aws-sdk-php": "~3.0", "aws/aws-sdk-php": "~3.0",
@ -2890,7 +2891,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2016-06-17 19:25:12" "time": "2016-07-20 13:13:06"
}, },
{ {
"name": "laravel/socialite", "name": "laravel/socialite",
@ -3047,16 +3048,16 @@
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.24", "version": "1.0.25",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b" "reference": "a76afa4035931be0c78ca8efc6abf3902362f437"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437",
"reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b", "reference": "a76afa4035931be0c78ca8efc6abf3902362f437",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3069,7 +3070,7 @@
"ext-fileinfo": "*", "ext-fileinfo": "*",
"mockery/mockery": "~0.9", "mockery/mockery": "~0.9",
"phpspec/phpspec": "^2.2", "phpspec/phpspec": "^2.2",
"phpunit/phpunit": "~4.8 || ~5.0" "phpunit/phpunit": "~4.8"
}, },
"suggest": { "suggest": {
"ext-fileinfo": "Required for MimeType", "ext-fileinfo": "Required for MimeType",
@ -3126,7 +3127,7 @@
"sftp", "sftp",
"storage" "storage"
], ],
"time": "2016-06-03 19:11:39" "time": "2016-07-18 12:22:57"
}, },
{ {
"name": "league/flysystem-aws-s3-v3", "name": "league/flysystem-aws-s3-v3",
@ -3454,16 +3455,16 @@
}, },
{ {
"name": "maatwebsite/excel", "name": "maatwebsite/excel",
"version": "v2.1.2", "version": "v2.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git",
"reference": "aae17dbd6f39606cf8f588359a7a79438ab5aa53" "reference": "c6ab521e8a5f2a4acc83cb575c4a09733a5e17c9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/aae17dbd6f39606cf8f588359a7a79438ab5aa53", "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/c6ab521e8a5f2a4acc83cb575c4a09733a5e17c9",
"reference": "aae17dbd6f39606cf8f588359a7a79438ab5aa53", "reference": "c6ab521e8a5f2a4acc83cb575c4a09733a5e17c9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3491,8 +3492,7 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"classmap": [ "classmap": [
"src/Maatwebsite/Excel", "src/Maatwebsite/Excel"
"tests/TestCase.php"
], ],
"psr-0": { "psr-0": {
"Maatwebsite\\Excel\\": "src/" "Maatwebsite\\Excel\\": "src/"
@ -3518,7 +3518,7 @@
"import", "import",
"laravel" "laravel"
], ],
"time": "2016-03-01 17:45:44" "time": "2016-07-09 09:40:10"
}, },
{ {
"name": "meebio/omnipay-creditcall", "name": "meebio/omnipay-creditcall",
@ -4054,16 +4054,16 @@
}, },
{ {
"name": "omnipay/authorizenet", "name": "omnipay/authorizenet",
"version": "2.4.1", "version": "2.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/omnipay-authorizenet.git", "url": "https://github.com/thephpleague/omnipay-authorizenet.git",
"reference": "439bb6e649a4c57cddc24d6d704301a8ee5c3c3f" "reference": "6e1990f5d22f0f8e4dfe363b89c9776d0d803c34"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/omnipay-authorizenet/zipball/439bb6e649a4c57cddc24d6d704301a8ee5c3c3f", "url": "https://api.github.com/repos/thephpleague/omnipay-authorizenet/zipball/6e1990f5d22f0f8e4dfe363b89c9776d0d803c34",
"reference": "439bb6e649a4c57cddc24d6d704301a8ee5c3c3f", "reference": "6e1990f5d22f0f8e4dfe363b89c9776d0d803c34",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4109,7 +4109,7 @@
"pay", "pay",
"payment" "payment"
], ],
"time": "2016-06-16 10:06:24" "time": "2016-07-16 21:00:00"
}, },
{ {
"name": "omnipay/bitpay", "name": "omnipay/bitpay",
@ -8734,16 +8734,16 @@
}, },
{ {
"name": "codeception/c3", "name": "codeception/c3",
"version": "2.0.6", "version": "2.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Codeception/c3.git", "url": "https://github.com/Codeception/c3.git",
"reference": "dc4d39b36d585c2eda58129407e78855ea67b1ca" "reference": "51eec2c3a8e093deb621f58004f0393dc0871983"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Codeception/c3/zipball/dc4d39b36d585c2eda58129407e78855ea67b1ca", "url": "https://api.github.com/repos/Codeception/c3/zipball/51eec2c3a8e093deb621f58004f0393dc0871983",
"reference": "dc4d39b36d585c2eda58129407e78855ea67b1ca", "reference": "51eec2c3a8e093deb621f58004f0393dc0871983",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8780,7 +8780,7 @@
"code coverage", "code coverage",
"codecoverage" "codecoverage"
], ],
"time": "2016-02-09 23:31:08" "time": "2016-06-27 16:49:12"
}, },
{ {
"name": "codeception/codeception", "name": "codeception/codeception",
@ -9262,16 +9262,16 @@
}, },
{ {
"name": "phpspec/phpspec", "name": "phpspec/phpspec",
"version": "2.5.0", "version": "2.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/phpspec.git", "url": "https://github.com/phpspec/phpspec.git",
"reference": "385ecb015e97c13818074f1517928b24d4a26067" "reference": "531d00ee76e9ae98279ed4dbb2419e5e0f7fb82d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/phpspec/zipball/385ecb015e97c13818074f1517928b24d4a26067", "url": "https://api.github.com/repos/phpspec/phpspec/zipball/531d00ee76e9ae98279ed4dbb2419e5e0f7fb82d",
"reference": "385ecb015e97c13818074f1517928b24d4a26067", "reference": "531d00ee76e9ae98279ed4dbb2419e5e0f7fb82d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9289,7 +9289,7 @@
}, },
"require-dev": { "require-dev": {
"behat/behat": "^3.0.11", "behat/behat": "^3.0.11",
"bossa/phpspec2-expect": "~1.0", "ciaranmcnulty/versionbasedtestskipper": "^0.2.1",
"phpunit/phpunit": "~4.4", "phpunit/phpunit": "~4.4",
"symfony/filesystem": "~2.1|~3.0" "symfony/filesystem": "~2.1|~3.0"
}, },
@ -9302,7 +9302,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.2.x-dev" "dev-master": "2.5.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -9336,7 +9336,7 @@
"testing", "testing",
"tests" "tests"
], ],
"time": "2016-03-20 20:34:32" "time": "2016-07-16 08:34:07"
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
@ -9645,16 +9645,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "4.8.26", "version": "4.8.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74" "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74", "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9713,7 +9713,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2016-05-17 03:09:28" "time": "2016-07-21 06:48:14"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@ -10444,6 +10444,11 @@
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": {
"php": ">=5.5.9",
"ext-mcrypt": "*",
"ext-gmp": "*",
"ext-gd": "*"
},
"platform-dev": [] "platform-dev": []
} }

12
public/built.js
View File

@ -30545,12 +30545,12 @@ function calculateAmounts(invoice) {
invoice.has_product_key = true; invoice.has_product_key = true;
} }
if (item.tax_rate1 && parseFloat(item.tax_rate1)) { if (item.tax_name1) {
taxRate1 = parseFloat(item.tax_rate1); taxRate1 = parseFloat(item.tax_rate1);
taxName1 = item.tax_name1; taxName1 = item.tax_name1;
} }
if (item.tax_rate2 && parseFloat(item.tax_rate2)) { if (item.tax_name2) {
taxRate2 = parseFloat(item.tax_rate2); taxRate2 = parseFloat(item.tax_rate2);
taxName2 = item.tax_name2; taxName2 = item.tax_name2;
} }
@ -30566,7 +30566,7 @@ function calculateAmounts(invoice) {
} }
var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100); var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100);
if (taxAmount1) { if (taxName1) {
var key = taxName1 + taxRate1; var key = taxName1 + taxRate1;
if (taxes.hasOwnProperty(key)) { if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount1; taxes[key].amount += taxAmount1;
@ -30576,7 +30576,7 @@ function calculateAmounts(invoice) {
} }
var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100); var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100);
if (taxAmount2) { if (taxName2) {
var key = taxName2 + taxRate2; var key = taxName2 + taxRate2;
if (taxes.hasOwnProperty(key)) { if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount2; taxes[key].amount += taxAmount2;
@ -31542,11 +31542,11 @@ NINJA.subtotals = function(invoice, hideBalance)
} }
} }
if (invoice.tax_amount1) { if (invoice.tax_name1) {
var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%'; var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%';
data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]); data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]);
} }
if (invoice.tax_amount2) { if (invoice.tax_name2) {
var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%'; var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%';
data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]); data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]);
} }

4
public/js/pdf.pdfmake.js
View File

@ -502,11 +502,11 @@ NINJA.subtotals = function(invoice, hideBalance)
} }
} }
if (invoice.tax_amount1) { if (invoice.tax_name1) {
var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%'; var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%';
data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]); data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]);
} }
if (invoice.tax_amount2) { if (invoice.tax_name2) {
var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%'; var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%';
data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]); data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]);
} }

8
public/js/script.js
View File

@ -651,12 +651,12 @@ function calculateAmounts(invoice) {
invoice.has_product_key = true; invoice.has_product_key = true;
} }
if (item.tax_rate1 && parseFloat(item.tax_rate1)) { if (item.tax_name1) {
taxRate1 = parseFloat(item.tax_rate1); taxRate1 = parseFloat(item.tax_rate1);
taxName1 = item.tax_name1; taxName1 = item.tax_name1;
} }
if (item.tax_rate2 && parseFloat(item.tax_rate2)) { if (item.tax_name2) {
taxRate2 = parseFloat(item.tax_rate2); taxRate2 = parseFloat(item.tax_rate2);
taxName2 = item.tax_name2; taxName2 = item.tax_name2;
} }
@ -672,7 +672,7 @@ function calculateAmounts(invoice) {
} }
var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100); var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100);
if (taxAmount1) { if (taxName1) {
var key = taxName1 + taxRate1; var key = taxName1 + taxRate1;
if (taxes.hasOwnProperty(key)) { if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount1; taxes[key].amount += taxAmount1;
@ -682,7 +682,7 @@ function calculateAmounts(invoice) {
} }
var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100); var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100);
if (taxAmount2) { if (taxName2) {
var key = taxName2 + taxRate2; var key = taxName2 + taxRate2;
if (taxes.hasOwnProperty(key)) { if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount2; taxes[key].amount += taxAmount2;

2
resources/lang/en/texts.php
View File

@ -2043,6 +2043,8 @@ $LANG = array(
'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.', 'payment_error_code' => 'There was an error processing your payment [:code]. Please try again later.',
'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.', 'standard_fees_apply' => 'Standard fees apply: 2.9% + $0.30 per successful charge.',
'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less', 'limit_import_rows' => 'Data needs to be imported in batches of :count rows or less',
'error_title' => 'Something went wrong',
'error_contact_text' => 'If you\'d like help please email us at :mailaddress',
); );

4
resources/views/error.blade.php
View File

@ -7,9 +7,9 @@
<div class="well"> <div class="well">
<div class="container" style="min-height:400px"> <div class="container" style="min-height:400px">
<h3>Something went wrong...</h3> <h3>{{ trans('texts.error_title') }}...</h3>
<h4>{{ $error }}</h4> <h4>{{ $error }}</h4>
<h4>If you'd like help please email us at {{ env('MAIL_USERNAME') }}.</h4> <h4>{{ trans('texts.error_contact_text', ['mailaddress' => env('MAIL_USERNAME')]) }}</h4>
</div> </div>
</div> </div>

1
resources/views/header.blade.php
View File

@ -305,6 +305,7 @@
/* Set the defaults for Bootstrap datepicker */ /* Set the defaults for Bootstrap datepicker */
$.extend(true, $.fn.datepicker.defaults, { $.extend(true, $.fn.datepicker.defaults, {
language: '{{ $appLanguage }}',
weekStart: {{ Session::get('start_of_week') }} weekStart: {{ Session::get('start_of_week') }}
}); });

2
resources/views/tasks/edit.blade.php
View File

@ -170,7 +170,7 @@
var value = ko.utils.unwrapObservable(valueAccessor()); var value = ko.utils.unwrapObservable(valueAccessor());
// http://xdsoft.net/jqplugins/datetimepicker/ // http://xdsoft.net/jqplugins/datetimepicker/
$(element).datetimepicker({ $(element).datetimepicker({
lang: '{{ Utils::getLocaleRegion() }}', lang: '{{ $appLanguage }}',
lazyInit: true, lazyInit: true,
validateOnBlur: false, validateOnBlur: false,
step: 30, step: 30,