|
@@ -5,7 +5,9 @@ namespace App\Imports;
|
|
use App\Http\Requests\API\CustomField\CreateOrUpdateRequest;
|
|
use App\Http\Requests\API\CustomField\CreateOrUpdateRequest;
|
|
use App\Models\CustomField;
|
|
use App\Models\CustomField;
|
|
use App\Models\CustomOptions;
|
|
use App\Models\CustomOptions;
|
|
|
|
+use App\Models\NamingRule;
|
|
use Illuminate\Support\Collection;
|
|
use Illuminate\Support\Collection;
|
|
|
|
+use Illuminate\Support\Facades\Auth;
|
|
use Maatwebsite\Excel\Concerns\ToCollection;
|
|
use Maatwebsite\Excel\Concerns\ToCollection;
|
|
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
|
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
|
|
|
|
|
@@ -14,6 +16,11 @@ class NameRuleImport implements ToCollection, WithHeadingRow
|
|
use ImportValidatorHelper;
|
|
use ImportValidatorHelper;
|
|
public function collection(Collection $collection)
|
|
public function collection(Collection $collection)
|
|
{
|
|
{
|
|
|
|
+ $group=request()->group;
|
|
|
|
+ $namingRule = NamingRule::query()->where("company_id", Auth::user()->company_id)->where("id", $group)->first();
|
|
|
|
+ if (! $namingRule) {
|
|
|
|
+ return $this->forbidden('Naming rule does not exist');
|
|
|
|
+ }
|
|
$requestRule = new CreateOrUpdateRequest();
|
|
$requestRule = new CreateOrUpdateRequest();
|
|
|
|
|
|
$this->validatorByCollection($collection,$requestRule->importRules());
|
|
$this->validatorByCollection($collection,$requestRule->importRules());
|
|
@@ -26,7 +33,6 @@ class NameRuleImport implements ToCollection, WithHeadingRow
|
|
foreach ($collection as $item){
|
|
foreach ($collection as $item){
|
|
$key = $item->get('key');
|
|
$key = $item->get('key');
|
|
$type = $item->get('type');
|
|
$type = $item->get('type');
|
|
- $group = $item->get('naming_rule_id');
|
|
|
|
|
|
|
|
if (!isset($seenKeys[$key])) {
|
|
if (!isset($seenKeys[$key])) {
|
|
$keys[$key] = $type;
|
|
$keys[$key] = $type;
|