ladybirdweb / agorainvoicing

app/Model/Order/Payment.php

Indentation +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     protected $table = 'payments';
     protected $fillable = ['parent_id', 'invoice_id', 'amount',
-     'payment_method', 'user_id', 'payment_status', 'created_at','amt_to_credit' ];
+        'payment_method', 'user_id', 'payment_status', 'created_at','amt_to_credit' ];
 
     public function invoice()
     {

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     protected $table = 'payments';
     protected $fillable = ['parent_id', 'invoice_id', 'amount',
-     'payment_method', 'user_id', 'payment_status', 'created_at','amt_to_credit' ];
+     'payment_method', 'user_id', 'payment_status', 'created_at', 'amt_to_credit'];
 
     public function invoice()
     {

app/Http/Controllers/Order/ExtendedBaseInvoiceController.php

Indentation +5 added lines, -9 removed lines

@@ -35,7 +35,7 @@ 
             $orders = $order->where('client', $clientid)->get();
 
             return view('themes.default1.invoice.newpayment', compact('clientid', 'client', 'invoices',  'orders',
-                  'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
+                    'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
         } catch (Exception $ex) {
             return redirect()->back()->with('fails', $ex->getMessage());
         }
@@ -45,9 +45,9 @@ 
     {
         dd('sad');
         $this->validate($request, [
-           'payment_date'  => 'required',
-           'payment_method'=> 'required',
-           'amount'        => 'required',
+            'payment_date'  => 'required',
+            'payment_method'=> 'required',
+            'amount'        => 'required',
         ]);
 
         try {
@@ -215,8 +215,4 @@ 
             app('log')->error($ex->getMessage());
             Bugsnag::notifyException($ex);
 
-            return redirect()->back()->with('fails', $ex->getMessage());
-        }
-
-    }
-}
+            return redirect()->back()->with('fails', $ex->getMessage
\ No newline at end of file

Switch Indentation +1 added lines, -5 removed lines

@@ -215,8 +215,4 @@
             app('log')->error($ex->getMessage());
             Bugsnag::notifyException($ex);
 
-            return redirect()->back()->with('fails', $ex->getMessage());
-        }
-
-    }
-}
+            return redirect()->back()->with('fails', $ex->getMessage
\ No newline at end of file

Spacing +3 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
             $currency = $client->currency;
             $orders = $order->where('client', $clientid)->get();
 
-            return view('themes.default1.invoice.newpayment', compact('clientid', 'client', 'invoices',  'orders',
+            return view('themes.default1.invoice.newpayment', compact('clientid', 'client', 'invoices', 'orders',
                   'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
         } catch (Exception $ex) {
             return redirect()->back()->with('fails', $ex->getMessage());
@@ -97,7 +97,7 @@ 
             $invoiceChecked = $request->invoiceChecked;
             $invoicAmount = $request->invoiceAmount;
             $amtToCredit = $request->amtToCredit;
-<<<<<<< HEAD
+<< << <<< HEAD
             $payment_status= "success";
             $payment = $this->multiplePayment($clientid,$invoiceChecked, $payment_method,
              $payment_date, $totalAmt,$invoicAmount,$amtToCredit,$payment_status);
@@ -215,8 +215,4 @@ 
             app('log')->error($ex->getMessage());
             Bugsnag::notifyException($ex);
 
-            return redirect()->back()->with('fails', $ex->getMessage());
-        }
-
-    }
-}
+            return redirect()->back()->with('fails', $ex->getMessage
\ No newline at end of file

Braces +1 added lines, -5 removed lines

@@ -215,8 +215,4 @@
             app('log')->error($ex->getMessage());
             Bugsnag::notifyException($ex);
 
-            return redirect()->back()->with('fails', $ex->getMessage());
-        }
-
-    }
-}
+            return redirect()->back()->with('fails', $ex->getMessage
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -215,8 +215,4 @@
             app('log')->error($ex->getMessage());
             Bugsnag::notifyException($ex);
 
-            return redirect()->back()->with('fails', $ex->getMessage());
-        }
-
-    }
-}
+            return redirect()->back()->with('fails', $ex->getMessage
\ No newline at end of file

app/Http/Controllers/Order/TaxRatesAndCodeExpiryController.php

Indentation +7 added lines, -7 removed lines

@@ -183,7 +183,7 @@ 
                         '<td style="border-bottom: 1px solid#ccc; color: #333; 
                         font-family: Arial,sans-serif; font-size: 14px; line-height: 20px;
                          padding: 15px 8px;" valign="top">'.$this->currency($invoiceid).' '
-                         .$item->subtotal.'</td>'.
+                            .$item->subtotal.'</td>'.
                         '</tr>';
             }
         }
