Completed
Pull Request — development (#731)
by Ashutosh
19:03 queued 09:03
created
app/Http/Controllers/Order/TaxRatesAndCodeExpiryController.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
                         '<td style="border-bottom: 1px solid#ccc; color: #333; 
187 187
                         font-family: Arial,sans-serif; font-size: 14px; line-height: 20px;
188 188
                          padding: 15px 8px;" valign="top">'.$this->currency($invoiceid).' '
189
-                         .$item->subtotal.'</td>'.
189
+                            .$item->subtotal.'</td>'.
190 190
                         '</tr>';
191 191
             }
192 192
         }
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
             return view('themes.default1.invoice.editPayment',
288 288
                 compact('amountReceived','clientid', 'client', 'invoices',  'orders',
289
-                  'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'symbol'));
289
+                    'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'symbol'));
290 290
         } catch (\Exception $e) {
291 291
             Bugsnag::notifyException($e);
292 292
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
             $orders = $order->where('client', $clientid)->get();
286 286
 
287 287
             return view('themes.default1.invoice.editPayment',
288
-                compact('amountReceived','clientid', 'client', 'invoices',  'orders',
288
+                compact('amountReceived', 'clientid', 'client', 'invoices', 'orders',
289 289
                   'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'symbol'));
290 290
         } catch (\Exception $e) {
291 291
             Bugsnag::notifyException($e);
Please login to merge, or discard this patch.
app/Model/Common/ChatScript.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
         return '';
34 34
 
35 35
         // return "Product  has been {$eventName}";
36
-         // \Auth::user()->activity;
36
+            // \Auth::user()->activity;
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
app/Model/Product/ProductCategory.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,6 +33,6 @@
 block discarded – undo
33 33
         return '';
34 34
 
35 35
         // return "Product  has been {$eventName}";
36
-         // \Auth::user()->activity;
36
+            // \Auth::user()->activity;
37 37
     }
38 38
 }
Please login to merge, or discard this patch.
app/Http/Controllers/Common/TemplateController.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -122,18 +122,18 @@  discard block
 block discarded – undo
122 122
     public function getTemplates()
123 123
     {
124 124
         return \DataTables::of($this->template->select('id', 'name', 'type')->get())
125
-                        ->addColumn('checkbox', function ($model) {
125
+                        ->addColumn('checkbox', function($model) {
126 126
                             return "<input type='checkbox' class='template_checkbox' 
127 127
                             value=".$model->id.' name=select[] id=check>';
128 128
                         })
129 129
 
130
-                         ->addColumn('name', function ($model) {
130
+                         ->addColumn('name', function($model) {
131 131
                              return $model->name;
132 132
                          })
133
-                        ->addColumn('type', function ($model) {
133
+                        ->addColumn('type', function($model) {
134 134
                             return $this->type->where('id', $model->type)->first()->name;
135 135
                         })
136
-                        ->addColumn('action', function ($model) {
136
+                        ->addColumn('action', function($model) {
137 137
                             return '<a href='.url('templates/'.$model->id.'/edit').
138 138
                             " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
139 139
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
             
285 285
             $settings = \App\Model\Common\Setting::find(1);
286 286
             $fromname = $settings->company;
287
-            \Mail::send('emails.mail', ['data' => $data], function ($m) use ($from, $to, $subject, $fromname, $toname, $cc, $attach) {
287
+            \Mail::send('emails.mail', ['data' => $data], function($m) use ($from, $to, $subject, $fromname, $toname, $cc, $attach) {
288 288
                 $m->from($from, $fromname);
289 289
 
290 290
                 $m->to($to, $toname)->subject($subject);
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
                             value=".$model->id.' name=select[] id=check>';
123 123
                         })
124 124
 
125
-                         ->addColumn('name', function ($model) {
126
-                             return $model->name;
127
-                         })
125
+                            ->addColumn('name', function ($model) {
126
+                                return $model->name;
127
+                            })
128 128
                         ->addColumn('type', function ($model) {
129 129
                             return $this->type->where('id', $model->type)->first()->name;
130 130
                         })
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
     }
269 269
 
270 270
     public function mailing($from, $to, $data, $subject, $replace = [],
271
-     $type = '', $fromname = '', $toname = '', $cc = [], $attach = [])
271
+        $type = '', $fromname = '', $toname = '', $cc = [], $attach = [])
272 272
     {
273 273
         try {
274 274
             $transform = [];
@@ -301,10 +301,10 @@  discard block
 block discarded – undo
301 301
             'date'       => date('Y-m-d H:i:s'),
302 302
             'from'       => $from,
303 303
             'to'         => $to,
304
-             'subject'   => $subject,
304
+                'subject'   => $subject,
305 305
             'body'       => $data,
306 306
             'status'     => 'success',
307
-          ]);
307
+            ]);
308 308
 
309 309
             return 'success';
310 310
         } catch (\Exception $ex) {
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
             'date'     => date('Y-m-d H:i:s'),
313 313
             'from'     => $from,
314 314
             'to'       => $to,
315
-             'subject' => $subject,
315
+                'subject' => $subject,
316 316
             'body'     => $data,
317 317
             'status'   => 'failed',
318 318
         ]);
Please login to merge, or discard this patch.
app/Model/Product/Product.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     protected static $logName = 'Product';
20 20
 
21 21
     protected static $logAttributes = ['name', 'description', 'type', 'file', 'category',
22
-         'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
22
+            'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
23 23
 
24 24
     protected static $logOnlyDirty = true;
25 25
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
     use LogsActivity;
11 11
     protected $table = 'products';
12 12
     protected $fillable = ['name', 'description', 'type', 'group', 'file', 'image', 'require_domain', 'category',
13
-        'can_modify_agent',  'can_modify_quantity', 'show_agent', 'tax_apply', 'show_product_quantity', 'hidden',  'auto_terminate',
13
+        'can_modify_agent', 'can_modify_quantity', 'show_agent', 'tax_apply', 'show_product_quantity', 'hidden', 'auto_terminate',
14 14
         'setup_order_placed', 'setup_first_payment', 'setup_accept_manually',
15 15
         'no_auto_setup', 'shoping_cart_link', 'process_url', 'github_owner',
16 16
         'github_repository',
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     protected static $logName = 'Product';
20 20
 
21 21
     protected static $logAttributes = ['name', 'description', 'type', 'file', 'category',
22
-         'github_owner', 'github_repository', 'version',  'subscription', 'hidden', 'product_sku', ];
22
+         'github_owner', 'github_repository', 'version', 'subscription', 'hidden', 'product_sku', ];
23 23
 
24 24
     protected static $logOnlyDirty = true;
25 25
 
Please login to merge, or discard this patch.
app/Console/Kernel.php 2 patches
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,15 +48,15 @@
 block discarded – undo
48 48
             $condition = new \App\Model\Mailjob\Condition();
49 49
             $command = $condition->getConditionValue($task);
50 50
             switch ($task) {
51
-            case 'expiryMail':
52
-               if ($expiryMailStatus == 1) {
53
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
54
-               }
51
+                case 'expiryMail':
52
+                   if ($expiryMailStatus == 1) {
53
+                       return $this->getCondition($schedule->command('expiry:notification'), $command);
54
+                   }
55 55
 
56
-            case 'deleteLogs':
57
-             if ($logDeleteStatus == 1) {
58
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
59
-             }
56
+                case 'deleteLogs':
57
+                 if ($logDeleteStatus == 1) {
58
+                     return $this->getCondition($schedule->command('activitylog:clean'), $command);
59
+                 }
60 60
             }
61 61
         }
62 62
     }
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
      */
18 18
     protected $commands = [
19 19
         //
20
-         'App\Console\Commands\Inspire',
21
-         \App\Console\Commands\Install::class,
22
-          CurrencyManage::class,
20
+            'App\Console\Commands\Inspire',
21
+            \App\Console\Commands\Install::class,
22
+            CurrencyManage::class,
23 23
         'App\Console\Commands\ExpiryCron',
24 24
     ];
25 25
 
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
             switch ($task) {
53 53
             case 'expiryMail':
54 54
                if ($expiryMailStatus == 1) {
55
-                   return $this->getCondition($schedule->command('expiry:notification'), $command);
56
-               }
55
+                    return $this->getCondition($schedule->command('expiry:notification'), $command);
56
+                }
57 57
 
58 58
             case 'deleteLogs':
59 59
              if ($logDeleteStatus == 1) {
60
-                 return $this->getCondition($schedule->command('activitylog:clean'), $command);
61
-             }
60
+                    return $this->getCondition($schedule->command('activitylog:clean'), $command);
61
+                }
62 62
             }
63 63
         }
64 64
     }
Please login to merge, or discard this patch.
app/Plugins/Ccavanue/Controllers/ProcessController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -120,10 +120,10 @@
 block discarded – undo
120 120
             $url = '';
121 121
             $crypto = new Crypto();
122 122
             $ccavanue = $this->ccavanue->findOrFail(1);
123
-            $workingKey = $ccavanue->working_key;  //Working Key should be provided here.
124
-            $encResponse = $request->get('encResp');   //This is the response sent by the CCAvenue Server
123
+            $workingKey = $ccavanue->working_key; //Working Key should be provided here.
124
+            $encResponse = $request->get('encResp'); //This is the response sent by the CCAvenue Server
125 125
 
126
-            $rcvdString = \Crypt::decrypt($encResponse, $workingKey);  //Crypto Decryption used as per the specified working key.
126
+            $rcvdString = \Crypt::decrypt($encResponse, $workingKey); //Crypto Decryption used as per the specified working key.
127 127
             $order_status = '';
128 128
             $decryptValues = explode('&', $rcvdString);
129 129
             $dataSize = count($decryptValues);
Please login to merge, or discard this patch.
app/Http/Controllers/Common/BaseTemplateController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@
 block discarded – undo
25 25
             $currencyAndSymbol = $cart_controller->currency();
26 26
             $currency = $currencyAndSymbol['currency'];
27 27
             $symbol = $currencyAndSymbol['symbol'];
28
-            if ($symbol == '') {  //If user has no currency symbol(In case of old customers)
28
+            if ($symbol == '') {
29
+//If user has no currency symbol(In case of old customers)
29 30
                 $symbol = Currency::where('code', $currency)->pluck('symbol')->first();
30 31
                 $symbol = \Auth::user()->update(['currency_symbol'=> $symbol]);
31 32
             }
Please login to merge, or discard this patch.
app/Http/Controllers/Common/BaseSettingsController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -435,7 +435,7 @@
 block discarded – undo
435 435
 
436 436
         StatusSetting::where('id', 1)->update(['recaptcha_status'=>$status]);
437 437
         ApiKey::where('id', 1)->update(['nocaptcha_sitekey'=> $nocaptcha_sitekey,
438
-         'captcha_secretCheck'                             => $captcha_secretCheck, ]);
438
+            'captcha_secretCheck'                             => $captcha_secretCheck, ]);
439 439
 
440 440
         return ['message' => 'success', 'update'=>'Recaptcha Settings Updated'];
441 441
     }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
 
297 297
         // validate detected / default PHP CLI
298 298
         // Because array_filter() preserves keys, you should consider the resulting array to be an associative array even if the original array had integer keys for there may be holes in your sequence of keys. This means that, for example, json_encode() will convert your result array into an object instead of an array. Call array_values() on the result array to guarantee json_encode() gives you an array.
299
-        $paths = array_values(array_filter($paths, function ($path) {
299
+        $paths = array_values(array_filter($paths, function($path) {
300 300
             return is_executable($path) && preg_match("/php[0-9\.a-z]{0,3}$/i", $path);
301 301
         }));
302 302
 
Please login to merge, or discard this patch.