ladybirdweb / agorainvoicing

app/Http/Controllers/Order/InvoiceController.php

Braces +10 added lines, -5 removed lines

@@ -475,7 +475,8 @@ 
             if ($this->tax_option->findOrFail(1)->inclusive == 0) {
                 if ($this->tax_option->findOrFail(1)->tax_enable == 1) {
                     $taxs = $this->getTaxWhenEnable($productid, $taxs[0], $userid);
-                } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0
+                } elseif ($this->tax_option->tax_enable == 0) {
+//if tax_enable is 0
 
                     $taxClassId = Tax::where('country', '')->where('state', 'Any State')
                      ->pluck('tax_classes_id')->first(); //In case of India when
@@ -484,13 +485,15 @@ 
                         $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
                         $taxs = $rate['taxes'];
                         $rate = $rate['rate'];
-                    } elseif ($geoip_country != 'IN') {//In case of other country
+                    } elseif ($geoip_country != 'IN') {
+//In case of other country
                         // when tax is available and tax is not enabled(Applicable
                         //when Global Tax class for any country and state is not there)
 
                         $taxClassId = Tax::where('state', $geoip_state)
                         ->orWhere('country', $geoip_country)->pluck('tax_classes_id')->first();
-                        if ($taxClassId) { //if state equals the user State
+                        if ($taxClassId) {
+//if state equals the user State
                             $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
                             $taxs = $rate['taxes'];
                             $rate = $rate['rate'];
@@ -533,11 +536,13 @@ 
         $i_gst = 0;
         $ut_gst = 0;
         $state_code = '';
-        if ($user_state != '') {//Get the CGST,SGST,IGST,STATE_CODE of the user
+        if ($user_state != '') {
+//Get the CGST,SGST,IGST,STATE_CODE of the user
             $tax = $this->getTaxWhenState($user_state, $productid, $origin_state);
             $taxes = $tax['taxes'];
             $value = $tax['value'];
-        } else {//If user from other Country
+        } else {
+//If user from other Country
             $tax = $this->getTaxWhenOtherCountry($geoip_state, $geoip_country, $productid);
             $taxes = $tax['taxes'];
             $value = $tax['value'];

Indentation +44 added lines, -44 removed lines

@@ -125,12 +125,12 @@ 
         $query = $this->advanceSearch($name, $invoice_no, $currency, $status, $from, $till);
 
         return \DataTables::of($query->take(100))
-         ->setTotalRecords($query->count())
+            ->setTotalRecords($query->count())
 
-         ->addColumn('checkbox', function ($model) {
-             return "<input type='checkbox' class='invoice_checkbox' 
+            ->addColumn('checkbox', function ($model) {
+                return "<input type='checkbox' class='invoice_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
-         })
+            })
                         ->addColumn('user_id', function ($model) {
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
@@ -138,9 +138,9 @@ 
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
                         })
-                         ->addColumn('number', function ($model) {
-                             return ucfirst($model->number);
-                         })
+                            ->addColumn('number', function ($model) {
+                                return ucfirst($model->number);
+                            })
 
                         ->addColumn('date', function ($model) {
                             $date = ($model->created_at);
@@ -148,12 +148,12 @@ 
                             return $date;
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
                         })
-                         ->addColumn('grand_total', function ($model) {
-                             return ucfirst($model->number);
-                         })
-                          ->addColumn('status', function ($model) {
-                              return ucfirst($model->status);
-                          })
+                            ->addColumn('grand_total', function ($model) {
+                                return ucfirst($model->number);
+                            })
+                            ->addColumn('status', function ($model) {
+                                return ucfirst($model->status);
+                            })
 
                         ->addColumn('action', function ($model) {
                             $action = '';
@@ -171,30 +171,30 @@ 
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
                                     ."   $action";
                         })
-                         ->filterColumn('user_id', function ($query, $keyword) {
-                             $sql = 'first_name like ?';
-                             $query->whereRaw($sql, ["%{$keyword}%"]);
-                         })
+                            ->filterColumn('user_id', function ($query, $keyword) {
+                                $sql = 'first_name like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
 
-                          ->filterColumn('status', function ($query, $keyword) {
-                              $sql = 'status like ?';
-                              $query->whereRaw($sql, ["%{$keyword}%"]);
-                          })
+                            ->filterColumn('status', function ($query, $keyword) {
+                                $sql = 'status like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
 
                         ->filterColumn('number', function ($query, $keyword) {
                             $sql = 'number like ?';
                             $query->whereRaw($sql, ["%{$keyword}%"]);
                         })
-                         ->filterColumn('grand_total', function ($query, $keyword) {
-                             $sql = 'grand_total like ?';
-                             $query->whereRaw($sql, ["%{$keyword}%"]);
-                         })
-                          ->filterColumn('date', function ($query, $keyword) {
-                              $sql = 'date like ?';
-                              $query->whereRaw($sql, ["%{$keyword}%"]);
-                          })
-
-                         ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
+                            ->filterColumn('grand_total', function ($query, $keyword) {
+                                $sql = 'grand_total like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
+                            ->filterColumn('date', function ($query, $keyword) {
+                                $sql = 'date like ?';
+                                $query->whereRaw($sql, ["%{$keyword}%"]);
+                            })
+
+                            ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
                         ->make(true);
     }
 
@@ -234,7 +234,7 @@ 
         $join = $join->select('id', 'user_id', 'number', 'date', 'grand_total', 'currency', 'status', 'created_at');
 
         $join = $join->orderBy('created_at', 'desc')
-         ->select('invoices.id','first_name','invoices.created_at',
+            ->select('invoices.id','first_name','invoices.created_at',
             'invoices.currency', 'user_id', 'number', 'status');
 
         return $join;
@@ -384,8 +384,8 @@ 
             $symbol = $attributes[0]['currency'][0]['code'];
             //dd($symbol);
             $invoice = $this->invoice->create(['user_id' => $user_id, 'number' => $number,
-             'date'                                      => $date, 'grand_total' => $grand_total, 'status' => 'pending',
-             'currency'                                  => $symbol, ]);
+                'date'                                      => $date, 'grand_total' => $grand_total, 'status' => 'pending',
+                'currency'                                  => $symbol, ]);
 
             foreach (\Cart::getContent() as $cart) {
                 $this->createInvoiceItems($invoice->id, $cart);
@@ -489,7 +489,7 @@ 
                 'currency'                        => $currency, 'status' => 'pending', 'description' => $description, ]);
 
             $items = $this->createInvoiceItemsByAdmin($invoice->id, $productid,
-             $code, $total, $currency, $qty, $plan, $user_id, $tax_name, $tax_rate);
+                $code, $total, $currency, $qty, $plan, $user_id, $tax_name, $tax_rate);
             $result = $this->getMessage($items, $user_id);
         } catch (\Exception $ex) {
             app('log')->useDailyFiles(storage_path().'/laravel.log');
@@ -638,7 +638,7 @@ 
                 } elseif ($this->tax_option->tax_enable == 0) {//if tax_enable is 0
 
                     $taxClassId = Tax::where('country', '')->where('state', 'Any State')
-                     ->pluck('tax_classes_id')->first(); //In case of India when
+                        ->pluck('tax_classes_id')->first(); //In case of India when
                     //other tax is available and tax is not enabled
                     if ($taxClassId) {
                         $rate = $this->getTotalRate($taxClassId, $productid, $taxs);
@@ -707,10 +707,10 @@ 
         foreach ($taxes as $key => $tax) {
             if ($taxes[0]) {
                 $tax_attribute[$key] = ['name' => $tax->name, 'name1' => $name1,
-                 'name2'                       => $name2, 'name3' => $name3, 'name4' => $name4,
-                 'rate'                        => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst,
-                 'rate3'                       => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code,
-                  'origin_state'               => $origin_state, ];
+                    'name2'                       => $name2, 'name3' => $name3, 'name4' => $name4,
+                    'rate'                        => $value, 'rate1'=>$c_gst, 'rate2'=>$s_gst,
+                    'rate3'                       => $i_gst, 'rate4'=>$ut_gst, 'state'=>$state_code,
+                    'origin_state'               => $origin_state, ];
 
                 $rate = $tax->rate;
 
@@ -920,8 +920,8 @@ 
                 }
 
                 return view('themes.default1.invoice.payment',
-                 compact('invoice_status', 'payment_status',
-                  'payment_method', 'invoice_id', 'domain', 'invoice', 'userid'));
+                    compact('invoice_status', 'payment_status',
+                    'payment_method', 'invoice_id', 'domain', 'invoice', 'userid'));
             }
 
             return redirect()->back();
@@ -959,7 +959,7 @@ 
                 case 1:
                     $percentage = $price * ($value / 100);
 
-                     return $price - $percentage;
+                        return $price - $percentage;
                 case 2:
                     return $price - $value;
                 case 3:
@@ -991,7 +991,7 @@ 
             $payment_date = \Carbon\Carbon::now()->toDateTimeString();
             $amount = $grand_total;
             $paymentRenewal = $this->updateInvoicePayment($invoiceid, $payment_method,
-             $payment_status, $payment_date, $amount);
+                $payment_status, $payment_date, $amount);
 
             return redirect()->back()->with('success', 'Payment Accepted Successfully');
         } catch (\Exception $ex) {

Spacing +14 added lines, -14 removed lines

@@ -104,7 +104,7 @@ 
             $from = $request->input('from');
             $till = $request->input('till');
 
-            return view('themes.default1.invoice.index', compact('name','invoice_no','status','currencies','currency_id','from',
+            return view('themes.default1.invoice.index', compact('name', 'invoice_no', 'status', 'currencies', 'currency_id', 'from',
 
                 'till'));
         } catch (\Exception $ex) {
@@ -127,35 +127,35 @@ 
         return \DataTables::of($query->take(100))
          ->setTotalRecords($query->count())
 
-         ->addColumn('checkbox', function ($model) {
+         ->addColumn('checkbox', function($model) {
              return "<input type='checkbox' class='invoice_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
          })
-                        ->addColumn('user_id', function ($model) {
+                        ->addColumn('user_id', function($model) {
                             $first = $this->user->where('id', $model->user_id)->first()->first_name;
                             $last = $this->user->where('id', $model->user_id)->first()->last_name;
                             $id = $this->user->where('id', $model->user_id)->first()->id;
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
                         })
-                         ->addColumn('number', function ($model) {
+                         ->addColumn('number', function($model) {
                              return ucfirst($model->number);
                          })
 
-                        ->addColumn('date', function ($model) {
+                        ->addColumn('date', function($model) {
                             $date = ($model->created_at);
 
                             return $date;
                             // return "<span style='display:none'>$model->id</span>".$date->format('l, F j, Y H:m');
                         })
-                         ->addColumn('grand_total', function ($model) {
+                         ->addColumn('grand_total', function($model) {
                              return ucfirst($model->number);
                          })
-                          ->addColumn('status', function ($model) {
+                          ->addColumn('status', function($model) {
                               return ucfirst($model->status);
                           })
 
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             $action = '';
 
                             $check = $this->checkExecution($model->id);
@@ -171,25 +171,25 @@ 
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>"
                                     ."   $action";
                         })
-                         ->filterColumn('user_id', function ($query, $keyword) {
+                         ->filterColumn('user_id', function($query, $keyword) {
                              $sql = 'first_name like ?';
                              $query->whereRaw($sql, ["%{$keyword}%"]);
                          })
 
-                          ->filterColumn('status', function ($query, $keyword) {
+                          ->filterColumn('status', function($query, $keyword) {
                               $sql = 'status like ?';
                               $query->whereRaw($sql, ["%{$keyword}%"]);
                           })
 
-                        ->filterColumn('number', function ($query, $keyword) {
+                        ->filterColumn('number', function($query, $keyword) {
                             $sql = 'number like ?';
                             $query->whereRaw($sql, ["%{$keyword}%"]);
                         })
-                         ->filterColumn('grand_total', function ($query, $keyword) {
+                         ->filterColumn('grand_total', function($query, $keyword) {
                              $sql = 'grand_total like ?';
                              $query->whereRaw($sql, ["%{$keyword}%"]);
                          })
-                          ->filterColumn('date', function ($query, $keyword) {
+                          ->filterColumn('date', function($query, $keyword) {
                               $sql = 'date like ?';
                               $query->whereRaw($sql, ["%{$keyword}%"]);
                           })
@@ -234,7 +234,7 @@ 
         $join = $join->select('id', 'user_id', 'number', 'date', 'grand_total', 'currency', 'status', 'created_at');
 
         $join = $join->orderBy('created_at', 'desc')
-         ->select('invoices.id','first_name','invoices.created_at',
+         ->select('invoices.id', 'first_name', 'invoices.created_at',
             'invoices.currency', 'user_id', 'number', 'status');
 
         return $join;

app/Http/Controllers/User/ClientController.php

Spacing +7 added lines, -7 removed lines

@@ -75,18 +75,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);
@@ -96,7 +96,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>";
@@ -114,7 +114,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>"
@@ -123,7 +123,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')

app/Http/Controllers/Order/ExtendedBaseInvoiceController.php

Indentation +8 added lines, -8 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());
         }
@@ -44,9 +44,9 @@ 
     public function postNewPayment($clientid, Request $request)
     {
         $this->validate($request, [
-           'payment_date'  => 'required',
-           'payment_method'=> 'required',
-           'amount'        => 'required',
+            'payment_date'  => 'required',
+            'payment_method'=> 'required',
+            'amount'        => 'required',
         ]);
 
         try {
@@ -111,7 +111,7 @@ 
             $amtToCredit = $request->amtToCredit;
             $payment_status = 'success';
             $payment = $this->multiplePayment($clientid,$invoiceChecked, $payment_method,
-             $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
+                $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
             $response = ['type' => 'success', 'message' => 'Payment Updated Successfully'];
 
             return response()->json($response);
@@ -129,7 +129,7 @@ 
     }
 
     public function multiplePayment($clientid,$invoiceChecked, $payment_method,
-             $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
+                $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
     {
         try {
             foreach ($invoiceChecked as $key => $value) {
@@ -193,7 +193,7 @@ 
             $amtToCredit = $request->amtToCredit;
             $payment_status = 'success';
             $payment = $this->updatePaymentByInvoice($clientid,$invoiceChecked, $payment_method,
-             $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
+                $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
             $response = ['type' => 'success', 'message' => 'Payment Updated Successfully'];
 
             return response()->json($response);
@@ -207,7 +207,7 @@ 
     }
 
     public function updatePaymentByInvoice($clientid,$invoiceChecked, $payment_method,
-             $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
+                $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
     {
         try {
             $sum = 0;

Spacing +5 added lines, -5 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());
@@ -110,7 +110,7 @@ 
             $invoicAmount = $request->invoiceAmount;
             $amtToCredit = $request->amtToCredit;
             $payment_status = 'success';
-            $payment = $this->multiplePayment($clientid,$invoiceChecked, $payment_method,
+            $payment = $this->multiplePayment($clientid, $invoiceChecked, $payment_method,
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
             $response = ['type' => 'success', 'message' => 'Payment Updated Successfully'];
 
@@ -128,7 +128,7 @@ 
         }
     }
 
-    public function multiplePayment($clientid,$invoiceChecked, $payment_method,
+    public function multiplePayment($clientid, $invoiceChecked, $payment_method,
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
     {
         try {
@@ -192,7 +192,7 @@ 
             $invoicAmount = $request->invoiceAmount;
             $amtToCredit = $request->amtToCredit;
             $payment_status = 'success';
-            $payment = $this->updatePaymentByInvoice($clientid,$invoiceChecked, $payment_method,
+            $payment = $this->updatePaymentByInvoice($clientid, $invoiceChecked, $payment_method,
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
             $response = ['type' => 'success', 'message' => 'Payment Updated Successfully'];
 
@@ -206,7 +206,7 @@ 
         }
     }
 
-    public function updatePaymentByInvoice($clientid,$invoiceChecked, $payment_method,
+    public function updatePaymentByInvoice($clientid, $invoiceChecked, $payment_method,
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
     {
         try {

Braces +6 added lines, -3 removed lines

@@ -133,7 +133,8 @@ 
     {
         try {
             foreach ($invoiceChecked as $key => $value) {
-                if ($key != 0) {//If Payment is linked to Invoice
+                if ($key != 0) {
+//If Payment is linked to Invoice
                     $invoice = Invoice::find($value);
                     $invoice_status = 'pending';
                     $payment = Payment::where('invoice_id', $value)->create([
@@ -157,7 +158,8 @@ 
                         $invoice->status = $invoice_status;
                         $invoice->save();
                     }
-                } else {//If Payment is not linked to any invoice and is to be credited to User Accunt
+                } else {
+//If Payment is not linked to any invoice and is to be credited to User Accunt
                     $payment = Payment::create([
                 'invoice_id'     => $value,
                 'user_id'        => $clientid,
@@ -212,7 +214,8 @@ 
         try {
             $sum = 0;
             foreach ($invoiceChecked as $key => $value) {
-                if ($key != 0) {//If Payment is linked to Invoice
+                if ($key != 0) {
+//If Payment is linked to Invoice
                     $invoice = Invoice::find($value);
                     Payment::where('user_id', $clientid)->where('invoice_id', 0)->update(['amt_to_credit'=>$amtToCredit]);
                     $invoice_status = 'pending';