Merge branch 'DCTN-494/fix' into 'master'

fix: showing of the lense

See merge request !6

app/Nova/Lenses/CompareProduct.php

@@ -22,18 +22,16 @@ public static function query(LensRequest $request, $query)
         if ($data) {
             $existFields = Product::where('retailer_id', $data['retailer'])->pluck('sku')->all();
             $returnQuery = $query
-            ->where('retailer_id', '!=', $data['retailer'])
-            ->whereIn('sku', $existFields)
-            ->join('retailers as r', 'products.retailer_id', '=', 'r.id');
-            if($data['field'] === 'name')
-            {
+                ->where('retailer_id', '!=', $data['retailer'])
+                ->whereIn('sku', $existFields)
+                ->join('retailers as r', 'products.retailer_id', '=', 'r.id');
+            if ($data['field'] === 'name') {
                 $returnQuery->select(
                     'sku',
                     DB::raw('group_concat(products.id) as id'),
                     DB::raw('group_concat(products.name) as name'),
                     DB::raw('group_concat(r.id) as retailer_id'));
-            }
-            else{
+            } else {
                 $returnQuery->select(
                     'sku',
                     DB::raw('group_concat(products.id) as id'),
@@ -76,16 +74,19 @@ public function fields(NovaRequest $request)
                 $availeble = Product::where('retailer_id', $key)->whereIn('sku', $existFields)->get();
                 if (count($availeble) !== 0) {
                     array_push($fields,
-                        Text::make($retailer . ' ' . $data['field'], function () use ($count, $data) {
-                            $field = $data['field'];
-                            $fields = explode(',', $this[$field]);
-                            if (count($fields) < $count + 1) {
-                                return null;
+                        Text::make($retailer . ' ' . $data['field'], function () use ($count, $data, $key) {
+                            $fields = explode(',', $this[$data['field']]);
+                            if (!array_key_exists($count, $fields)) {
+                                $count = 0;
+                            }
+                            $currentProduct = Product::where('retailer_id', $key)->where('sku', $this->sku)->get();
+                            if (count($currentProduct) !== 0) {
+                                return $fields[$count];
                             }
-                            return $fields[$count];
+                            return null;
                         }));
+                    $count++;
                 }
-                $count++;
             }
             return $fields;
         }
@@ -127,9 +128,9 @@ public function actions(NovaRequest $request)
             $retailers = self::getRetailers();
             return [
                 \App\Nova\Actions\ChangeValue::make($data['field'], $data['retailer'], $retailers)
-                ->confirmText('This action is used to change the value of the previously selected field in the previously selected retailer to the value of the field in the newly selected retailer')
-                ->confirmButtonText('Change')
-                ->cancelButtonText("Don't change"),
+                    ->confirmText('This action is used to change the value of the previously selected field in the previously selected retailer to the value of the field in the newly selected retailer')
+                    ->confirmButtonText('Change')
+                    ->cancelButtonText("Don't change"),
             ];
         }
     }