@@ -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.'); |
@@ -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 | }); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | $login = ClientService::login($request); |
118 | 118 | |
119 | - if($login) { |
|
119 | + if ($login) { |
|
120 | 120 | return redirect()->to('/account'); |
121 | 121 | } |
122 | 122 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | { |
134 | 134 | $validateRegister = ClientService::validateRegister($request->all()); |
135 | 135 | |
136 | - if($validateRegister->fails()) { |
|
136 | + if ($validateRegister->fails()) { |
|
137 | 137 | foreach ($validator->errors()->all() as $error) { |
138 | 138 | Notification::error($error); |
139 | 139 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | if ($register) { |
147 | 147 | $data = $register->toArray(); |
148 | - Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function ($message) use ($data) { |
|
148 | + Mail::send('frontend.email.register-mail', array('user' => $register->toArray(), 'password' => $request->get('password'), 'billAddress' => $register->clientBillAddress->toArray()), function($message) use ($data) { |
|
149 | 149 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject(trans('register-completed-subject')); |
150 | 150 | }); |
151 | 151 | Notification::success(trans('you-are-registered-consumer')); |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | 'code' => $forgotPassword->confirmation_code |
190 | 190 | ); |
191 | 191 | |
192 | - Mail::send('frontend.email.reset-password-mail', $data, function ($message) use ($data) { |
|
192 | + Mail::send('frontend.email.reset-password-mail', $data, function($message) use ($data) { |
|
193 | 193 | $message->to($data['email'])->from('[email protected]', 'Hideyo')->subject('Forgot password'); |
194 | 194 | }); |
195 | 195 |