hideyo / ecommerce

app/Http/Controllers/Backend/ContentGroupController.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
             ->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
 
             $datatables = DataTables::of($query)
-            ->addColumn('action', function ($query) {
+            ->addColumn('action', function($query) {
                 $deleteLink = Form::deleteajax(url()->route('content-group.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $links = '<a href="'.url()->route('content-group.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
             
@@ -47,7 +47,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = ContentService::createGroup($request->all());
+        $result = ContentService::createGroup($request->all());
         return ContentService::notificationRedirect('content-group.index', $result, 'The content group was inserted.');
     }
 
@@ -58,7 +58,7 @@ 
 
     public function update(Request $request, $contentGroupId)
     {
-        $result  = ContentService::updateGroupById($request->all(), $contentGroupId);
+        $result = ContentService::updateGroupById($request->all(), $contentGroupId);
         return ContentService::notificationRedirect('content-group.index', $result, 'The content group was updated.');
     }
 
@@ -69,7 +69,7 @@ 
      */
     public function destroy($contentGroupId)
     {
-        $result  = ContentService::destroyGroup($contentGroupId);
+        $result = ContentService::destroyGroup($contentGroupId);
 
         if ($result) {
             Notification::success('The content was deleted.');

app/Http/Controllers/Backend/ProductImageController.php

Spacing +8 added lines, -8 removed lines

@@ -24,11 +24,11 @@ 
             $query = ProductService::getImageModel()->where('product_id', '=', $productId);
             
             $datatables = \DataTables::of($query)
-            ->addColumn('thumb', function ($query) use ($productId) {
+            ->addColumn('thumb', function($query) use ($productId) {
                 return '<img src="/files/product/100x100/'.$query->product_id.'/'.$query->file.'"  />';
             })
 
-            ->addColumn('action', function ($query) use ($productId) {
+            ->addColumn('action', function($query) use ($productId) {
                 $deleteLink = \Form::deleteajax(url()->route('product.images.destroy', array('productId' => $productId, 'id' => $query->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $links = '<a href="'.url()->route('product.images.edit', array('productId' => $productId, 'id' => $query->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
             
@@ -50,7 +50,7 @@ 
 
     public function store(Request $request, $productId)
     {
-        $result  = ProductService::createImage($request->all(), $productId);
+        $result = ProductService::createImage($request->all(), $productId);
         return ProductService::notificationRedirect(array('product.images.index', $productId), $result, 'The product image was inserted.');
     }
 
@@ -64,13 +64,13 @@ 
 
         if ($productImage->relatedProductAttributes->count()) {
             foreach ($productImage->relatedProductAttributes as $row) {
-                $selectedProductAttributes[] =  $row->pivot->product_attribute_id;
+                $selectedProductAttributes[] = $row->pivot->product_attribute_id;
             }
         }
 
         if ($productImage->relatedAttributes->count()) {
             foreach ($productImage->relatedAttributes as $row) {
-                $selectedAttributes[] =  $row->pivot->attribute_id;
+                $selectedAttributes[] = $row->pivot->attribute_id;
             }
         }
 
@@ -79,7 +79,7 @@ 
 
     public function generateAttributeLists($product)
     {
-        $productAttributes =         $product->attributes;
+        $productAttributes = $product->attributes;
         $newProductAttributes = array();
         $attributesList = array();
         $productAttributesList = array();
@@ -109,13 +109,13 @@ 
 
     public function update(Request $request, $productId, $productImageId)
     {
-        $result  = ProductService::updateImageById($request->all(), $productId, $productImageId);
+        $result = ProductService::updateImageById($request->all(), $productId, $productImageId);
         return ProductService::notificationRedirect(array('product.images.index', $productId), $result, 'The product image was update.');
     }
 
     public function destroy($productId, $productImageId)
     {
-        $result  = ProductService::destroyImage($productImageId);
+        $result = ProductService::destroyImage($productImageId);
 
         if ($result) {
             Notification::success('The product image is deleted.');

app/Http/Controllers/Backend/ProductController.php

Spacing +27 added lines, -27 removed lines

@@ -29,7 +29,7 @@ 
                 ['product.*', 
                 'brand.title as brandtitle', 
                 'product_category.title as categorytitle']
-            )->with(array('productCategory', 'brand', 'subcategories', 'attributes',  'productImages','taxRate'))
+            )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages', 'taxRate'))
 
             ->leftJoin('product_category as product_category', 'product_category.id', '=', 'product.product_category_id')
 
@@ -38,23 +38,23 @@ 
             ->where('product.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
             
             $datatables = \DataTables::of($product)
-            ->filterColumn('reference_code', function ($query, $keyword) {
+            ->filterColumn('reference_code', function($query, $keyword) {
                 $query->whereRaw("product.reference_code like ?", ["%{$keyword}%"]);
             })
-            ->filterColumn('active', function ($query, $keyword) {
+            ->filterColumn('active', function($query, $keyword) {
                 $query->whereRaw("product.active like ?", ["%{$keyword}%"]);
                 ;
             })
 
-            ->addColumn('rank', function ($product) {
+            ->addColumn('rank', function($product) {
                 return '<input type="text" class="change-rank" value="'.$product->rank.'" style="width:50px;" data-url="/admin/product/change-rank/'.$product->id.'">';
               
             })
 
-            ->filterColumn('title', function ($query, $keyword) {
+            ->filterColumn('title', function($query, $keyword) {
 
                 $query->where(
-                    function ($query) use ($keyword) {
+                    function($query) use ($keyword) {
                         $query->whereRaw("product.title like ?", ["%{$keyword}%"]);
                         $query->orWhereRaw("product.reference_code like ?", ["%{$keyword}%"]);
                              $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]);
@@ -63,11 +63,11 @@ 
                 );
             })
 
-            ->filterColumn('categorytitle', function ($query, $keyword) {
+            ->filterColumn('categorytitle', function($query, $keyword) {
                 $query->whereRaw("product_category.title like ?", ["%{$keyword}%"]);
             })
 
-            ->addColumn('active', function ($product) {
+            ->addColumn('active', function($product) {
                 if ($product->active) {
                     return '<a href="#" class="change-active" data-url="'.url()->route('product.change-active', array('productId' => $product->id)).'"><span class="glyphicon glyphicon-ok icon-green"></span></a>';
                 }
@@ -75,7 +75,7 @@ 
                 return '<a href="#" class="change-active" data-url="'.url()->route('product.change-active', array('productId' => $product->id)).'"><span class="glyphicon glyphicon-remove icon-red"></span></a>';
             })
 
-            ->addColumn('title', function ($product) {
+            ->addColumn('title', function($product) {
                 if ($product->brand) {
                     return $product->brand->title.' | '.$product->title;
                 }
@@ -84,7 +84,7 @@ 
             })
 
 
-            ->addColumn('amount', function ($product) {
+            ->addColumn('amount', function($product) {
                 if ($product->attributes->count()) {
                     return '<a href="/admin/product/'.$product->id.'/product-combination">combinations</a>';
                 }
@@ -92,12 +92,12 @@ 
                 return '<input type="text" class="change-amount" value="'.$product->amount.'" style="width:50px;" data-url="'.url()->route('product.change-amount', array('productId' => $product->id)).'">';
             })
 
-            ->addColumn('image', function ($product) {
+            ->addColumn('image', function($product) {
                 if ($product->productImages->count()) {
                     return '<img src="/files/product/100x100/'.$product->id.'/'.$product->productImages->first()->file.'"  />';
                 }
             })
-            ->addColumn('price', function ($product) {
+            ->addColumn('price', function($product) {
 
                 $result = "";
                 if ($product->price) {
@@ -147,7 +147,7 @@ 
                         'amount' => $product->amount
                         );
 
-                    $result =  '&euro; '.$output['orginal_price_ex_tax_number_format'].' / &euro; '.$output['orginal_price_inc_tax_number_format'];
+                    $result = '&euro; '.$output['orginal_price_ex_tax_number_format'].' / &euro; '.$output['orginal_price_inc_tax_number_format'];
 
 
                     if ($product->discount_value) {
@@ -159,7 +159,7 @@ 
             })
 
 
-            ->addColumn('categorytitle', function ($product) {
+            ->addColumn('categorytitle', function($product) {
                 if ($product->subcategories()->count()) {
                     $subcategories = $product->subcategories()->pluck('title')->toArray();
                     return $product->categorytitle.', <small> '.implode(', ', $subcategories).'</small>';
@@ -168,7 +168,7 @@ 
                 return $product->categorytitle;
             })
 
-            ->addColumn('action', function ($product) {
+            ->addColumn('action', function($product) {
                 $deleteLink = \Form::deleteajax(url()->route('product.destroy', $product->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'), $product->title);
                 $copy = '<a href="'.url()->route('product.copy', $product->id).'" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Copy</a>';
 
@@ -191,26 +191,26 @@ 
                 ['product.*', 
                 'brand.title as brandtitle', 
                 'product_category.title as categorytitle']
-            )->with(array('productCategory', 'brand', 'subcategories', 'attributes',  'productImages','taxRate'))
+            )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages', 'taxRate'))
             ->leftJoin('product_category as product_category', 'product_category.id', '=', 'product.product_category_id')
             ->leftJoin('brand as brand', 'brand.id', '=', 'product.brand_id')
             ->where('product.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
             
             $datatables = \DataTables::of($product)
-            ->addColumn('rank', function ($product) {
+            ->addColumn('rank', function($product) {
                 return '<input type="text" class="change-rank" value="'.$product->rank.'" style="width:50px;" data-url="'.url()->route('product.change-rank', array('productId' => $product->id)).'">';
             })
-            ->filterColumn('categorytitle', function ($query, $keyword) {
+            ->filterColumn('categorytitle', function($query, $keyword) {
                 $query->whereRaw("product_category.title like ?", ["%{$keyword}%"]);
             })
-            ->addColumn('title', function ($product) {
+            ->addColumn('title', function($product) {
                 if ($product->brand) {
                     return $product->brand->title.' | '.$product->title;
                 }
                 
                 return $product->title;      
             })
-            ->addColumn('categorytitle', function ($product) {
+            ->addColumn('categorytitle', function($product) {
                 if ($product->subcategories()->count()) {
                     $subcategories = $product->subcategories()->pluck('title')->toArray();
                     return $product->categorytitle.', <small> '.implode(', ', $subcategories).'</small>';
@@ -239,7 +239,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = ProductService::create($request->all());
+        $result = ProductService::create($request->all());
         return ProductService::notificationRedirect('product.index', $result, 'The product was inserted.');
     }
 
@@ -284,10 +284,10 @@ 
     public function postExport()
     {
 
-        $result  =  ProductService::selectAllExport();
-        Excel::create('export', function ($excel) use ($result) {
+        $result = ProductService::selectAllExport();
+        Excel::create('export', function($excel) use ($result) {
 
-            $excel->sheet('Products', function ($sheet) use ($result) {
+            $excel->sheet('Products', function($sheet) use ($result) {
                 $newArray = array();
                 foreach ($result as $row) {
                     $category = "";
@@ -316,7 +316,7 @@ 
                         $i = 0;
                         foreach ($row->productImages as $image) {
                             $i++;
-                            $newArray[$row->id]['image_'.$i] =  url('/').'/files/product/800x800/'.$row->id.'/'.$image->file;
+                            $newArray[$row->id]['image_'.$i] = url('/').'/files/product/800x800/'.$row->id.'/'.$image->file;
                         }
                     }
                 }
@@ -386,7 +386,7 @@ 
     public function update(Request $request, $productId)
     {
         $input = $request->all();
-        $result  = ProductService::updateById($input, $productId);
+        $result = ProductService::updateById($input, $productId);
 
         $redirect = redirect()->route('product.index');
 
@@ -416,7 +416,7 @@ 
 
     public function destroy($id)
     {
-        $result  = ProductService::destroy($id);
+        $result = ProductService::destroy($id);
 
         if ($result) {
             Notification::success('The product was deleted.');

app/Http/Controllers/Backend/ProductAmountSeriesController.php

Spacing +5 added lines, -5 removed lines

@@ -26,14 +26,14 @@ 
             
             $datatables = DataTables::of($query)
 
-            ->addColumn('active', function ($query) {
+            ->addColumn('active', function($query) {
                 if ($query->active) {
                     return '<a href="#" class="change-active" data-url="/admin/html-block/change-active/'.$query->id.'"><span class="glyphicon glyphicon-ok icon-green"></span></a>';
                 }
                 
                 return '<a href="#" class="change-active" data-url="/admin/html-block/change-active/'.$query->id.'"><span class="glyphicon glyphicon-remove icon-red"></span></a>';
             })
-            ->addColumn('action', function ($query) use ($productId) {
+            ->addColumn('action', function($query) use ($productId) {
                 $deleteLink = Form::deleteajax(url()->route('product.product-amount-series.destroy', array('productId' => $productId, 'id' => $query->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $links = '<a href="'.url()->route('product.product-amount-series.edit', array('productId' => $productId, 'id' => $query->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
                 
@@ -49,7 +49,7 @@ 
 
     public function store(Request $request, $productId)
     {
-        $result  = ProductAmountSeriesService::create($request->all(), $productId);
+        $result = ProductAmountSeriesService::create($request->all(), $productId);
         return ProductService::notificationRedirect(array('product.product-amount-series.index', $productId), $result, 'The product amount series is inserted.');
     }
 
@@ -68,13 +68,13 @@ 
 
     public function update(Request $request, $productId, $id)
     {
-        $result  = ProductAmountSeriesService::updateById($request->all(), $productId, $id);
+        $result = ProductAmountSeriesService::updateById($request->all(), $productId, $id);
         return ProductService::notificationRedirect(array('product.product-amount-series.index', $productId), $result, 'The product amount series is updated.');
     }
 
     public function destroy($productId, $id)
     {
-        $result  = ProductAmountSeriesService::destroy($id);
+        $result = ProductAmountSeriesService::destroy($id);
 
         if ($result) {
             Notification::success('The product amount series is deleted.');

app/Http/Controllers/Backend/SendingMethodController.php

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
         if ($request->wantsJson()) {
             $query = SendingMethodService::getModel()->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
 
-            $datatables = DataTables::of($query)->addColumn('action', function ($query) {
+            $datatables = DataTables::of($query)->addColumn('action', function($query) {
                 $deleteLink = Form::deleteajax(url()->route('sending-method.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-sm btn-danger'), $query->title);
                 $links = '<a href="'.url()->route('sending-method.country-prices.index', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Country prices ('.$query->countryPrices()->count().')</a>  <a href="/admin/sending-method/'.$query->id.'/edit" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
             
@@ -49,7 +49,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = SendingMethodService::create($request->all());
+        $result = SendingMethodService::create($request->all());
         return SendingMethodService::notificationRedirect('sending-method.index', $result, 'The sending method was inserted.');
     }
 
@@ -66,13 +66,13 @@ 
 
     public function update(Request $request, $sendingMethodId)
     {
-        $result  = SendingMethodService::updateById($request->all(), $sendingMethodId);
+        $result = SendingMethodService::updateById($request->all(), $sendingMethodId);
         return SendingMethodService::notificationRedirect('sending-method.index', $result, 'The sending method was updated.');
     }
 
     public function destroy($sendingMethodId)
     {
-        $result  = SendingMethodService::destroy($sendingMethodId);
+        $result = SendingMethodService::destroy($sendingMethodId);
 
         if ($result) {
             Notification::success('The sending method was deleted.');

app/Http/Controllers/Backend/ProductCategoryController.php

Spacing +11 added lines, -11 removed lines

@@ -27,13 +27,13 @@ 
             
             $datatables = DataTables::of($productCategory)
 
-            ->addColumn('image', function ($productCategory) {
+            ->addColumn('image', function($productCategory) {
                 if ($productCategory->productCategoryImages->count()) {
                     return '<img src="/files/product_category/100x100/'.$productCategory->id.'/'.$productCategory->productCategoryImages->first()->file.'"  />';
                 }
             })
 
-            ->addColumn('title', function ($productCategory) {
+            ->addColumn('title', function($productCategory) {
 
                 $categoryTitle = $productCategory->title;
                 if ($productCategory->refProductCategory) {
@@ -47,17 +47,17 @@ 
                 return $categoryTitle;
             })
 
-            ->addColumn('products', function ($productCategory) {
+            ->addColumn('products', function($productCategory) {
                 return $productCategory->products->count();
             })
-            ->addColumn('parent', function ($productCategory) {
+            ->addColumn('parent', function($productCategory) {
              
                 if ($productCategory->parent()->count()) {
                     return $productCategory->parent()->first()->title;
                 }
             })
 
-            ->addColumn('active', function ($product) {
+            ->addColumn('active', function($product) {
                 if ($product->active) {
                     return '<a href="#" class="change-active" data-url="/admin/product-category/change-active/'.$product->id.'"><span class="glyphicon glyphicon-ok icon-green"></span></a>';
                 }
@@ -66,12 +66,12 @@ 
             })
 
 
-            ->addColumn('seo', function ($productCategory) {
+            ->addColumn('seo', function($productCategory) {
                 if ($productCategory->meta_title && $productCategory->meta_description) {
                     return '<i class="fa fa-check"></i>';
                 }
             })
-            ->addColumn('action', function ($productCategory) {
+            ->addColumn('action', function($productCategory) {
                 $deleteLink = Form::deleteajax(url()->route('product-category.destroy', $productCategory->id), 'Delete', '', array('class'=>'btn btn-sm btn-danger'), $productCategory->title);
                 $links = '<a href="'.url()->route('product-category.edit', $productCategory->id).'" class="btn btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
             
@@ -132,7 +132,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = ProductCategoryService::create($this->generateInput($request->all()));
+        $result = ProductCategoryService::create($this->generateInput($request->all()));
         return ProductCategoryService::notificationRedirect('product-category.index', $result, 'The product category was inserted.');
     }
 
@@ -154,13 +154,13 @@ 
 
     public function update(Request $request, $productCategoryId)
     {
-        $result  = ProductCategoryService::updateById($this->generateInput($request->all()), $productCategoryId);
+        $result = ProductCategoryService::updateById($this->generateInput($request->all()), $productCategoryId);
         return ProductCategoryService::notificationRedirect('product-category.index', $result, 'The product category was updated.');
     }
 
     public function destroy($productCategoryId)
     {
-        $result  = ProductCategoryService::destroy($productCategoryId);
+        $result = ProductCategoryService::destroy($productCategoryId);
 
         if ($result) {
             Notification::success('Category was deleted.');
@@ -230,7 +230,7 @@ 
             } elseif ($parent->children()->count()) {
                 $node->makeLastChildOf($parent);
                 foreach ($parent->children()->get() as $key => $row) {
-                    $positionKey =  $position - 1;
+                    $positionKey = $position - 1;
                     if ($key == $positionKey) {
                         $node->moveToRightOf($row);
                     }

app/Http/Controllers/Backend/NewsImageController.php

Spacing +5 added lines, -5 removed lines

@@ -26,10 +26,10 @@ 
             
             $datatables = DataTables::of($image)
 
-            ->addColumn('thumb', function ($image) {
+            ->addColumn('thumb', function($image) {
                 return '<img src="/files/news/100x100/'.$image->news_id.'/'.$image->file.'"  />';
             })
-            ->addColumn('action', function ($image) use ($newsId) {
+            ->addColumn('action', function($image) use ($newsId) {
                 $deleteLink = Form::deleteajax(url()->route('news-images.destroy', array('newsId' => $newsId, 'id' => $image->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $links = '<a href="'.url()->route('news-images.edit', array('newsId' => $newsId, 'id' => $image->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>  '.$deleteLink;
 
@@ -50,7 +50,7 @@ 
 
     public function store(Request $request, $newsId)
     {
-        $result  = NewsService::createImage($request->all(), $newsId);
+        $result = NewsService::createImage($request->all(), $newsId);
         return NewsService::notificationRedirect(array('news-images.index', $newsId), $result, 'The news image was inserted.');
     }
 
@@ -62,13 +62,13 @@ 
 
     public function update(Request $request, $newsId, $newsImageId)
     {
-        $result  = NewsService::updateImageById($request->all(), $newsId, $newsImageId);
+        $result = NewsService::updateImageById($request->all(), $newsId, $newsImageId);
         return NewsService::notificationRedirect(array('news-images.index', $newsId), $result, 'The news image was updated.');
     }
 
     public function destroy($newsId, $newsImageId)
     {
-        $result  = NewsService::destroyImage($newsImageId);
+        $result = NewsService::destroyImage($newsImageId);
 
         if ($result) {
             Notification::success('The file was deleted.');

app/Http/Controllers/Backend/AttributeGroupController.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
         if ($request->wantsJson()) {
             $query = AttributeService::getGroupModel()->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
             
-            $datatables = DataTables::of($query)->addColumn('action', function ($query) {
+            $datatables = DataTables::of($query)->addColumn('action', function($query) {
                 $deleteLink = Form::deleteajax(url()->route('attribute-group.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'));
                 $links = '
                     <a href="'.url()->route('attribute.index', $query->id).'" class="btn btn-sm btn-info"><i class="entypo-pencil"></i>'.$query->attributes->count().' Attributes</a>
@@ -52,7 +52,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = AttributeService::createGroup($request->all());
+        $result = AttributeService::createGroup($request->all());
         return AttributeService::notificationRedirect('attribute-group.index', $result, 'The attribute group was inserted.');
     }
 
@@ -63,13 +63,13 @@ 
 
     public function update(Request $request, $attributeGroupId)
     {
-        $result  = AttributeService::updateGroupById($request->all(), $attributeGroupId);
+        $result = AttributeService::updateGroupById($request->all(), $attributeGroupId);
         return AttributeService::notificationRedirect('attribute-group.index', $result, 'The attribute group was updated.');
     }
 
     public function destroy($attributeGroupId)
     {
-        $result  = AttributeService::destroyGroup($attributeGroupId);
+        $result = AttributeService::destroyGroup($attributeGroupId);
 
         if ($result) {
             Notification::success('Attribute group was deleted.');

app/Http/Controllers/Backend/GeneralSettingController.php

Spacing +4 added lines, -4 removed lines

@@ -16,7 +16,7 @@ 
 
             $query = GeneralSettingService::getModel()->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id);
             
-            $datatables = DataTables::of($query)->addColumn('action', function ($query) {
+            $datatables = DataTables::of($query)->addColumn('action', function($query) {
                 $deleteLink = Form::deleteajax(url()->route('general-setting.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-sm btn-danger'));
                 $links = '<a href="'.url()->route('general-setting.edit', $query->id).'" class="btn btn-sm btn-success"><i class="fi-pencil"></i>Edit</a>  '.$deleteLink;
                 return $links;
@@ -35,7 +35,7 @@ 
 
     public function store(Request $request)
     {
-        $result  = GeneralSettingService::create($request->all());
+        $result = GeneralSettingService::create($request->all());
         return GeneralSettingService::notificationRedirect('general-setting.index', $result, 'The general setting was inserted.');
     }
 
@@ -46,13 +46,13 @@ 
 
     public function update(Request $request, $generalSettingId)
     {
-        $result  = GeneralSettingService::updateById($request->all(), $generalSettingId);
+        $result = GeneralSettingService::updateById($request->all(), $generalSettingId);
         return GeneralSettingService::notificationRedirect('general-setting.index', $result, 'The general setting was updated.');
     }
 
     public function destroy($generalSettingId)
     {
-        $result  = GeneralSettingService::destroy($generalSettingId);
+        $result = GeneralSettingService::destroy($generalSettingId);
         if ($result) {
             Notification::error('The general setting was deleted.');
             return redirect()->route('general-setting.index');