@@ -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; |
@@ -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 | } |
@@ -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 | |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | { |
| 14 | 14 | if ($request->wantsJson()) { |
| 15 | 15 | $query = TaxRateService::getModel()->where('shop_id', '=', auth('hideyobackend')->user()->selected_shop_id); |
| 16 | - $datatables = DataTables::of($query)->addColumn('action', function ($query) { |
|
| 16 | + $datatables = DataTables::of($query)->addColumn('action', function($query) { |
|
| 17 | 17 | $deleteLink = Form::deleteajax(url()->route('tax-rate.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-sm btn-danger'), $query->title); |
| 18 | 18 | $links = '<a href="'.url()->route('tax-rate.edit', $query->id).'" class="btn btn-sm btn-success"><i class="fi-pencil"></i>Edit</a> '.$deleteLink; |
| 19 | 19 | return $links; |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | Notification::error($validator->errors()->all()); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - Mail::send('frontend.email.contact', ['data' => $input], function ($m) use ($input) { |
|
| 38 | + Mail::send('frontend.email.contact', ['data' => $input], function($m) use ($input) { |
|
| 39 | 39 | $m->from('[email protected]', 'Dutchbridge'); |
| 40 | 40 | $m->replyTo($input['email'], $input['name']); |
| 41 | 41 | $m->to('[email protected]')->subject(': thnx for your contact!'); |
@@ -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) { |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $page = $request->get('page', 1); |
| 29 | 29 | $news = NewsService::selectByGroupAndByShopIdAndPaginate(config()->get('app.shop_id'), $newsGroupSlug, 25); |
| 30 | 30 | $newsGroup = NewsService::selectOneGroupByShopIdAndSlug(config()->get('app.shop_id'), $newsGroupSlug); |
| 31 | - $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
| 31 | + $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
| 32 | 32 | |
| 33 | 33 | if ($newsGroup) { |
| 34 | 34 | return view('frontend.news.group')->with(array('selectedPage' => $page, 'news' => $news, 'newsGroups' => $newsGroups, 'newsGroup' => $newsGroup)); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $page = $request->get('page', 1); |
| 43 | 43 | $news = NewsService::selectAllByShopIdAndPaginate(config()->get('app.shop_id'), 25); |
| 44 | - $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
| 44 | + $newsGroups = NewsService::selectAllActiveGroupsByShopId(config()->get('app.shop_id')); |
|
| 45 | 45 | if ($news) { |
| 46 | 46 | return view('frontend.news.index')->with(array('selectedPage' => $page, 'news' => $news, 'newsGroups' => $newsGroups)); |
| 47 | 47 | } |
@@ -16,8 +16,8 @@ |
||
| 16 | 16 | |
| 17 | 17 | $query = ExceptionService::getModel(); |
| 18 | 18 | |
| 19 | - $datatables = \DataTables::of($query)->addColumn('action', function ($query) { |
|
| 20 | - $deleteLink = \Form::deleteajax('/admin/general-setting/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 19 | + $datatables = \DataTables::of($query)->addColumn('action', function($query) { |
|
| 20 | + $deleteLink = \Form::deleteajax('/admin/general-setting/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 21 | 21 | $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; |
| 22 | 22 | |
| 23 | 23 | return $links; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | 'confirmation_code' => $requestChange->confirmation_code |
| 84 | 84 | ); |
| 85 | 85 | |
| 86 | - Mail::send('frontend.email.reset-account-settings-mail', $data, function ($message) use ($data) { |
|
| 86 | + Mail::send('frontend.email.reset-account-settings-mail', $data, function($message) use ($data) { |
|
| 87 | 87 | |
| 88 | 88 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject('confirm changing account details'); |
| 89 | 89 | }); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | return redirect()->back()->withInput(); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if(ClientService::login($request)) { |
|
| 117 | + if (ClientService::login($request)) { |
|
| 118 | 118 | return redirect()->to('/account'); |
| 119 | 119 | } |
| 120 | 120 | |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | { |
| 132 | 132 | $validateRegister = ClientService::validateRegister($request->all()); |
| 133 | 133 | |
| 134 | - if($validateRegister->fails()) { |
|
| 134 | + if ($validateRegister->fails()) { |
|
| 135 | 135 | foreach ($validator->errors()->all() as $error) { |
| 136 | 136 | Notification::error($error); |
| 137 | 137 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | |
| 144 | 144 | if ($register) { |
| 145 | 145 | $data = $register->toArray(); |
| 146 | - Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function ($message) use ($data) { |
|
| 146 | + Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function($message) use ($data) { |
|
| 147 | 147 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject(trans('register-completed-subject')); |
| 148 | 148 | }); |
| 149 | 149 | Notification::success(trans('you-are-registered-consumer')); |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | 'code' => $forgotPassword->confirmation_code |
| 188 | 188 | ); |
| 189 | 189 | |
| 190 | - Mail::send('frontend.email.reset-password-mail', $data, function ($message) use ($data) { |
|
| 190 | + Mail::send('frontend.email.reset-password-mail', $data, function($message) use ($data) { |
|
| 191 | 191 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject('Forgot password'); |
| 192 | 192 | }); |
| 193 | 193 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | return redirect()->to('cart'); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - if($sendingMethodsList->count() AND !Cart::getConditionsByType('sending_method')->count()) { |
|
| 22 | + if ($sendingMethodsList->count() AND !Cart::getConditionsByType('sending_method')->count()) { |
|
| 23 | 23 | self::updateSendingMethod($sendingMethodsList->first()->id); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $request->get('amount') |
| 59 | 59 | ); |
| 60 | 60 | |
| 61 | - if($result){ |
|
| 61 | + if ($result) { |
|
| 62 | 62 | return response()->json(array( |
| 63 | 63 | 'result' => true, |
| 64 | 64 | 'producttotal' => Cart::getContent()->count(), |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $product = Cart::get($productId); |
| 90 | 90 | $amountNa = false; |
| 91 | 91 | |
| 92 | - if($product->quantity < $amount) { |
|
| 92 | + if ($product->quantity < $amount) { |
|
| 93 | 93 | $amountNa = view('frontend.cart.amount-na')->with(array('product' => $product))->render(); |
| 94 | 94 | } |
| 95 | 95 | |