diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index a3e92c1b7459..12c1f4da60ca 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -583,7 +583,6 @@ class CompanySettings extends BaseSettings
$variables = [
'client_details' => [
'$client.name',
- '$client.id_number',
'$client.vat_number',
'$client.address1',
'$client.address2',
@@ -630,19 +629,17 @@ class CompanySettings extends BaseSettings
],
'product_columns' => [
'$product.product_key',
- '$product.notes',
- '$product.cost',
+ '$product.description',
+ '$product.unit_cost',
'$product.quantity',
- '$product.discount',
'$product.tax',
'$product.line_total',
],
'task_columns' =>[
'$task.product_key',
- '$task.notes',
+ '$task.description',
'$task.rate',
'$task.hours',
- '$task.discount',
'$task.tax',
'$task.line_total',
],
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index af4835563bfe..095e96f24503 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -421,7 +421,7 @@ class BaseController extends Controller
$data['report_errors'] = true;
}
- $data['hash'] = md5(public_path('main.dart.js'));
+ // $data['hash'] = md5_file(public_path('main.dart.js'));
$this->buildCache();
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index e669dca1d4ae..c6e5cca7d187 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -152,7 +152,12 @@ class HtmlEngine
$data['$discount'] = &$data['$invoice.discount'];
$data['$subtotal'] = ['value' => Number::formatMoney($this->entity_calc->getSubTotal(), $this->client) ?: ' ', 'label' => ctrans('texts.subtotal')];
$data['$invoice.subtotal'] = &$data['$subtotal'];
- $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
+
+ if($this->entity->partial > 0)
+ $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
+ else
+ $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
+
$data['$quote.balance_due'] = &$data['$balance_due'];
$data['$invoice.balance_due'] = &$data['$balance_due'];
$data['$balance_due'] = &$data['$balance_due'];
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index dfbae0aa309a..b22de8319de5 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -6,7 +6,7 @@
Invoice Ninja
-
+
@@ -88,7 +88,7 @@
if ('serviceWorker' in navigator) {
window.addEventListener('load', function () {
- navigator.serviceWorker.register('/flutter_service_worker.js?v={{ $hash }}');
+ navigator.serviceWorker.register('/flutter_service_worker.js?v={{ config('ninja.app_version') }}');
});
}
@@ -97,7 +97,7 @@
});
-
+