@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | public function index(Request $request) |
| 23 | 23 | { |
| 24 | 24 | if ($request->wantsJson()) { |
| 25 | - $query = UserService::getModel()->select(['id','email', 'username']); |
|
| 26 | - $datatables = DataTables::of($query)->addColumn('action', function ($query) { |
|
| 25 | + $query = UserService::getModel()->select(['id', 'email', 'username']); |
|
| 26 | + $datatables = DataTables::of($query)->addColumn('action', function($query) { |
|
| 27 | 27 | $deleteLink = Form::deleteajax(url()->route('user.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 28 | 28 | $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; |
| 29 | 29 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | public function store(Request $request) |
| 46 | 46 | { |
| 47 | - $result = UserService::signup($request->all()); |
|
| 47 | + $result = UserService::signup($request->all()); |
|
| 48 | 48 | return UserService::notificationRedirect('user.index', $result, 'The user was inserted.'); |
| 49 | 49 | } |
| 50 | 50 | |
@@ -61,20 +61,20 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | $shop = ShopService::find($shopId); |
| 64 | - $result = UserService::updateShopProfileById($shop, $id); |
|
| 64 | + $result = UserService::updateShopProfileById($shop, $id); |
|
| 65 | 65 | Notification::success('The shop changed.'); |
| 66 | 66 | return redirect()->route('shop.index'); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | public function update(Request $request, $id) |
| 70 | 70 | { |
| 71 | - $result = UserService::updateById($request->all(), $request->file('avatar'), $id); |
|
| 71 | + $result = UserService::updateById($request->all(), $request->file('avatar'), $id); |
|
| 72 | 72 | return UserService::notificationRedirect('user.index', $result, 'The user was updated.'); |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | public function destroy($id) |
| 76 | 76 | { |
| 77 | - $result = UserService::destroy($id); |
|
| 77 | + $result = UserService::destroy($id); |
|
| 78 | 78 | |
| 79 | 79 | if ($result) { |
| 80 | 80 | Notification::success('The user was deleted.'); |
@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | $query = RedirectService::selectAll(); |
| 25 | 25 | $datatables = DataTables::of($query) |
| 26 | 26 | |
| 27 | - ->addColumn('url', function ($query) { |
|
| 27 | + ->addColumn('url', function($query) { |
|
| 28 | 28 | return '<a href="'.$query->url.'" target="_blank">'.$query->url.'</a>'; |
| 29 | 29 | }) |
| 30 | 30 | |
| 31 | - ->addColumn('action', function ($query) { |
|
| 31 | + ->addColumn('action', function($query) { |
|
| 32 | 32 | $deleteLink = \Form::deleteajax(url()->route('redirect.destroy', $query->id), 'Delete', '', array('class'=>'btn btn-default btn-sm btn-danger')); |
| 33 | 33 | $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; |
| 34 | 34 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | public function store() |
| 52 | 52 | { |
| 53 | - $result = RedirectService::create($request->all()); |
|
| 53 | + $result = RedirectService::create($request->all()); |
|
| 54 | 54 | return RedirectService::notificationRedirect('redirect.index', $result, 'The redirect was inserted.'); |
| 55 | 55 | } |
| 56 | 56 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | public function postImport() |
| 72 | 72 | { |
| 73 | 73 | $file = $request->file('file'); |
| 74 | - Excel::load($file, function ($reader) { |
|
| 74 | + Excel::load($file, function($reader) { |
|
| 75 | 75 | |
| 76 | 76 | $results = $reader->get(); |
| 77 | 77 | |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | public function getExport() |
| 92 | 92 | { |
| 93 | - $result = RedirectService::selectAll(); |
|
| 93 | + $result = RedirectService::selectAll(); |
|
| 94 | 94 | |
| 95 | - Excel::create('redirects', function ($excel) use ($result) { |
|
| 95 | + Excel::create('redirects', function($excel) use ($result) { |
|
| 96 | 96 | |
| 97 | - $excel->sheet('Redirects', function ($sheet) use ($result) { |
|
| 97 | + $excel->sheet('Redirects', function($sheet) use ($result) { |
|
| 98 | 98 | $newArray = array(); |
| 99 | 99 | foreach ($result as $row) { |
| 100 | 100 | $newArray[$row->id] = array( |
@@ -111,13 +111,13 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | public function update($redirectId) |
| 113 | 113 | { |
| 114 | - $result = RedirectService::updateById($request->all(), $redirectId); |
|
| 114 | + $result = RedirectService::updateById($request->all(), $redirectId); |
|
| 115 | 115 | return RedirectService::notificationRedirect('redirect.index', $result, 'The redirect was updated.'); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | public function destroy($redirectId) |
| 119 | 119 | { |
| 120 | - $result = RedirectService::destroy($redirectId); |
|
| 120 | + $result = RedirectService::destroy($redirectId); |
|
| 121 | 121 | |
| 122 | 122 | if ($result) { |
| 123 | 123 | Notification::success('Redirect item is deleted.'); |
@@ -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; |
@@ -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 | } |