@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | 'name'] |
37 | 37 | )->where('sending_method_id', '=', $sendingMethodId); |
38 | 38 | |
39 | - $datatables = \Datatables::of($users)->addColumn('action', function ($users) use ($sendingMethodId) { |
|
39 | + $datatables = \Datatables::of($users)->addColumn('action', function($users) use ($sendingMethodId) { |
|
40 | 40 | $delete = \Form::deleteajax(url()->route('sending-method.country-prices.destroy', array('sendingMethodId' => $sendingMethodId, 'id' => $users->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
41 | 41 | $link = '<a href="'.url()->route('sending-method.country-prices.edit', array('sendingMethodId' => $sendingMethodId, 'id' => $users->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$delete; |
42 | 42 | |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | $countries = \Excel::load($file, function($reader) { |
72 | 72 | })->get(); |
73 | 73 | |
74 | - if($countries) { |
|
75 | - $result = SendingMethodService::importCountries($countries, $this->request->get('tax_rate_id'), $sendingMethodId); |
|
74 | + if ($countries) { |
|
75 | + $result = SendingMethodService::importCountries($countries, $this->request->get('tax_rate_id'), $sendingMethodId); |
|
76 | 76 | Notification::success('The countries are inserted.'); |
77 | 77 | return redirect()->route('sending-method.country-prices.index', $sendingMethodId); |
78 | 78 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | public function store($sendingMethodId) |
82 | 82 | { |
83 | - $result = SendingMethodService::createCountry($this->request->all(), $sendingMethodId); |
|
83 | + $result = SendingMethodService::createCountry($this->request->all(), $sendingMethodId); |
|
84 | 84 | return SendingMethodService::notificationRedirect(array('sending-method.country-prices.index', $sendingMethodId), $result, 'The country was inserted.'); |
85 | 85 | } |
86 | 86 | |
@@ -95,13 +95,13 @@ discard block |
||
95 | 95 | |
96 | 96 | public function update($sendingMethodId, $id) |
97 | 97 | { |
98 | - $result = SendingMethodService::updateCountryById($this->request->all(), $id); |
|
98 | + $result = SendingMethodService::updateCountryById($this->request->all(), $id); |
|
99 | 99 | return SendingMethodService::notificationRedirect(array('sending-method.country-prices.index', $sendingMethodId), $result, 'The country was updated.'); |
100 | 100 | } |
101 | 101 | |
102 | 102 | public function destroy($sendingMethodId, $id) |
103 | 103 | { |
104 | - $result = SendingMethodService::destroyCountry($id); |
|
104 | + $result = SendingMethodService::destroyCountry($id); |
|
105 | 105 | |
106 | 106 | if ($result) { |
107 | 107 | Notification::success('The country price was deleted.'); |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | if ($request->wantsJson()) { |
31 | 31 | |
32 | 32 | $query = AttributeService::getGroupModel() |
33 | - ->select(['id','title']) |
|
33 | + ->select(['id', 'title']) |
|
34 | 34 | ->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
35 | 35 | |
36 | - $datatables = Datatables::of($query)->addColumn('action', function ($query) { |
|
36 | + $datatables = Datatables::of($query)->addColumn('action', function($query) { |
|
37 | 37 | $deleteLink = Form::deleteajax(url()->route('attribute-group.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
38 | 38 | $links = ' |
39 | 39 | <a href="'.url()->route('attribute.index', $query->id).'" class="btn btn-sm btn-info"><i class="entypo-pencil"></i>'.$query->attributes->count().' Attributes</a> |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function store(Request $request) |
57 | 57 | { |
58 | - $result = AttributeService::createGroup($request->all()); |
|
58 | + $result = AttributeService::createGroup($request->all()); |
|
59 | 59 | return AttributeService::notificationRedirect('attribute-group.index', $result, 'The attribute group was inserted.'); |
60 | 60 | } |
61 | 61 | |
@@ -66,13 +66,13 @@ discard block |
||
66 | 66 | |
67 | 67 | public function update(Request $request, $attributeGroupId) |
68 | 68 | { |
69 | - $result = AttributeService::updateGroupById($request->all(), $attributeGroupId); |
|
69 | + $result = AttributeService::updateGroupById($request->all(), $attributeGroupId); |
|
70 | 70 | return AttributeService::notificationRedirect('attribute-group.index', $result, 'The attribute group was updated.'); |
71 | 71 | } |
72 | 72 | |
73 | 73 | public function destroy($attributeGroupId) |
74 | 74 | { |
75 | - $result = AttributeService::destroyGroup($attributeGroupId); |
|
75 | + $result = AttributeService::destroyGroup($attributeGroupId); |
|
76 | 76 | |
77 | 77 | if ($result) { |
78 | 78 | Notification::success('Attribute group was deleted.'); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | |
24 | 24 | public function index($productId) |
25 | 25 | { |
26 | - $product = ProductService::find($productId); |
|
26 | + $product = ProductService::find($productId); |
|
27 | 27 | if ($this->request->wantsJson()) { |
28 | 28 | |
29 | 29 | $query = ProductService::getImageModel()->where('product_id', '=', $productId); |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | foreach ($newProductAttributes as $key => $productAttribute) { |
102 | 102 | $newArray = array(); |
103 | 103 | foreach ($productAttribute as $keyNew => $valueNew) { |
104 | - $newArray[] = $keyNew.': '.$valueNew['value']; |
|
105 | - $attributesList[$valueNew['id']] = $valueNew['value']; |
|
104 | + $newArray[] = $keyNew.': '.$valueNew['value']; |
|
105 | + $attributesList[$valueNew['id']] = $valueNew['value']; |
|
106 | 106 | } |
107 | 107 | $productAttributesList[$key] = implode(', ', $newArray); |
108 | 108 | } |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | $query = ProductService::getImageModel()->where('product_id', '=', $productId); |
30 | 30 | |
31 | 31 | $datatables = \Datatables::of($query) |
32 | - ->addColumn('thumb', function ($query) use ($productId) { |
|
32 | + ->addColumn('thumb', function($query) use ($productId) { |
|
33 | 33 | return '<img src="/files/product/100x100/'.$query->product_id.'/'.$query->file.'" />'; |
34 | 34 | }) |
35 | 35 | |
36 | - ->addColumn('action', function ($query) use ($productId) { |
|
36 | + ->addColumn('action', function($query) use ($productId) { |
|
37 | 37 | $deleteLink = \Form::deleteajax(url()->route('product.images.destroy', array('productId' => $productId, 'id' => $query->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
38 | 38 | $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; |
39 | 39 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function store($productId) |
57 | 57 | { |
58 | - $result = ProductService::createImage($this->request->all(), $productId); |
|
58 | + $result = ProductService::createImage($this->request->all(), $productId); |
|
59 | 59 | return ProductService::notificationRedirect(array('product.images.index', $productId), $result, 'The product image was inserted.'); |
60 | 60 | } |
61 | 61 | |
@@ -69,13 +69,13 @@ discard block |
||
69 | 69 | |
70 | 70 | if ($productImage->relatedProductAttributes->count()) { |
71 | 71 | foreach ($productImage->relatedProductAttributes as $row) { |
72 | - $selectedProductAttributes[] = $row->pivot->product_attribute_id; |
|
72 | + $selectedProductAttributes[] = $row->pivot->product_attribute_id; |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | |
76 | 76 | if ($productImage->relatedAttributes->count()) { |
77 | 77 | foreach ($productImage->relatedAttributes as $row) { |
78 | - $selectedAttributes[] = $row->pivot->attribute_id; |
|
78 | + $selectedAttributes[] = $row->pivot->attribute_id; |
|
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | public function generateAttributeLists($product) |
86 | 86 | { |
87 | - $productAttributes = $product->attributes; |
|
87 | + $productAttributes = $product->attributes; |
|
88 | 88 | $newProductAttributes = array(); |
89 | 89 | $attributesList = array(); |
90 | 90 | $productAttributesList = array(); |
@@ -114,13 +114,13 @@ discard block |
||
114 | 114 | |
115 | 115 | public function update($productId, $productImageId) |
116 | 116 | { |
117 | - $result = ProductService::updateImageById($this->request->all(), $productId, $productImageId); |
|
117 | + $result = ProductService::updateImageById($this->request->all(), $productId, $productImageId); |
|
118 | 118 | return ProductService::notificationRedirect(array('product.images.index', $productId), $result, 'The product image was update.'); |
119 | 119 | } |
120 | 120 | |
121 | 121 | public function destroy($productId, $productImageId) |
122 | 122 | { |
123 | - $result = ProductService::destroyImage($productImageId); |
|
123 | + $result = ProductService::destroyImage($productImageId); |
|
124 | 124 | |
125 | 125 | if ($result) { |
126 | 126 | Notification::success('The product image is deleted.'); |
@@ -24,11 +24,11 @@ |
||
24 | 24 | [ |
25 | 25 | |
26 | 26 | 'id', |
27 | - 'class', 'file' , 'status_code', 'line', 'message', 'url', 'method'] |
|
27 | + 'class', 'file', 'status_code', 'line', 'message', 'url', 'method'] |
|
28 | 28 | ); |
29 | 29 | |
30 | - $datatables = \Datatables::of($query)->addColumn('action', function ($query) { |
|
31 | - $deleteLink = \Form::deleteajax('/admin/general-setting/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
30 | + $datatables = \Datatables::of($query)->addColumn('action', function($query) { |
|
31 | + $deleteLink = \Form::deleteajax('/admin/general-setting/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
32 | 32 | $links = '<a href="/admin/general-setting/'.$query->id.'/edit" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
33 | 33 | |
34 | 34 | return $links; |
@@ -47,6 +47,6 @@ |
||
47 | 47 | public function store($productId, Request $request) |
48 | 48 | { |
49 | 49 | $result = ProductExtraFieldValueService::create($request->all(), $productId); |
50 | - return ProductExtraFieldValueService::notificationRedirect(array('product.product-extra-field-value.index', $productId), $result, 'The product extra fields are updated.'); |
|
50 | + return ProductExtraFieldValueService::notificationRedirect(array('product.product-extra-field-value.index', $productId), $result, 'The product extra fields are updated.'); |
|
51 | 51 | } |
52 | 52 | } |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | public function store($productId, Request $request) |
48 | 48 | { |
49 | - $result = ProductExtraFieldValueService::create($request->all(), $productId); |
|
49 | + $result = ProductExtraFieldValueService::create($request->all(), $productId); |
|
50 | 50 | return ProductExtraFieldValueService::notificationRedirect(array('product.product-extra-field-value.index', $productId), $result, 'The product extra fields are updated.'); |
51 | 51 | } |
52 | 52 | } |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | $query = RedirectService::selectAll(); |
26 | 26 | $datatables = \Datatables::of($query) |
27 | 27 | |
28 | - ->addColumn('url', function ($query) { |
|
28 | + ->addColumn('url', function($query) { |
|
29 | 29 | return '<a href="'.$query->url.'" target="_blank">'.$query->url.'</a>'; |
30 | 30 | }) |
31 | 31 | |
32 | - ->addColumn('action', function ($query) { |
|
32 | + ->addColumn('action', function($query) { |
|
33 | 33 | $deleteLink = \Form::deleteajax(url()->route('redirect.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
34 | 34 | $links = '<a href="'.url()->route('redirect.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
35 | 35 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | public function store() |
53 | 53 | { |
54 | - $result = RedirectService::create(Request::all()); |
|
54 | + $result = RedirectService::create(Request::all()); |
|
55 | 55 | return RedirectService::notificationRedirect('redirect.index', $result, 'The redirect was inserted.'); |
56 | 56 | } |
57 | 57 | |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | public function postImport() |
73 | 73 | { |
74 | 74 | $file = Request::file('file'); |
75 | - Excel::load($file, function ($reader) { |
|
75 | + Excel::load($file, function($reader) { |
|
76 | 76 | |
77 | 77 | $results = $reader->get(); |
78 | 78 | |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | |
92 | 92 | public function getExport() |
93 | 93 | { |
94 | - $result = RedirectService::selectAll(); |
|
94 | + $result = RedirectService::selectAll(); |
|
95 | 95 | |
96 | - Excel::create('redirects', function ($excel) use ($result) { |
|
96 | + Excel::create('redirects', function($excel) use ($result) { |
|
97 | 97 | |
98 | - $excel->sheet('Redirects', function ($sheet) use ($result) { |
|
98 | + $excel->sheet('Redirects', function($sheet) use ($result) { |
|
99 | 99 | $newArray = array(); |
100 | 100 | foreach ($result as $row) { |
101 | 101 | $newArray[$row->id] = array( |
@@ -112,13 +112,13 @@ discard block |
||
112 | 112 | |
113 | 113 | public function update($redirectId) |
114 | 114 | { |
115 | - $result = RedirectService::updateById(Request::all(), $redirectId); |
|
115 | + $result = RedirectService::updateById(Request::all(), $redirectId); |
|
116 | 116 | return RedirectService::notificationRedirect('redirect.index', $result, 'The redirect was updated.'); |
117 | 117 | } |
118 | 118 | |
119 | 119 | public function destroy($redirectId) |
120 | 120 | { |
121 | - $result = RedirectService::destroy($redirectId); |
|
121 | + $result = RedirectService::destroy($redirectId); |
|
122 | 122 | |
123 | 123 | if ($result) { |
124 | 124 | Notification::success('Redirect item is deleted.'); |
@@ -259,9 +259,9 @@ |
||
259 | 259 | { |
260 | 260 | $order = OrderService::find($orderId); |
261 | 261 | if($order->orderLabel()->count()) { |
262 | - header("Content-type: application/octet-stream"); |
|
263 | - header("Content-disposition: attachment;filename=label.pdf"); |
|
264 | - echo $order->orderLabel->data; |
|
262 | + header("Content-type: application/octet-stream"); |
|
263 | + header("Content-disposition: attachment;filename=label.pdf"); |
|
264 | + echo $order->orderLabel->data; |
|
265 | 265 | } |
266 | 266 | } |
267 | 267 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | public function index() |
32 | 32 | { |
33 | - $shop = auth('hideyobackend')->user()->shop; |
|
33 | + $shop = auth('hideyobackend')->user()->shop; |
|
34 | 34 | $now = Carbon::now(); |
35 | 35 | |
36 | 36 | $revenueThisMonth = null; |
@@ -60,15 +60,15 @@ discard block |
||
60 | 60 | |
61 | 61 | $datatables = \Datatables::of($order) |
62 | 62 | |
63 | - ->addColumn('generated_custom_order_id', function ($order) { |
|
63 | + ->addColumn('generated_custom_order_id', function($order) { |
|
64 | 64 | return $order->generated_custom_order_id; |
65 | 65 | }) |
66 | 66 | |
67 | - ->addColumn('created_at', function ($order) { |
|
67 | + ->addColumn('created_at', function($order) { |
|
68 | 68 | return date('d F H:i', strtotime($order->created_at)); |
69 | 69 | }) |
70 | 70 | |
71 | - ->addColumn('status', function ($order) { |
|
71 | + ->addColumn('status', function($order) { |
|
72 | 72 | if ($order->orderStatus) { |
73 | 73 | if ($order->orderStatus->color) { |
74 | 74 | return '<a href="/admin/order/'.$order->id.'" style="text-decoration:none;"><span style="background-color:'.$order->orderStatus->color.'; padding: 10px; line-height:30px; text-align:center; color:white;">'.$order->orderStatus->title.'</span></a>'; |
@@ -77,46 +77,46 @@ discard block |
||
77 | 77 | } |
78 | 78 | }) |
79 | 79 | |
80 | - ->filterColumn('client', function ($query, $keyword) { |
|
80 | + ->filterColumn('client', function($query, $keyword) { |
|
81 | 81 | |
82 | 82 | $query->where( |
83 | - function ($query) use ($keyword) { |
|
83 | + function($query) use ($keyword) { |
|
84 | 84 | $query->whereRaw("order_address.firstname like ?", ["%{$keyword}%"]); |
85 | 85 | $query->orWhereRaw("order_address.lastname like ?", ["%{$keyword}%"]); |
86 | 86 | ; |
87 | 87 | } |
88 | 88 | ); |
89 | 89 | }) |
90 | - ->addColumn('client', function ($order) { |
|
90 | + ->addColumn('client', function($order) { |
|
91 | 91 | if ($order->client) { |
92 | 92 | if ($order->orderBillAddress) { |
93 | - return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count() .')</a>'; |
|
93 | + return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count().')</a>'; |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | }) |
97 | - ->addColumn('products', function ($order) { |
|
97 | + ->addColumn('products', function($order) { |
|
98 | 98 | if ($order->products) { |
99 | 99 | return $order->products->count(); |
100 | 100 | } |
101 | 101 | }) |
102 | - ->addColumn('price_with_tax', function ($order) { |
|
102 | + ->addColumn('price_with_tax', function($order) { |
|
103 | 103 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
104 | 104 | return $money; |
105 | 105 | }) |
106 | 106 | |
107 | 107 | |
108 | - ->addColumn('paymentMethod', function ($order) { |
|
108 | + ->addColumn('paymentMethod', function($order) { |
|
109 | 109 | if ($order->orderPaymentMethod) { |
110 | 110 | return $order->orderPaymentMethod->title; |
111 | 111 | } |
112 | 112 | }) |
113 | - ->addColumn('sendingMethod', function ($order) { |
|
113 | + ->addColumn('sendingMethod', function($order) { |
|
114 | 114 | if ($order->orderSendingMethod) { |
115 | 115 | return $order->orderSendingMethod->title; |
116 | 116 | } |
117 | 117 | }) |
118 | - ->addColumn('action', function ($order) { |
|
119 | - $deleteLink = \Form::deleteajax('/admin/order/'. $order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
118 | + ->addColumn('action', function($order) { |
|
119 | + $deleteLink = \Form::deleteajax('/admin/order/'.$order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
120 | 120 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
121 | 121 | |
122 | 122 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | |
150 | 150 | if ($data and $data['order']) { |
151 | 151 | |
152 | - if($data['type'] == 'one-pdf') { |
|
152 | + if ($data['type'] == 'one-pdf') { |
|
153 | 153 | $pdfHtml = ""; |
154 | 154 | $countOrders = count($data['order']); |
155 | 155 | $i = 0; |
@@ -175,15 +175,15 @@ discard block |
||
175 | 175 | $pdf = PDF::loadHTML($pdfHtmlBody); |
176 | 176 | |
177 | 177 | return $pdf->download('order-'.$order->generated_custom_order_id.'.pdf'); |
178 | - } elseif($data['type'] == 'product-list') { |
|
178 | + } elseif ($data['type'] == 'product-list') { |
|
179 | 179 | $products = OrderService::productsByOrderIds($data['order']); |
180 | 180 | |
181 | - if($products) { |
|
181 | + if ($products) { |
|
182 | 182 | |
183 | 183 | |
184 | - Excel::create('products', function ($excel) use ($products) { |
|
184 | + Excel::create('products', function($excel) use ($products) { |
|
185 | 185 | |
186 | - $excel->sheet('Products', function ($sheet) use ($products) { |
|
186 | + $excel->sheet('Products', function($sheet) use ($products) { |
|
187 | 187 | $newArray = array(); |
188 | 188 | foreach ($products as $key => $row) { |
189 | 189 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | |
215 | 215 | if ($orders) { |
216 | 216 | Request::session()->put('print_orders', $orders->toArray()); |
217 | - return response()->json(array('orders' => $orders->toArray() )); |
|
217 | + return response()->json(array('orders' => $orders->toArray())); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | Request::session()->destroy('print_orders'); |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | public function downloadLabel($orderId) |
258 | 258 | { |
259 | 259 | $order = OrderService::find($orderId); |
260 | - if($order->orderLabel()->count()) { |
|
260 | + if ($order->orderLabel()->count()) { |
|
261 | 261 | header("Content-type: application/octet-stream"); |
262 | 262 | header("Content-disposition: attachment;filename=label.pdf"); |
263 | 263 | echo $order->orderLabel->data; |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | |
290 | 290 | ); |
291 | 291 | foreach ($replace as $key => $val) { |
292 | - $content = str_replace("[" . $key . "]", $val, $content); |
|
292 | + $content = str_replace("[".$key."]", $val, $content); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | return $content; |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | |
303 | 303 | public function update($orderId) |
304 | 304 | { |
305 | - $result = OrderService::updateById(Request::all(), $orderId); |
|
305 | + $result = OrderService::updateById(Request::all(), $orderId); |
|
306 | 306 | |
307 | 307 | if ($result->errors()->all()) { |
308 | 308 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | $product = ProductService::find($productId); |
35 | 35 | |
36 | - if($product) { |
|
36 | + if ($product) { |
|
37 | 37 | if ($this->request->wantsJson()) { |
38 | 38 | |
39 | 39 | $query = ProductCombinationService::getModel()->select( |
@@ -41,18 +41,18 @@ discard block |
||
41 | 41 | 'default_on'] |
42 | 42 | )->where('product_id', '=', $productId); |
43 | 43 | |
44 | - $datatables = \Datatables::of($query)->addColumn('action', function ($query) use ($productId) { |
|
44 | + $datatables = \Datatables::of($query)->addColumn('action', function($query) use ($productId) { |
|
45 | 45 | $deleteLink = \Form::deleteajax(url()->route('product-combination.destroy', array('productId' => $productId, 'id' => $query->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
46 | 46 | $links = '<a href="'.url()->route('product-combination.edit', array('productId' => $productId, 'id' => $query->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
47 | 47 | |
48 | 48 | return $links; |
49 | 49 | }) |
50 | 50 | |
51 | - ->addColumn('amount', function ($query) { |
|
51 | + ->addColumn('amount', function($query) { |
|
52 | 52 | return '<input type="text" class="change-amount-product-attribute" value="'.$query->amount.'" data-url="/admin/product/'.$query->product_id.'/product-combination/change-amount-attribute/'.$query->id.'">'; |
53 | 53 | }) |
54 | 54 | |
55 | - ->addColumn('price', function ($query) { |
|
55 | + ->addColumn('price', function($query) { |
|
56 | 56 | $result = 0; |
57 | 57 | if ($query->price) { |
58 | 58 | |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | 'amount' => $query->amount |
102 | 102 | ); |
103 | 103 | |
104 | - $result = '€ '.$output['orginal_price_ex_tax_number_format'].' / € '.$output['orginal_price_inc_tax_number_format']; |
|
104 | + $result = '€ '.$output['orginal_price_ex_tax_number_format'].' / € '.$output['orginal_price_inc_tax_number_format']; |
|
105 | 105 | |
106 | 106 | |
107 | 107 | if ($query->discount_value) { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | return $result; |
113 | 113 | }) |
114 | 114 | |
115 | - ->addColumn('combinations', function ($query) use ($productId) { |
|
115 | + ->addColumn('combinations', function($query) use ($productId) { |
|
116 | 116 | $items = array(); |
117 | 117 | foreach ($query->combinations as $row) { |
118 | 118 | $items[] = $row->attribute->attributeGroup->title.': '.$row->attribute->value; |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | |
158 | 158 | public function store($productId) |
159 | 159 | { |
160 | - $result = ProductCombinationService::create($this->request->all(), $productId); |
|
161 | - if($result) { |
|
160 | + $result = ProductCombinationService::create($this->request->all(), $productId); |
|
161 | + if ($result) { |
|
162 | 162 | return ProductCombinationService::notificationRedirect(array('product-combination.index', $productId), $result, 'The product extra fields are updated.'); |
163 | 163 | |
164 | 164 | } |
@@ -195,14 +195,14 @@ discard block |
||
195 | 195 | public function update($productId, $id) |
196 | 196 | { |
197 | 197 | |
198 | - $result = ProductCombinationService::updateById($this->request->all(), $productId, $id); |
|
198 | + $result = ProductCombinationService::updateById($this->request->all(), $productId, $id); |
|
199 | 199 | return ProductCombinationService::notificationRedirect(array('product-combination.index', $productId), $result, 'The product combinations are updated.'); |
200 | 200 | |
201 | 201 | } |
202 | 202 | |
203 | 203 | public function destroy($productId, $id) |
204 | 204 | { |
205 | - $result = ProductCombinationService::destroy($id); |
|
205 | + $result = ProductCombinationService::destroy($id); |
|
206 | 206 | |
207 | 207 | if ($result) { |
208 | 208 | Notification::success('The product combination is deleted.'); |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | if ($request->wantsJson()) { |
31 | 31 | |
32 | 32 | $query = AttributeService::getModel() |
33 | - ->select(['id','value']) |
|
33 | + ->select(['id', 'value']) |
|
34 | 34 | ->where('attribute_group_id', '=', $attributeGroupId); |
35 | 35 | |
36 | 36 | $datatables = Datatables::of($query) |
37 | - ->addColumn('action', function ($query) use ($attributeGroupId) { |
|
37 | + ->addColumn('action', function($query) use ($attributeGroupId) { |
|
38 | 38 | $deleteLink = Form::deleteajax(url()->route('attribute.destroy', array('attributeGroupId' => $attributeGroupId, 'id' => $query->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
39 | 39 | $links = ' <a href="'.url()->route('attribute.edit', array('attributeGroupId' => $attributeGroupId, 'id' => $query->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a>'.$deleteLink; |
40 | 40 | return $links; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | */ |
67 | 67 | public function store(Request $request, $attributeGroupId) |
68 | 68 | { |
69 | - $result = AttributeService::create($request->all(), $attributeGroupId); |
|
69 | + $result = AttributeService::create($request->all(), $attributeGroupId); |
|
70 | 70 | return AttributeService::notificationRedirect(array('attribute.index', $attributeGroupId), $result, 'The attribute was inserted.'); |
71 | 71 | } |
72 | 72 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | */ |
91 | 91 | public function update(Request $request, $attributeGroupId, $attributeId) |
92 | 92 | { |
93 | - $result = AttributeService::updateById($request->all(), $attributeGroupId, $attributeId); |
|
93 | + $result = AttributeService::updateById($request->all(), $attributeGroupId, $attributeId); |
|
94 | 94 | return AttributeService::notificationRedirect(array('attribute.index', $attributeGroupId), $result, 'The attribute was updated.'); |
95 | 95 | } |
96 | 96 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function destroy($attributeGroupId, $attributeId) |
104 | 104 | { |
105 | - $result = AttributeService::destroy($attributeId); |
|
105 | + $result = AttributeService::destroy($attributeId); |
|
106 | 106 | |
107 | 107 | if ($result) { |
108 | 108 | Notification::success('Atrribute was deleted.'); |