View GitHub Repository agorainvoicing

Schedule Inspection
Subscribe
Test Setup Failed
Branch — development (80c362)
by Ashutosh
14:59
created
Category
Toggle Patches
app/Http/Controllers/Payment/CurrencyController.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -46,24 +46,24 @@
 
 block discarded – undo
46 46 
                             return $model->name;
47 47 
                         })
48 48
49 
-                          ->addColumn('code', function ($model) {
50 
-                              return $model->code;
51 
-                          })
49 
+                            ->addColumn('code', function ($model) {
50 
+                                return $model->code;
51 
+                            })
52 52
53 
-                          ->addColumn('symbol', function ($model) {
54 
-                              return $model->symbol;
55 
-                          })
53 
+                            ->addColumn('symbol', function ($model) {
54 
+                                return $model->symbol;
55 
+                            })
56 56
57 
-                          ->addColumn('dashboard', function ($model) {
58 
-                              if ($model->status == 1) {
59 
-                                  $showButton = $this->getButtonColor($model->id);
57 
+                            ->addColumn('dashboard', function ($model) {
58 
+                                if ($model->status == 1) {
59 
+                                    $showButton = $this->getButtonColor($model->id);
60 60
61 
-                                  return $showButton;
62 
-                              } else {
63 
-                                  return  '<a class="btn btn-sm btn-secondary btn-xs disabled"><i class="fa fa-eye"
61 
+                                    return $showButton;
62 
+                                } else {
63 
+                                    return  '<a class="btn btn-sm btn-secondary btn-xs disabled"><i class="fa fa-eye"
64 64 
                                 style="color:white;"> </i>&nbsp;&nbsp;Show on Dashboard</a>';
65 
-                              }
66 
-                          })
65 
+                                }
66 
+                            })
67 67
68 68 
                         ->addColumn('status', function ($model) {
69 69 
                             if ($model->status == 1) {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -42,19 +42,19 @@  discard block
 
 block discarded – undo
42 42
43 43 
         return \DataTables::of($model)
44 44
45 
-                        ->addColumn('name', function ($model) {
45 
+                        ->addColumn('name', function($model) {
46 46 
                             return $model->name;
47 47 
                         })
48 48
49 
-                          ->addColumn('code', function ($model) {
49 
+                          ->addColumn('code', function($model) {
50 50 
                               return $model->code;
51 51 
                           })
52 52
53 
-                          ->addColumn('symbol', function ($model) {
53 
+                          ->addColumn('symbol', function($model) {
54 54 
                               return $model->symbol;
55 55 
                           })
56 56
57 
-                          ->addColumn('dashboard', function ($model) {
57 
+                          ->addColumn('dashboard', function($model) {
58 58 
                               if ($model->status == 1) {
59 59 
                                   $showButton = $this->getButtonColor($model->id);
60 60 
 
@@ -65,7 +65,7 @@  discard block
 
 block discarded – undo
65 65 
                               }
66 66 
                           })
67 67
68 
-                        ->addColumn('status', function ($model) {
68 
+                        ->addColumn('status', function($model) {
69 69 
                             if ($model->status == 1) {
70 70 
                                 return'<label class="switch toggle_event_editing">
71 71 
                             <input type="hidden" name="module_id" class="module_id" value="'.$model->id.'" >
 
@@ -225,7 +225,7 @@  discard block
 
 block discarded – undo
225 225 
     {
226 226 
         try {
227 227 
             $ids = $request->input('select');
228 
-            if (! empty($ids)) {
228 
+            if (!empty($ids)) {
229 229 
                 foreach ($ids as $id) {
230 230 
                     if ($id != 1) {
231 231 
                         $currency = $this->currency->where('id', $id)->first();
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/TaxController.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
                             ->addColumn('country', function ($model) {
86 86 
                                 if ($this->country->where('country_code_char2', $model->country)->first()) {
87 87 
                                     return ucfirst($this->country
88 
-                                      ->where('country_code_char2', $model->country)->first()->country_name);
88 
+                                        ->where('country_code_char2', $model->country)->first()->country_name);
89 89 
                                 } else {
90 90 
                                     return '--';
91 91 
                                 }
 
@@ -119,27 +119,27 @@  discard block
 
 block discarded – undo
119 119 
     public function getTaxTable()
120 120 
     {
121 121 
         return \DataTables::of(TaxByState::select('id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst')->get())
122 
-                         ->addColumn('id', function ($model) {
123 
-                             return $model->id;
124 
-                         })
125 
-
126 
-                         ->addColumn('state', function ($model) {
127 
-                             return ucfirst($model->state);
128 
-                         })
129 
-                         ->addColumn('c_gst', function ($model) {
130 
-                             return ucfirst($model->c_gst);
131 
-                         })
132 
-                         ->addColumn('s_gst', function ($model) {
133 
-                             return ucfirst($model->s_gst);
134 
-                         })
135 
-                         ->addColumn('i_gst', function ($model) {
136 
-                             return ucfirst($model->i_gst);
137 
-                         })
138 
-                         ->addColumn('ut_gst', function ($model) {
139 
-                             return ucfirst($model->ut_gst);
140 
-                         })
141 
-                          ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
142 
-                          ->make(true);
122 
+                            ->addColumn('id', function ($model) {
123 
+                                return $model->id;
124 
+                            })
125 
+
126 
+                            ->addColumn('state', function ($model) {
127 
+                                return ucfirst($model->state);
128 
+                            })
129 
+                            ->addColumn('c_gst', function ($model) {
130 
+                                return ucfirst($model->c_gst);
131 
+                            })
132 
+                            ->addColumn('s_gst', function ($model) {
133 
+                                return ucfirst($model->s_gst);
134 
+                            })
135 
+                            ->addColumn('i_gst', function ($model) {
136 
+                                return ucfirst($model->i_gst);
137 
+                            })
138 
+                            ->addColumn('ut_gst', function ($model) {
139 
+                                return ucfirst($model->ut_gst);
140 
+                            })
141 
+                            ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
142 
+                            ->make(true);
143 143 
     }
144 144
145 145 
     /**
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch 
@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
     {
50 50 
         try {
51 51 
             $options = $this->tax_option->find(1);
52 
-            if (! $options) {
52 
+            if (!$options) {
53 53 
                 $options = '';
54 54 
             }
55 55 
             $classes = $this->tax_class->pluck('name', 'id')->toArray();
 
@@ -70,19 +70,19 @@  discard block
 
 block discarded – undo
70 70 
     public function getTax()
71 71 
     {
72 72 
         return \DataTables::of($this->tax->select('id', 'tax_classes_id', 'name', 'country', 'state', 'rate')->get())
73 
-                            ->addColumn('checkbox', function ($model) {
73 
+                            ->addColumn('checkbox', function($model) {
74 74 
                                 return "<input type='checkbox' class='tax_checkbox'
75 75 
                                 value=".$model->id.' name=select[] id=check>';
76 76 
                             })
77 
-                            ->addColumn('tax_classes_id', function ($model) {
77 
+                            ->addColumn('tax_classes_id', function($model) {
78 78 
                                 return ucfirst($this->tax_class->where('id', $model->tax_classes_id)->first()->name);
79 79 
                             })
80 
-                            ->addColumn('name', function ($model) {
80 
+                            ->addColumn('name', function($model) {
81 81 
                                 return ucfirst($model->name);
82 82 
                             })
83 83
84 84 
                             // ->showColumns('name', 'level')
85 
-                            ->addColumn('country', function ($model) {
85 
+                            ->addColumn('country', function($model) {
86 86 
                                 if ($this->country->where('country_code_char2', $model->country)->first()) {
87 87 
                                     return ucfirst($this->country
88 88 
                                       ->where('country_code_char2', $model->country)->first()->country_name);
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
                                     return '--';
91 91 
                                 }
92 92 
                             })
93 
-                            ->addColumn('state', function ($model) {
93 
+                            ->addColumn('state', function($model) {
94 94 
                                 if ($this->state->where('state_subdivision_code', $model->state)->first()) {
95 95 
                                     return $this->state
96 96 
                                     ->where('state_subdivision_code', $model->state)
 
@@ -99,7 +99,7 @@  discard block
 
 block discarded – undo
99 99 
                                     return '--';
100 100 
                                 }
101 101 
                             })
102 
-                            ->addColumn('rate', function ($model) {
102 
+                            ->addColumn('rate', function($model) {
103 103 
                                 if ($model->rate) {
104 104 
                                     return $model->rate;
105 105 
                                 } else {
 
@@ -107,7 +107,7 @@  discard block
 
 block discarded – undo
107 107 
                                 }
108 108 
                             })
109 109
110 
-                            ->addColumn('action', function ($model) {
110 
+                            ->addColumn('action', function($model) {
111 111 
                                 return '<a href='.url('tax/'.$model->id.'/edit').
112 112 
                                 " class='btn btn-sm btn-secondary btn-xs'".tooltip('Edit')."<i class='fa fa-edit'
113 113 
                                 style='color:white;'> </i></a>";
 
@@ -119,26 +119,26 @@  discard block
 
 block discarded – undo
119 119 
     public function getTaxTable()
120 120 
     {
121 121 
         return \DataTables::of(TaxByState::select('id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst')->get())
122 
-                         ->addColumn('id', function ($model) {
122 
+                         ->addColumn('id', function($model) {
123 123 
                              return $model->id;
124 124 
                          })
125 125
126 
-                         ->addColumn('state', function ($model) {
126 
+                         ->addColumn('state', function($model) {
127 127 
                              return ucfirst($model->state);
128 128 
                          })
129 
-                         ->addColumn('c_gst', function ($model) {
129 
+                         ->addColumn('c_gst', function($model) {
130 130 
                              return ucfirst($model->c_gst);
131 131 
                          })
132 
-                         ->addColumn('s_gst', function ($model) {
132 
+                         ->addColumn('s_gst', function($model) {
133 133 
                              return ucfirst($model->s_gst);
134 134 
                          })
135 
-                         ->addColumn('i_gst', function ($model) {
135 
+                         ->addColumn('i_gst', function($model) {
136 136 
                              return ucfirst($model->i_gst);
137 137 
                          })
138 
-                         ->addColumn('ut_gst', function ($model) {
138 
+                         ->addColumn('ut_gst', function($model) {
139 139 
                              return ucfirst($model->ut_gst);
140 140 
                          })
141 
-                          ->rawColumns(['id', 'state',  'c_gst', 's_gst', 'i_gst', 'ut_gst'])
141 
+                          ->rawColumns(['id', 'state', 'c_gst', 's_gst', 'i_gst', 'ut_gst'])
142 142 
                           ->make(true);
143 143 
     }
144 144 
 
@@ -189,7 +189,7 @@  discard block
 
 block discarded – undo
189 189 
             }
190 190 
             $taxClassesName = $request->tax_classes_id;
191 191 
             $taxClass = TaxClass::where('name', $request->tax_classes_id)->first();
192 
-            if (! $taxClass) {
192 
+            if (!$taxClass) {
193 193 
                 $taxClass = $this->tax_class->create(['name'=>$taxClassesName]);
194 194 
             }
195 195 
             $taxId = $taxClass->id;
 
@@ -222,7 +222,7 @@  discard block
 
 block discarded – undo
222 222 
     {
223 223 
         try {
224 224 
             $ids = $request->input('select');
225 
-            if (! empty($ids)) {
225 
+            if (!empty($ids)) {
226 226 
                 foreach ($ids as $id) {
227 227 
                     $tax = $this->tax->where('id', $id)->first();
228 228 
                     $taxClassId = $tax->tax_classes_id;
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/PromotionController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -87,7 +87,7 @@
 
 block discarded – undo
87 87 
                             ." class='btn btn-sm btn-secondary btn-xs'".tooltip('Edit')."<i class='fa fa-edit'
88 88 
                             style='color:white;'> </i></a>";
89 89 
                         })
90 
-                         ->rawColumns(['checkbox', 'code', 'products', 'action'])
90 
+                            ->rawColumns(['checkbox', 'code', 'products', 'action'])
91 91
92 92 
                         ->make(true);
93 93 
     }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -59,30 +59,30 @@  discard block
 
 block discarded – undo
59 59 
         $new_promotion = $this->promotion->select('code', 'type', 'id')->get();
60 60
61 61 
         return\ DataTables::of($new_promotion)
62 
-                            ->addColumn('checkbox', function ($model) {
62 
+                            ->addColumn('checkbox', function($model) {
63 63 
                                 return "<input type='checkbox' class='promotion_checkbox'
64 64 
                                  value=".$model->id.' name=select[] id=check>';
65 65 
                             })
66 
-                        ->addColumn('code', function ($model) {
66 
+                        ->addColumn('code', function($model) {
67 67 
                             return ucfirst($model->code);
68 68 
                         })
69 
-                        ->addColumn('type', function ($model) {
69 
+                        ->addColumn('type', function($model) {
70 70 
                             return $this->type->where('id', $model->type)->first()->name;
71 71 
                         })
72 
-                        ->addColumn('products', function ($model) {
72 
+                        ->addColumn('products', function($model) {
73 73 
                             $selected = $this->promoRelation->select('product_id')
74 74 
                             ->where('promotion_id', $model->id)->get();
75 75 
                             $result = [];
76 76 
                             foreach ($selected as $key => $select) {
77 77 
                                 $result[$key] = $this->product->where('id', $select->product_id)->first()->name;
78 78 
                             }
79 
-                            if (! empty($result)) {
79 
+                            if (!empty($result)) {
80 80 
                                 return implode(',', $result);
81 81 
                             } else {
82 82 
                                 return 'None';
83 83 
                             }
84 84 
                         })
85 
-                        ->addColumn('action', function ($model) {
85 
+                        ->addColumn('action', function($model) {
86 86 
                             return '<a href='.url('promotions/'.$model->id.'/edit')
87 87 
                             ." class='btn btn-sm btn-secondary btn-xs'".tooltip('Edit')."<i class='fa fa-edit'
88 88 
                             style='color:white;'> </i></a>";
 
@@ -230,7 +230,7 @@  discard block
 
 block discarded – undo
230 230 
     {
231 231 
         try {
232 232 
             $ids = $request->input('select');
233 
-            if (! empty($ids)) {
233 
+            if (!empty($ids)) {
234 234 
                 foreach ($ids as $id) {
235 235 
                     $promotion = $this->promotion->where('id', $id)->first();
236 236 
                     if ($promotion) {
Please login to merge, or discard this patch.
app/Http/Controllers/Payment/BasePromotionController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -39,7 +39,7 @@
 
 block discarded – undo
39 39 
     {
40 40 
         $promo = Promotion::where('code', $code)->first();
41 41 
         //check promotion code is valid
42 
-        if (! $promo) {
42 
+        if (!$promo) {
43 43 
             throw new \Exception('Invalid promo code');
44 44 
         }
45 45 
         $relation = $promo->relation()->get();
Please login to merge, or discard this patch.
app/Http/Controllers/BaseHomeController.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -39,7 +39,7 @@  discard block
 
 block discarded – undo
39 39 
         try {
40 40 
             $order = new Order();
41 41 
             $this_order = $order->where('domain', $request_url)->first();
42 
-            if (! $this_order) {
42 
+            if (!$this_order) {
43 43 
                 return;
44 44 
             } else {
45 45 
                 return $this_order->domain;
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
             $order = new Order();
56 56 
             //$faveo_decrypted_key = self::decryptByFaveoPrivateKey($faveo_encrypted_key);
57 57 
             $this_order = $order->where('number', $order_number)->first();
58 
-            if (! $this_order) {
58 
+            if (!$this_order) {
59 59 
                 return;
60 60 
             } else {
61 61 
                 if ($this_order->serial_key == $faveo_encrypted_key) {
 
@@ -157,7 +157,7 @@  discard block
 
 block discarded – undo
157 157 
                     }
158 158 
                 }
159 159 
             } elseif ($licenseCode) {
160 
-                $orderForLicense = Order::all()->filter(function ($order) use ($licenseCode) {
160 
+                $orderForLicense = Order::all()->filter(function($order) use ($licenseCode) {
161 161 
                     if ($order->serial_key == $licenseCode) {
162 162 
                         return $order;
163 163 
                     }
 
@@ -183,7 +183,7 @@  discard block
 
 block discarded – undo
183 183 
         try {
184 184 
             $orderId = null;
185 185 
             $licenseCode = $request->input('licenseCode');
186 
-            $orderForLicense = Order::all()->filter(function ($order) use ($licenseCode) {
186 
+            $orderForLicense = Order::all()->filter(function($order) use ($licenseCode) {
187 187 
                 if ($order->serial_key == $licenseCode) {
188 188 
                     return $order;
189 189 
                 }
 
@@ -208,7 +208,7 @@  discard block
 
 block discarded – undo
208 208 
             $licCode = $request->input('licenseCode'); //The license code already existing for older client
209 209 
             $lastFour = $this->getLastFourDigistsOfLicenseCode($request->input('product'));
210 210 
             $existingLicense = Order::select('id', 'client', 'product', 'serial_key')->get()
211 
-                ->filter(function ($order) use ($licCode) {
211 
+                ->filter(function($order) use ($licCode) {
212 212 
                     return $order->serial_key == $licCode;
213 213 
                 })->first();
214 214
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -212,7 +212,8 @@
 
 block discarded – undo
212 212 
                     return $order->serial_key == $licCode;
213 213 
                 })->first();
214 214
215 
-            if ($existingLicense) {//If the license code that is sent in the request exists in billing
215 
+            if ($existingLicense) {
216 
+//If the license code that is sent in the request exists in billing
216 217 
                 $cont = new \App\Http\Controllers\License\LicenseController();
217 218 
                 $cont->updateInstalledDomain($licCode, $existingLicense->product); //Delete the installation first for the current license before updating license so that no Faveo installation exists on the user domain/IP path
218 219
Please login to merge, or discard this patch.
app/Http/Controllers/WelcomeController.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -56,10 +56,10 @@
 
 block discarded – undo
56 56 
                             ->addColumn('country', function ($model) {
57 57 
                                 return ucfirst($model->country);
58 58 
                             })
59 
-                              ->addColumn('count', function ($model) {
60 
-                                  return '<a href='.url('clients/'.$model->id.'?country='.$model->code).'>'
59 
+                                ->addColumn('count', function ($model) {
60 
+                                    return '<a href='.url('clients/'.$model->id.'?country='.$model->code).'>'
61 61 
                             .($model->count).'</a>';
62 
-                              })
62 
+                                })
63 63
64 64 
                             ->rawColumns(['country', 'count'])
65 65 
                             ->make(true);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -53,10 +53,10 @@
 
 block discarded – undo
53 53 
                 ->sortByDesc('count');
54 54
55 55 
         return\ DataTables::of($users)
56 
-                            ->addColumn('country', function ($model) {
56 
+                            ->addColumn('country', function($model) {
57 57 
                                 return ucfirst($model->country);
58 58 
                             })
59 
-                              ->addColumn('count', function ($model) {
59 
+                              ->addColumn('count', function($model) {
60 60 
                                   return '<a href='.url('clients/'.$model->id.'?country='.$model->code).'>'
61 61 
                             .($model->count).'</a>';
62 62 
                               })
Please login to merge, or discard this patch.
app/Http/Controllers/HomeController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -318,7 +318,7 @@
 
 block discarded – undo
318 318 
                     ->value('serial_key');
319 319
320 320 
             $this_order = $order
321 
-                     ->where('number', $faveo_encrypted_order_number)
321 
+                        ->where('number', $faveo_encrypted_order_number)
322 322 
                     ->first();
323 323 
             if ($this_order && $orderSerialKey == $faveo_serial_key) {
324 324 
                 $product_id = $this_order->product;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -123,7 +123,7 @@  discard block
 
 block discarded – undo
123 123 
             // Get the private Key
124 124 
             $path = storage_path('app'.DIRECTORY_SEPARATOR.'private.key');
125 125 
             $key_content = file_get_contents($path);
126 
-            if (! $privateKey = openssl_pkey_get_private($key_content)) {
126 
+            if (!$privateKey = openssl_pkey_get_private($key_content)) {
127 127 
                 dd('Private Key failed');
128 128 
             }
129 129 
             $a_key = openssl_pkey_get_details($privateKey);
 
@@ -136,7 +136,7 @@  discard block
 
 block discarded – undo
136 136 
                 $chunk = substr($encrypted, 0, $chunkSize);
137 137 
                 $encrypted = substr($encrypted, $chunkSize);
138 138 
                 $decrypted = '';
139 
-                if (! openssl_private_decrypt($chunk, $decrypted, $privateKey)) {
139 
+                if (!openssl_private_decrypt($chunk, $decrypted, $privateKey)) {
140 140 
                     dd('Failed to decrypt data');
141 141 
                 }
142 142 
                 $output .= $decrypted;
 
@@ -183,7 +183,7 @@  discard block
 
 block discarded – undo
183 183 
 //            $faveo_decrypted_order = self::decryptByFaveoPrivateKey($faveo_encrypted_order_number);
184 184
185 185 
             $this_order = $order->where('number', 'LIKE', $faveo_decrypted_order)->first();
186 
-            if (! $this_order) {
186 
+            if (!$this_order) {
187 187 
                 return;
188 188 
             } else {
189 189 
                 return $this_order->number;
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/LoginController.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -73,13 +73,13 @@  discard block
 
 block discarded – undo
73 73 
         $password = $request->input('password1');
74 74 
         $credentialsForEmail = ['email' => $usernameinput, 'password' => $password, 'active' => '1', 'mobile_verified' => '1'];
75 75 
         $auth = \Auth::attempt($credentialsForEmail, $request->has('remember'));
76 
-        if (! $auth) {//Check for correct email
76 
+        if (!$auth) {//Check for correct email
77 77 
             $credentialsForusername = ['user_name' => $usernameinput, 'password' => $password, 'active' => '1', 'mobile_verified' => '1'];
78 78 
             $auth = \Auth::attempt($credentialsForusername, $request->has('remember'));
79 79 
         }
80 
-        if (! $auth) {//Check for correct username
80 
+        if (!$auth) {//Check for correct username
81 81 
             $user = User::where('email', $usernameinput)->orWhere('user_name', $usernameinput)->first();
82 
-            if (! $user) {
82 
+            if (!$user) {
83 83 
                 return redirect()->back()
84 84 
                             ->withInput($request->only('email1', 'remember'))
85 85 
                             ->withErrors([
 
@@ -87,7 +87,7 @@  discard block
 
 block discarded – undo
87 87 
                             ]);
88 88 
             }
89 89
90 
-            if (! \Hash::check($password, $user->password)) {//Check for correct password
90 
+            if (!\Hash::check($password, $user->password)) {//Check for correct password
91 91 
                 return redirect()->back()
92 92 
                 ->withInput($request->only('email1', 'remember'))
93 93 
                 ->withErrors([
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -73,11 +73,13 @@  discard block
 
 block discarded – undo
73 73 
         $password = $request->input('password1');
74 74 
         $credentialsForEmail = ['email' => $usernameinput, 'password' => $password, 'active' => '1', 'mobile_verified' => '1'];
75 75 
         $auth = \Auth::attempt($credentialsForEmail, $request->has('remember'));
76 
-        if (! $auth) {//Check for correct email
76 
+        if (! $auth) {
77 
+//Check for correct email
77 78 
             $credentialsForusername = ['user_name' => $usernameinput, 'password' => $password, 'active' => '1', 'mobile_verified' => '1'];
78 79 
             $auth = \Auth::attempt($credentialsForusername, $request->has('remember'));
79 80 
         }
80 
-        if (! $auth) {//Check for correct username
81 
+        if (! $auth) {
82 
+//Check for correct username
81 83 
             $user = User::where('email', $usernameinput)->orWhere('user_name', $usernameinput)->first();
82 84 
             if (! $user) {
83 85 
                 return redirect()->back()
 
@@ -87,7 +89,8 @@  discard block
 
 block discarded – undo
87 89 
                             ]);
88 90 
             }
89 91
90 
-            if (! \Hash::check($password, $user->password)) {//Check for correct password
92 
+            if (! \Hash::check($password, $user->password)) {
93 
+//Check for correct password
91 94 
                 return redirect()->back()
92 95 
                 ->withInput($request->only('email1', 'remember'))
93 96 
                 ->withErrors([
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/AuthController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -163,8 +163,8 @@
 
 block discarded – undo
163 163 
             switch ($request->input('type')) {
164 164 
                 case 'text':
165 165 
                    $array = json_decode($result, true);
166 
-                   $response = ['type' => 'success',
167 
-                       'message'           => 'OTP has been resent to '.$number.'.Please Enter the OTP to login!!', ];
166 
+                    $response = ['type' => 'success',
167 
+                        'message'           => 'OTP has been resent to '.$number.'.Please Enter the OTP to login!!', ];
168 168
169 169 
                     break;
170 170
Please login to merge, or discard this patch.