shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-01-03 18:24:20 +03:00
parent dd503646b4 a3f2671d4f
commit 9ca1342665
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/View/Components/DocumentShow.php
View File

@@ -392,7 +392,7 @@ abstract class DocumentShow extends Component
$this->routeButtonEdit = $this->getRouteButtonEdit($type, $routeButtonEdit); $this->routeButtonEdit = $this->getRouteButtonEdit($type, $routeButtonEdit);
$this->routeButtonDuplicate = $this->getRouteButtonDuplicate($type, $routeButtonDuplicate); $this->routeButtonDuplicate = $this->getRouteButtonDuplicate($type, $routeButtonDuplicate);
$this->routeButtonPrint = $this->getRouteButtonPrint($type, $routeButtonPrint); $this->routeButtonPrint = $this->getRouteButtonPrint($type, $routeButtonPrint);
$this->routeButtonPdf = $this->getRouteButtonPrint($type, $routeButtonPdf); $this->routeButtonPdf = $this->getRouteButtonPdf($type, $routeButtonPdf);
$this->routeButtonCancelled = $this->getRouteButtonCancelled($type, $routeButtonCancelled); $this->routeButtonCancelled = $this->getRouteButtonCancelled($type, $routeButtonCancelled);
$this->routeButtonCustomize = $this->getRouteButtonCustomize($type, $routeButtonCustomize); $this->routeButtonCustomize = $this->getRouteButtonCustomize($type, $routeButtonCustomize);
$this->routeButtonDelete = $this->getRouteButtonDelete($type, $routeButtonDelete); $this->routeButtonDelete = $this->getRouteButtonDelete($type, $routeButtonDelete);

2
app/Http/Controllers/Purchases/Bills.php
View File

@@ -293,7 +293,7 @@ class Bills extends Controller
$pdf = app('dompdf.wrapper'); $pdf = app('dompdf.wrapper');
$pdf->loadHTML($html); $pdf->loadHTML($html);
$file_name = $this->getBillFileName($bill); $file_name = $this->getDocumentFileName($bill);
return $pdf->download($file_name); return $pdf->download($file_name);
} }

4
resources/assets/js/views/common/documents.js vendored
View File

@@ -489,7 +489,7 @@ const app = new Vue({
this.form.items.push({ this.form.items.push({
item_id: item.item_id, item_id: item.item_id,
name: item.name, name: item.name,
description: item.description, description: item.description === null ? "" : item.description,
quantity: item.quantity, quantity: item.quantity,
price: (item.price).toFixed(2), price: (item.price).toFixed(2),
tax_ids: item.tax_ids, tax_ids: item.tax_ids,
@@ -524,7 +524,7 @@ const app = new Vue({
this.items.push({ this.items.push({
item_id: item.item_id, item_id: item.item_id,
name: item.name, name: item.name,
description: item.description, description: item.description === null ? "" : item.description,
quantity: item.quantity, quantity: item.quantity,
price: (item.price).toFixed(2), price: (item.price).toFixed(2),
add_tax: true, add_tax: true,

3
resources/views/components/documents/form/line-item.blade.php
View File

@@ -44,7 +44,7 @@
required="required" required="required"
data-item="name" data-item="name"
v-model="row.name" v-model="row.name"
@input="onCalculateTotal" @input="onBindingItemField(index, 'name')"
@change="form.errors.clear('items.' + index + '.name')"> @change="form.errors.clear('items.' + index + '.name')">
<div class="invalid-feedback d-block" <div class="invalid-feedback d-block"
@@ -68,6 +68,7 @@
v-model="row.description" v-model="row.description"
data-item="description" data-item="description"
resize="none" resize="none"
@input="onBindingItemField(index, 'description')"
></textarea> ></textarea>
</td> </td>
@endif @endif