ladybirdweb / agorainvoicing

app/Http/Controllers/Product/PlanController.php

Indentation +13 added lines, -13 removed lines

@@ -170,11 +170,11 @@ 
         $periods = $this->period->pluck('name', 'days')->toArray();
         $products = $this->product->pluck('name', 'id')->toArray();
         foreach ($products as $key => $product) {
-          $selectedProduct = $this->product->where('id',$plan->product)
-          ->pluck('name','id','subscription')->toArray();
-       }
-      $selectedPeriods = $this->period->where('days',$plan->days)
-       ->pluck('name', 'days')->toArray();
+            $selectedProduct = $this->product->where('id',$plan->product)
+            ->pluck('name','id','subscription')->toArray();
+        }
+        $selectedPeriods = $this->period->where('days',$plan->days)
+        ->pluck('name', 'days')->toArray();
 
         return view('themes.default1.product.plan.edit',
             compact('plan', 'currency', 'add_price', 'renew_price', 'periods', 'products',
@@ -190,14 +190,14 @@ 
      */
     public function update($id, Request $request)
     {
-         $subs = Product::where('id',$request->input('product'))->value('subscription');
+            $subs = Product::where('id',$request->input('product'))->value('subscription');
         $days_rule = $subs == 1 ? 'required|' : 'sometimes|';
 
         $this->validate($request, [
             'name'        => 'required',
             'add_price.*' => 'required',
             'product'     => 'required',
-              'days'        => $days_rule . 'numeric',
+                'days'        => $days_rule . 'numeric',
         ]);
         $plan = $this->plan->where('id', $id)->first();
         $plan->fill($request->input())->save();
@@ -279,12 +279,12 @@ 
 
     public function checkSubscription(Request $request)
     {
-      try{
-      $product_id = $request->input('product_id');
-      $checkSubscription = Product::where('id',$product_id)->value('subscription');
-      $result = ['subscription'=> $checkSubscription];
-      return response()->json($result);
-      }catch (\Exception $ex) {
+        try{
+        $product_id = $request->input('product_id');
+        $checkSubscription = Product::where('id',$product_id)->value('subscription');
+        $result = ['subscription'=> $checkSubscription];
+        return response()->json($result);
+        }catch (\Exception $ex) {
             Bugsnag::notifyException($ex);
             $result = ['subscription' => $ex->getMessage()];
 

Spacing +16 added lines, -16 removed lines

@@ -58,19 +58,19 @@ 
         $new_plan = Plan::select('id', 'name', 'days', 'product')->get();
 
         return\ DataTables::of($new_plan)
-                        ->addColumn('checkbox', function ($model) {
+                        ->addColumn('checkbox', function($model) {
                             return "<input type='checkbox' class='plan_checkbox' 
                             value=".$model->id.' name=select[] id=check>';
                         })
-                        ->addColumn('name', function ($model) {
+                        ->addColumn('name', function($model) {
                             return ucfirst($model->name);
                         })
-                        ->addColumn('days', function ($model) {
+                        ->addColumn('days', function($model) {
                             $months = $model->days / 30;
 
                             return round($months);
                         })
-                        ->addColumn('product', function ($model) {
+                        ->addColumn('product', function($model) {
                             $productid = $model->product;
                             $product = $this->product->where('id', $productid)->first();
                             $response = '';
@@ -80,7 +80,7 @@ 
 
                             return ucfirst($response);
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('plans/'.$model->id.'/edit')." 
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
@@ -110,12 +110,12 @@ 
      */
     public function store(Request $request)
     {
-        $subs = Product::where('id',$request->input('product'))->value('subscription');
+        $subs = Product::where('id', $request->input('product'))->value('subscription');
         $days_rule = $subs == 1 ? 'required|' : 'sometimes|';
 
         $this->validate($request, [
             'name'        => 'required',
-            'days'        => $days_rule . 'numeric',
+            'days'        => $days_rule.'numeric',
             'add_price.*' => 'required',
             'product'     => 'required',
         ]);
@@ -170,15 +170,15 @@ 
         $periods = $this->period->pluck('name', 'days')->toArray();
         $products = $this->product->pluck('name', 'id')->toArray();
         foreach ($products as $key => $product) {
-          $selectedProduct = $this->product->where('id',$plan->product)
-          ->pluck('name','id','subscription')->toArray();
+          $selectedProduct = $this->product->where('id', $plan->product)
+          ->pluck('name', 'id', 'subscription')->toArray();
        }
-      $selectedPeriods = $this->period->where('days',$plan->days)
+      $selectedPeriods = $this->period->where('days', $plan->days)
        ->pluck('name', 'days')->toArray();
 
         return view('themes.default1.product.plan.edit',
             compact('plan', 'currency', 'add_price', 'renew_price', 'periods', 'products',
-                'selectedPeriods','selectedProduct'));
+                'selectedPeriods', 'selectedProduct'));
     }
 
     /**
@@ -190,14 +190,14 @@ 
      */
     public function update($id, Request $request)
     {
-         $subs = Product::where('id',$request->input('product'))->value('subscription');
+         $subs = Product::where('id', $request->input('product'))->value('subscription');
         $days_rule = $subs == 1 ? 'required|' : 'sometimes|';
 
         $this->validate($request, [
             'name'        => 'required',
             'add_price.*' => 'required',
             'product'     => 'required',
-              'days'        => $days_rule . 'numeric',
+              'days'        => $days_rule.'numeric',
         ]);
         $plan = $this->plan->where('id', $id)->first();
         $plan->fill($request->input())->save();
@@ -279,12 +279,12 @@ 
 
     public function checkSubscription(Request $request)
     {
-      try{
+      try {
       $product_id = $request->input('product_id');
-      $checkSubscription = Product::where('id',$product_id)->value('subscription');
+      $checkSubscription = Product::where('id', $product_id)->value('subscription');
       $result = ['subscription'=> $checkSubscription];
       return response()->json($result);
-      }catch (\Exception $ex) {
+      } catch (\Exception $ex) {
             Bugsnag::notifyException($ex);
             $result = ['subscription' => $ex->getMessage()];
 

Braces +2 added lines, -2 removed lines

@@ -279,12 +279,12 @@
 
     public function checkSubscription(Request $request)
     {
-      try{
+      try {
       $product_id = $request->input('product_id');
       $checkSubscription = Product::where('id',$product_id)->value('subscription');
       $result = ['subscription'=> $checkSubscription];
       return response()->json($result);
-      }catch (\Exception $ex) {
+      } catch (\Exception $ex) {
             Bugsnag::notifyException($ex);
             $result = ['subscription' => $ex->getMessage()];
 

app/Http/Controllers/Front/CartController.php

Indentation +121 added lines, -121 removed lines

@@ -192,149 +192,149 @@ 
                 $tax_class_id = TaxProductRelation::where('product_id', $productid)->pluck('tax_class_id')->toArray();
 
                 if ($tax_class_id) {//If the product is allowed for tax (Check in tax_product relation table)
-                   if ($tax_enable == 1) {//If GST is Enabled
-
-                       $state_code = '';
-                       $c_gst = '';
-                       $s_gst = '';
-                       $i_gst = '';
-                       $ut_gst = '';
-                       $value = '';
-                       $rate = '';
-                       $status = 1;
-
-                       if ($user_state != '') {//Get the CGST,SGST,IGST,STATE_CODE of the user
-                           $c_gst = $user_state->c_gst;
-                           $s_gst = $user_state->s_gst;
-                           $i_gst = $user_state->i_gst;
-                           $ut_gst = $user_state->ut_gst;
-                           $state_code = $user_state->state_code;
-
-                           if ($state_code == $origin_state) {//If user and origin state are same
-                               $rateForSameState = $this->getTaxWhenIndianSameState($user_state,
+                    if ($tax_enable == 1) {//If GST is Enabled
+
+                        $state_code = '';
+                        $c_gst = '';
+                        $s_gst = '';
+                        $i_gst = '';
+                        $ut_gst = '';
+                        $value = '';
+                        $rate = '';
+                        $status = 1;
+
+                        if ($user_state != '') {//Get the CGST,SGST,IGST,STATE_CODE of the user
+                            $c_gst = $user_state->c_gst;
+                            $s_gst = $user_state->s_gst;
+                            $i_gst = $user_state->i_gst;
+                            $ut_gst = $user_state->ut_gst;
+                            $state_code = $user_state->state_code;
+
+                            if ($state_code == $origin_state) {//If user and origin state are same
+                                $rateForSameState = $this->getTaxWhenIndianSameState($user_state,
                                 $origin_state, $productid, $c_gst, $s_gst, $state_code, $status);
 
-                               $taxes = $rateForSameState['taxes'];
-                               $status = $rateForSameState['status'];
-                               $value = $rateForSameState['value'];
-                           } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {//If user is from other state
-                               $rateForOtherState = $this->getTaxWhenIndianOtherState($user_state,
+                                $taxes = $rateForSameState['taxes'];
+                                $status = $rateForSameState['status'];
+                                $value = $rateForSameState['value'];
+                            } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {//If user is from other state
+                                $rateForOtherState = $this->getTaxWhenIndianOtherState($user_state,
                                 $origin_state, $productid, $i_gst, $state_code, $status);
-                               $taxes = $rateForOtherState['taxes'];
-                               $status = $rateForOtherState['status'];
-                               $value = $rateForOtherState['value'];
-                           } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {//if user from Union Territory
-                               $rateForUnionTerritory = $this->getTaxWhenUnionTerritory($user_state,
+                                $taxes = $rateForOtherState['taxes'];
+                                $status = $rateForOtherState['status'];
+                                $value = $rateForOtherState['value'];
+                            } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {//if user from Union Territory
+                                $rateForUnionTerritory = $this->getTaxWhenUnionTerritory($user_state,
                                 $origin_state, $productid, $c_gst, $ut_gst, $state_code, $status);
-                               $taxes = $rateForUnionTerritory['taxes'];
-                               $status = $rateForUnionTerritory['status'];
-                               $value = $rateForUnionTerritory['value'];
-                           }
-                       } else {//If user from other Country
-                           $taxClassId = Tax::where('state', $geoip_state)
-                           ->orWhere('country', $geoip_country)
-                           ->pluck('tax_classes_id')->first();
-                           if ($taxClassId) { //if state equals the user State or country equals user country
-                               $taxForSpecificCountry = $this->getTaxForSpecificCountry($taxClassId,
+                                $taxes = $rateForUnionTerritory['taxes'];
+                                $status = $rateForUnionTerritory['status'];
+                                $value = $rateForUnionTerritory['value'];
+                            }
+                        } else {//If user from other Country
+                            $taxClassId = Tax::where('state', $geoip_state)
+                            ->orWhere('country', $geoip_country)
+                            ->pluck('tax_classes_id')->first();
+                            if ($taxClassId) { //if state equals the user State or country equals user country
+                                $taxForSpecificCountry = $this->getTaxForSpecificCountry($taxClassId,
                                 $productid, $status);
-                               $taxes = $taxForSpecificCountry['taxes'];
-                               $status = $taxForSpecificCountry['status'];
-                               $value = $taxForSpecificCountry['value'];
-                               $rate = $taxForSpecificCountry['value'];
-                           } else {//if Tax is selected for Any Country Any State
-                               $taxClassId = Tax::where('country', '')
-                               ->where('state', 'Any State')
-                               ->pluck('tax_classes_id')->first();
-                               if ($taxClassId) {
-                                   $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId, $productid, $status);
-                                   $taxes = $taxForAnyCountry['taxes'];
-                                   $status = $taxForAnyCountry['status'];
-                                   $value = $taxForAnyCountry['value'];
-                                   $rate = $taxForAnyCountry['value'];
-                               } else {
-                                   $taxes = [0];
-                               }
-                           }
-                       }
-                       foreach ($taxes as $key => $tax) {
+                                $taxes = $taxForSpecificCountry['taxes'];
+                                $status = $taxForSpecificCountry['status'];
+                                $value = $taxForSpecificCountry['value'];
+                                $rate = $taxForSpecificCountry['value'];
+                            } else {//if Tax is selected for Any Country Any State
+                                $taxClassId = Tax::where('country', '')
+                                ->where('state', 'Any State')
+                                ->pluck('tax_classes_id')->first();
+                                if ($taxClassId) {
+                                    $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId, $productid, $status);
+                                    $taxes = $taxForAnyCountry['taxes'];
+                                    $status = $taxForAnyCountry['status'];
+                                    $value = $taxForAnyCountry['value'];
+                                    $rate = $taxForAnyCountry['value'];
+                                } else {
+                                    $taxes = [0];
+                                }
+                            }
+                        }
+                        foreach ($taxes as $key => $tax) {
 
                                     //All the da a attribute that is sent to the checkout Page if tax_compound=0
-                           if ($taxes[0]) {
-                               $tax_attribute[$key] = ['name' => $tax->name, 'c_gst'=>$c_gst,
-                               's_gst'                        => $s_gst, 'i_gst'=>$i_gst, 'ut_gst'=>$ut_gst,
+                            if ($taxes[0]) {
+                                $tax_attribute[$key] = ['name' => $tax->name, 'c_gst'=>$c_gst,
+                                's_gst'                        => $s_gst, 'i_gst'=>$i_gst, 'ut_gst'=>$ut_gst,
                                 'state'                       => $state_code, 'origin_state'=>$origin_state,
-                                 'tax_enable'                 => $tax_enable, 'rate'=>$value, 'status'=>$status, ];
+                                    'tax_enable'                 => $tax_enable, 'rate'=>$value, 'status'=>$status, ];
 
-                               $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
+                                $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
 
                                             'name'   => 'no compound',
                                             'type'   => 'tax',
                                             'target' => 'item',
                                             'value'  => $value,
-                                          ]);
-                           } else {
-                               $tax_attribute[0] = ['name' => 'null', 'rate' => 0, 'tax_enable' =>0];
-                               $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
-                                           'name'   => 'null',
-                                           'type'   => 'tax',
-                                           'target' => 'item',
-                                           'value'  => '0%',
-                                         ]);
-                           }
-                       }
-                   } elseif ($tax_enable == 0) {//If Tax enable is 0
-                       $status = 1;
-                       if ($this->tax_option->findOrFail(1)->tax_enable == 0) {
-                           $taxClassId = Tax::where('country', '')
-                           ->where('state', 'Any State')
-                           ->pluck('tax_classes_id')->first(); //In case of India when
-                           // other tax is available and tax is not enabled
-                           if ($taxClassId) {
-                               $taxes = $this->getTaxByPriority($taxClassId);
-                               $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
-                               if ($value == 0) {
-                                   $status = 0;
-                               }
-                               $rate = $value;
-                               foreach ($taxes as $key => $tax) {
-                                   $tax_attribute[$key] = ['name' => $tax->name,
-                                   'rate'                         => $value, 'tax_enable'=>0, 'status' => $status, ];
-                                   $taxCondition[$key] = new \Darryldecode\Cart\CartCondition([
+                                            ]);
+                            } else {
+                                $tax_attribute[0] = ['name' => 'null', 'rate' => 0, 'tax_enable' =>0];
+                                $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
+                                            'name'   => 'null',
+                                            'type'   => 'tax',
+                                            'target' => 'item',
+                                            'value'  => '0%',
+                                            ]);
+                            }
+                        }
+                    } elseif ($tax_enable == 0) {//If Tax enable is 0
+                        $status = 1;
+                        if ($this->tax_option->findOrFail(1)->tax_enable == 0) {
+                            $taxClassId = Tax::where('country', '')
+                            ->where('state', 'Any State')
+                            ->pluck('tax_classes_id')->first(); //In case of India when
+                            // other tax is available and tax is not enabled
+                            if ($taxClassId) {
+                                $taxes = $this->getTaxByPriority($taxClassId);
+                                $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
+                                if ($value == 0) {
+                                    $status = 0;
+                                }
+                                $rate = $value;
+                                foreach ($taxes as $key => $tax) {
+                                    $tax_attribute[$key] = ['name' => $tax->name,
+                                    'rate'                         => $value, 'tax_enable'=>0, 'status' => $status, ];
+                                    $taxCondition[$key] = new \Darryldecode\Cart\CartCondition([
 
                                             'name'   => $tax->name,
                                             'type'   => 'tax',
                                             'target' => 'item',
                                             'value'  => $value,
                                         ]);
-                               }
-                           } else {//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
-                                   $taxes = $this->getTaxByPriority($taxClassId);
-                                   $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
-                                   if ($value == '') {
-                                       $status = 0;
-                                   }
-                                   $rate = $value;
-                               }
-                               foreach ($taxes as $key => $tax) {
-                                   $tax_attribute[$key] = ['name' => $tax->name,
-                                   'rate'                         => $value, 'tax_enable'=>0, 'status' => $status, ];
-                                   $taxCondition[$key] = new \Darryldecode\Cart\CartCondition([
+                                }
+                            } else {//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
+                                    $taxes = $this->getTaxByPriority($taxClassId);
+                                    $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
+                                    if ($value == '') {
+                                        $status = 0;
+                                    }
+                                    $rate = $value;
+                                }
+                                foreach ($taxes as $key => $tax) {
+                                    $tax_attribute[$key] = ['name' => $tax->name,
+                                    'rate'                         => $value, 'tax_enable'=>0, 'status' => $status, ];
+                                    $taxCondition[$key] = new \Darryldecode\Cart\CartCondition([
 
                                             'name'   => $tax->name,
                                             'type'   => 'tax',
                                             'target' => 'item',
                                             'value'  => $value,
                                         ]);
-                               }
-                           }
-                       }
-                   }
+                                }
+                            }
+                        }
+                    }
                 } else {
                     $tax_attribute[0] = ['name' => 'null', 'rate' => 0, 'tax_enable' =>0];
                     $taxCondition[0] = new \Darryldecode\Cart\CartCondition([
@@ -413,7 +413,7 @@ 
         $value = '';
         $value = $taxes->toArray()[0]['active'] ?
              (TaxProductRelation::where('product_id', $productid)
-              ->where('tax_class_id', $taxClassId)->count() ? $ut_gst + $c_gst.'%' : 0) : 0;
+                ->where('tax_class_id', $taxClassId)->count() ? $ut_gst + $c_gst.'%' : 0) : 0;
 
         return $value;
     }
@@ -430,7 +430,7 @@ 
         $otherRate = 0;
         $status = $taxes->toArray()[0]['active'];
         if ($status && (TaxProductRelation::where('product_id', $productid)
-          ->where('tax_class_id', $taxClassId)->count() > 0)) {
+            ->where('tax_class_id', $taxClassId)->count() > 0)) {
             $otherRate = Tax::where('tax_classes_id', $taxClassId)->first()->rate;
         }
         $value = $otherRate.'%';
@@ -600,7 +600,7 @@ 
      */
     public static function rounding($price)
     {
-      try {
+        try {
             $tax_rule = new \App\Model\Payment\TaxOption();
             $rule = $tax_rule->findOrFail(1);
             $rounding = $rule->rounding;
@@ -723,7 +723,7 @@ 
             if ($subregion) {
                 $result = ['id' => $subregion->state_subdivision_code,
 
-                     'name' => $subregion->state_subdivision_name, ];
+                        'name' => $subregion->state_subdivision_name, ];
             }
 
             return $result;

app/Http/Controllers/Front/ClientController.php

Indentation +18 added lines, -18 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();
 
             return \DataTables::of($versions)
                             ->addColumn('id', function ($versions) {
@@ -155,14 +155,14 @@ 
                                 //if product has expiry date ie sunscriptioon is generated
                                 if ($endDate) {
                                     if ($getDownloadCondition == 1){//Perpetual download till expiry selected
-                                     $getDownload = $this->whenDownloadTillExpiry($endDate,$productid,$versions,$clientid,$invoiceid);
+                                        $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($endDate,$productid,$versions,$clientid,$invoiceid);
                                         return $getDownload;
-                                  }
+                                    }
                                 }
                             })
                             ->rawColumns(['version', 'title', 'description', 'file'])
@@ -176,7 +176,7 @@ 
 
     public function whenDownloadTillExpiry($endDate,$productid,$versions,$clientid,$invoiceid)
     {
-      if ($versions->created_at->toDateTimeString()
+        if ($versions->created_at->toDateTimeString()
 
         < $endDate->ends_at->toDateTimeString()) {
             return '<p><a href='.url('download/'.$productid.'/'
@@ -357,7 +357,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);
 
@@ -436,7 +436,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);
@@ -462,17 +462,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 +29 added lines, -29 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) {
@@ -132,19 +132,19 @@ 
              'title', 'description', 'file', 'created_at')->get();
 
             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 ($clientid, $invoiceid, $productid) {
+                            ->addColumn('file', function($versions) use ($clientid, $invoiceid, $productid) {
                                 $invoice_id = Invoice::where('number', $invoiceid)->pluck('id')->first();
                                 $order = Order::where('invoice_id', '=', $invoice_id)->first();
                                 $order_id = $order->id;
@@ -154,13 +154,13 @@ 
 
                                 //if product has expiry date ie sunscriptioon is generated
                                 if ($endDate) {
-                                    if ($getDownloadCondition == 1){//Perpetual download till expiry selected
-                                     $getDownload = $this->whenDownloadTillExpiry($endDate,$productid,$versions,$clientid,$invoiceid);
+                                    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($endDate,$productid,$versions,$clientid,$invoiceid);
+                                        $getDownload = $this->whenDownloadExpiresAfterExpiry($endDate, $productid, $versions, $clientid, $invoiceid);
                                         return $getDownload;
                                   }
                                 }
@@ -174,7 +174,7 @@ 
     }
 
 
-    public function whenDownloadTillExpiry($endDate,$productid,$versions,$clientid,$invoiceid)
+    public function whenDownloadTillExpiry($endDate, $productid, $versions, $clientid, $invoiceid)
     {
       if ($versions->created_at->toDateTimeString()
 
@@ -192,7 +192,7 @@ 
         }
     }
 
-    public function whenDownloadExpiresAfterExpiry($endDate,$productid,$versions,$clientid,$invoiceid)
+    public function whenDownloadExpiresAfterExpiry($endDate, $productid, $versions, $clientid, $invoiceid)
     {
         if ($versions->created_at->toDateTimeString()
         < $endDate->ends_at->toDateTimeString()) {
@@ -236,18 +236,18 @@ 
             $link = (array_slice($link, 0, 10, true));
 
             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 ($invoiceid, $productid) {
+                            ->addColumn('file', function($link) use ($invoiceid, $productid) {
                                 $order = Order::where('invoice_id', '=', $invoiceid)->first();
                                 $order_id = $order->id;
                                 $orderEndDate = Subscription::select('ends_at')
@@ -294,20 +294,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;
@@ -422,17 +422,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',
@@ -459,13 +459,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

@@ -154,11 +154,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($endDate,$productid,$versions,$clientid,$invoiceid);
                                         return $getDownload;

app/Http/Controllers/Order/BaseOrderController.php

Indentation +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
         ]);
         $this->addOrderInvoiceRelation($invoiceid, $order->id);
         if ($this->checkOrderCreateSubscription($order->id) == true) {
-           $this->addSubscription($order->id, $plan_id, $version, $product);
+            $this->addSubscription($order->id, $plan_id, $version, $product);
         }
         $this->sendOrderMail($user_id, $order->id, $item->id);
     }
@@ -149,7 +149,7 @@ 
                 $user_id = $this->order->find($orderid)->client;
                 $this->subscription->create(['user_id' => $user_id,
                     'plan_id'                          => $planid, 'order_id' => $orderid, 'ends_at' => $ends_at,
-                     'version'                         => $version, 'product_id' =>$product, ]);
+                        'version'                         => $version, 'product_id' =>$product, ]);
             }
         } catch (\Exception $ex) {
             Bugsnag::notifyException($ex);