@@ -265,10 +265,10 @@ 
     {
         try {
             $cltCont = new \App\Http\Controllers\User\ClientController();
-             $amountReceived = $cltCont->getAmountPaid($id);
+                $amountReceived = $cltCont->getAmountPaid($id);
             $payment = Payment::find($id);
             $clientid = $payment->user_id;
-             $invoice = new Invoice();
+                $invoice = new Invoice();
             $order = new Order();
             $invoices = $invoice->where('user_id', $clientid)->where('status', '=', 'pending')->orderBy('created_at', 'desc')->get();
             $cltCont = new \App\Http\Controllers\User\ClientController();
@@ -278,8 +278,8 @@ 
             $client = $this->user->where('id', $clientid)->first();
             $currency = $client->currency;
             $orders = $order->where('client', $clientid)->get();
-              return view('themes.default1.invoice.editPayment',compact('amountReceived','clientid', 'client', 'invoices',  'orders',
-                  'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
+                return view('themes.default1.invoice.editPayment',compact('amountReceived','clientid', 'client', 'invoices',  'orders',
+                    'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
 
 
 
@@ -287,8 +287,8 @@ 
         
             
         } catch (Exception $e) {
-             Bugsnag::notifyException($e);
-             return redirect()->back()->with('fails', $e->getMessage());
+                Bugsnag::notifyException($e);
+                return redirect()->back()->with('fails', $e->getMessage());
         }
     }
 

Spacing +1 added lines, -1 removed lines

@@ -278,7 +278,7 @@
             $client = $this->user->where('id', $clientid)->first();
             $currency = $client->currency;
             $orders = $order->where('client', $clientid)->get();
-              return view('themes.default1.invoice.editPayment',compact('amountReceived','clientid', 'client', 'invoices',  'orders',
+              return view('themes.default1.invoice.editPayment', compact('amountReceived', 'clientid', 'client', 'invoices', 'orders',
                   'invoiceSum', 'amountReceived', 'pendingAmount', 'currency'));
 
 

app/Http/Controllers/User/ClientController.php

Indentation +23 added lines, -23 removed lines

@@ -73,29 +73,29 @@ 
         $position = $request->input('position');
 
         $user = $this->advanceSearch($name, $username, $company,
-         $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position);
+            $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position);
 
         return\ DataTables::of($user->get())
-                         ->addColumn('checkbox', function ($model) {
-                             return "<input type='checkbox' class='user_checkbox' 
+                            ->addColumn('checkbox', function ($model) {
+                                return "<input type='checkbox' class='user_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
-                         })
+                            })
                         ->addColumn('first_name', function ($model) {
                             return '<a href='.url('clients/'.$model->id).'>'
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
                         })
-                         ->addColumn('email', function ($model) {
-                             return $model->email;
-                         })
-                          ->addColumn('created_at', function ($model) {
-                              $ends = $model->created_at;
-                              if ($ends) {
-                                  $date = date_create($ends);
-                                  $end = date_format($date, 'l, F j, Y H:m');
-                              }
-
-                              return $end;
-                          })
+                            ->addColumn('email', function ($model) {
+                                return $model->email;
+                            })
+                            ->addColumn('created_at', function ($model) {
+                                $ends = $model->created_at;
+                                if ($ends) {
+                                    $date = date_create($ends);
+                                    $end = date_format($date, 'l, F j, Y H:m');
+                                }
+
+                                return $end;
+                            })
                         // ->showColumns('email', 'created_at')
                         ->addColumn('active', function ($model) {
                             if ($model->active == 1) {
@@ -208,7 +208,7 @@ 
 
             return view('themes.default1.user.client.show',
                 compact('id', 'client', 'invoices', 'model_popup', 'orders',
-                 'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency','extraAmt'));
+                    'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency','extraAmt'));
         } catch (\Exception $ex) {
             app('log')->useDailyFiles(storage_path().'/logs/laravel.log');
             app('log')->info($ex->getMessage());
@@ -402,9 +402,9 @@ 
                 return \Response::json([]);
             }
             $users = User::where('email', 'LIKE', '%'.$term.'%')
-             ->orWhere('first_name', 'LIKE', '%'.$term.'%')
-             ->orWhere('last_name', 'LIKE', '%'.$term.'%')
-             ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get();
+                ->orWhere('first_name', 'LIKE', '%'.$term.'%')
+                ->orWhere('last_name', 'LIKE', '%'.$term.'%')
+                ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get();
             $formatted_tags = [];
 
             foreach ($users as $user) {
@@ -420,8 +420,8 @@ 
     }
 
     public function advanceSearch($name = '', $username = '', $company = '',
-     $mobile = '', $email = '', $country = '', $industry = '',
-      $company_type = '', $company_size = '', $role = '', $position = '')
+        $mobile = '', $email = '', $country = '', $industry = '',
+        $company_type = '', $company_size = '', $role = '', $position = '')
     {
         $join = \DB::table('users');
         $join = $this->getNamUserCom($join, $name, $username, $company);
@@ -431,7 +431,7 @@ 
 
         $join = $join->orderBy('created_at', 'desc')
         ->select('id', 'first_name', 'last_name', 'email', 'created_at',
-         'active', 'mobile_verified', 'role', 'position');
+            'active', 'mobile_verified', 'role', 'position');
 
         return $join;
     }

Spacing +8 added lines, -8 removed lines

@@ -76,18 +76,18 @@ 
          $mobile, $email, $country, $industry, $company_type, $company_size, $role, $position);
 
         return\ DataTables::of($user->get())
-                         ->addColumn('checkbox', function ($model) {
+                         ->addColumn('checkbox', function($model) {
                              return "<input type='checkbox' class='user_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
                          })
-                        ->addColumn('first_name', function ($model) {
+                        ->addColumn('first_name', function($model) {
                             return '<a href='.url('clients/'.$model->id).'>'
                             .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>';
                         })
-                         ->addColumn('email', function ($model) {
+                         ->addColumn('email', function($model) {
                              return $model->email;
                          })
-                          ->addColumn('created_at', function ($model) {
+                          ->addColumn('created_at', function($model) {
                               $ends = $model->created_at;
                               if ($ends) {
                                   $date = date_create($ends);
@@ -97,7 +97,7 @@ 
                               return $end;
                           })
                         // ->showColumns('email', 'created_at')
-                        ->addColumn('active', function ($model) {
+                        ->addColumn('active', function($model) {
                             if ($model->active == 1) {
                                 $email = "<span class='glyphicon glyphicon-envelope'
                                  style='color:green' title='verified email'></span>";
@@ -115,7 +115,7 @@ 
 
                             return $email.'&nbsp;&nbsp;'.$mobile;
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('clients/'.$model->id.'/edit')
                             ." class='btn btn-sm btn-primary btn-xs'>
                             <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>"
@@ -124,7 +124,7 @@ 
                                     <i class='fa fa-eye' style='color:white;'> </i>&nbsp;&nbsp;View</a>";
                             // return 'hhhh';
                         })
-                        ->rawColumns(['checkbox', 'first_name', 'email',  'created_at', 'active', 'action'])
+                        ->rawColumns(['checkbox', 'first_name', 'email', 'created_at', 'active', 'action'])
                         ->make(true);
 
         // ->searchColumns('email', 'first_name')
@@ -208,7 +208,7 @@ 
 
             return view('themes.default1.user.client.show',
                 compact('id', 'client', 'invoices', 'model_popup', 'orders',
-                 'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency','extraAmt'));
+                 'payments', 'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'extraAmt'));
         } catch (\Exception $ex) {
             app('log')->useDailyFiles(storage_path().'/logs/laravel.log');
             app('log')->info($ex->getMessage());