From 1aa59512fefe6a906e3f2f8c833ccfc04b43ccee Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 14 Feb 2018 13:44:00 +0200 Subject: [PATCH] Support importing custom product fields --- app/Models/Product.php | 4 ++++ app/Ninja/Import/CSV/ProductTransformer.php | 2 ++ app/Services/ImportService.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Models/Product.php b/app/Models/Product.php index ca632d655ab8..455f75bc9fdf 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -47,6 +47,8 @@ class Product extends EntityModel 'product_key', 'notes', 'cost', + 'custom_value1', + 'custom_value2', ]; } @@ -59,6 +61,8 @@ class Product extends EntityModel 'product|item' => 'product_key', 'notes|description|details' => 'notes', 'cost|amount|price' => 'cost', + 'custom_value1' => 'custom_value1', + 'custom_value2' => 'custom_value2', ]; } diff --git a/app/Ninja/Import/CSV/ProductTransformer.php b/app/Ninja/Import/CSV/ProductTransformer.php index 22e146e2c98a..cdfde4b8f843 100644 --- a/app/Ninja/Import/CSV/ProductTransformer.php +++ b/app/Ninja/Import/CSV/ProductTransformer.php @@ -27,6 +27,8 @@ class ProductTransformer extends BaseTransformer 'product_key' => $this->getString($data, 'product_key'), 'notes' => $this->getString($data, 'notes'), 'cost' => $this->getFloat($data, 'cost'), + 'custom_value1' => $this->getString($data, 'custom_value1'), + 'custom_value2' => $this->getString($data, 'custom_value2'), ]; }); } diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 6a5ca4ac3177..7c927660b964 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -651,7 +651,7 @@ class ImportService $this->checkForFile($fileName); $file = file_get_contents($fileName); $data = array_map("str_getcsv", preg_split('/\r*\n+|\r+/', $file)); - dd($data); + if (count($data) > 0) { $headers = $data[0];