@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | use Hideyo\Ecommerce\Framework\Services\Order\OrderFacade as OrderService; |
15 | 15 | use Hideyo\Ecommerce\Framework\Services\Order\OrderStatusFacade as OrderStatusService; |
16 | 16 | use Hideyo\Ecommerce\Framework\Services\PaymentMethod\PaymentMethodFacade as PaymentMethodService; |
17 | -use Hideyo\Ecommerce\Framework\Services\SendingMethod\SendingMethodFacade as SendingMethodService;use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService; |
|
17 | +use Hideyo\Ecommerce\Framework\Services\SendingMethod\SendingMethodFacade as SendingMethodService; use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService; |
|
18 | 18 | |
19 | 19 | use Carbon\Carbon; |
20 | 20 | use Request; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | { |
29 | 29 | public function index() |
30 | 30 | { |
31 | - $shop = auth('hideyobackend')->user()->shop; |
|
31 | + $shop = auth('hideyobackend')->user()->shop; |
|
32 | 32 | $now = Carbon::now(); |
33 | 33 | |
34 | 34 | $revenueThisMonth = null; |
@@ -56,15 +56,15 @@ discard block |
||
56 | 56 | |
57 | 57 | $datatables = \DataTables::of($order) |
58 | 58 | |
59 | - ->addColumn('generated_custom_order_id', function ($order) { |
|
59 | + ->addColumn('generated_custom_order_id', function($order) { |
|
60 | 60 | return $order->generated_custom_order_id; |
61 | 61 | }) |
62 | 62 | |
63 | - ->addColumn('created_at', function ($order) { |
|
63 | + ->addColumn('created_at', function($order) { |
|
64 | 64 | return date('d F H:i', strtotime($order->created_at)); |
65 | 65 | }) |
66 | 66 | |
67 | - ->addColumn('status', function ($order) { |
|
67 | + ->addColumn('status', function($order) { |
|
68 | 68 | if ($order->orderStatus) { |
69 | 69 | if ($order->orderStatus->color) { |
70 | 70 | 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>'; |
@@ -73,46 +73,46 @@ discard block |
||
73 | 73 | } |
74 | 74 | }) |
75 | 75 | |
76 | - ->filterColumn('client', function ($query, $keyword) { |
|
76 | + ->filterColumn('client', function($query, $keyword) { |
|
77 | 77 | |
78 | 78 | $query->where( |
79 | - function ($query) use ($keyword) { |
|
79 | + function($query) use ($keyword) { |
|
80 | 80 | $query->whereRaw("order_address.firstname like ?", ["%{$keyword}%"]); |
81 | 81 | $query->orWhereRaw("order_address.lastname like ?", ["%{$keyword}%"]); |
82 | 82 | ; |
83 | 83 | } |
84 | 84 | ); |
85 | 85 | }) |
86 | - ->addColumn('client', function ($order) { |
|
86 | + ->addColumn('client', function($order) { |
|
87 | 87 | if ($order->client) { |
88 | 88 | if ($order->orderBillAddress) { |
89 | - return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count() .')</a>'; |
|
89 | + return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count().')</a>'; |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | }) |
93 | - ->addColumn('products', function ($order) { |
|
93 | + ->addColumn('products', function($order) { |
|
94 | 94 | if ($order->products) { |
95 | 95 | return $order->products->count(); |
96 | 96 | } |
97 | 97 | }) |
98 | - ->addColumn('price_with_tax', function ($order) { |
|
98 | + ->addColumn('price_with_tax', function($order) { |
|
99 | 99 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
100 | 100 | return $money; |
101 | 101 | }) |
102 | 102 | |
103 | 103 | |
104 | - ->addColumn('paymentMethod', function ($order) { |
|
104 | + ->addColumn('paymentMethod', function($order) { |
|
105 | 105 | if ($order->orderPaymentMethod) { |
106 | 106 | return $order->orderPaymentMethod->title; |
107 | 107 | } |
108 | 108 | }) |
109 | - ->addColumn('sendingMethod', function ($order) { |
|
109 | + ->addColumn('sendingMethod', function($order) { |
|
110 | 110 | if ($order->orderSendingMethod) { |
111 | 111 | return $order->orderSendingMethod->title; |
112 | 112 | } |
113 | 113 | }) |
114 | - ->addColumn('action', function ($order) { |
|
115 | - $deleteLink = \Form::deleteajax('/admin/order/'. $order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
114 | + ->addColumn('action', function($order) { |
|
115 | + $deleteLink = \Form::deleteajax('/admin/order/'.$order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
116 | 116 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
117 | 117 | |
118 | 118 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | if ($data and $data['order']) { |
147 | 147 | |
148 | - if($data['type'] == 'one-pdf') { |
|
148 | + if ($data['type'] == 'one-pdf') { |
|
149 | 149 | $pdfHtml = ""; |
150 | 150 | $countOrders = count($data['order']); |
151 | 151 | $i = 0; |
@@ -171,15 +171,15 @@ discard block |
||
171 | 171 | $pdf = PDF::loadHTML($pdfHtmlBody); |
172 | 172 | |
173 | 173 | return $pdf->download('order-'.$order->generated_custom_order_id.'.pdf'); |
174 | - } elseif($data['type'] == 'product-list') { |
|
174 | + } elseif ($data['type'] == 'product-list') { |
|
175 | 175 | $products = OrderService::productsByOrderIds($data['order']); |
176 | 176 | |
177 | - if($products) { |
|
177 | + if ($products) { |
|
178 | 178 | |
179 | 179 | |
180 | - Excel::create('products', function ($excel) use ($products) { |
|
180 | + Excel::create('products', function($excel) use ($products) { |
|
181 | 181 | |
182 | - $excel->sheet('Products', function ($sheet) use ($products) { |
|
182 | + $excel->sheet('Products', function($sheet) use ($products) { |
|
183 | 183 | $newArray = array(); |
184 | 184 | foreach ($products as $key => $row) { |
185 | 185 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | |
211 | 211 | if ($orders) { |
212 | 212 | Request::session()->put('print_orders', $orders->toArray()); |
213 | - return response()->json(array('orders' => $orders->toArray() )); |
|
213 | + return response()->json(array('orders' => $orders->toArray())); |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | Request::session()->destroy('print_orders'); |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | public function downloadLabel($orderId) |
254 | 254 | { |
255 | 255 | $order = OrderService::find($orderId); |
256 | - if($order->orderLabel()->count()) { |
|
256 | + if ($order->orderLabel()->count()) { |
|
257 | 257 | header("Content-type: application/octet-stream"); |
258 | 258 | header("Content-disposition: attachment;filename=label.pdf"); |
259 | 259 | echo $order->orderLabel->data; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | 'clientDeliveryCompany' => $order->orderDeliveryAddress->company |
284 | 284 | ); |
285 | 285 | foreach ($replace as $key => $val) { |
286 | - $content = str_replace("[" . $key . "]", $val, $content); |
|
286 | + $content = str_replace("[".$key."]", $val, $content); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | return $content; |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | |
297 | 297 | public function update($orderId) |
298 | 298 | { |
299 | - $result = OrderService::updateById(Request::all(), $orderId); |
|
299 | + $result = OrderService::updateById(Request::all(), $orderId); |
|
300 | 300 | |
301 | 301 | if ($result->errors()->all()) { |
302 | 302 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -95,8 +95,8 @@ |
||
95 | 95 | foreach ($newProductAttributes as $key => $productAttribute) { |
96 | 96 | $newArray = array(); |
97 | 97 | foreach ($productAttribute as $keyNew => $valueNew) { |
98 | - $newArray[] = $keyNew.': '.$valueNew['value']; |
|
99 | - $attributesList[$valueNew['id']] = $valueNew['value']; |
|
98 | + $newArray[] = $keyNew.': '.$valueNew['value']; |
|
99 | + $attributesList[$valueNew['id']] = $valueNew['value']; |
|
100 | 100 | } |
101 | 101 | $productAttributesList[$key] = implode(', ', $newArray); |
102 | 102 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | if ($request->wantsJson()) { |
23 | 23 | $query = ProductTagGroupService::getModel()->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
24 | 24 | |
25 | - $datatables = \DataTables::of($query)->addColumn('action', function ($query) { |
|
25 | + $datatables = \DataTables::of($query)->addColumn('action', function($query) { |
|
26 | 26 | $deleteLink = \Form::deleteajax(url()->route('product-tag-group.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
27 | 27 | $links = '<a href="'.url()->route('product-tag-group.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
28 | 28 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | |
45 | 45 | public function store(Request $request) |
46 | 46 | { |
47 | - $result = ProductTagGroupService::create($request->all()); |
|
47 | + $result = ProductTagGroupService::create($request->all()); |
|
48 | 48 | return ProductTagGroupService::notificationRedirect('product-tag-group.index', $result, 'The product group tag was inserted.'); |
49 | 49 | } |
50 | 50 | |
@@ -60,13 +60,13 @@ discard block |
||
60 | 60 | |
61 | 61 | public function update(Request $request, $productTagGroupId) |
62 | 62 | { |
63 | - $result = ProductTagGroupService::updateById($request->all(), $productTagGroupId); |
|
63 | + $result = ProductTagGroupService::updateById($request->all(), $productTagGroupId); |
|
64 | 64 | return ProductTagGroupService::notificationRedirect('product-tag-group.index', $result, 'The product group tag was updated.'); |
65 | 65 | } |
66 | 66 | |
67 | 67 | public function destroy($productTagGroupId) |
68 | 68 | { |
69 | - $result = ProductTagGroupService::destroy($productTagGroupId); |
|
69 | + $result = ProductTagGroupService::destroy($productTagGroupId); |
|
70 | 70 | |
71 | 71 | if ($result) { |
72 | 72 | Notification::success('The product group tag was deleted.'); |
@@ -24,10 +24,10 @@ discard block |
||
24 | 24 | $image = BrandService::getModelImage()->where('brand_id', '=', $brandId); |
25 | 25 | |
26 | 26 | $datatables = DataTables::of($image) |
27 | - ->addColumn('thumb', function ($image) { |
|
27 | + ->addColumn('thumb', function($image) { |
|
28 | 28 | return '<img src="'.config('hideyo.public_path').'/brand/100x100/'.$image->brand_id.'/'.$image->file.'" />'; |
29 | 29 | }) |
30 | - ->addColumn('action', function ($image) use ($brandId) { |
|
30 | + ->addColumn('action', function($image) use ($brandId) { |
|
31 | 31 | $deleteLink = Form::deleteajax(url()->route('brand.images.destroy', array('brandId' => $brandId, 'id' => $image->id)), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
32 | 32 | $links = '<a href="'.url()->route('brand.images.edit', array('brandId' => $brandId, 'id' => $image->id)).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
33 | 33 | return $links; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | return $datatables->make(true); |
37 | 37 | } |
38 | 38 | |
39 | - return view('backend.brand_image.index')->with(array( 'brand' => $brand)); |
|
39 | + return view('backend.brand_image.index')->with(array('brand' => $brand)); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function create($brandId) |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | public function store(Request $request, $brandId) |
49 | 49 | { |
50 | - $result = BrandService::createImage($request->all(), $brandId); |
|
50 | + $result = BrandService::createImage($request->all(), $brandId); |
|
51 | 51 | return BrandService::notificationRedirect(array('brand.images.index', $brandId), $result, 'The brand image was inserted.'); |
52 | 52 | } |
53 | 53 | |
@@ -59,13 +59,13 @@ discard block |
||
59 | 59 | |
60 | 60 | public function update(Request $request, $brandId, $brandImageId) |
61 | 61 | { |
62 | - $result = BrandService::updateImageById($request->all(), $brandId, $brandImageId); |
|
62 | + $result = BrandService::updateImageById($request->all(), $brandId, $brandImageId); |
|
63 | 63 | return BrandService::notificationRedirect(array('brand.images.index', $brandId), $result, 'The brand image was updated.'); |
64 | 64 | } |
65 | 65 | |
66 | 66 | public function destroy($brandId, $brandImageId) |
67 | 67 | { |
68 | - $result = BrandService::destroyImage($brandImageId); |
|
68 | + $result = BrandService::destroyImage($brandImageId); |
|
69 | 69 | |
70 | 70 | if ($result) { |
71 | 71 | Notification::success('The file was deleted.'); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $query = OrderStatusService::getModel()->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
25 | 25 | |
26 | 26 | $datatables = \DataTables::of($query) |
27 | - ->addColumn('title', function ($query) { |
|
27 | + ->addColumn('title', function($query) { |
|
28 | 28 | |
29 | 29 | if ($query->color) { |
30 | 30 | return '<span style="background-color:'.$query->color.'; padding: 10px; line-height:30px; text-align:center; color:white;">'.$query->title.'</span>'; |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | |
33 | 33 | return $query->title; |
34 | 34 | }) |
35 | - ->addColumn('action', function ($query) { |
|
36 | - $deleteLink = Form::deleteajax('/admin/order-status/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
35 | + ->addColumn('action', function($query) { |
|
36 | + $deleteLink = Form::deleteajax('/admin/order-status/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
37 | 37 | $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; |
38 | 38 | |
39 | 39 | return $links; |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | public function store(Request $request) |
54 | 54 | { |
55 | - $result = OrderStatusService::create($request->all()); |
|
55 | + $result = OrderStatusService::create($request->all()); |
|
56 | 56 | return OrderStatusService::notificationRedirect('order-status.index', $result, 'The order status was inserted.'); |
57 | 57 | } |
58 | 58 | |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | |
74 | 74 | public function update(Request $request, $orderStatusId) |
75 | 75 | { |
76 | - $result = OrderStatusService::updateById($request->all(), $orderStatusId); |
|
76 | + $result = OrderStatusService::updateById($request->all(), $orderStatusId); |
|
77 | 77 | return OrderStatusService::notificationRedirect('order-status.index', $result, 'The order status was updated.'); |
78 | 78 | } |
79 | 79 | |
80 | 80 | public function destroy($orderStatusId) |
81 | 81 | { |
82 | - $result = OrderStatusService::destroy($orderStatusId); |
|
82 | + $result = OrderStatusService::destroy($orderStatusId); |
|
83 | 83 | |
84 | 84 | if ($result) { |
85 | 85 | Notification::success('The order status was deleted.'); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | if ($request->wantsJson()) { |
26 | 26 | $users = SendingMethodService::getCountryModel()->where('sending_method_id', '=', $sendingMethodId); |
27 | 27 | |
28 | - $datatables = \DataTables::of($users)->addColumn('action', function ($users) use ($sendingMethodId) { |
|
28 | + $datatables = \DataTables::of($users)->addColumn('action', function($users) use ($sendingMethodId) { |
|
29 | 29 | $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')); |
30 | 30 | $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; |
31 | 31 | |
@@ -60,8 +60,8 @@ discard block |
||
60 | 60 | $countries = \Excel::load($file, function($reader) { |
61 | 61 | })->get(); |
62 | 62 | |
63 | - if($countries) { |
|
64 | - $result = SendingMethodService::importCountries($countries, $request->get('tax_rate_id'), $sendingMethodId); |
|
63 | + if ($countries) { |
|
64 | + $result = SendingMethodService::importCountries($countries, $request->get('tax_rate_id'), $sendingMethodId); |
|
65 | 65 | Notification::success('The countries are inserted.'); |
66 | 66 | return redirect()->route('sending-method.country-prices.index', $sendingMethodId); |
67 | 67 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | public function store(Request $request, $sendingMethodId) |
71 | 71 | { |
72 | - $result = SendingMethodService::createCountry($request->all(), $sendingMethodId); |
|
72 | + $result = SendingMethodService::createCountry($request->all(), $sendingMethodId); |
|
73 | 73 | return SendingMethodService::notificationRedirect(array('sending-method.country-prices.index', $sendingMethodId), $result, 'The country was inserted.'); |
74 | 74 | } |
75 | 75 | |
@@ -84,13 +84,13 @@ discard block |
||
84 | 84 | |
85 | 85 | public function update(Request $request, $sendingMethodId, $id) |
86 | 86 | { |
87 | - $result = SendingMethodService::updateCountryById($request->all(), $id); |
|
87 | + $result = SendingMethodService::updateCountryById($request->all(), $id); |
|
88 | 88 | return SendingMethodService::notificationRedirect(array('sending-method.country-prices.index', $sendingMethodId), $result, 'The country was updated.'); |
89 | 89 | } |
90 | 90 | |
91 | 91 | public function destroy($sendingMethodId, $id) |
92 | 92 | { |
93 | - $result = SendingMethodService::destroyCountry($id); |
|
93 | + $result = SendingMethodService::destroyCountry($id); |
|
94 | 94 | |
95 | 95 | if ($result) { |
96 | 96 | Notification::success('The country price was deleted.'); |
@@ -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.'); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'confirmation_code' => $requestChange->confirmation_code |
111 | 111 | ); |
112 | 112 | |
113 | - Mail::send('frontend.email.reset-account-settings-mail', $data, function ($message) use ($data) { |
|
113 | + Mail::send('frontend.email.reset-account-settings-mail', $data, function($message) use ($data) { |
|
114 | 114 | |
115 | 115 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject('confirm changing account details'); |
116 | 116 | }); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | |
144 | 144 | $login = ClientService::login($request); |
145 | 145 | |
146 | - if($login) { |
|
146 | + if ($login) { |
|
147 | 147 | return redirect()->to('/account'); |
148 | 148 | } |
149 | 149 | |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $userdata = $request->all(); |
162 | 162 | $validateRegister = ClientService::validateRegister($userdata); |
163 | 163 | |
164 | - if($validateRegister->fails()) { |
|
164 | + if ($validateRegister->fails()) { |
|
165 | 165 | foreach ($validator->errors()->all() as $error) { |
166 | 166 | Notification::error($error); |
167 | 167 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | |
174 | 174 | if ($register) { |
175 | 175 | $data = $register->toArray(); |
176 | - Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function ($message) use ($data) { |
|
176 | + Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function($message) use ($data) { |
|
177 | 177 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject(trans('register-completed-subject')); |
178 | 178 | }); |
179 | 179 | Notification::success(trans('you-are-registered-consumer')); |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | 'code' => $forgotPassword->confirmation_code |
220 | 220 | ); |
221 | 221 | |
222 | - Mail::send('frontend.email.reset-password-mail', $data, function ($message) use ($data) { |
|
222 | + Mail::send('frontend.email.reset-password-mail', $data, function($message) use ($data) { |
|
223 | 223 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject('Wachtwoord vergeten'); |
224 | 224 | }); |
225 | 225 |