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-28 16:53:40 +03:00
commit b56fb42971
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Abstracts/Import.php
View File

@ -4,19 +4,21 @@ namespace App\Abstracts;
use App\Traits\Import as ImportHelper; use App\Traits\Import as ImportHelper;
use App\Utilities\Date; use App\Utilities\Date;
use Carbon\Exceptions\InvalidFormatException;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Maatwebsite\Excel\Concerns\Importable; use Maatwebsite\Excel\Concerns\Importable;
use Maatwebsite\Excel\Concerns\ToModel;
use Maatwebsite\Excel\Concerns\SkipsOnError; use Maatwebsite\Excel\Concerns\SkipsOnError;
use Maatwebsite\Excel\Concerns\SkipsOnFailure; use Maatwebsite\Excel\Concerns\SkipsOnFailure;
use Maatwebsite\Excel\Concerns\ToModel;
use Maatwebsite\Excel\Concerns\WithBatchInserts; use Maatwebsite\Excel\Concerns\WithBatchInserts;
use Maatwebsite\Excel\Concerns\WithChunkReading; use Maatwebsite\Excel\Concerns\WithChunkReading;
use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithHeadingRow;
use Maatwebsite\Excel\Concerns\WithMapping; use Maatwebsite\Excel\Concerns\WithMapping;
use Maatwebsite\Excel\Concerns\WithValidation; use Maatwebsite\Excel\Concerns\WithValidation;
use Maatwebsite\Excel\Validators\Failure; use Maatwebsite\Excel\Validators\Failure;
use Illuminate\Support\Facades\Validator;
use PhpOffice\PhpSpreadsheet\Shared\Date as ExcelDate; use PhpOffice\PhpSpreadsheet\Shared\Date as ExcelDate;
abstract class Import implements ToModel, SkipsOnError, SkipsOnFailure, WithBatchInserts, WithChunkReading, WithHeadingRow, WithMapping, WithValidation abstract class Import implements ToModel, SkipsOnError, SkipsOnFailure, WithBatchInserts, WithChunkReading, WithHeadingRow, WithMapping, WithValidation
@ -45,7 +47,12 @@ abstract class Import implements ToModel, SkipsOnError, SkipsOnFailure, WithBatc
continue; continue;
} }
$row[$date_field] = Date::parse(ExcelDate::excelToDateTimeObject($row[$date_field]))->format('Y-m-d H:i:s'); try {
$row[$date_field] = Date::parse(ExcelDate::excelToDateTimeObject($row[$date_field]))
->format('Y-m-d H:i:s');
} catch (InvalidFormatException | \Exception $e) {
Log::info($e->getMessage());
}
} }
return $row; return $row;

4
app/Imports/Purchases/Sheets/BillItemTaxes.php
View File

@ -31,9 +31,9 @@ class BillItemTaxes extends Import
$row['document_id'] = (int) Document::bill()->number($row['bill_number'])->pluck('id')->first(); $row['document_id'] = (int) Document::bill()->number($row['bill_number'])->pluck('id')->first();
if (empty($row['bill_item_id']) && !empty($row['item_name'])) { if (empty($row['document_item_id']) && !empty($row['item_name'])) {
$item_id = Item::name($row['item_name'])->pluck('id')->first(); $item_id = Item::name($row['item_name'])->pluck('id')->first();
$row['bill_item_id'] = DocumentItem::bill()->where('item_id', $item_id)->pluck('id')->first(); $row['document_item_id'] = DocumentItem::bill()->where('item_id', $item_id)->pluck('id')->first();
} }
$row['tax_id'] = $this->getTaxId($row); $row['tax_id'] = $this->getTaxId($row);

4
app/Imports/Sales/Sheets/InvoiceItemTaxes.php
View File

@ -31,9 +31,9 @@ class InvoiceItemTaxes extends Import
$row['document_id'] = (int) Document::invoice()->number($row['invoice_number'])->pluck('id')->first(); $row['document_id'] = (int) Document::invoice()->number($row['invoice_number'])->pluck('id')->first();
if (empty($row['invoice_item_id']) && !empty($row['item_name'])) { if (empty($row['document_item_id']) && !empty($row['item_name'])) {
$item_id = Item::name($row['item_name'])->pluck('id')->first(); $item_id = Item::name($row['item_name'])->pluck('id')->first();
$row['invoice_item_id'] = DocumentItem::invoice()->where('item_id', $item_id)->pluck('id')->first(); $row['document_item_id'] = DocumentItem::invoice()->where('item_id', $item_id)->pluck('id')->first();
} }
$row['tax_id'] = $this->getTaxId($row); $row['tax_id'] = $this->getTaxId($row);

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

@ -309,7 +309,9 @@ const app = new Vue({
// invoice_item_checkbox_sample: [], // invoice_item_checkbox_sample: [],
}); });
this.onCalculateTotal(); setTimeout(function() {
this.onCalculateTotal();
}.bind(this), 800);
}, },
onSelectedTax(item_index) { onSelectedTax(item_index) {