@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | public function handle($request, \Closure $next, $guard = null) |
16 | 16 | { |
17 | - if($request->ajax()) |
|
17 | + if ($request->ajax()) |
|
18 | 18 | return $next($request); |
19 | 19 | |
20 | 20 | abort('404'); |
@@ -14,8 +14,9 @@ |
||
14 | 14 | */ |
15 | 15 | public function handle($request, \Closure $next, $guard = null) |
16 | 16 | { |
17 | - if($request->ajax()) |
|
18 | - return $next($request); |
|
17 | + if($request->ajax()) { |
|
18 | + return $next($request); |
|
19 | + } |
|
19 | 20 | |
20 | 21 | abort('404'); |
21 | 22 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | { |
64 | 64 | $this->request = $request; |
65 | 65 | |
66 | - if(! $request->ajax()) |
|
66 | + if (!$request->ajax()) |
|
67 | 67 | { |
68 | 68 | if (!in_array($this->getCurrentRouteName(), $this->except)) |
69 | 69 | { |
@@ -72,8 +72,9 @@ |
||
72 | 72 | if (!is_null($product_id)) { |
73 | 73 | $this->cleanDraftedProduct(); |
74 | 74 | |
75 | - if ($product = $this->products->findDrafted($product_id)) |
|
76 | - $product->delete(); |
|
75 | + if ($product = $this->products->findDrafted($product_id)) { |
|
76 | + $product->delete(); |
|
77 | + } |
|
77 | 78 | } |
78 | 79 | } |
79 | 80 | } |
@@ -40,19 +40,19 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function handle($request, Closure $next, $guard = null) |
42 | 42 | { |
43 | - if($lot = $request->route('lot')) |
|
43 | + if ($lot = $request->route('lot')) |
|
44 | 44 | { |
45 | - if($lot->status == Lot::STATUS_DRAFTED) |
|
45 | + if ($lot->status == Lot::STATUS_DRAFTED) |
|
46 | 46 | { |
47 | 47 | /*$category = $lot->category;*/ |
48 | - if($this->issetAmount($lot, $request->get('comision'))) |
|
48 | + if ($this->issetAmount($lot, $request->get('comision'))) |
|
49 | 49 | { |
50 | 50 | $lot->status = Lot::STATUS_COMPLETE; |
51 | 51 | $lot->save(); |
52 | 52 | return $next($request); |
53 | 53 | } else { |
54 | 54 | //return redirect()->back()->withErrors('No amount'); |
55 | - return response('No amount',402); |
|
55 | + return response('No amount', 402); |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | private function issetAmount($lot, $requestComision) |
64 | 64 | { |
65 | - $comision = $this->lots->userLotsPendingComision(\Auth::user(),$lot->id) + $requestComision; |
|
65 | + $comision = $this->lots->userLotsPendingComision(\Auth::user(), $lot->id) + $requestComision; |
|
66 | 66 | $wallet = $this->auth->user()->wallet; |
67 | 67 | if ($wallet->amount >= $comision) { |
68 | 68 | return true; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $summ = $this->calcEraseSumm($tax, $amount); |
85 | 85 | |
86 | 86 | $calc = $wallet->amount - $summ; |
87 | - if($calc > 0) |
|
87 | + if ($calc > 0) |
|
88 | 88 | { |
89 | 89 | return $wallet->fill([ |
90 | 90 | //'amount' => $calc, |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $user = $this->auth->user(); |
107 | 107 | $amount = $lot->yield_amount; |
108 | 108 | |
109 | - if(! $user->isAdmin()) |
|
109 | + if (!$user->isAdmin()) |
|
110 | 110 | { |
111 | 111 | return $this->eraseSummFromWallet($tax, $amount); |
112 | 112 | } else { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | $summ = $this->calcEraseSumm($tax, $amount); |
129 | 129 | |
130 | 130 | $calc = $wallet->amount - $summ; |
131 | - if($calc > 0) |
|
131 | + if ($calc > 0) |
|
132 | 132 | { |
133 | 133 | return $wallet->fill([ |
134 | 134 | 'amount' => $calc |
@@ -53,10 +53,10 @@ |
||
53 | 53 | */ |
54 | 54 | private function getObjectHolder($model) |
55 | 55 | { |
56 | - if($model && $model instanceof Lot) |
|
56 | + if ($model && $model instanceof Lot) |
|
57 | 57 | return $model->vendor->user; |
58 | 58 | |
59 | - if($model) |
|
59 | + if ($model) |
|
60 | 60 | return $model->user()->first(); |
61 | 61 | |
62 | 62 | $this->abort(); |
@@ -28,8 +28,9 @@ discard block |
||
28 | 28 | $this->getRouteParameter($parameter) |
29 | 29 | ); |
30 | 30 | |
31 | - if ($user_holder && Auth::id() == $user_holder->id) |
|
32 | - return $next($request); |
|
31 | + if ($user_holder && Auth::id() == $user_holder->id) { |
|
32 | + return $next($request); |
|
33 | + } |
|
33 | 34 | |
34 | 35 | $this->abort(); |
35 | 36 | } |
@@ -53,11 +54,13 @@ discard block |
||
53 | 54 | */ |
54 | 55 | private function getObjectHolder($model) |
55 | 56 | { |
56 | - if($model && $model instanceof Lot) |
|
57 | - return $model->vendor->user; |
|
57 | + if($model && $model instanceof Lot) { |
|
58 | + return $model->vendor->user; |
|
59 | + } |
|
58 | 60 | |
59 | - if($model) |
|
60 | - return $model->user()->first(); |
|
61 | + if($model) { |
|
62 | + return $model->user()->first(); |
|
63 | + } |
|
61 | 64 | |
62 | 65 | $this->abort(); |
63 | 66 | } |
@@ -2,136 +2,136 @@ |
||
2 | 2 | use App\Repositories\TranslateRepository; |
3 | 3 | |
4 | 4 | |
5 | -Breadcrumbs::register('home', function ($breadcrumbs, $key = 'breadcrumbs_home') { |
|
5 | +Breadcrumbs::register('home', function($breadcrumbs, $key = 'breadcrumbs_home') { |
|
6 | 6 | $repository = new TranslateRepository(); |
7 | 7 | $breadcrumbs->push($repository->getKey($key)->value, route('home')); |
8 | 8 | }); |
9 | 9 | |
10 | -Breadcrumbs::register('expire_soon_products', function ($breadcrumbs, $key = 'breadcrumbs_offerts') { |
|
10 | +Breadcrumbs::register('expire_soon_products', function($breadcrumbs, $key = 'breadcrumbs_offerts') { |
|
11 | 11 | $repository = new TranslateRepository(); |
12 | 12 | $breadcrumbs->parent('home'); |
13 | 13 | $breadcrumbs->push($repository->getKey($key)->value, route('expire_soon_products')); |
14 | 14 | }); |
15 | 15 | |
16 | -Breadcrumbs::register('view_blog', function ($breadcrumbs, $key = 'breadcrumbs_blog') { |
|
16 | +Breadcrumbs::register('view_blog', function($breadcrumbs, $key = 'breadcrumbs_blog') { |
|
17 | 17 | $repository = new TranslateRepository(); |
18 | 18 | $breadcrumbs->parent('home'); |
19 | 19 | $breadcrumbs->push($repository->getKey($key)->value, route('view_blog')); |
20 | 20 | }); |
21 | 21 | |
22 | -Breadcrumbs::register('view_post', function ($breadcrumbs, $post) { |
|
22 | +Breadcrumbs::register('view_post', function($breadcrumbs, $post) { |
|
23 | 23 | $repository = new TranslateRepository(); |
24 | 24 | $breadcrumbs->parent('view_blog'); |
25 | 25 | $breadcrumbs->push($post->title, route('view_post', $post->id)); |
26 | 26 | }); |
27 | 27 | |
28 | -Breadcrumbs::register('contacts', function ($breadcrumbs, $key = 'breadcrumbs_contacts') { |
|
28 | +Breadcrumbs::register('contacts', function($breadcrumbs, $key = 'breadcrumbs_contacts') { |
|
29 | 29 | $repository = new TranslateRepository(); |
30 | 30 | $breadcrumbs->parent('home'); |
31 | 31 | $breadcrumbs->push($repository->getKey($key)->value, route('contacts')); |
32 | 32 | }); |
33 | 33 | |
34 | -Breadcrumbs::register('frontend_vendors', function ($breadcrumbs, $key = 'breadcrumbs_vendors') { |
|
34 | +Breadcrumbs::register('frontend_vendors', function($breadcrumbs, $key = 'breadcrumbs_vendors') { |
|
35 | 35 | $repository = new TranslateRepository(); |
36 | 36 | $breadcrumbs->parent('home'); |
37 | 37 | $breadcrumbs->push($repository->getKey($key)->value, route('vendors')); |
38 | 38 | }); |
39 | 39 | |
40 | -Breadcrumbs::register('view_vendor_frontend', function ($breadcrumbs, $vendor) { |
|
40 | +Breadcrumbs::register('view_vendor_frontend', function($breadcrumbs, $vendor) { |
|
41 | 41 | $repository = new TranslateRepository(); |
42 | 42 | $breadcrumbs->parent('view_blog'); |
43 | 43 | $breadcrumbs->push($vendor->name, route('view_vendor', $vendor->id)); |
44 | 44 | }); |
45 | 45 | |
46 | -Breadcrumbs::register('support', function ($breadcrumbs, $key = 'breadcrumbs_support') { |
|
46 | +Breadcrumbs::register('support', function($breadcrumbs, $key = 'breadcrumbs_support') { |
|
47 | 47 | $repository = new TranslateRepository(); |
48 | 48 | $breadcrumbs->parent('home'); |
49 | 49 | $breadcrumbs->push($repository->getKey($key)->value, route('support')); |
50 | 50 | }); |
51 | 51 | |
52 | -Breadcrumbs::register('show_page', function ($breadcrumbs, $static_page) { |
|
52 | +Breadcrumbs::register('show_page', function($breadcrumbs, $static_page) { |
|
53 | 53 | $breadcrumbs->parent('home'); |
54 | 54 | $breadcrumbs->push($static_page->title, route('show_page', $static_page->id)); |
55 | 55 | }); |
56 | 56 | |
57 | -Breadcrumbs::register('view_category', function ($breadcrumbs, $category) { |
|
57 | +Breadcrumbs::register('view_category', function($breadcrumbs, $category) { |
|
58 | 58 | $breadcrumbs->parent('home'); |
59 | 59 | $breadcrumbs->push($category->present()->renderName(), route('view_category', [ $category->slug ])); |
60 | 60 | }); |
61 | 61 | |
62 | -Breadcrumbs::register('view_vendor', function ($breadcrumbs, $vendor) { |
|
62 | +Breadcrumbs::register('view_vendor', function($breadcrumbs, $vendor) { |
|
63 | 63 | $breadcrumbs->parent('home'); |
64 | 64 | $breadcrumbs->push($vendor->present()->renderTitle(), route('view_vendor', $vendor->slug)); |
65 | 65 | }); |
66 | 66 | |
67 | -Breadcrumbs::register('view_sub_category', function ($breadcrumbs, $category, $subcategory) { |
|
67 | +Breadcrumbs::register('view_sub_category', function($breadcrumbs, $category, $subcategory) { |
|
68 | 68 | $breadcrumbs->parent('view_category', $category); |
69 | 69 | $breadcrumbs->push($subcategory->present()->renderName(), route('view_sub_category', [ $category->slug, $subcategory->slug ])); |
70 | 70 | }); |
71 | 71 | |
72 | -Breadcrumbs::register('view_lot', function ($breadcrumbs, $lot) { |
|
73 | - if($lot->vendor) |
|
72 | +Breadcrumbs::register('view_lot', function($breadcrumbs, $lot) { |
|
73 | + if ($lot->vendor) |
|
74 | 74 | $breadcrumbs->parent('view_vendor', $lot->vendor); |
75 | 75 | |
76 | 76 | $breadcrumbs->push($lot->present()->renderName(), route('view_lot', $lot->id)); |
77 | 77 | }); |
78 | 78 | |
79 | -Breadcrumbs::register('view_product', function ($breadcrumbs, $product) { |
|
80 | - if($product->lots) |
|
79 | +Breadcrumbs::register('view_product', function($breadcrumbs, $product) { |
|
80 | + if ($product->lots) |
|
81 | 81 | $breadcrumbs->parent('view_lot', $product->lot); |
82 | 82 | |
83 | 83 | $breadcrumbs->push($product->name, route('view_product', $product->id)); |
84 | 84 | }); |
85 | 85 | |
86 | -Breadcrumbs::register('my_vendors', function ($breadcrumbs) { |
|
86 | +Breadcrumbs::register('my_vendors', function($breadcrumbs) { |
|
87 | 87 | //todo: dashoboard. |
88 | 88 | $breadcrumbs->push('My Vendors', route('my_vendors')); |
89 | 89 | }); |
90 | 90 | |
91 | -Breadcrumbs::register('create_vendor', function ($breadcrumbs) { |
|
91 | +Breadcrumbs::register('create_vendor', function($breadcrumbs) { |
|
92 | 92 | //todo: dashoboard. |
93 | 93 | $breadcrumbs->push('Vendor Create', route('create_vendor')); |
94 | 94 | }); |
95 | 95 | |
96 | -Breadcrumbs::register('vendors', function ($breadcrumbs, $key = 'breadcrumbs_vendors') { |
|
96 | +Breadcrumbs::register('vendors', function($breadcrumbs, $key = 'breadcrumbs_vendors') { |
|
97 | 97 | $repository = new TranslateRepository(); |
98 | 98 | $breadcrumbs->push($repository->getKey($key)->value, route('vendors')); |
99 | 99 | }); |
100 | 100 | |
101 | -Breadcrumbs::register('add_lot', function ($breadcrumbs, $vendor) { |
|
101 | +Breadcrumbs::register('add_lot', function($breadcrumbs, $vendor) { |
|
102 | 102 | //todo: dashoboard. |
103 | 103 | $breadcrumbs->parent('view_vendor', $vendor); |
104 | 104 | $breadcrumbs->push('Create lot', route('add_lot', $vendor->slug)); |
105 | 105 | }); |
106 | 106 | |
107 | -Breadcrumbs::register('settings', function ($breadcrumbs, $key = 'breadcrumbs_settings') { |
|
107 | +Breadcrumbs::register('settings', function($breadcrumbs, $key = 'breadcrumbs_settings') { |
|
108 | 108 | $repository = new TranslateRepository(); |
109 | 109 | |
110 | 110 | $breadcrumbs->push($repository->getKey($key)->value, route('settings')); |
111 | 111 | }); |
112 | 112 | |
113 | -Breadcrumbs::register('user_password', function ($breadcrumbs, $key = 'breadcrumbs_user_password') { |
|
113 | +Breadcrumbs::register('user_password', function($breadcrumbs, $key = 'breadcrumbs_user_password') { |
|
114 | 114 | $repository = new TranslateRepository(); |
115 | 115 | |
116 | 116 | $breadcrumbs->push($repository->getKey($key)->value, route('user_password')); |
117 | 117 | }); |
118 | 118 | |
119 | -Breadcrumbs::register('my_involved', function ($breadcrumbs) { |
|
119 | +Breadcrumbs::register('my_involved', function($breadcrumbs) { |
|
120 | 120 | //todo: dashoboard. |
121 | 121 | $breadcrumbs->push('My Involved', route('my_involved')); |
122 | 122 | }); |
123 | 123 | |
124 | -Breadcrumbs::register('my_products', function ($breadcrumbs) { |
|
124 | +Breadcrumbs::register('my_products', function($breadcrumbs) { |
|
125 | 125 | //todo: dashoboard. |
126 | 126 | $breadcrumbs->push('My Products', route('my_products')); |
127 | 127 | }); |
128 | 128 | |
129 | -Breadcrumbs::register('my_lots', function ($breadcrumbs) { |
|
129 | +Breadcrumbs::register('my_lots', function($breadcrumbs) { |
|
130 | 130 | //todo: dashoboard. |
131 | 131 | $breadcrumbs->push('My Lots', route('my_lots')); |
132 | 132 | }); |
133 | 133 | |
134 | -Breadcrumbs::register('edit_vendor', function ($breadcrumbs, $vendor) { |
|
134 | +Breadcrumbs::register('edit_vendor', function($breadcrumbs, $vendor) { |
|
135 | 135 | //todo: dashoboard. |
136 | 136 | $breadcrumbs->push('Edit Vendor', route('edit_vendor', $vendor->id)); |
137 | 137 | }); |
138 | 138 | \ No newline at end of file |
@@ -70,15 +70,17 @@ |
||
70 | 70 | }); |
71 | 71 | |
72 | 72 | Breadcrumbs::register('view_lot', function ($breadcrumbs, $lot) { |
73 | - if($lot->vendor) |
|
74 | - $breadcrumbs->parent('view_vendor', $lot->vendor); |
|
73 | + if($lot->vendor) { |
|
74 | + $breadcrumbs->parent('view_vendor', $lot->vendor); |
|
75 | + } |
|
75 | 76 | |
76 | 77 | $breadcrumbs->push($lot->present()->renderName(), route('view_lot', $lot->id)); |
77 | 78 | }); |
78 | 79 | |
79 | 80 | Breadcrumbs::register('view_product', function ($breadcrumbs, $product) { |
80 | - if($product->lots) |
|
81 | - $breadcrumbs->parent('view_lot', $product->lot); |
|
81 | + if($product->lots) { |
|
82 | + $breadcrumbs->parent('view_lot', $product->lot); |
|
83 | + } |
|
82 | 84 | |
83 | 85 | $breadcrumbs->push($product->name, route('view_product', $product->id)); |
84 | 86 | }); |
@@ -27,68 +27,68 @@ discard block |
||
27 | 27 | * ---------------------------------------------- |
28 | 28 | */ |
29 | 29 | |
30 | -Route::bind('category', function ($slug) { |
|
30 | +Route::bind('category', function($slug) { |
|
31 | 31 | return (new CategoryRepository)->findBySlug($slug); |
32 | 32 | }); |
33 | 33 | |
34 | -Route::bind('sub_category', function ($slug) { |
|
34 | +Route::bind('sub_category', function($slug) { |
|
35 | 35 | return (new SubCategoriesRepository())->findBySlug($slug); |
36 | 36 | }); |
37 | 37 | |
38 | -Route::bind('post', function ($slug) { |
|
38 | +Route::bind('post', function($slug) { |
|
39 | 39 | return (new PostsRepository)->findBySlug($slug); |
40 | 40 | }); |
41 | 41 | |
42 | -Route::bind('product', function ($id) { |
|
42 | +Route::bind('product', function($id) { |
|
43 | 43 | return ((new ProductsRepository)->find($id)) ? (new ProductsRepository)->find($id) : abort(404); |
44 | 44 | }); |
45 | 45 | |
46 | -Route::bind('lot', function ($id) { |
|
46 | +Route::bind('lot', function($id) { |
|
47 | 47 | return (new LotRepository())->find($id); |
48 | 48 | }); |
49 | 49 | |
50 | -Route::bind('vendor', function ($slug) { |
|
50 | +Route::bind('vendor', function($slug) { |
|
51 | 51 | return (new VendorRepository)->find($slug); |
52 | 52 | }); |
53 | 53 | |
54 | -Route::bind('static_page', function ($slug) { |
|
54 | +Route::bind('static_page', function($slug) { |
|
55 | 55 | return (new PagesRepository())->find($slug); |
56 | 56 | }); |
57 | 57 | |
58 | -Route::bind('involved', function ($id) { |
|
58 | +Route::bind('involved', function($id) { |
|
59 | 59 | return (new InvolvedRepository())->find($id); |
60 | 60 | }); |
61 | 61 | |
62 | -Route::bind('token', function ($token){ |
|
62 | +Route::bind('token', function($token) { |
|
63 | 63 | |
64 | 64 | return (new RecoverPasswordRepository())->getByToken($token); |
65 | 65 | }); |
66 | 66 | |
67 | -Route::bind('unscribe', function ($token){ |
|
67 | +Route::bind('unscribe', function($token) { |
|
68 | 68 | return (new SubscribeRepository())->getByToken($token); |
69 | 69 | }); |
70 | 70 | |
71 | -Route::bind('social', function ($provider, $router) { |
|
71 | +Route::bind('social', function($provider, $router) { |
|
72 | 72 | return (new SocialiteRepository())->getUserByProvider( |
73 | 73 | $router->getParameter('provider'), $provider |
74 | 74 | ); |
75 | 75 | }); |
76 | 76 | |
77 | -Route::bind('provider', function($provider){ |
|
78 | - if(config("services.$provider")) |
|
77 | +Route::bind('provider', function($provider) { |
|
78 | + if (config("services.$provider")) |
|
79 | 79 | return $provider; |
80 | 80 | |
81 | 81 | abort('404'); |
82 | 82 | }); |
83 | 83 | |
84 | -Route::multilingual(function () { |
|
85 | - Route::get('lot', function(){ |
|
84 | +Route::multilingual(function() { |
|
85 | + Route::get('lot', function() { |
|
86 | 86 | return view('html.lot'); |
87 | 87 | }); |
88 | - Route::get('lot_show', function(){ |
|
88 | + Route::get('lot_show', function() { |
|
89 | 89 | return view('html.lot_show'); |
90 | 90 | }); |
91 | - Route::get('lot_listing', function(){ |
|
91 | + Route::get('lot_listing', function() { |
|
92 | 92 | return view('html.lot_listing'); |
93 | 93 | }); |
94 | 94 | Route::get('/', [ |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | * Auth routes. |
194 | 194 | * ---------------------------------------------- |
195 | 195 | */ |
196 | - Route::group(['middleware' => 'auth'], function () { |
|
196 | + Route::group([ 'middleware' => 'auth' ], function() { |
|
197 | 197 | /* ---------------------------------------------- |
198 | 198 | * Vendor routes. |
199 | 199 | * ---------------------------------------------- |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | ]); |
245 | 245 | |
246 | 246 | |
247 | - Route::group(['middleware' => 'can_handle_action:lot'], function () // For product only |
|
247 | + Route::group([ 'middleware' => 'can_handle_action:lot' ], function() // For product only |
|
248 | 248 | { |
249 | 249 | |
250 | 250 | Route::post('lots/{lot}/product/load-spec-price', [ |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | 'middleware' => 'add_lot_filter', |
339 | 339 | 'uses' => 'LotsController@publishedLot' |
340 | 340 | ]); |
341 | - Route::group(['middleware' => 'accept-ajax'], function () { |
|
341 | + Route::group([ 'middleware' => 'accept-ajax' ], function() { |
|
342 | 342 | Route::post('product/{product}/add-image', [ |
343 | 343 | 'as' => 'add_product_image', |
344 | 344 | 'uses' => 'ProductsController@addImage' |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | 'uses' => 'DashboardController@accountSettings' |
412 | 412 | ]); |
413 | 413 | |
414 | - Route::get('how-amma-work',[ |
|
414 | + Route::get('how-amma-work', [ |
|
415 | 415 | 'as'=>'how_work', |
416 | 416 | 'uses'=> 'DashboardController@howWork' |
417 | 417 | ]); |
@@ -431,13 +431,13 @@ discard block |
||
431 | 431 | 'uses' => 'DashboardController@updatePassword' |
432 | 432 | ]); |
433 | 433 | |
434 | - Route::post('vote_vendor/{vendor}',[ |
|
434 | + Route::post('vote_vendor/{vendor}', [ |
|
435 | 435 | 'as' => 'vote_vendor', |
436 | 436 | 'middleware' => 'accept-ajax', |
437 | 437 | 'uses' => 'VendorController@vote_vendor' |
438 | 438 | ]); |
439 | 439 | |
440 | - Route::group(['middleware' => 'can_handle_action:vendor'], function () { |
|
440 | + Route::group([ 'middleware' => 'can_handle_action:vendor' ], function() { |
|
441 | 441 | Route::get('vendor/{vendor}/edit', [ |
442 | 442 | 'as' => 'edit_vendor', |
443 | 443 | 'uses' => 'VendorController@edit' |
@@ -449,9 +449,9 @@ discard block |
||
449 | 449 | ]); |
450 | 450 | }); |
451 | 451 | |
452 | - Route::group(['middleware' => 'can_handle_action:product'], function () // For product only |
|
452 | + Route::group([ 'middleware' => 'can_handle_action:product' ], function() // For product only |
|
453 | 453 | { |
454 | - Route::group(['middleware' => 'accept-ajax'], function () { |
|
454 | + Route::group([ 'middleware' => 'accept-ajax' ], function() { |
|
455 | 455 | Route::post('product/{product}/add-image', [ |
456 | 456 | 'as' => 'add_product_image', |
457 | 457 | 'uses' => 'ProductsController@addImage' |
@@ -515,34 +515,34 @@ discard block |
||
515 | 515 | 'uses' => 'Auth\PasswordController@postEmail' |
516 | 516 | ]); |
517 | 517 | |
518 | - Route::get('password/reset/{token}',[ |
|
518 | + Route::get('password/reset/{token}', [ |
|
519 | 519 | 'as' => 'reset_password_token', |
520 | 520 | 'uses' => 'Auth\PasswordController@getReset' |
521 | 521 | ]); |
522 | 522 | |
523 | - Route::post('password/reset',[ |
|
523 | + Route::post('password/reset', [ |
|
524 | 524 | 'as' => 'reset_password', |
525 | 525 | 'uses' => 'Auth\PasswordController@postReset' |
526 | 526 | ]); |
527 | 527 | |
528 | 528 | //Social Login |
529 | 529 | |
530 | - Route::get('/social/login/{provider?}',[ |
|
530 | + Route::get('/social/login/{provider?}', [ |
|
531 | 531 | 'as' => 'social_auth', |
532 | 532 | 'uses' => 'Auth\SocialiteController@getSocialAuth' |
533 | 533 | ]); |
534 | 534 | |
535 | - Route::get('/social/login/callback/{provider?}',[ |
|
535 | + Route::get('/social/login/callback/{provider?}', [ |
|
536 | 536 | 'as' => 'social_callback', |
537 | 537 | 'uses' => 'Auth\SocialiteController@getSocialAuthCallback' |
538 | 538 | ]); |
539 | 539 | |
540 | - Route::get('/social/login/{provider}/{social}/edit-email',[ |
|
540 | + Route::get('/social/login/{provider}/{social}/edit-email', [ |
|
541 | 541 | 'as' => 'social_auth_email', |
542 | 542 | 'uses' => 'Auth\SocialiteController@getEmailForm' |
543 | 543 | ]); |
544 | 544 | |
545 | - Route::post('/social/login/{provider}/{social}/require-email',[ |
|
545 | + Route::post('/social/login/{provider}/{social}/require-email', [ |
|
546 | 546 | 'as' => 'post_social_auth_email', |
547 | 547 | 'uses' => 'Auth\SocialiteController@postEmailForm' |
548 | 548 | ]); |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | 'uses' => 'Auth\VerifyUserController@confirm' |
578 | 578 | ]); |
579 | 579 | |
580 | - Route::group(['middleware' => 'auth'], function () { |
|
580 | + Route::group([ 'middleware' => 'auth' ], function() { |
|
581 | 581 | Route::get('confirmation-code/resend', [ |
582 | 582 | 'as' => 'resend_verify_email_form', |
583 | 583 | 'uses' => 'Auth\VerifyUserController@resendVerify' |
@@ -75,8 +75,9 @@ |
||
75 | 75 | }); |
76 | 76 | |
77 | 77 | Route::bind('provider', function($provider){ |
78 | - if(config("services.$provider")) |
|
79 | - return $provider; |
|
78 | + if(config("services.$provider")) { |
|
79 | + return $provider; |
|
80 | + } |
|
80 | 81 | |
81 | 82 | abort('404'); |
82 | 83 | }); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | WalletRepository $walletRepository = null |
67 | 67 | ) |
68 | 68 | { |
69 | - $this->middleware($this->guestMiddleware(), ['except' => 'logout']); |
|
69 | + $this->middleware($this->guestMiddleware(), [ 'except' => 'logout' ]); |
|
70 | 70 | $this->users = $userRepository; |
71 | 71 | $this->wallets = $walletRepository; |
72 | 72 | } |
@@ -93,24 +93,24 @@ discard block |
||
93 | 93 | if ($throttles && $lockedOut = $this->hasTooManyLoginAttempts($request)) { |
94 | 94 | $this->fireLockoutEvent($request); |
95 | 95 | |
96 | - return json_encode(['errors' => [ |
|
97 | - $this->loginUsername() => [$this->getLockoutErrorMessage($this->secondsRemainingOnLockout($request))] |
|
98 | - ]]); |
|
96 | + return json_encode([ 'errors' => [ |
|
97 | + $this->loginUsername() => [ $this->getLockoutErrorMessage($this->secondsRemainingOnLockout($request)) ] |
|
98 | + ] ]); |
|
99 | 99 | } |
100 | 100 | |
101 | - if($validation->fails()) { |
|
102 | - if ($throttles && ! $lockedOut) |
|
101 | + if ($validation->fails()) { |
|
102 | + if ($throttles && !$lockedOut) |
|
103 | 103 | $this->incrementLoginAttempts($request); |
104 | 104 | |
105 | - return json_encode(['errors' => $validation->errors()]); |
|
105 | + return json_encode([ 'errors' => $validation->errors() ]); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | $credentials = $this->getCredentials($request); |
109 | 109 | |
110 | - if(Auth::validate($credentials)) |
|
110 | + if (Auth::validate($credentials)) |
|
111 | 111 | { |
112 | - if(! $this->users->getByEmail($credentials['email'])->active) |
|
113 | - return json_encode(['errors' => ['This account has blocked. Please contact the support.']]); |
|
112 | + if (!$this->users->getByEmail($credentials[ 'email' ])->active) |
|
113 | + return json_encode([ 'errors' => [ 'This account has blocked. Please contact the support.' ] ]); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | if (Auth::guard($this->getGuard())->attempt($credentials, $request->has('remember'))) { |
@@ -123,10 +123,10 @@ discard block |
||
123 | 123 | |
124 | 124 | (new CreateWalletOrder($user)); |
125 | 125 | |
126 | - if(! $user->confirmed) |
|
127 | - return json_encode(['redirect' => route('resend_verify_email_form')]); |
|
126 | + if (!$user->confirmed) |
|
127 | + return json_encode([ 'redirect' => route('resend_verify_email_form') ]); |
|
128 | 128 | |
129 | - return json_encode([]); |
|
129 | + return json_encode([ ]); |
|
130 | 130 | } |
131 | 131 | } |
132 | 132 | |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | $validation = Validator::make( |
136 | 136 | $request->all(), RegisterUserRequest::getRules() |
137 | 137 | ); |
138 | - if($validation->fails()) |
|
139 | - return json_encode(['errors' => $validation->errors()]); |
|
138 | + if ($validation->fails()) |
|
139 | + return json_encode([ 'errors' => $validation->errors() ]); |
|
140 | 140 | |
141 | 141 | $user = $this->users->createSimpleUser($request->all()); |
142 | 142 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | Auth::guard($this->getGuard())->login($user); |
146 | 146 | |
147 | - return json_encode(['redirect' => route('resend_verify_email_form')]); |
|
147 | + return json_encode([ 'redirect' => route('resend_verify_email_form') ]); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -164,11 +164,11 @@ discard block |
||
164 | 164 | |
165 | 165 | $credentials = $this->getCredentials($request); |
166 | 166 | |
167 | - if(Auth::validate($credentials)) |
|
167 | + if (Auth::validate($credentials)) |
|
168 | 168 | { |
169 | - if(! $this->users->getByEmail($credentials['email'])->active) |
|
169 | + if (!$this->users->getByEmail($credentials[ 'email' ])->active) |
|
170 | 170 | return redirect()->back() |
171 | - ->withErrors(['account' => 'This account has blocked. Please contact the support.']); |
|
171 | + ->withErrors([ 'account' => 'This account has blocked. Please contact the support.' ]); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | if (Auth::guard($this->getGuard())->attempt($credentials, $request->has('remember'))) { |
@@ -189,13 +189,13 @@ discard block |
||
189 | 189 | |
190 | 190 | (new CreateWalletOrder($user)); |
191 | 191 | |
192 | - if(! $user->confirmed) |
|
192 | + if (!$user->confirmed) |
|
193 | 193 | return redirect()->route('resend_verify_email_form'); |
194 | 194 | |
195 | 195 | return redirect()->intended($this->redirectPath()); |
196 | 196 | } |
197 | 197 | |
198 | - if ($throttles && ! $lockedOut) { |
|
198 | + if ($throttles && !$lockedOut) { |
|
199 | 199 | $this->incrementLoginAttempts($request); |
200 | 200 | } |
201 | 201 |
@@ -99,8 +99,9 @@ discard block |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | if($validation->fails()) { |
102 | - if ($throttles && ! $lockedOut) |
|
103 | - $this->incrementLoginAttempts($request); |
|
102 | + if ($throttles && ! $lockedOut) { |
|
103 | + $this->incrementLoginAttempts($request); |
|
104 | + } |
|
104 | 105 | |
105 | 106 | return json_encode(['errors' => $validation->errors()]); |
106 | 107 | } |
@@ -109,8 +110,9 @@ discard block |
||
109 | 110 | |
110 | 111 | if(Auth::validate($credentials)) |
111 | 112 | { |
112 | - if(! $this->users->getByEmail($credentials['email'])->active) |
|
113 | - return json_encode(['errors' => ['This account has blocked. Please contact the support.']]); |
|
113 | + if(! $this->users->getByEmail($credentials['email'])->active) { |
|
114 | + return json_encode(['errors' => ['This account has blocked. Please contact the support.']]); |
|
115 | + } |
|
114 | 116 | } |
115 | 117 | |
116 | 118 | if (Auth::guard($this->getGuard())->attempt($credentials, $request->has('remember'))) { |
@@ -123,8 +125,9 @@ discard block |
||
123 | 125 | |
124 | 126 | (new CreateWalletOrder($user)); |
125 | 127 | |
126 | - if(! $user->confirmed) |
|
127 | - return json_encode(['redirect' => route('resend_verify_email_form')]); |
|
128 | + if(! $user->confirmed) { |
|
129 | + return json_encode(['redirect' => route('resend_verify_email_form')]); |
|
130 | + } |
|
128 | 131 | |
129 | 132 | return json_encode([]); |
130 | 133 | } |
@@ -135,8 +138,9 @@ discard block |
||
135 | 138 | $validation = Validator::make( |
136 | 139 | $request->all(), RegisterUserRequest::getRules() |
137 | 140 | ); |
138 | - if($validation->fails()) |
|
139 | - return json_encode(['errors' => $validation->errors()]); |
|
141 | + if($validation->fails()) { |
|
142 | + return json_encode(['errors' => $validation->errors()]); |
|
143 | + } |
|
140 | 144 | |
141 | 145 | $user = $this->users->createSimpleUser($request->all()); |
142 | 146 | |
@@ -166,9 +170,10 @@ discard block |
||
166 | 170 | |
167 | 171 | if(Auth::validate($credentials)) |
168 | 172 | { |
169 | - if(! $this->users->getByEmail($credentials['email'])->active) |
|
170 | - return redirect()->back() |
|
173 | + if(! $this->users->getByEmail($credentials['email'])->active) { |
|
174 | + return redirect()->back() |
|
171 | 175 | ->withErrors(['account' => 'This account has blocked. Please contact the support.']); |
176 | + } |
|
172 | 177 | } |
173 | 178 | |
174 | 179 | if (Auth::guard($this->getGuard())->attempt($credentials, $request->has('remember'))) { |
@@ -189,8 +194,9 @@ discard block |
||
189 | 194 | |
190 | 195 | (new CreateWalletOrder($user)); |
191 | 196 | |
192 | - if(! $user->confirmed) |
|
193 | - return redirect()->route('resend_verify_email_form'); |
|
197 | + if(! $user->confirmed) { |
|
198 | + return redirect()->route('resend_verify_email_form'); |
|
199 | + } |
|
194 | 200 | |
195 | 201 | return redirect()->intended($this->redirectPath()); |
196 | 202 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | */ |
69 | 69 | public function getEmailForm(GetEmailFormRequest $request, $provider, $social) |
70 | 70 | { |
71 | - return view('auth.email', ['social' => $social]); |
|
71 | + return view('auth.email', [ 'social' => $social ]); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | public function postEmailForm( |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | 'password' => $this->users->hashPassword(str_random(45)), |
86 | 86 | 'firstname' => $frst_n, |
87 | 87 | 'lastname' => $last_n |
88 | - ], (int)true); |
|
88 | + ], (int) true); |
|
89 | 89 | $this->service->tryToAssociateUser($social, $request->get('email')); |
90 | 90 | |
91 | 91 | $this->service->login($user); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | } elseif ($user instanceof User) { |
117 | 117 | $this->service->login($user); |
118 | 118 | |
119 | - if(! $user->checkAvatar()) |
|
119 | + if (!$user->checkAvatar()) |
|
120 | 120 | $this->service->avatar($s_user->getAvatar()); |
121 | 121 | |
122 | 122 | return redirect()->route('home'); |
@@ -116,8 +116,9 @@ |
||
116 | 116 | } elseif ($user instanceof User) { |
117 | 117 | $this->service->login($user); |
118 | 118 | |
119 | - if(! $user->checkAvatar()) |
|
120 | - $this->service->avatar($s_user->getAvatar()); |
|
119 | + if(! $user->checkAvatar()) { |
|
120 | + $this->service->avatar($s_user->getAvatar()); |
|
121 | + } |
|
121 | 122 | |
122 | 123 | return redirect()->route('home'); |
123 | 124 | } |
@@ -18,17 +18,17 @@ discard block |
||
18 | 18 | |
19 | 19 | public function index(SubscribeRequest $request) |
20 | 20 | { |
21 | - if (!$this->subscribe->checkSubscriber($request['email'])) |
|
21 | + if (!$this->subscribe->checkSubscriber($request[ 'email' ])) |
|
22 | 22 | { |
23 | 23 | $subscribe = $this->subscribe->sendSubscribe($request->all()); |
24 | 24 | |
25 | 25 | $this->sendEmail($subscribe); |
26 | 26 | } else { |
27 | - $subscribe = $this->subscribe->getByEmail($request['email']); |
|
27 | + $subscribe = $this->subscribe->getByEmail($request[ 'email' ]); |
|
28 | 28 | |
29 | 29 | if (!$subscribe->active) { |
30 | 30 | $subscribe->fill([ |
31 | - 'active' => (int)true, |
|
31 | + 'active' => (int) true, |
|
32 | 32 | ])->save(); |
33 | 33 | |
34 | 34 | $this->sendEmail($subscribe); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | private function sendEmail(Subscribe $subscribe) |
50 | 50 | { |
51 | - \Mail::send('email.subscribe', compact('subscribe'), function (Message $message) use ($subscribe) { |
|
51 | + \Mail::send('email.subscribe', compact('subscribe'), function(Message $message) use ($subscribe) { |
|
52 | 52 | $message->to($subscribe->email, sprintf('%s %s', $subscribe->email, $subscribe->token)) |
53 | 53 | ->subject("Amma subscribed message!"); |
54 | 54 | }); |