Tax rate import completed

Author: jitendra-webkul

packages/Webkul/Admin/src/Http/Controllers/Settings/DataTransfer/ImportController.php

@@ -101,7 +101,7 @@ public function store()
 
         session()->flash('success', trans('admin::app.settings.data-transfer.imports.create-success'));
 
-        return redirect()->route('admin.settings.data_transfer.imports.index');
+        return redirect()->route('admin.settings.data_transfer.imports.import', $import->id);
     }
 
     /**
@@ -181,7 +181,7 @@ public function update(int $id)
 
         session()->flash('success', trans('admin::app.settings.data-transfer.imports.update-success'));
 
-        return redirect()->route('admin.settings.data_transfer.imports.index');
+        return redirect()->route('admin.settings.data_transfer.imports.import', $import->id);
     }
 
     /**

packages/Webkul/DataTransfer/src/Helpers/Importers/TaxRate/Importer.php

@@ -11,7 +11,7 @@
 use Webkul\DataTransfer\Repositories\ImportBatchRepository;
 use Webkul\Tax\Repositories\TaxRateRepository;
 
-class TaxRate extends AbstractImporter
+class Importer extends AbstractImporter
 {
     /**
      * Error code for non existing identifier
@@ -28,7 +28,7 @@ class TaxRate extends AbstractImporter
      */
     protected array $validColumnNames = [
         'identifier',
-        'is_zip',
+        'is_zip_range',
         'zip_code',
         'zip_from',
         'zip_to',
@@ -128,13 +128,13 @@ public function validateRow(array $rowData, int $rowNumber): bool
          * Validate product attributes
          */
         $validator = Validator::make($rowData, [
-            'identifier' => 'required|string',
-            'is_zip'     => 'sometimes',
-            'zip_code'   => 'nullable',
-            'zip_from'   => 'nullable|required_with:is_zip',
-            'zip_to'     => 'nullable|required_with:is_zip,zip_from',
-            'country'    => 'required|string',
-            'tax_rate'   => 'required|numeric|min:0.0001',
+            'identifier'   => 'required|string',
+            'is_zip_range' => 'sometimes|boolean',
+            'zip_code'     => 'nullable|required_if:is_zip_range,0',
+            'zip_from'     => 'nullable|required_if:is_zip_range,1',
+            'zip_to'       => 'nullable|required_if:is_zip_range,1',
+            'country'      => 'required|string',
+            'tax_rate'     => 'required|numeric|min:0.0001',
         ]);
 
         if ($validator->fails()) {
@@ -240,34 +240,16 @@ protected function saveTaxRatesData(ImportBatchContract $batch): bool
             /**
              * Prepare tax rates for import
              */
-            $this->prepareTaxRates($rowData, $taxRates);
-        }
-
-        $this->saveTaxRates($taxRates);
-
-        return true;
-    }
-
-    /**
-     * Prepare tax rates from current batch
-     */
-    public function prepareTaxRates(array $rowData, array &$taxRates): void
-    {
-        if ($this->isIdentifierExist($rowData['identifier'])) {
-            $taxRates['update'][$rowData['identifier']] = $rowData;
-        } else {
-            $taxRates['insert'][$rowData['identifier']] = array_merge($rowData, [
-                'created_at' => $rowData['created_at'] ?? now(),
-                'updated_at' => $rowData['updated_at'] ?? now(),
-            ]);
+            if ($this->isIdentifierExist($rowData['identifier'])) {
+                $taxRates['update'][$rowData['identifier']] = $rowData;
+            } else {
+                $taxRates['insert'][$rowData['identifier']] = array_merge($rowData, [
+                    'created_at' => $rowData['created_at'] ?? now(),
+                    'updated_at' => $rowData['updated_at'] ?? now(),
+                ]);
+            }
         }
-    }
 
-    /**
-     * Save tax rates from current batch
-     */
-    public function saveTaxRates(array $taxRates): void
-    {
         if (! empty($taxRates['update'])) {
             $this->updatedItemsCount += count($taxRates['update']);
 
@@ -282,6 +264,8 @@ public function saveTaxRates(array $taxRates): void
 
             $this->taxRateRepository->insert($taxRates['insert']);
         }
+
+        return true;
     }
 
     /**
@@ -291,4 +275,16 @@ public function isIdentifierExist(string $identifier): bool
     {
         return $this->taxRateStorage->has($identifier);
     }
+
+    /**
+     * Prepare row data to save into the database
+     */
+    protected function prepareRowForDb(array $rowData): array
+    {
+        $rowData = parent::prepareRowForDb($rowData);
+
+        $rowData['is_zip'] = $rowData['is_zip_range'] ?? 0;
+
+        return Arr::except($rowData, 'is_zip_range');
+    }
 }

storage/app/public/data-transfer/samples/.gitignore

@@ -1,3 +1,4 @@
 !customers.csv
 !products.csv
+!tax-rates.csv
 !.gitignore

storage/app/public/data-transfer/samples/tax-rates.csv

@@ -0,0 +1,3 @@
+identifier,is_zip_range,zip_code,zip_from,zip_to,state,country,tax_rate
+US-CA-*-RATE-1,0,*,"","",CA,US,18.00
+US-CO-*-RATE-2,0,*,"","",CO,US,18.00