ladybirdweb / agorainvoicing

app/Http/Controllers/Common/BaseTemplateController.php

Indentation +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
     }
 
     public function getResult($country, $geoip_country, $state, $geoip_state,
-     $shop, $cart, $cart1, $shop1, $rate, $product, $price)
+        $shop, $cart, $cart1, $shop1, $rate, $product, $price)
     {
         if ($country == $geoip_country || $state == $geoip_state || ($country == '' && $state == '')) {
             $result = $this->getCartResult($product, $shop, $cart, $rate, $price, $cart1, $shop1);

app/Http/Controllers/Common/TemplateController.php

Indentation +4 added lines, -4 removed lines

@@ -127,9 +127,9 @@ 
                             value=".$model->id.' name=select[] id=check>';
                         })
 
-                         ->addColumn('name', function ($model) {
-                             return $model->name;
-                         })
+                            ->addColumn('name', function ($model) {
+                                return $model->name;
+                            })
                         ->addColumn('type', function ($model) {
                             return $this->type->where('id', $model->type)->first()->name;
                         })
@@ -272,7 +272,7 @@ 
     }
 
     public function mailing($from, $to, $data, $subject, $replace = [],
-     $type = '', $fromname = '', $toname = '', $cc = [], $attach = [])
+        $type = '', $fromname = '', $toname = '', $cc = [], $attach = [])
     {
         try {
             $transform = [];

Spacing +5 added lines, -5 removed lines

@@ -122,18 +122,18 @@ 
     public function getTemplates()
     {
         return \DataTables::of($this->template->select('id', 'name', 'type')->get())
-                        ->addColumn('checkbox', function ($model) {
+                        ->addColumn('checkbox', function($model) {
                             return "<input type='checkbox' class='template_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
                         })
 
-                         ->addColumn('name', function ($model) {
+                         ->addColumn('name', function($model) {
                              return $model->name;
                          })
-                        ->addColumn('type', function ($model) {
+                        ->addColumn('type', function($model) {
                             return $this->type->where('id', $model->type)->first()->name;
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('templates/'.$model->id.'/edit').
                             " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
@@ -282,7 +282,7 @@ 
             $data = $page_controller->transform($type, $data, $transform);
             $settings = \App\Model\Common\Setting::find(1);
             $fromname = $settings->company;
-            \Mail::send('emails.mail', ['data' => $data], function ($m) use ($from, $to, $subject, $fromname, $toname, $cc, $attach) {
+            \Mail::send('emails.mail', ['data' => $data], function($m) use ($from, $to, $subject, $fromname, $toname, $cc, $attach) {
                 $m->from($from, $fromname);
 
                 $m->to($to, $toname)->subject($subject);

app/Http/Controllers/Front/BaseClientController.php

Indentation +3 added lines, -3 removed lines

@@ -168,9 +168,9 @@
             }
 
             return \DataTables::of($invoices->get())
-             ->addColumn('number', function ($model) {
-                 return $model->number;
-             })
+                ->addColumn('number', function ($model) {
+                    return $model->number;
+                })
             ->addColumn('products', function ($model) {
                 $invoice = $this->invoice->find($model->id);
                 $products = $invoice->invoiceItem()->pluck('product_name')->toArray();

Spacing +7 added lines, -7 removed lines

@@ -114,7 +114,7 @@ 
                 $user->profile_pic = $fileName;
             }
             $user->fill($request->input())->save();
-            $response = ['type' => 'success',  'message' =>'Updated Successfully..'];
+            $response = ['type' => 'success', 'message' =>'Updated Successfully..'];
 
             return $response;
         } catch (Exception $ex) {
@@ -168,27 +168,27 @@ 
             }
 
             return \DataTables::of($invoices->get())
-             ->addColumn('number', function ($model) {
+             ->addColumn('number', function($model) {
                  return $model->number;
              })
-            ->addColumn('products', function ($model) {
+            ->addColumn('products', function($model) {
                 $invoice = $this->invoice->find($model->id);
                 $products = $invoice->invoiceItem()->pluck('product_name')->toArray();
 
                 return ucfirst(implode(',', $products));
             })
-            ->addColumn('date', function ($model) {
+            ->addColumn('date', function($model) {
                 $date = date_create($model->created_at);
 
                 return date_format($date, 'M j, Y, g:i a');
             })
-            ->addColumn('total', function ($model) {
+            ->addColumn('total', function($model) {
                 return $model->grand_total;
             })
-            ->addColumn('status', function ($model) {
+            ->addColumn('status', function($model) {
                 return ucfirst($model->status);
             })
-            ->addColumn('action', function ($model) {
+            ->addColumn('action', function($model) {
                 if (\Auth::user()->role == 'admin') {
                     $url = '/invoices/show?invoiceid='.$model->id;
                 } else {

app/Http/Controllers/Order/ExtendedBaseInvoiceController.php

Indentation +4 added lines, -4 removed lines

@@ -33,7 +33,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());
         }
@@ -42,9 +42,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 {

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,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());

app/Http/Controllers/Front/ClientController.php

Indentation +16 added lines, -16 removed lines

@@ -129,7 +129,7 @@ 
         try {
             $versions = ProductUpload::where('product_id', $productid)
             ->select('id', 'product_id', 'version',
-             'title', 'description', 'file', 'created_at')->get();
+                'title', 'description', 'file', 'created_at')->get();
             $countVersions = count($versions);
             $countExpiry = 0;
             $invoice_id = Invoice::where('number', $invoiceid)->pluck('id')->first();
@@ -137,11 +137,11 @@ 
 
             $order_id = $order->id;
             $endDate = Subscription::select('ends_at')
-                 ->where('product_id', $productid)->where('order_id', $order_id)->first();
+                    ->where('product_id', $productid)->where('order_id', $order_id)->first();
 
             foreach ($versions as $version) {
                 if ($version->created_at->toDateTimeString()
-               < $endDate->ends_at->toDateTimeString()) {
+                < $endDate->ends_at->toDateTimeString()) {
                     $countExpiry = $countExpiry + 1;
                 }
             }
@@ -379,7 +379,7 @@ 
             $bussinesses = \App\Model\Common\Bussiness::pluck('name', 'short')->toArray();
 
             return view('themes.default1.front.clients.profile',
-             compact('user', 'timezones', 'state', 'states', 'bussinesses'));
+                compact('user', 'timezones', 'state', 'states', 'bussinesses'));
         } catch (Exception $ex) {
             Bugsnag::notifyException($ex);
 
@@ -458,7 +458,7 @@ 
                                 return $model->grand_total;
                             })
                             ->rawColumns(['checkbox', 'number', 'total',
-                             'payment_method', 'payment_status', 'created_at', ])
+                                'payment_method', 'payment_status', 'created_at', ])
                             ->make(true);
         } catch (Exception $ex) {
             Bugsnag::notifyException($ex);
@@ -484,17 +484,17 @@ 
                             ->addColumn('number', function ($model) {
                                 return $model->invoice()->first()->number;
                             })
-                              ->addColumn('total', function ($model) {
-                                  return $model->amount;
-                              })
-                               ->addColumn('created_at', function ($model) {
-                                   $date1 = new DateTime($model->created_at);
-                                   $tz = \Auth::user()->timezone()->first()->name;
-                                   $date1->setTimezone(new DateTimeZone($tz));
-                                   $date = $date1->format('M j, Y, g:i a');
-
-                                   return $date;
-                               })
+                                ->addColumn('total', function ($model) {
+                                    return $model->amount;
+                                })
+                                ->addColumn('created_at', function ($model) {
+                                    $date1 = new DateTime($model->created_at);
+                                    $tz = \Auth::user()->timezone()->first()->name;
+                                    $date1->setTimezone(new DateTimeZone($tz));
+                                    $date = $date1->format('M j, Y, g:i a');
+
+                                    return $date;
+                                })
 
                             ->addColumn('payment_method', 'payment_status', 'created_at')
 

Spacing +23 added lines, -23 removed lines

@@ -77,20 +77,20 @@ 
                     ->select('number', 'created_at', 'grand_total', 'id', 'status');
 
             return \DataTables::of($invoices->get())
-                            ->addColumn('number', function ($model) {
+                            ->addColumn('number', function($model) {
                                 return $model->number;
                             })
-                            ->addColumn('date', function ($model) {
+                            ->addColumn('date', function($model) {
                                 $date = $model->created_at;
 
                                 return $date;
                                 // $myobject->created_at->timezone($this->auth->user()->timezone);
                             })
                             // ->showColumns('created_at')
-                            ->addColumn('total', function ($model) {
+                            ->addColumn('total', function($model) {
                                 return $model->grand_total;
                             })
-                            ->addColumn('Action', function ($model) {
+                            ->addColumn('Action', function($model) {
                                 $status = $model->status;
                                 $payment = '';
                                 if ($status == 'Pending' && $model->grand_total > 0) {
@@ -147,19 +147,19 @@ 
             }
 
             return \DataTables::of($versions)
-                            ->addColumn('id', function ($versions) {
+                            ->addColumn('id', function($versions) {
                                 return ucfirst($versions->id);
                             })
-                            ->addColumn('version', function ($versions) {
+                            ->addColumn('version', function($versions) {
                                 return ucfirst($versions->version);
                             })
-                            ->addColumn('title', function ($versions) {
+                            ->addColumn('title', function($versions) {
                                 return ucfirst($versions->title);
                             })
-                            ->addColumn('description', function ($versions) {
+                            ->addColumn('description', function($versions) {
                                 return ucfirst($versions->description);
                             })
-                            ->addColumn('file', function ($versions) use ($countExpiry, $countVersions,$clientid, $invoiceid, $productid) {
+                            ->addColumn('file', function($versions) use ($countExpiry, $countVersions, $clientid, $invoiceid, $productid) {
                                 $invoice_id = Invoice::where('number', $invoiceid)->pluck('id')->first();
                                 $order = Order::where('invoice_id', '=', $invoice_id)->first();
                                 $order_id = $order->id;
@@ -258,18 +258,18 @@ 
             }
 
             return \DataTables::of($link)
-                            ->addColumn('version', function ($link) {
+                            ->addColumn('version', function($link) {
                                 return ucfirst($link['tag_name']);
                             })
-                            ->addColumn('name', function ($link) {
+                            ->addColumn('name', function($link) {
                                 return ucfirst($link['name']);
                             })
-                            ->addColumn('description', function ($link) {
+                            ->addColumn('description', function($link) {
                                 $markdown = Markdown::convertToHtml(ucfirst($link['body']));
 
                                 return $markdown;
                             })
-                            ->addColumn('file', function ($link) use ($countExpiry,$countVersions,$invoiceid, $productid) {
+                            ->addColumn('file', function($link) use ($countExpiry, $countVersions, $invoiceid, $productid) {
                                 $order = Order::where('invoice_id', '=', $invoiceid)->first();
                                 $order_id = $order->id;
                                 $orderEndDate = Subscription::select('ends_at')
@@ -316,20 +316,20 @@ 
             $orders = Order::where('client', \Auth::user()->id);
 
             return \DataTables::of($orders->get())
-                            ->addColumn('id', function ($model) {
+                            ->addColumn('id', function($model) {
                                 return $model->id;
                             })
-                            ->addColumn('product_name', function ($model) {
+                            ->addColumn('product_name', function($model) {
                                 return $model->product()->first()->name;
                             })
-                            ->addColumn('expiry', function ($model) {
+                            ->addColumn('expiry', function($model) {
                                 $tz = \Auth::user()->timezone()->first()->name;
                                 $end = $this->getExpiryDate($model);
 
                                 return $end;
                             })
 
-                            ->addColumn('Action', function ($model) {
+                            ->addColumn('Action', function($model) {
                                 $sub = $model->subscription()->first();
                                 $order = Order::where('id', $model->id)->select('product')->first();
                                 $productid = $order->product;
@@ -444,17 +444,17 @@ 
                     ->select('id', 'invoice_id', 'user_id', 'amount', 'payment_method', 'payment_status', 'created_at');
 
             return \DataTables::of($payments->get())
-                            ->addColumn('checkbox', function ($model) {
+                            ->addColumn('checkbox', function($model) {
                                 if (\Input::get('client') != 'true') {
                                     return "<input type='checkbox' class='payment_checkbox' 
                                     value=".$model->id.' name=select[] id=check>';
                                 }
                             })
-                            ->addColumn('number', function ($model) {
+                            ->addColumn('number', function($model) {
                                 return $model->invoice()->first()->number;
                             })
                             ->addColumn('amount', 'payment_method', 'payment_status', 'created_at')
-                            ->addColumn('total', function ($model) {
+                            ->addColumn('total', function($model) {
                                 return $model->grand_total;
                             })
                             ->rawColumns(['checkbox', 'number', 'total',
@@ -481,13 +481,13 @@ 
                     ->select('id', 'invoice_id', 'user_id', 'payment_method', 'payment_status', 'created_at', 'amount');
             //dd(\Input::all());
             return \DataTables::of($payments->get())
-                            ->addColumn('number', function ($model) {
+                            ->addColumn('number', function($model) {
                                 return $model->invoice()->first()->number;
                             })
-                              ->addColumn('total', function ($model) {
+                              ->addColumn('total', function($model) {
                                   return $model->amount;
                               })
-                               ->addColumn('created_at', function ($model) {
+                               ->addColumn('created_at', function($model) {
                                    $date1 = new DateTime($model->created_at);
                                    $tz = \Auth::user()->timezone()->first()->name;
                                    $date1->setTimezone(new DateTimeZone($tz));

Braces +4 added lines, -2 removed lines

@@ -169,11 +169,13 @@
 
                                 //if product has expiry date ie sunscriptioon is generated
                                 if ($endDate) {
-                                    if ($getDownloadCondition == 1) {//Perpetual download till expiry selected
+                                    if ($getDownloadCondition == 1) {
+//Perpetual download till expiry selected
                                         $getDownload = $this->whenDownloadTillExpiry($endDate, $productid, $versions, $clientid, $invoiceid);
 
                                         return $getDownload;
-                                    } elseif ($getDownloadCondition == 0) {//When download retires after subscription
+                                    } elseif ($getDownloadCondition == 0) {
+//When download retires after subscription
 
                                         $getDownload = $this->whenDownloadExpiresAfterExpiry($countExpiry, $countVersions, $endDate, $productid, $versions, $clientid, $invoiceid);