@@ -41,19 +41,19 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | |
| 43 | 43 | $query = $this->productAmountSeries->getModel()->select( |
| 44 | - ['id', 'series_start', 'series_value', 'active','series_max'] |
|
| 44 | + ['id', 'series_start', 'series_value', 'active', 'series_max'] |
|
| 45 | 45 | )->where('product_id', '=', $productId); |
| 46 | 46 | |
| 47 | 47 | $datatables = Datatables::of($query) |
| 48 | 48 | |
| 49 | - ->addColumn('active', function ($query) { |
|
| 49 | + ->addColumn('active', function($query) { |
|
| 50 | 50 | if ($query->active) { |
| 51 | 51 | return '<a href="#" class="change-active" data-url="/admin/html-block/change-active/'.$query->id.'"><span class="glyphicon glyphicon-ok icon-green"></span></a>'; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | return '<a href="#" class="change-active" data-url="/admin/html-block/change-active/'.$query->id.'"><span class="glyphicon glyphicon-remove icon-red"></span></a>'; |
| 55 | 55 | }) |
| 56 | - ->addColumn('action', function ($query) use ($productId) { |
|
| 56 | + ->addColumn('action', function($query) use ($productId) { |
|
| 57 | 57 | $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')); |
| 58 | 58 | $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; |
| 59 | 59 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | public function store(Request $request, $productId) |
| 88 | 88 | { |
| 89 | - $result = $this->productAmountSeries->create($request->all(), $productId); |
|
| 89 | + $result = $this->productAmountSeries->create($request->all(), $productId); |
|
| 90 | 90 | |
| 91 | 91 | if (isset($result->id)) { |
| 92 | 92 | Notification::success('The product amount series is updated.'); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | public function update(Request $request, $productId, $id) |
| 118 | 118 | { |
| 119 | - $result = $this->productAmountSeries->updateById($request->all(), $productId, $id); |
|
| 119 | + $result = $this->productAmountSeries->updateById($request->all(), $productId, $id); |
|
| 120 | 120 | |
| 121 | 121 | if (!$result->id) { |
| 122 | 122 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | public function destroy($productId, $id) |
| 130 | 130 | { |
| 131 | - $result = $this->productAmountSeries->destroy($id); |
|
| 131 | + $result = $this->productAmountSeries->destroy($id); |
|
| 132 | 132 | |
| 133 | 133 | if ($result) { |
| 134 | 134 | Notification::success('The product amount series is deleted.'); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | ->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 32 | 32 | |
| 33 | 33 | $datatables = Datatables::of($query) |
| 34 | - ->addColumn('action', function ($query) { |
|
| 34 | + ->addColumn('action', function($query) { |
|
| 35 | 35 | $deleteLink = Form::deleteajax(url()->route('content-group.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 36 | 36 | $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; |
| 37 | 37 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | public function store() |
| 53 | 53 | { |
| 54 | - $result = ContentService::createGroup($this->request->all()); |
|
| 54 | + $result = ContentService::createGroup($this->request->all()); |
|
| 55 | 55 | return ContentService::notificationRedirect('content-group.index', $result, 'The content group was inserted.'); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | public function update($contentGroupId) |
| 64 | 64 | { |
| 65 | - $result = ContentService::updateGroupById($this->request->all(), $contentGroupId); |
|
| 65 | + $result = ContentService::updateGroupById($this->request->all(), $contentGroupId); |
|
| 66 | 66 | return ContentService::notificationRedirect('content-group.index', $result, 'The content group was updated.'); |
| 67 | 67 | } |
| 68 | 68 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function destroy($contentGroupId) |
| 75 | 75 | { |
| 76 | - $result = ContentService::destroyGroup($contentGroupId); |
|
| 76 | + $result = ContentService::destroyGroup($contentGroupId); |
|
| 77 | 77 | |
| 78 | 78 | if ($result) { |
| 79 | 79 | Notification::success('The content was deleted.'); |
@@ -34,18 +34,18 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | $datatables = Datatables::of($query) |
| 36 | 36 | |
| 37 | - ->addColumn('active', function ($query) { |
|
| 37 | + ->addColumn('active', function($query) { |
|
| 38 | 38 | if ($query->active) { |
| 39 | 39 | return '<a href="#" class="change-active" data-url="/admin/html-block/change-active/'.$query->id.'"><span class="glyphicon glyphicon-ok icon-green"></span></a>'; |
| 40 | 40 | } |
| 41 | 41 | return '<a href="#" class="change-active" data-url="/admin/html-block/change-active/'.$query->id.'"><span class="glyphicon glyphicon-remove icon-red"></span></a>'; |
| 42 | 42 | }) |
| 43 | - ->addColumn('image', function ($query) { |
|
| 43 | + ->addColumn('image', function($query) { |
|
| 44 | 44 | if ($query->image_file_name) { |
| 45 | 45 | return '<img src="'.config('hideyo.public_path').'/html_block/'.$query->id.'/'.$query->image_file_name.'" width="200px" />'; |
| 46 | 46 | } |
| 47 | 47 | }) |
| 48 | - ->addColumn('action', function ($query) { |
|
| 48 | + ->addColumn('action', function($query) { |
|
| 49 | 49 | $deleteLink = Form::deleteajax(url()->route('html-block.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 50 | 50 | $copy = '<a href="/admin/html-block/'.$query->id.'/copy" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Copy</a>'; |
| 51 | 51 | $links = '<a href="'.url()->route('html-block.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$copy.' '.$deleteLink; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | public function store() |
| 67 | 67 | { |
| 68 | - $result = HtmlBlockService::create($this->request->all()); |
|
| 68 | + $result = HtmlBlockService::create($this->request->all()); |
|
| 69 | 69 | return HtmlBlockService::notificationRedirect('html-block.index', $result, 'The html block was inserted.'); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | public function update($htmlBlockId) |
| 84 | 84 | { |
| 85 | - $result = HtmlBlockService::updateById($this->request->all(), $htmlBlockId); |
|
| 85 | + $result = HtmlBlockService::updateById($this->request->all(), $htmlBlockId); |
|
| 86 | 86 | return HtmlBlockService::notificationRedirect('html-block.index', $result, 'The html block was updated.'); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -101,8 +101,8 @@ discard block |
||
| 101 | 101 | { |
| 102 | 102 | $htmlBlock = HtmlBlockService::find($htmlBlockId); |
| 103 | 103 | |
| 104 | - if($htmlBlock) { |
|
| 105 | - $result = HtmlBlockService::createCopy($this->request->all(), $htmlBlockId); |
|
| 104 | + if ($htmlBlock) { |
|
| 105 | + $result = HtmlBlockService::createCopy($this->request->all(), $htmlBlockId); |
|
| 106 | 106 | return HtmlBlockService::notificationRedirect('html-block.index', $result, 'The html block was inserted.'); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | public function destroy($htmlBlockId) |
| 113 | 113 | { |
| 114 | - $result = HtmlBlockService::destroy($htmlBlockId); |
|
| 114 | + $result = HtmlBlockService::destroy($htmlBlockId); |
|
| 115 | 115 | |
| 116 | 116 | if ($result) { |
| 117 | 117 | Notification::success('The html block was deleted.'); |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | function ($query) use ($keyword) { |
| 69 | 69 | $query->whereRaw("product.title like ?", ["%{$keyword}%"]); |
| 70 | 70 | $query->orWhereRaw("product.reference_code like ?", ["%{$keyword}%"]); |
| 71 | - $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]); |
|
| 71 | + $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]); |
|
| 72 | 72 | ; |
| 73 | 73 | } |
| 74 | 74 | ); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | ['product.*', |
| 41 | 41 | 'brand.title as brandtitle', |
| 42 | 42 | 'product_category.title as categorytitle'] |
| 43 | - )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages','taxRate')) |
|
| 43 | + )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages', 'taxRate')) |
|
| 44 | 44 | |
| 45 | 45 | ->leftJoin('product_category as product_category', 'product_category.id', '=', 'product.product_category_id') |
| 46 | 46 | |
@@ -49,23 +49,23 @@ discard block |
||
| 49 | 49 | ->where('product.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 50 | 50 | |
| 51 | 51 | $datatables = \Datatables::of($product) |
| 52 | - ->filterColumn('reference_code', function ($query, $keyword) { |
|
| 52 | + ->filterColumn('reference_code', function($query, $keyword) { |
|
| 53 | 53 | $query->whereRaw("product.reference_code like ?", ["%{$keyword}%"]); |
| 54 | 54 | }) |
| 55 | - ->filterColumn('active', function ($query, $keyword) { |
|
| 55 | + ->filterColumn('active', function($query, $keyword) { |
|
| 56 | 56 | $query->whereRaw("product.active like ?", ["%{$keyword}%"]); |
| 57 | 57 | ; |
| 58 | 58 | }) |
| 59 | 59 | |
| 60 | - ->addColumn('rank', function ($product) { |
|
| 60 | + ->addColumn('rank', function($product) { |
|
| 61 | 61 | return '<input type="text" class="change-rank" value="'.$product->rank.'" style="width:50px;" data-url="/admin/product/change-rank/'.$product->id.'">'; |
| 62 | 62 | |
| 63 | 63 | }) |
| 64 | 64 | |
| 65 | - ->filterColumn('title', function ($query, $keyword) { |
|
| 65 | + ->filterColumn('title', function($query, $keyword) { |
|
| 66 | 66 | |
| 67 | 67 | $query->where( |
| 68 | - function ($query) use ($keyword) { |
|
| 68 | + function($query) use ($keyword) { |
|
| 69 | 69 | $query->whereRaw("product.title like ?", ["%{$keyword}%"]); |
| 70 | 70 | $query->orWhereRaw("product.reference_code like ?", ["%{$keyword}%"]); |
| 71 | 71 | $query->orWhereRaw("brand.title like ?", ["%{$keyword}%"]); |
@@ -74,11 +74,11 @@ discard block |
||
| 74 | 74 | ); |
| 75 | 75 | }) |
| 76 | 76 | |
| 77 | - ->filterColumn('categorytitle', function ($query, $keyword) { |
|
| 77 | + ->filterColumn('categorytitle', function($query, $keyword) { |
|
| 78 | 78 | $query->whereRaw("product_category.title like ?", ["%{$keyword}%"]); |
| 79 | 79 | }) |
| 80 | 80 | |
| 81 | - ->addColumn('active', function ($product) { |
|
| 81 | + ->addColumn('active', function($product) { |
|
| 82 | 82 | if ($product->active) { |
| 83 | 83 | 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>'; |
| 84 | 84 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | 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>'; |
| 87 | 87 | }) |
| 88 | 88 | |
| 89 | - ->addColumn('title', function ($product) { |
|
| 89 | + ->addColumn('title', function($product) { |
|
| 90 | 90 | if ($product->brand) { |
| 91 | 91 | return $product->brand->title.' | '.$product->title; |
| 92 | 92 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | }) |
| 96 | 96 | |
| 97 | 97 | |
| 98 | - ->addColumn('amount', function ($product) { |
|
| 98 | + ->addColumn('amount', function($product) { |
|
| 99 | 99 | if ($product->attributes->count()) { |
| 100 | 100 | return '<a href="/admin/product/'.$product->id.'/product-combination">combinations</a>'; |
| 101 | 101 | } |
@@ -103,12 +103,12 @@ discard block |
||
| 103 | 103 | return '<input type="text" class="change-amount" value="'.$product->amount.'" style="width:50px;" data-url="'.url()->route('product.change-amount', array('productId' => $product->id)).'">'; |
| 104 | 104 | }) |
| 105 | 105 | |
| 106 | - ->addColumn('image', function ($product) { |
|
| 106 | + ->addColumn('image', function($product) { |
|
| 107 | 107 | if ($product->productImages->count()) { |
| 108 | 108 | return '<img src="/files/product/100x100/'.$product->id.'/'.$product->productImages->first()->file.'" />'; |
| 109 | 109 | } |
| 110 | 110 | }) |
| 111 | - ->addColumn('price', function ($product) { |
|
| 111 | + ->addColumn('price', function($product) { |
|
| 112 | 112 | |
| 113 | 113 | $result = ""; |
| 114 | 114 | if ($product->price) { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | 'amount' => $product->amount |
| 159 | 159 | ); |
| 160 | 160 | |
| 161 | - $result = '€ '.$output['orginal_price_ex_tax_number_format'].' / € '.$output['orginal_price_inc_tax_number_format']; |
|
| 161 | + $result = '€ '.$output['orginal_price_ex_tax_number_format'].' / € '.$output['orginal_price_inc_tax_number_format']; |
|
| 162 | 162 | |
| 163 | 163 | |
| 164 | 164 | if ($product->discount_value) { |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | }) |
| 171 | 171 | |
| 172 | 172 | |
| 173 | - ->addColumn('categorytitle', function ($product) { |
|
| 173 | + ->addColumn('categorytitle', function($product) { |
|
| 174 | 174 | if ($product->subcategories()->count()) { |
| 175 | 175 | $subcategories = $product->subcategories()->pluck('title')->toArray(); |
| 176 | 176 | return $product->categorytitle.', <small> '.implode(', ', $subcategories).'</small>'; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | return $product->categorytitle; |
| 180 | 180 | }) |
| 181 | 181 | |
| 182 | - ->addColumn('action', function ($product) { |
|
| 182 | + ->addColumn('action', function($product) { |
|
| 183 | 183 | $deleteLink = \Form::deleteajax(url()->route('product.destroy', $product->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'), $product->title); |
| 184 | 184 | $copy = '<a href="'.url()->route('product.copy', $product->id).'" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Copy</a>'; |
| 185 | 185 | |
@@ -202,26 +202,26 @@ discard block |
||
| 202 | 202 | ['product.*', |
| 203 | 203 | 'brand.title as brandtitle', |
| 204 | 204 | 'product_category.title as categorytitle'] |
| 205 | - )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages','taxRate')) |
|
| 205 | + )->with(array('productCategory', 'brand', 'subcategories', 'attributes', 'productImages', 'taxRate')) |
|
| 206 | 206 | ->leftJoin('product_category as product_category', 'product_category.id', '=', 'product.product_category_id') |
| 207 | 207 | ->leftJoin('brand as brand', 'brand.id', '=', 'product.brand_id') |
| 208 | 208 | ->where('product.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 209 | 209 | |
| 210 | 210 | $datatables = \Datatables::of($product) |
| 211 | - ->addColumn('rank', function ($product) { |
|
| 211 | + ->addColumn('rank', function($product) { |
|
| 212 | 212 | return '<input type="text" class="change-rank" value="'.$product->rank.'" style="width:50px;" data-url="'.url()->route('product.change-rank', array('productId' => $product->id)).'">'; |
| 213 | 213 | }) |
| 214 | - ->filterColumn('categorytitle', function ($query, $keyword) { |
|
| 214 | + ->filterColumn('categorytitle', function($query, $keyword) { |
|
| 215 | 215 | $query->whereRaw("product_category.title like ?", ["%{$keyword}%"]); |
| 216 | 216 | }) |
| 217 | - ->addColumn('title', function ($product) { |
|
| 217 | + ->addColumn('title', function($product) { |
|
| 218 | 218 | if ($product->brand) { |
| 219 | 219 | return $product->brand->title.' | '.$product->title; |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | return $product->title; |
| 223 | 223 | }) |
| 224 | - ->addColumn('categorytitle', function ($product) { |
|
| 224 | + ->addColumn('categorytitle', function($product) { |
|
| 225 | 225 | if ($product->subcategories()->count()) { |
| 226 | 226 | $subcategories = $product->subcategories()->pluck('title')->toArray(); |
| 227 | 227 | return $product->categorytitle.', <small> '.implode(', ', $subcategories).'</small>'; |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | |
| 251 | 251 | public function store() |
| 252 | 252 | { |
| 253 | - $result = ProductService::create($this->request->all()); |
|
| 253 | + $result = ProductService::create($this->request->all()); |
|
| 254 | 254 | return ProductService::notificationRedirect('product.index', $result, 'The product was inserted.'); |
| 255 | 255 | } |
| 256 | 256 | |
@@ -295,10 +295,10 @@ discard block |
||
| 295 | 295 | public function postExport() |
| 296 | 296 | { |
| 297 | 297 | |
| 298 | - $result = ProductService::selectAllExport(); |
|
| 299 | - Excel::create('export', function ($excel) use ($result) { |
|
| 298 | + $result = ProductService::selectAllExport(); |
|
| 299 | + Excel::create('export', function($excel) use ($result) { |
|
| 300 | 300 | |
| 301 | - $excel->sheet('Products', function ($sheet) use ($result) { |
|
| 301 | + $excel->sheet('Products', function($sheet) use ($result) { |
|
| 302 | 302 | $newArray = array(); |
| 303 | 303 | foreach ($result as $row) { |
| 304 | 304 | $category = ""; |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $i = 0; |
| 328 | 328 | foreach ($row->productImages as $image) { |
| 329 | 329 | $i++; |
| 330 | - $newArray[$row->id]['image_'.$i] = url('/').'/files/product/800x800/'.$row->id.'/'.$image->file; |
|
| 330 | + $newArray[$row->id]['image_'.$i] = url('/').'/files/product/800x800/'.$row->id.'/'.$image->file; |
|
| 331 | 331 | } |
| 332 | 332 | } |
| 333 | 333 | } |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | { |
| 399 | 399 | |
| 400 | 400 | $input = $this->request->all(); |
| 401 | - $result = ProductService::updateById($input, $productId); |
|
| 401 | + $result = ProductService::updateById($input, $productId); |
|
| 402 | 402 | |
| 403 | 403 | $redirect = redirect()->route('product.index'); |
| 404 | 404 | |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | |
| 429 | 429 | public function destroy($id) |
| 430 | 430 | { |
| 431 | - $result = ProductService::destroy($id); |
|
| 431 | + $result = ProductService::destroy($id); |
|
| 432 | 432 | |
| 433 | 433 | if ($result) { |
| 434 | 434 | Notification::success('The product was deleted.'); |
@@ -26,10 +26,10 @@ discard block |
||
| 26 | 26 | { |
| 27 | 27 | if ($this->request->wantsJson()) { |
| 28 | 28 | $brand = BrandService::getModel() |
| 29 | - ->select(['id', 'rank','title']) |
|
| 29 | + ->select(['id', 'rank', 'title']) |
|
| 30 | 30 | ->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 31 | 31 | |
| 32 | - $datatables = Datatables::of($brand)->addColumn('action', function ($query) { |
|
| 32 | + $datatables = Datatables::of($brand)->addColumn('action', function($query) { |
|
| 33 | 33 | $deleteLink = Form::deleteajax(url()->route('brand.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger'), $query->title); |
| 34 | 34 | $links = '<a href="'.url()->route('brand.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
| 35 | 35 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | public function store() |
| 51 | 51 | { |
| 52 | - $result = BrandService::create($this->request->all()); |
|
| 52 | + $result = BrandService::create($this->request->all()); |
|
| 53 | 53 | return BrandService::notificationRedirect('brand.index', $result, 'The brand was inserted.'); |
| 54 | 54 | } |
| 55 | 55 | |
@@ -60,13 +60,13 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | public function update($brandId) |
| 62 | 62 | { |
| 63 | - $result = BrandService::updateById($this->request->all(), $brandId); |
|
| 63 | + $result = BrandService::updateById($this->request->all(), $brandId); |
|
| 64 | 64 | return BrandService::notificationRedirect('brand.index', $result, 'The brand was updated.'); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function destroy($brandId) |
| 68 | 68 | { |
| 69 | - $result = BrandService::destroy($brandId); |
|
| 69 | + $result = BrandService::destroy($brandId); |
|
| 70 | 70 | if ($result) { |
| 71 | 71 | Notification::error('The brand was deleted.'); |
| 72 | 72 | return redirect()->route('brand.index'); |
@@ -44,15 +44,15 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | $datatables = \Datatables::of($invoice) |
| 46 | 46 | |
| 47 | - ->addColumn('price_with_tax', function ($order) { |
|
| 47 | + ->addColumn('price_with_tax', function($order) { |
|
| 48 | 48 | $money = '€ '.$order->price_with_tax; |
| 49 | 49 | return $money; |
| 50 | 50 | }) |
| 51 | 51 | |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - ->addColumn('action', function ($invoice) { |
|
| 55 | - $deleteLink = \Form::deleteajax('/invoice/'. $invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 54 | + ->addColumn('action', function($invoice) { |
|
| 55 | + $deleteLink = \Form::deleteajax('/invoice/'.$invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 56 | 56 | $download = '<a href="/invoice/'.$invoice->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
| 57 | 57 | $links = '<a href="/invoice/'.$invoice->id.'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Show</a> '.$download; |
| 58 | 58 | |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | public function store() |
| 92 | 92 | { |
| 93 | - $result = $this->invoice->create(Request::all()); |
|
| 93 | + $result = $this->invoice->create(Request::all()); |
|
| 94 | 94 | |
| 95 | 95 | if (isset($result->id)) { |
| 96 | 96 | \Notification::success('The invoice was inserted.'); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | public function update($invoiceId) |
| 114 | 114 | { |
| 115 | - $result = $this->invoice->updateById(Request::all(), $invoiceId); |
|
| 115 | + $result = $this->invoice->updateById(Request::all(), $invoiceId); |
|
| 116 | 116 | |
| 117 | 117 | if (isset($result->id)) { |
| 118 | 118 | \Notification::success('The invoice was updated.'); |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | public function destroy($invoiceId) |
| 127 | 127 | { |
| 128 | - $result = $this->invoice->destroy($invoiceId); |
|
| 128 | + $result = $this->invoice->destroy($invoiceId); |
|
| 129 | 129 | |
| 130 | 130 | if ($result) { |
| 131 | 131 | Notification::success('The invoice was deleted.'); |
@@ -41,10 +41,10 @@ discard block |
||
| 41 | 41 | ->where('faq_item.shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 42 | 42 | |
| 43 | 43 | $datatables = Datatables::of($query) |
| 44 | - ->addColumn('faqitemgroup', function ($query) { |
|
| 44 | + ->addColumn('faqitemgroup', function($query) { |
|
| 45 | 45 | return $query->grouptitle; |
| 46 | 46 | }) |
| 47 | - ->addColumn('action', function ($query) { |
|
| 47 | + ->addColumn('action', function($query) { |
|
| 48 | 48 | $deleteLink = Form::deleteajax(url()->route('faq.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 49 | 49 | $links = '<a href="'.url()->route('faq.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
| 50 | 50 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function store() |
| 68 | 68 | { |
| 69 | - $result = FaqService::create($this->request->all()); |
|
| 69 | + $result = FaqService::create($this->request->all()); |
|
| 70 | 70 | return FaqService::notificationRedirect('faq.index', $result, 'FaqItem was inserted.'); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | public function update($faqId) |
| 80 | 80 | { |
| 81 | - $result = FaqService::updateById($this->request->all(), $faqId); |
|
| 81 | + $result = FaqService::updateById($this->request->all(), $faqId); |
|
| 82 | 82 | return FaqService::notificationRedirect('faq.index', $result, 'FaqItem was updated.'); |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | public function destroy($faqItemId) |
| 86 | 86 | { |
| 87 | - $result = FaqService::destroy($faqItemId); |
|
| 87 | + $result = FaqService::destroy($faqItemId); |
|
| 88 | 88 | |
| 89 | 89 | if ($result) { |
| 90 | 90 | Notification::success('The faq was deleted.'); |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | if ($this->request->wantsJson()) { |
| 33 | 33 | |
| 34 | 34 | $query = OrderStatusService::getModel()->select( |
| 35 | - ['id', 'color','title'] |
|
| 35 | + ['id', 'color', 'title'] |
|
| 36 | 36 | )->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 37 | 37 | |
| 38 | 38 | $datatables = \Datatables::of($query) |
| 39 | 39 | |
| 40 | - ->addColumn('title', function ($query) { |
|
| 40 | + ->addColumn('title', function($query) { |
|
| 41 | 41 | |
| 42 | 42 | if ($query->color) { |
| 43 | 43 | return '<span style="background-color:'.$query->color.'; padding: 10px; line-height:30px; text-align:center; color:white;">'.$query->title.'</span>'; |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | }) |
| 47 | 47 | |
| 48 | 48 | |
| 49 | - ->addColumn('action', function ($query) { |
|
| 50 | - $deleteLink = \Form::deleteajax('/admin/order-status/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 49 | + ->addColumn('action', function($query) { |
|
| 50 | + $deleteLink = \Form::deleteajax('/admin/order-status/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 51 | 51 | $links = '<a href="/admin/order-status/'.$query->id.'/edit" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
| 52 | 52 | |
| 53 | 53 | return $links; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | public function store() |
| 70 | 70 | { |
| 71 | - $result = OrderStatusService::create($this->request->all()); |
|
| 71 | + $result = OrderStatusService::create($this->request->all()); |
|
| 72 | 72 | return OrderStatusService::notificationRedirect('order-status.index', $result, 'The order status was inserted.'); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -89,13 +89,13 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | public function update($orderStatusId) |
| 91 | 91 | { |
| 92 | - $result = OrderStatusService::updateById($this->request->all(), $orderStatusId); |
|
| 92 | + $result = OrderStatusService::updateById($this->request->all(), $orderStatusId); |
|
| 93 | 93 | return OrderStatusService::notificationRedirect('order-status.index', $result, 'The order status was updated.'); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | public function destroy($orderStatusId) |
| 97 | 97 | { |
| 98 | - $result = OrderStatusService::destroy($orderStatusId); |
|
| 98 | + $result = OrderStatusService::destroy($orderStatusId); |
|
| 99 | 99 | |
| 100 | 100 | if ($result) { |
| 101 | 101 | Notification::success('The order status was deleted.'); |
@@ -30,12 +30,12 @@ discard block |
||
| 30 | 30 | if ($this->request->wantsJson()) { |
| 31 | 31 | |
| 32 | 32 | $query = ExtraFieldService::getModel() |
| 33 | - ->select(['id', 'all_products','title']) |
|
| 33 | + ->select(['id', 'all_products', 'title']) |
|
| 34 | 34 | ->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 35 | 35 | |
| 36 | 36 | $datatables = Datatables::of($query) |
| 37 | 37 | |
| 38 | - ->addColumn('category', function ($query) { |
|
| 38 | + ->addColumn('category', function($query) { |
|
| 39 | 39 | if ($query->categories) { |
| 40 | 40 | $output = array(); |
| 41 | 41 | foreach ($query->categories as $categorie) { |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | }) |
| 48 | 48 | |
| 49 | - ->addColumn('action', function ($query) { |
|
| 49 | + ->addColumn('action', function($query) { |
|
| 50 | 50 | $deleteLink = Form::deleteajax(url()->route('extra-field.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 51 | 51 | $links = '<a href="'.url()->route('extra-field.values.index', $query->id).'" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>'.$query->values->count().' values</a> |
| 52 | 52 | <a href="'.url()->route('extra-field.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | public function store() |
| 70 | 70 | { |
| 71 | - $result = ExtraFieldService::create($this->request->all()); |
|
| 71 | + $result = ExtraFieldService::create($this->request->all()); |
|
| 72 | 72 | return ExtraFieldService::notificationRedirect('extra-field.index', $result, 'The extra field was inserted.'); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -79,13 +79,13 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | public function update($id) |
| 81 | 81 | { |
| 82 | - $result = ExtraFieldService::updateById($this->request->all(), $id); |
|
| 82 | + $result = ExtraFieldService::updateById($this->request->all(), $id); |
|
| 83 | 83 | return ExtraFieldService::notificationRedirect('extra-field.index', $result, 'The extra field was updated.'); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | public function destroy($id) |
| 87 | 87 | { |
| 88 | - $result = ExtraFieldService::destroy($id); |
|
| 88 | + $result = ExtraFieldService::destroy($id); |
|
| 89 | 89 | |
| 90 | 90 | if ($result) { |
| 91 | 91 | Notification::success('Extra field was deleted.'); |