@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | public function getItem(Request $request, $newsGroupSlug, $slug) |
11 | 11 | { |
12 | 12 | $news = NewsService::selectOneBySlug(config()->get('app.shop_id'), $slug); |
13 | - $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
13 | + $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
14 | 14 | |
15 | 15 | if ($news) { |
16 | 16 | if ($news->slug != $slug or $news->newsGroup->slug != $newsGroupSlug) { |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $news = NewsService::selectByGroupAndByShopIdAndPaginate(config()->get('app.shop_id'), $newsGroupSlug, 25); |
30 | 30 | |
31 | 31 | $newsGroup = NewsService::selectOneGroupByShopIdAndSlug(config()->get('app.shop_id'), $newsGroupSlug); |
32 | - $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
32 | + $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
33 | 33 | |
34 | 34 | if ($newsGroup) { |
35 | 35 | return view('frontend.news.group')->with(array('selectedPage' => $page, 'news' => $news, 'newsGroups' => $newsGroups, 'newsGroup' => $newsGroup)); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | $page = $request->get('page', 1); |
44 | 44 | $news = NewsService::selectAllByShopIdAndPaginate(config()->get('app.shop_id'), 25); |
45 | - $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
45 | + $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
46 | 46 | if ($news) { |
47 | 47 | return view('frontend.news.index')->with(array('selectedPage' => $page, 'news' => $news, 'newsGroups' => $newsGroups)); |
48 | 48 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | 'paymentMethodsList' => $paymentMethodsList)); |
63 | 63 | } |
64 | 64 | |
65 | - return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
65 | + return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $user = auth('web')->user(); |
@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | |
32 | 32 | $paymentMethodsList = Cart::getConditionsByType('sending_method')->first()->getAttributes()['data']['related_payment_methods_list']; |
33 | 33 | |
34 | - if(!Cart::getConditionsByType('sending_method')->count()) { |
|
34 | + if (!Cart::getConditionsByType('sending_method')->count()) { |
|
35 | 35 | Notification::error('Selecteer een verzendwijze'); |
36 | 36 | return redirect()->to('cart'); |
37 | 37 | } |
38 | 38 | |
39 | - if(!Cart::getConditionsByType('payment_method')->count()) { |
|
39 | + if (!Cart::getConditionsByType('payment_method')->count()) { |
|
40 | 40 | |
41 | 41 | Notification::error('Selecteer een betaalwijze'); |
42 | 42 | return redirect()->to('cart'); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | 'paymentMethodsList' => $paymentMethodsList)); |
63 | 63 | } |
64 | 64 | |
65 | - return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
65 | + return view('frontend.checkout.login')->with(array('sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $user = auth('web')->user(); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | { |
85 | 85 | // create the validation rules ------------------------ |
86 | 86 | $rules = array( |
87 | - 'email' => 'required|email', // required and must be unique in the ducks table |
|
87 | + 'email' => 'required|email', // required and must be unique in the ducks table |
|
88 | 88 | 'password' => 'required' |
89 | 89 | ); |
90 | 90 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $userdata = $request->all(); |
129 | 129 | |
130 | 130 | $rules = array( |
131 | - 'email' => 'required|email', // required and must be unique in the ducks table |
|
131 | + 'email' => 'required|email', // required and must be unique in the ducks table |
|
132 | 132 | 'password' => 'required', |
133 | 133 | 'firstname' => 'required', |
134 | 134 | 'lastname' => 'required', |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $data = $register; |
176 | 176 | $data['shop'] = app('shop'); |
177 | 177 | |
178 | - Mail::send('frontend.email.register-mail', array('password' => $userdata['password'], 'user' => $data->toArray(), 'billAddress' => $data->clientBillAddress->toArray()), function ($message) use ($data) { |
|
178 | + Mail::send('frontend.email.register-mail', array('password' => $userdata['password'], 'user' => $data->toArray(), 'billAddress' => $data->clientBillAddress->toArray()), function($message) use ($data) { |
|
179 | 179 | |
180 | 180 | $message->to($data['email'])->from($data['shop']->email, $data['shop']->title)->subject('Je bent geregistreerd.'); |
181 | 181 | }); |
@@ -241,15 +241,15 @@ discard block |
||
241 | 241 | $data['user_id'] = $noAccountUser['client_id']; |
242 | 242 | } |
243 | 243 | |
244 | - if(Cart::getConditionsByType('sending_method')->count()) { |
|
244 | + if (Cart::getConditionsByType('sending_method')->count()) { |
|
245 | 245 | $data['sending_method'] = Cart::getConditionsByType('sending_method'); |
246 | 246 | } |
247 | 247 | |
248 | - if(Cart::getConditionsByType('sending_method_country_price')->count()) { |
|
248 | + if (Cart::getConditionsByType('sending_method_country_price')->count()) { |
|
249 | 249 | $data['sending_method_country_price'] = Cart::getConditionsByType('sending_method_country_price'); |
250 | 250 | } |
251 | 251 | |
252 | - if(Cart::getConditionsByType('payment_method')->count()) { |
|
252 | + if (Cart::getConditionsByType('payment_method')->count()) { |
|
253 | 253 | $data['payment_method'] = Cart::getConditionsByType('payment_method'); |
254 | 254 | } |
255 | 255 |
@@ -209,7 +209,7 @@ |
||
209 | 209 | |
210 | 210 | Notification::error('wachtwoord vergeten is mislukt'); |
211 | 211 | return redirect()->to('account/forgot-password') |
212 | - ->withErrors(true, 'forgot')->withInput(); |
|
212 | + ->withErrors(true, 'forgot')->withInput(); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | public function postResetPassword(Request $request, $confirmationCode, $email) |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | ); |
60 | 60 | |
61 | 61 | foreach ($replace as $key => $val) { |
62 | - $content = str_replace("[" . $key . "]", $val, $content); |
|
62 | + $content = str_replace("[".$key."]", $val, $content); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | return $content; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | 'confirmation_code' => $requestChange->confirmation_code |
164 | 164 | ); |
165 | 165 | |
166 | - Mail::send('frontend.email.reset-account-settings-mail', $data, function ($message) use ($data) { |
|
166 | + Mail::send('frontend.email.reset-account-settings-mail', $data, function($message) use ($data) { |
|
167 | 167 | |
168 | 168 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject('confirm changing account details'); |
169 | 169 | }); |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | 'code' => $forgotPassword->confirmation_code |
288 | 288 | ); |
289 | 289 | |
290 | - Mail::send('frontend.email.reset-password-mail', $data, function ($message) use ($data) { |
|
290 | + Mail::send('frontend.email.reset-password-mail', $data, function($message) use ($data) { |
|
291 | 291 | |
292 | 292 | $message->to($data['email'])->from('[email protected]', 'Phil & Phae')->subject('Wachtwoord vergeten'); |
293 | 293 | }); |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | |
369 | 369 | $validateRegister = ClientService::validateRegister($userdata); |
370 | 370 | |
371 | - if($validateRegister->fails()) { |
|
371 | + if ($validateRegister->fails()) { |
|
372 | 372 | |
373 | 373 | foreach ($validator->errors()->all() as $error) { |
374 | 374 | Notification::error($error); |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | $register = ClientService::register($userdata, config()->get('app.shop_id')); |
381 | 381 | |
382 | 382 | if ($register) { |
383 | - Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function ($message) use ($data) { |
|
383 | + Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function($message) use ($data) { |
|
384 | 384 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject(trans('register-completed-subject')); |
385 | 385 | }); |
386 | 386 | Notification::success(trans('you-are-registered-consumer')); |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $template = 'frontend.product.combinations'; |
44 | 44 | |
45 | 45 | $leadingAttributeId = key(reset($newPullDowns)); |
46 | - if($productAttributeId) { |
|
46 | + if ($productAttributeId) { |
|
47 | 47 | $leadingAttributeId = $productAttributeId; |
48 | 48 | } else { |
49 | 49 | $productAttributeId = $pullDowns['productAttribute']->first()->id; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | |
27 | 27 | if (app('cart')->getContent()->count()) { |
28 | 28 | |
29 | - if($sendingMethodsList->count() AND !app('cart')->getConditionsByType('sending_method')->count()) { |
|
29 | + if ($sendingMethodsList->count() AND !app('cart')->getConditionsByType('sending_method')->count()) { |
|
30 | 30 | self::updateSendingMethod($sendingMethodsList->first()->id); |
31 | 31 | } |
32 | 32 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $request->get('amount') |
74 | 74 | ); |
75 | 75 | |
76 | - if($result){ |
|
76 | + if ($result) { |
|
77 | 77 | |
78 | 78 | return response()->json(array( |
79 | 79 | 'result' => true, |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $product = app('cart')->get($productId); |
107 | 107 | $amountNa = false; |
108 | 108 | |
109 | - if($product->quantity < $amount) { |
|
109 | + if ($product->quantity < $amount) { |
|
110 | 110 | $amountNa = view('frontend.cart.amount-na')->with(array('product' => $product))->render(); |
111 | 111 | } |
112 | 112 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | Notification::error($validator->errors()->all()); |
40 | 40 | } |
41 | 41 | |
42 | - Mail::send('frontend.email.contact', ['data' => $input], function ($m) use ($input) { |
|
42 | + Mail::send('frontend.email.contact', ['data' => $input], function($m) use ($input) { |
|
43 | 43 | |
44 | 44 | $m->from('[email protected]', 'Dutchbridge'); |
45 | 45 | $m->replyTo($input['email'], $input['name']); |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | ->addColumn('status', function ($order) { |
48 | 48 | if ($order->orderStatus) { |
49 | - return $order->orderStatus->title; |
|
49 | + return $order->orderStatus->title; |
|
50 | 50 | } |
51 | 51 | }) |
52 | 52 |
@@ -44,16 +44,16 @@ discard block |
||
44 | 44 | |
45 | 45 | $datatables = Datatables::of($order) |
46 | 46 | |
47 | - ->addColumn('status', function ($order) { |
|
47 | + ->addColumn('status', function($order) { |
|
48 | 48 | if ($order->orderStatus) { |
49 | 49 | return $order->orderStatus->title; |
50 | 50 | } |
51 | 51 | }) |
52 | 52 | |
53 | - ->addColumn('created_at', function ($order) { |
|
53 | + ->addColumn('created_at', function($order) { |
|
54 | 54 | return date('d F H:i', strtotime($order->created_at)); |
55 | 55 | }) |
56 | - ->addColumn('status', function ($order) { |
|
56 | + ->addColumn('status', function($order) { |
|
57 | 57 | if ($order->orderStatus) { |
58 | 58 | if ($order->orderStatus->color) { |
59 | 59 | 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>'; |
@@ -61,33 +61,33 @@ discard block |
||
61 | 61 | return $order->orderStatus->title; |
62 | 62 | } |
63 | 63 | }) |
64 | - ->addColumn('client', function ($order) { |
|
64 | + ->addColumn('client', function($order) { |
|
65 | 65 | if ($order->client) { |
66 | 66 | if ($order->orderBillAddress) { |
67 | 67 | return $order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname; |
68 | 68 | } |
69 | 69 | } |
70 | 70 | }) |
71 | - ->addColumn('products', function ($order) { |
|
71 | + ->addColumn('products', function($order) { |
|
72 | 72 | if ($order->products) { |
73 | 73 | return $order->products->count(); |
74 | 74 | } |
75 | 75 | }) |
76 | - ->addColumn('price_with_tax', function ($order) { |
|
76 | + ->addColumn('price_with_tax', function($order) { |
|
77 | 77 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
78 | 78 | return $money; |
79 | 79 | }) |
80 | - ->addColumn('paymentMethod', function ($order) { |
|
80 | + ->addColumn('paymentMethod', function($order) { |
|
81 | 81 | if ($order->orderPaymentMethod) { |
82 | 82 | return $order->orderPaymentMethod->title; |
83 | 83 | } |
84 | 84 | }) |
85 | - ->addColumn('sendingMethod', function ($order) { |
|
85 | + ->addColumn('sendingMethod', function($order) { |
|
86 | 86 | if ($order->orderSendingMethod) { |
87 | 87 | return $order->orderSendingMethod->title; |
88 | 88 | } |
89 | 89 | }) |
90 | - ->addColumn('action', function ($order) { |
|
90 | + ->addColumn('action', function($order) { |
|
91 | 91 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
92 | 92 | $links = '<a href="/admin/order/'.$order->id.'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Show</a> '.$download; |
93 | 93 |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | public function index() |
24 | 24 | { |
25 | 25 | if (Request::wantsJson()) { |
26 | - $query = UserService::getModel()->select(['id','email', 'username']); |
|
27 | - $datatables = \Datatables::of($query)->addColumn('action', function ($query) { |
|
26 | + $query = UserService::getModel()->select(['id', 'email', 'username']); |
|
27 | + $datatables = \Datatables::of($query)->addColumn('action', function($query) { |
|
28 | 28 | $deleteLink = \Form::deleteajax(url()->route('user.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
29 | 29 | $links = '<a href="'.url()->route('user.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
30 | 30 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | public function store() |
47 | 47 | { |
48 | - $result = UserService::signup(Request::all()); |
|
48 | + $result = UserService::signup(Request::all()); |
|
49 | 49 | return UserService::notificationRedirect('user.index', $result, 'The user was inserted.'); |
50 | 50 | } |
51 | 51 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | $shop = ShopService::find($shopId); |
76 | - $result = UserService::updateShopProfileById($shop, $id); |
|
76 | + $result = UserService::updateShopProfileById($shop, $id); |
|
77 | 77 | Notification::success('The shop changed.'); |
78 | 78 | return redirect()->route('shop.index'); |
79 | 79 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $id = auth()->id(); |
85 | 85 | } |
86 | 86 | |
87 | - $result = UserService::updateProfileById(Request::all(), Request::file('avatar'), $id); |
|
87 | + $result = UserService::updateProfileById(Request::all(), Request::file('avatar'), $id); |
|
88 | 88 | return UserService::notificationRedirect('user.index', $result, 'The user was updated.'); |
89 | 89 | } |
90 | 90 | |
@@ -106,13 +106,13 @@ discard block |
||
106 | 106 | |
107 | 107 | public function update($id) |
108 | 108 | { |
109 | - $result = UserService::updateById(Request::all(), Request::file('avatar'), $id); |
|
109 | + $result = UserService::updateById(Request::all(), Request::file('avatar'), $id); |
|
110 | 110 | return UserService::notificationRedirect('user.index', $result, 'The user was updated.'); |
111 | 111 | } |
112 | 112 | |
113 | 113 | public function destroy($id) |
114 | 114 | { |
115 | - $result = UserService::destroy($id); |
|
115 | + $result = UserService::destroy($id); |
|
116 | 116 | |
117 | 117 | if ($result) { |
118 | 118 | Notification::success('The user was deleted.'); |
@@ -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 | } |