@@ -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; |
@@ -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 | use Illuminate\Http\Request; |
| 19 | 19 | use Carbon\Carbon; |
| 20 | 20 | use Notification; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | public function index(Request $request) |
| 29 | 29 | { |
| 30 | - $shop = auth('hideyobackend')->user()->shop; |
|
| 30 | + $shop = auth('hideyobackend')->user()->shop; |
|
| 31 | 31 | $now = Carbon::now(); |
| 32 | 32 | |
| 33 | 33 | $revenueThisMonth = null; |
@@ -55,15 +55,15 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | $datatables = \DataTables::of($order) |
| 57 | 57 | |
| 58 | - ->addColumn('generated_custom_order_id', function ($order) { |
|
| 58 | + ->addColumn('generated_custom_order_id', function($order) { |
|
| 59 | 59 | return $order->generated_custom_order_id; |
| 60 | 60 | }) |
| 61 | 61 | |
| 62 | - ->addColumn('created_at', function ($order) { |
|
| 62 | + ->addColumn('created_at', function($order) { |
|
| 63 | 63 | return date('d F H:i', strtotime($order->created_at)); |
| 64 | 64 | }) |
| 65 | 65 | |
| 66 | - ->addColumn('status', function ($order) { |
|
| 66 | + ->addColumn('status', function($order) { |
|
| 67 | 67 | if ($order->orderStatus) { |
| 68 | 68 | if ($order->orderStatus->color) { |
| 69 | 69 | 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>'; |
@@ -72,46 +72,46 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | }) |
| 74 | 74 | |
| 75 | - ->filterColumn('client', function ($query, $keyword) { |
|
| 75 | + ->filterColumn('client', function($query, $keyword) { |
|
| 76 | 76 | |
| 77 | 77 | $query->where( |
| 78 | - function ($query) use ($keyword) { |
|
| 78 | + function($query) use ($keyword) { |
|
| 79 | 79 | $query->whereRaw("order_address.firstname like ?", ["%{$keyword}%"]); |
| 80 | 80 | $query->orWhereRaw("order_address.lastname like ?", ["%{$keyword}%"]); |
| 81 | 81 | ; |
| 82 | 82 | } |
| 83 | 83 | ); |
| 84 | 84 | }) |
| 85 | - ->addColumn('client', function ($order) { |
|
| 85 | + ->addColumn('client', function($order) { |
|
| 86 | 86 | if ($order->client) { |
| 87 | 87 | if ($order->orderBillAddress) { |
| 88 | - return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count() .')</a>'; |
|
| 88 | + return '<a href="/admin/client/'.$order->client_id.'/order">'.$order->orderBillAddress->firstname.' '.$order->orderBillAddress->lastname.' ('.$order->client->orders->count().')</a>'; |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | }) |
| 92 | - ->addColumn('products', function ($order) { |
|
| 92 | + ->addColumn('products', function($order) { |
|
| 93 | 93 | if ($order->products) { |
| 94 | 94 | return $order->products->count(); |
| 95 | 95 | } |
| 96 | 96 | }) |
| 97 | - ->addColumn('price_with_tax', function ($order) { |
|
| 97 | + ->addColumn('price_with_tax', function($order) { |
|
| 98 | 98 | $money = '€ '.$order->getPriceWithTaxNumberFormat(); |
| 99 | 99 | return $money; |
| 100 | 100 | }) |
| 101 | 101 | |
| 102 | 102 | |
| 103 | - ->addColumn('paymentMethod', function ($order) { |
|
| 103 | + ->addColumn('paymentMethod', function($order) { |
|
| 104 | 104 | if ($order->orderPaymentMethod) { |
| 105 | 105 | return $order->orderPaymentMethod->title; |
| 106 | 106 | } |
| 107 | 107 | }) |
| 108 | - ->addColumn('sendingMethod', function ($order) { |
|
| 108 | + ->addColumn('sendingMethod', function($order) { |
|
| 109 | 109 | if ($order->orderSendingMethod) { |
| 110 | 110 | return $order->orderSendingMethod->title; |
| 111 | 111 | } |
| 112 | 112 | }) |
| 113 | - ->addColumn('action', function ($order) { |
|
| 114 | - $deleteLink = \Form::deleteajax('/admin/order/'. $order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 113 | + ->addColumn('action', function($order) { |
|
| 114 | + $deleteLink = \Form::deleteajax('/admin/order/'.$order->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 115 | 115 | $download = '<a href="/admin/order/'.$order->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
| 116 | 116 | |
| 117 | 117 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | if ($data and $data['order']) { |
| 146 | 146 | |
| 147 | - if($data['type'] == 'one-pdf') { |
|
| 147 | + if ($data['type'] == 'one-pdf') { |
|
| 148 | 148 | $pdfHtml = ""; |
| 149 | 149 | $countOrders = count($data['order']); |
| 150 | 150 | $i = 0; |
@@ -170,15 +170,15 @@ discard block |
||
| 170 | 170 | $pdf = PDF::loadHTML($pdfHtmlBody); |
| 171 | 171 | |
| 172 | 172 | return $pdf->download('order-'.$order->generated_custom_order_id.'.pdf'); |
| 173 | - } elseif($data['type'] == 'product-list') { |
|
| 173 | + } elseif ($data['type'] == 'product-list') { |
|
| 174 | 174 | $products = OrderService::productsByOrderIds($data['order']); |
| 175 | 175 | |
| 176 | - if($products) { |
|
| 176 | + if ($products) { |
|
| 177 | 177 | |
| 178 | 178 | |
| 179 | - Excel::create('products', function ($excel) use ($products) { |
|
| 179 | + Excel::create('products', function($excel) use ($products) { |
|
| 180 | 180 | |
| 181 | - $excel->sheet('Products', function ($sheet) use ($products) { |
|
| 181 | + $excel->sheet('Products', function($sheet) use ($products) { |
|
| 182 | 182 | $newArray = array(); |
| 183 | 183 | foreach ($products as $key => $row) { |
| 184 | 184 | |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | if ($orders) { |
| 211 | 211 | $request->session()->put('print_orders', $orders->toArray()); |
| 212 | - return response()->json(array('orders' => $orders->toArray() )); |
|
| 212 | + return response()->json(array('orders' => $orders->toArray())); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | $request->session()->destroy('print_orders'); |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | public function downloadLabel($orderId) |
| 253 | 253 | { |
| 254 | 254 | $order = OrderService::find($orderId); |
| 255 | - if($order->orderLabel()->count()) { |
|
| 255 | + if ($order->orderLabel()->count()) { |
|
| 256 | 256 | header("Content-type: application/octet-stream"); |
| 257 | 257 | header("Content-disposition: attachment;filename=label.pdf"); |
| 258 | 258 | echo $order->orderLabel->data; |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | 'clientDeliveryCompany' => $order->orderDeliveryAddress->company |
| 283 | 283 | ); |
| 284 | 284 | foreach ($replace as $key => $val) { |
| 285 | - $content = str_replace("[" . $key . "]", $val, $content); |
|
| 285 | + $content = str_replace("[".$key."]", $val, $content); |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | return $content; |
@@ -295,7 +295,7 @@ discard block |
||
| 295 | 295 | |
| 296 | 296 | public function update(Request $request, $orderId) |
| 297 | 297 | { |
| 298 | - $result = OrderService::updateById($request->all(), $orderId); |
|
| 298 | + $result = OrderService::updateById($request->all(), $orderId); |
|
| 299 | 299 | |
| 300 | 300 | if ($result->errors()->all()) { |
| 301 | 301 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | use Hideyo\Ecommerce\Framework\Services\Product\ProductFacade as ProductService; |
| 16 | 16 | use Hideyo\Ecommerce\Framework\Services\ExtraField\ExtraFieldFacade as ExtraFieldService; |
| 17 | 17 | use Hideyo\Ecommerce\Framework\Services\Attribute\AttributeFacade as AttributeService; |
| 18 | -use Hideyo\Ecommerce\Framework\Services\TaxRate\TaxRateFacade as TaxRateService;; |
|
| 18 | +use Hideyo\Ecommerce\Framework\Services\TaxRate\TaxRateFacade as TaxRateService; ; |
|
| 19 | 19 | |
| 20 | 20 | use Request; |
| 21 | 21 | use Notification; |
@@ -26,14 +26,14 @@ discard block |
||
| 26 | 26 | { |
| 27 | 27 | public function index($productId) |
| 28 | 28 | { |
| 29 | - $datatable = new ProductAmountOptionDatatable(); |
|
| 29 | + $datatable = new ProductAmountOptionDatatable(); |
|
| 30 | 30 | $product = $this->product->find($productId); |
| 31 | 31 | if (Request::wantsJson()) { |
| 32 | 32 | |
| 33 | 33 | $query = $this->productAmountOption->getModel()->where('product_id', '=', $productId); |
| 34 | 34 | |
| 35 | - $datatables = DataTables::of($query)->addColumn('action', function ($query) use ($productId) { |
|
| 36 | - $deleteLink = Form::deleteajax('/admin/product/'.$productId.'/product-amount-option/'. $query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 35 | + $datatables = DataTables::of($query)->addColumn('action', function($query) use ($productId) { |
|
| 36 | + $deleteLink = Form::deleteajax('/admin/product/'.$productId.'/product-amount-option/'.$query->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 37 | 37 | $links = '<a href="/admin/product/'.$productId.'/product-amount-option/'.$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; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function store($productId) |
| 66 | 66 | { |
| 67 | 67 | |
| 68 | - $result = $this->productAmountOption->create(Request::all(), $productId); |
|
| 68 | + $result = $this->productAmountOption->create(Request::all(), $productId); |
|
| 69 | 69 | |
| 70 | 70 | if (isset($result->id)) { |
| 71 | 71 | Notification::success('The product amount option is updated.'); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | public function update($productId, $id) |
| 97 | 97 | { |
| 98 | - $result = $this->productAmountOption->updateById(Request::all(), $productId, $id); |
|
| 98 | + $result = $this->productAmountOption->updateById(Request::all(), $productId, $id); |
|
| 99 | 99 | |
| 100 | 100 | if (!$result->id) { |
| 101 | 101 | return redirect()->back()->withInput()->withErrors($result->errors()->all()); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | public function destroy($productId, $id) |
| 109 | 109 | { |
| 110 | - $result = $this->productAmountOption->destroy($id); |
|
| 110 | + $result = $this->productAmountOption->destroy($id); |
|
| 111 | 111 | |
| 112 | 112 | if ($result) { |
| 113 | 113 | Notification::success('The product amount option is deleted.'); |
@@ -30,12 +30,12 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | $datatables = \DataTables::of($invoice) |
| 33 | - ->addColumn('price_with_tax', function ($order) { |
|
| 33 | + ->addColumn('price_with_tax', function($order) { |
|
| 34 | 34 | $money = '€ '.$order->price_with_tax; |
| 35 | 35 | return $money; |
| 36 | 36 | }) |
| 37 | - ->addColumn('action', function ($invoice) { |
|
| 38 | - $deleteLink = \Form::deleteajax('/invoice/'. $invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 37 | + ->addColumn('action', function($invoice) { |
|
| 38 | + $deleteLink = \Form::deleteajax('/invoice/'.$invoice->id, 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
|
| 39 | 39 | $download = '<a href="/invoice/'.$invoice->id.'/download" class="btn btn-default btn-sm btn-info"><i class="entypo-pencil"></i>Download</a> '; |
| 40 | 40 | $links = '<a href="/invoice/'.$invoice->id.'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Show</a> '.$download; |
| 41 | 41 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | public function store(Request $request) |
| 72 | 72 | { |
| 73 | - $result = InvoiceService::create($request->all()); |
|
| 73 | + $result = InvoiceService::create($request->all()); |
|
| 74 | 74 | |
| 75 | 75 | if (isset($result->id)) { |
| 76 | 76 | Notification::success('The invoice was inserted.'); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | public function update(Request $request, $invoiceId) |
| 94 | 94 | { |
| 95 | - $result = InvoiceService::updateById($request->all(), $invoiceId); |
|
| 95 | + $result = InvoiceService::updateById($request->all(), $invoiceId); |
|
| 96 | 96 | |
| 97 | 97 | if (isset($result->id)) { |
| 98 | 98 | Notification::success('The invoice was updated.'); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | public function destroy($invoiceId) |
| 107 | 107 | { |
| 108 | - $result = InvoiceService::destroy($invoiceId); |
|
| 108 | + $result = InvoiceService::destroy($invoiceId); |
|
| 109 | 109 | |
| 110 | 110 | if ($result) { |
| 111 | 111 | Notification::success('The invoice was deleted.'); |
@@ -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 | |
@@ -25,13 +25,13 @@ |
||
| 25 | 25 | |
| 26 | 26 | $datatables = DataTables::of($query) |
| 27 | 27 | |
| 28 | - ->addColumn('action', function ($query) { |
|
| 28 | + ->addColumn('action', function($query) { |
|
| 29 | 29 | $deleteLink = Form::deleteajax(url()->route('shop.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 30 | 30 | $links = '<a href="'.url()->route('shop.edit', $query->id).'" class="btn btn-default btn-sm btn-success"><i class="entypo-pencil"></i>Edit</a> '.$deleteLink; |
| 31 | 31 | return $links; |
| 32 | 32 | }) |
| 33 | 33 | |
| 34 | - ->addColumn('image', function ($query) { |
|
| 34 | + ->addColumn('image', function($query) { |
|
| 35 | 35 | if ($query->logo_file_name) { |
| 36 | 36 | return '<img src="/files/shop/'.$query->id.'/'.$query->logo_file_name.'" />'; |
| 37 | 37 | } |
@@ -26,12 +26,12 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $paymentMethodsList = Cart::getConditionsByType('sending_method')->first()->getAttributes()['data']['related_payment_methods_list']; |
| 28 | 28 | |
| 29 | - if(!Cart::getConditionsByType('sending_method')->count()) { |
|
| 29 | + if (!Cart::getConditionsByType('sending_method')->count()) { |
|
| 30 | 30 | Notification::error('Selecteer een verzendwijze'); |
| 31 | 31 | return redirect()->to('cart'); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - if(!Cart::getConditionsByType('payment_method')->count()) { |
|
| 34 | + if (!Cart::getConditionsByType('payment_method')->count()) { |
|
| 35 | 35 | Notification::error('Selecteer een betaalwijze'); |
| 36 | 36 | return redirect()->to('cart'); |
| 37 | 37 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | 'paymentMethodsList' => $paymentMethodsList)); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - return view('frontend.checkout.login')->with(array( 'sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
| 53 | + return view('frontend.checkout.login')->with(array('sendingMethodsList' => $sendingMethodsList, 'paymentMethodsList' => $paymentMethodsList)); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $user = auth('web')->user(); |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | $validateRegister = ClientService::validateRegister($request->all(), $noAccount); |
| 110 | 110 | |
| 111 | - if($validateRegister->fails()) { |
|
| 111 | + if ($validateRegister->fails()) { |
|
| 112 | 112 | foreach ($validator->errors()->all() as $error) { |
| 113 | 113 | Notification::error($error); |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | return redirect()->to('cart/checkout') |
| 117 | - ->withErrors(true, 'register')->withInput();; |
|
| 117 | + ->withErrors(true, 'register')->withInput(); ; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | if ($request->get('password')) { |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $data = $register; |
| 138 | 138 | $data['shop'] = app('shop'); |
| 139 | 139 | |
| 140 | - Mail::send('frontend.email.register-mail', array('password' => $request->get('password'), 'user' => $data->toArray(), 'billAddress' => $data->clientBillAddress->toArray()), function ($message) use ($data) { |
|
| 140 | + Mail::send('frontend.email.register-mail', array('password' => $request->get('password'), 'user' => $data->toArray(), 'billAddress' => $data->clientBillAddress->toArray()), function($message) use ($data) { |
|
| 141 | 141 | |
| 142 | 142 | $message->to($data['email'])->from($data['shop']->email, $data['shop']->title)->subject('Je bent geregistreerd.'); |
| 143 | 143 | }); |
@@ -199,19 +199,19 @@ discard block |
||
| 199 | 199 | $data['user_id'] = auth('web')->user()->id; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - if ($noAccountUser){ |
|
| 202 | + if ($noAccountUser) { |
|
| 203 | 203 | $data['user_id'] = $noAccountUser['client_id']; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | - if(Cart::getConditionsByType('sending_method')->count()) { |
|
| 206 | + if (Cart::getConditionsByType('sending_method')->count()) { |
|
| 207 | 207 | $data['sending_method'] = Cart::getConditionsByType('sending_method'); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - if(Cart::getConditionsByType('sending_method_country_price')->count()) { |
|
| 210 | + if (Cart::getConditionsByType('sending_method_country_price')->count()) { |
|
| 211 | 211 | $data['sending_method_country_price'] = Cart::getConditionsByType('sending_method_country_price'); |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | - if(Cart::getConditionsByType('payment_method')->count()) { |
|
| 214 | + if (Cart::getConditionsByType('payment_method')->count()) { |
|
| 215 | 215 | $data['payment_method'] = Cart::getConditionsByType('payment_method'); |
| 216 | 216 | } |
| 217 | 217 | |