Completed
Push — development ( f35ff8...60aad4 )
by Ashutosh
73:37 queued 63:38
created
app/Http/Controllers/Product/ProductTypeController.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,21 +34,21 @@
 block discarded – undo
34 34
             $allTypes = $this->productType->select('id', 'name')->get();
35 35
 
36 36
             return \DataTables::of($allTypes)
37
-         ->addColumn('checkbox', function ($model) {
38
-             return "<input type='checkbox' class='type_checkbox' 
37
+            ->addColumn('checkbox', function ($model) {
38
+                return "<input type='checkbox' class='type_checkbox' 
39 39
             value=".$model->id.' name=select[] id=check>';
40
-         })
41
-         ->addColumn('type_name', function ($model) {
42
-             return ucfirst($model->name);
43
-         })
44
-         ->addColumn('action', function ($model) {
45
-             return "<p><button data-toggle='modal' 
40
+            })
41
+            ->addColumn('type_name', function ($model) {
42
+                return ucfirst($model->name);
43
+            })
44
+            ->addColumn('action', function ($model) {
45
+                return "<p><button data-toggle='modal' 
46 46
              data-id=".$model->id." data-name= '$model->name' 
47 47
              class='btn btn-sm btn-primary btn-xs editType'><i class='fa fa-edit'
48 48
              style='color:white;'> </i>&nbsp;&nbsp;Edit</button>&nbsp;</p>";
49
-         })
50
-         ->rawColumns(['checkbox', 'type_name', 'action'])
51
-         ->make(true);
49
+            })
50
+            ->rawColumns(['checkbox', 'type_name', 'action'])
51
+            ->make(true);
52 52
         } catch (\Exception $ex) {
53 53
             Bugsnag::notifyException($ex);
54 54
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,14 +34,14 @@
 block discarded – undo
34 34
             $allTypes = $this->productType->select('id', 'name')->get();
35 35
 
36 36
             return \DataTables::of($allTypes)
37
-         ->addColumn('checkbox', function ($model) {
37
+         ->addColumn('checkbox', function($model) {
38 38
              return "<input type='checkbox' class='type_checkbox' 
39 39
             value=".$model->id.' name=select[] id=check>';
40 40
          })
41
-         ->addColumn('type_name', function ($model) {
41
+         ->addColumn('type_name', function($model) {
42 42
              return ucfirst($model->name);
43 43
          })
44
-         ->addColumn('action', function ($model) {
44
+         ->addColumn('action', function($model) {
45 45
              return "<p><button data-toggle='modal' 
46 46
              data-id=".$model->id." data-name= '$model->name' 
47 47
              class='btn btn-sm btn-primary btn-xs editType'><i class='fa fa-edit'
Please login to merge, or discard this patch.
app/Model/Order/Payment.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 {
9 9
     protected $table = 'payments';
10 10
     protected $fillable = ['parent_id', 'invoice_id', 'amount',
11
-     'payment_method', 'user_id', 'payment_status', 'created_at', 'amt_to_credit', ];
11
+        'payment_method', 'user_id', 'payment_status', 'created_at', 'amt_to_credit', ];
12 12
 
13 13
     public function invoice()
14 14
     {
Please login to merge, or discard this patch.
app/Http/Controllers/Common/ChatScriptController.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@
 block discarded – undo
36 36
                             value=".$model->id.' name=select[] id=check>';
37 37
                         })
38 38
 
39
-                         ->addColumn('name', function ($model) {
40
-                             return $model->name;
41
-                         })
39
+                            ->addColumn('name', function ($model) {
40
+                                return $model->name;
41
+                            })
42 42
 
43 43
                         ->addColumn('action', function ($model) {
44 44
                             return '<a href='.url('chat/'.$model->id.'/edit').
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,21 +32,21 @@
 block discarded – undo
32 32
     {
33 33
         try {
34 34
             return \DataTables::of($this->script->get())
35
-                        ->addColumn('checkbox', function ($model) {
35
+                        ->addColumn('checkbox', function($model) {
36 36
                             return "<input type='checkbox' class='chat_checkbox' 
37 37
                             value=".$model->id.' name=select[] id=check>';
38 38
                         })
39 39
 
40
-                         ->addColumn('name', function ($model) {
40
+                         ->addColumn('name', function($model) {
41 41
                              return $model->name;
42 42
                          })
43 43
 
44
-                        ->addColumn('action', function ($model) {
44
+                        ->addColumn('action', function($model) {
45 45
                             return '<a href='.url('chat/'.$model->id.'/edit').
46 46
                             " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
47 47
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
48 48
                         })
49
-                        ->rawColumns(['checkbox', 'name',  'action'])
49
+                        ->rawColumns(['checkbox', 'name', 'action'])
50 50
                         ->make(true);
51 51
         } catch (\Exception $ex) {
52 52
             return redirect()->back()->with('fails', $ex->getMessage());
Please login to merge, or discard this patch.
app/Http/Controllers/Front/WidgetController.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,19 +31,19 @@
 block discarded – undo
31 31
     public function getPages()
32 32
     {
33 33
         return \DataTables::of($this->widget->get())
34
-                       ->addColumn('checkbox', function ($model) {
35
-                           return "<input type='checkbox' class='widget_checkbox' 
34
+                        ->addColumn('checkbox', function ($model) {
35
+                            return "<input type='checkbox' class='widget_checkbox' 
36 36
                             value=".$model->id.' name=select[] id=check>';
37
-                       })
38
-                          ->addColumn('name', function ($model) {
39
-                              return ucfirst($model->name);
40
-                          })
37
+                        })
38
+                            ->addColumn('name', function ($model) {
39
+                                return ucfirst($model->name);
40
+                            })
41 41
                             ->addColumn('type', function ($model) {
42 42
                                 return $model->type;
43 43
                             })
44
-                              ->addColumn('created_at', function ($model) {
45
-                                  return $model->created_at;
46
-                              })
44
+                                ->addColumn('created_at', function ($model) {
45
+                                    return $model->created_at;
46
+                                })
47 47
                         // ->showColumns('name', 'type', 'created_at')
48 48
                         ->addColumn('content', function ($model) {
49 49
                             return str_limit($model->content, 10, '...');
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,24 +31,24 @@
 block discarded – undo
31 31
     public function getPages()
32 32
     {
33 33
         return \DataTables::of($this->widget->get())
34
-                       ->addColumn('checkbox', function ($model) {
34
+                       ->addColumn('checkbox', function($model) {
35 35
                            return "<input type='checkbox' class='widget_checkbox' 
36 36
                             value=".$model->id.' name=select[] id=check>';
37 37
                        })
38
-                          ->addColumn('name', function ($model) {
38
+                          ->addColumn('name', function($model) {
39 39
                               return ucfirst($model->name);
40 40
                           })
41
-                            ->addColumn('type', function ($model) {
41
+                            ->addColumn('type', function($model) {
42 42
                                 return $model->type;
43 43
                             })
44
-                              ->addColumn('created_at', function ($model) {
44
+                              ->addColumn('created_at', function($model) {
45 45
                                   return $model->created_at;
46 46
                               })
47 47
                         // ->showColumns('name', 'type', 'created_at')
48
-                        ->addColumn('content', function ($model) {
48
+                        ->addColumn('content', function($model) {
49 49
                             return str_limit($model->content, 10, '...');
50 50
                         })
51
-                        ->addColumn('action', function ($model) {
51
+                        ->addColumn('action', function($model) {
52 52
                             return '<a href='.url('widgets/'.$model->id.'/edit')."
53 53
                              class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
54 54
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
Please login to merge, or discard this patch.
app/Model/Payment/Currency.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 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
 
39 39
     public function country()
Please login to merge, or discard this patch.
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.