Merge pull request #1287 from denisdulici/master

Import rules not applicable in map
akaunting · Feb 25, 2020 · 084b597 · 084b597
2 parents 695a3ed + 34c339c
commit 084b597
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 12 deletions.
diff --git a/app/Abstracts/Import.php b/app/Abstracts/Import.php
@@ -3,6 +3,7 @@
 namespace App\Abstracts;
 
 use App\Traits\Import as ImportHelper;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Jenssegers\Date\Date;
 use Maatwebsite\Excel\Concerns\Importable;
@@ -15,6 +16,7 @@
 use Maatwebsite\Excel\Concerns\WithMapping;
 use Maatwebsite\Excel\Concerns\WithValidation;
 use Maatwebsite\Excel\Validators\Failure;
+use Illuminate\Support\Facades\Validator;
 
 abstract class Import implements ToModel, SkipsOnError, SkipsOnFailure, WithBatchInserts, WithChunkReading, WithHeadingRow, WithMapping, WithValidation
 {
@@ -87,4 +89,24 @@ public function onError(\Throwable $e)
     {
         flash($e->getMessage())->error()->important();
     }
+
+    public function isNotValid($row)
+    {
+        return Validator::make($row, $this->rules())->fails();
+    }
+
+    public function isEmpty($row, $fields)
+    {
+        $fields = Arr::wrap($fields);
+
+        foreach ($fields as $field) {
+            if (!empty($row[$field])) {
+                continue;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/app/Imports/Purchases/Sheets/BillHistories.php b/app/Imports/Purchases/Sheets/BillHistories.php
@@ -11,7 +11,7 @@ class BillHistories extends Import
 {
     public function model(array $row)
     {
-        // @todo remove after 3.2 release
+        // @todo remove after laravel-excel 3.2 release
         if ($row['bill_number'] == $this->empty_field) {
             return null;
         }
@@ -21,9 +21,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'bill_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['bill_id'] = Bill::number($row['bill_number'])->pluck('id')->first();
+        $row['bill_id'] = (int) Bill::number($row['bill_number'])->pluck('id')->first();
 
         $row['notify'] = (int) $row['notify'];
 

diff --git a/app/Imports/Purchases/Sheets/BillItemTaxes.php b/app/Imports/Purchases/Sheets/BillItemTaxes.php
@@ -13,7 +13,7 @@ class BillItemTaxes extends Import
 {
     public function model(array $row)
     {
-        // @todo remove after 3.2 release
+        // @todo remove after laravel-excel 3.2 release
         if ($row['bill_number'] == $this->empty_field) {
             return null;
         }
@@ -23,9 +23,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'bill_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['bill_id'] = Bill::number($row['bill_number'])->pluck('id')->first();
+        $row['bill_id'] = (int) Bill::number($row['bill_number'])->pluck('id')->first();
 
         if (empty($row['invoice_item_id']) && !empty($row['item_name'])) {
             $item_id = Item::name($row['item_name'])->pluck('id')->first();

diff --git a/app/Imports/Purchases/Sheets/BillItems.php b/app/Imports/Purchases/Sheets/BillItems.php
@@ -16,9 +16,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'bill_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['bill_id'] = Bill::number($row['bill_number'])->pluck('id')->first();
+        $row['bill_id'] = (int) Bill::number($row['bill_number'])->pluck('id')->first();
 
         if (empty($row['item_id']) && !empty($row['item_name'])) {
             $row['item_id'] = $this->getItemIdFromName($row);

diff --git a/app/Imports/Purchases/Sheets/BillTotals.php b/app/Imports/Purchases/Sheets/BillTotals.php
@@ -16,9 +16,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'bill_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['bill_id'] = Bill::number($row['bill_number'])->pluck('id')->first();
+        $row['bill_id'] = (int) Bill::number($row['bill_number'])->pluck('id')->first();
 
         return $row;
     }

diff --git a/app/Imports/Purchases/Sheets/BillTransactions.php b/app/Imports/Purchases/Sheets/BillTransactions.php
@@ -15,6 +15,10 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'bill_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
         $row['type'] = 'expense';

diff --git a/app/Imports/Purchases/Sheets/Bills.php b/app/Imports/Purchases/Sheets/Bills.php
@@ -15,6 +15,10 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'bill_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
         $row['category_id'] = $this->getCategoryId($row, 'expense');

diff --git a/app/Imports/Sales/Sheets/InvoiceHistories.php b/app/Imports/Sales/Sheets/InvoiceHistories.php
@@ -11,7 +11,7 @@ class InvoiceHistories extends Import
 {
     public function model(array $row)
     {
-        // @todo remove after 3.2 release
+        // @todo remove after laravel-excel 3.2 release
         if ($row['invoice_number'] == $this->empty_field) {
             return null;
         }
@@ -21,9 +21,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'invoice_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['invoice_id'] = Invoice::number($row['invoice_number'])->pluck('id')->first();
+        $row['invoice_id'] = (int) Invoice::number($row['invoice_number'])->pluck('id')->first();
 
         $row['notify'] = (int) $row['notify'];
 

diff --git a/app/Imports/Sales/Sheets/InvoiceItemTaxes.php b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php
@@ -13,7 +13,7 @@ class InvoiceItemTaxes extends Import
 {
     public function model(array $row)
     {
-        // @todo remove after 3.2 release
+        // @todo remove after laravel-excel 3.2 release
         if ($row['invoice_number'] == $this->empty_field) {
             return null;
         }
@@ -23,9 +23,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'invoice_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['invoice_id'] = Invoice::number($row['invoice_number'])->pluck('id')->first();
+        $row['invoice_id'] = (int) Invoice::number($row['invoice_number'])->pluck('id')->first();
 
         if (empty($row['invoice_item_id']) && !empty($row['item_name'])) {
             $item_id = Item::name($row['item_name'])->pluck('id')->first();

diff --git a/app/Imports/Sales/Sheets/InvoiceItems.php b/app/Imports/Sales/Sheets/InvoiceItems.php
@@ -16,9 +16,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'invoice_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['invoice_id'] = Invoice::number($row['invoice_number'])->pluck('id')->first();
+        $row['invoice_id'] = (int) Invoice::number($row['invoice_number'])->pluck('id')->first();
 
         if (empty($row['item_id']) && !empty($row['item_name'])) {
             $row['item_id'] = $this->getItemIdFromName($row);

diff --git a/app/Imports/Sales/Sheets/InvoiceTotals.php b/app/Imports/Sales/Sheets/InvoiceTotals.php
@@ -16,9 +16,13 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'invoice_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
-        $row['invoice_id'] = Invoice::number($row['invoice_number'])->pluck('id')->first();
+        $row['invoice_id'] = (int) Invoice::number($row['invoice_number'])->pluck('id')->first();
 
         return $row;
     }

diff --git a/app/Imports/Sales/Sheets/InvoiceTransactions.php b/app/Imports/Sales/Sheets/InvoiceTransactions.php
@@ -15,6 +15,10 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'invoice_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
         $row['type'] = 'income';

diff --git a/app/Imports/Sales/Sheets/Invoices.php b/app/Imports/Sales/Sheets/Invoices.php
@@ -15,6 +15,10 @@ public function model(array $row)
 
     public function map($row): array
     {
+        if ($this->isEmpty($row, 'invoice_number')) {
+            return [];
+        }
+
         $row = parent::map($row);
 
         $row['category_id'] = $this->getCategoryId($row, 'income');