ladybirdweb / agorainvoicing

app/Http/Controllers/Product/ProductController.php

Spacing +15 added lines, -15 removed lines

@@ -107,13 +107,13 @@ 
 
                 return\ DataTables::of($new_product)
             // return \Datatable::collection($this->product->select('id', 'name', 'type', 'group')->where('id', '!=', 1)->get())
-                            ->addColumn('checkbox', function ($model) {
+                            ->addColumn('checkbox', function($model) {
                                 return "<input type='checkbox' class='product_checkbox' value=".$model->id.' name=select[] id=check>';
                             })
-                            ->addColumn('name', function ($model) {
+                            ->addColumn('name', function($model) {
                                 return ucfirst($model->name);
                             })
-                            ->addColumn('type', function ($model) {
+                            ->addColumn('type', function($model) {
                                 //dd($model->type());
                                 if ($this->type->where('id', $model->type)->first()) {
                                     return $this->type->where('id', $model->type)->first()->name;
@@ -121,7 +121,7 @@ 
                                     return 'Not available';
                                 }
                             })
-                            ->addColumn('group', function ($model) {
+                            ->addColumn('group', function($model) {
                                 //dd($model->type());
                                 if ($this->group->where('id', $model->group)->first()) {
                                     return $this->group->where('id', $model->group)->first()->name;
@@ -129,21 +129,21 @@ 
                                     return 'Not available';
                                 }
                             })
-                            ->addColumn('price', function ($model) {
+                            ->addColumn('price', function($model) {
                                 if ($this->price->where('product_id', $model->id)->first()) {
                                     return $this->price->where('product_id', $model->id)->first()->price;
                                 } else {
                                     return 'Not available';
                                 }
                             })
-                            ->addColumn('currency', function ($model) {
+                            ->addColumn('currency', function($model) {
                                 if ($this->price->where('product_id', $model->id)->first()) {
                                     return $this->price->where('product_id', $model->id)->first()->currency;
                                 } else {
                                     return 'Not available';
                                 }
                             })
-                            ->addColumn('Action', function ($model) {
+                            ->addColumn('Action', function($model) {
                                 $url = '';
                                 if ($model->type == 2) {
                                     $url = '<a href='.url('product/download/'.$model->id)." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-download' style='color:white;'> </i>&nbsp;&nbsp;Download</a>";
@@ -166,28 +166,28 @@ 
             $new_upload = ProductUpload::where('product_id', '=', $id)->select('id', 'product_id', 'title', 'description', 'version', 'file')->get();
 
             return \DataTables::of($new_upload)
-        ->addColumn('checkbox', function ($model) {
+        ->addColumn('checkbox', function($model) {
             return "<input type='checkbox' class='upload_checkbox' value=".$model->id.' name=select[] id=checks>';
         })
 
-        ->addColumn('product_id', function ($model) {
+        ->addColumn('product_id', function($model) {
             return ucfirst($this->product->where('id', $model->product_id)->first()->name);
         })
 
-        ->addColumn('title', function ($model) {
+        ->addColumn('title', function($model) {
             return ucfirst($model->title);
         })
-        ->addColumn('description', function ($model) {
+        ->addColumn('description', function($model) {
             return ucfirst($model->description);
         })
-        ->addColumn('version', function ($model) {
+        ->addColumn('version', function($model) {
             return $model->version;
         })
 
-        ->addColumn('file', function ($model) {
+        ->addColumn('file', function($model) {
             return $model->file;
         })
-        ->addColumn('action', function ($model) {
+        ->addColumn('action', function($model) {
             return '<a href='.('#edit-upload-option/'.$model->id).'  class=" btn btn-sm btn-primary " data-title="'.$model->title.'" data-description="'.$model->description.'" data-version="'.$model->version.'" data-id="'.$model->id.'" onclick="openEditPopup(this)" >Edit</a>';
         })
         ->rawcolumns(['checkbox', 'product_id', 'title', 'description', 'version', 'file', 'action'])
@@ -449,7 +449,7 @@ 
             $newTax->product_id = $product_id;
             $newTax->tax_class_id = $tax;
             $newTax->save();
-            return ;
+            return;
 
             }
         }

app/Http/Controllers/Front/CartController.php

Indentation +100 added lines, -100 removed lines

@@ -189,131 +189,131 @@ 
                 $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
+                    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'];
-                     }
+                            $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,$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,$origin_state,$productid,$c_gst, $ut_gst,$state_code,$status);
-                       $taxes = $rateForUnionTerritory['taxes'];
-                       $status = $rateForUnionTerritory['status'];
-                       $value = $rateForUnionTerritory['value'];
+                            $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,$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
+                            }
+                        } 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) {
+                            } 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, 'state'=>$state_code, 'origin_state'=>$origin_state, 'tax_enable'=>$tax_enable, 'rate'=>$value, 'status'=>$status];
+                            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];
                               
-                               $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([
@@ -329,8 +329,8 @@ 
 
             return ['conditions' => $taxCondition, 'attributes' => ['tax' => $tax_attribute, 'currency' => $currency_attribute]];
         } catch (\Exception $ex) {
-          Bugsnag::notifyException($ex);
-          throw new \Exception('Can not check the tax');
+            Bugsnag::notifyException($ex);
+            throw new \Exception('Can not check the tax');
         }
     }
 

Spacing +9 added lines, -9 removed lines

@@ -208,7 +208,7 @@ 
                          $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);
+                       $rateForSameState = $this->getTaxWhenIndianSameState($user_state, $origin_state, $productid, $c_gst, $s_gst, $state_code, $status);
 
                        $taxes = $rateForSameState['taxes'];
                        $status = $rateForSameState['status'];
@@ -216,14 +216,14 @@ 
                      }
                        
                         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);
+                          $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,$origin_state,$productid,$c_gst, $ut_gst,$state_code,$status);
+                      $rateForUnionTerritory = $this->getTaxWhenUnionTerritory($user_state, $origin_state, $productid, $c_gst, $ut_gst, $state_code, $status);
                        $taxes = $rateForUnionTerritory['taxes'];
                        $status = $rateForUnionTerritory['status'];
                        $value = $rateForUnionTerritory['value'];
@@ -232,15 +232,15 @@ 
                        } 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'];
+                            $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'];
+                               $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId, $productid, $status);
+                               $taxes = $taxForAnyCountry['taxes']; $status = $taxForAnyCountry['status'];
+                              $value = $taxForAnyCountry['value']; $rate = $taxForAnyCountry['value'];
                                } else {
                                    $taxes = [0];
 

Braces +24 added lines, -16 removed lines

@@ -188,8 +188,10 @@ 
                 $origin_state = $this->setting->first()->state; //Get the State of origin
                 $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
+                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 = '';
@@ -200,42 +202,45 @@ 
                        $rate = '';
                        $status = 1;
 
-                       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
                         $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
+                         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
+                     } 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
+                          } 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
+                       } 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
+                          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
+                           } 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);
@@ -270,7 +275,8 @@ 
                                          ]);
                            }
                        }
-                   } elseif ($tax_enable == 0) {//If Tax enable is 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
@@ -291,9 +297,11 @@ 
                                             '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)
+                           } 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
+                               if ($taxClassId) {
+//if state equals the user State
                                    $taxes = $this->getTaxByPriority($taxClassId);
                                    $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
                                    if ($value == '') {

app/Http/Controllers/Front/ExtendedBaseCartController.php

Indentation +65 added lines, -65 removed lines

@@ -199,8 +199,8 @@ 
     $geoip_country = '';
     if (\Auth::user()) {
     $geoip_country = \Auth::user()->country;
-      }
-   if ($geoip_country == '') {
+        }
+    if ($geoip_country == '') {
         $geoip_country = \App\Http\Controllers\Front\CartController::findCountryByGeoip($country_iso);
     }
     return $geoip_country;
@@ -208,9 +208,9 @@ 
 
     public function getGeoipState($state_code)
     {
-     $geoip_state = '';
-     $geoip_state_array = \App\Http\Controllers\Front\CartController::getStateByCode($state_code);
-      if (\Auth::user()) {
+        $geoip_state = '';
+        $geoip_state_array = \App\Http\Controllers\Front\CartController::getStateByCode($state_code);
+        if (\Auth::user()) {
         $geoip_state = \Auth::user()->state;
         }
         if ($geoip_state == '') {
@@ -222,49 +222,49 @@ 
     }
     
     /**
-    * When from same Indian State
-    */
+     * When from same Indian State
+     */
     public function getTaxWhenIndianSameState($user_state,$origin_state,$productid,$c_gst,$s_gst,$state_code,$status)
     {
-           $taxClassId = TaxClass::where('name', 'Intra State GST')->pluck('id')->toArray(); //Get the class Id  of state
-           if ($taxClassId) {
-               $taxes = $this->getTaxByPriority($taxClassId);
-               $value = $this->getValueForSameState($productid, $c_gst, $s_gst, $taxClassId, $taxes);
+            $taxClassId = TaxClass::where('name', 'Intra State GST')->pluck('id')->toArray(); //Get the class Id  of state
+            if ($taxClassId) {
+                $taxes = $this->getTaxByPriority($taxClassId);
+                $value = $this->getValueForSameState($productid, $c_gst, $s_gst, $taxClassId, $taxes);
 
-               if ($value == '') {
-                   $status = 0;
-               }
-           } else {
-               $taxes = [0];
-               $value ='';  
-           }
+                if ($value == '') {
+                    $status = 0;
+                }
+            } else {
+                $taxes = [0];
+                $value ='';  
+            }
        
-       return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
+        return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
     }
     
 
     /**
-    * When from other Indian State
-    */
+     * When from other Indian State
+     */
     public function getTaxWhenIndianOtherState($user_state,$origin_state,$productid,$i_gst,$state_code,$status)
     {
-       $taxClassId = TaxClass::where('name', 'Inter State GST')->pluck('id')->toArray(); //Get the class Id  of state
-       if ($taxClassId) {
-           $taxes = $this->getTaxByPriority($taxClassId);
-           $value = $this->getValueForOtherState($productid, $i_gst, $taxClassId, $taxes);
-           if ($value == '') {
-               $status = 0;
-           }
-       } else {
-           $taxes = [0];
-           $value ='';  
-       }
-       return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
+        $taxClassId = TaxClass::where('name', 'Inter State GST')->pluck('id')->toArray(); //Get the class Id  of state
+        if ($taxClassId) {
+            $taxes = $this->getTaxByPriority($taxClassId);
+            $value = $this->getValueForOtherState($productid, $i_gst, $taxClassId, $taxes);
+            if ($value == '') {
+                $status = 0;
+            }
+        } else {
+            $taxes = [0];
+            $value ='';  
+        }
+        return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
     }
 
-     /**
-    * When from Union Territory
-    */
+        /**
+         * When from Union Territory
+         */
     public function getTaxWhenUnionTerritory($user_state,$origin_state,$productid,$c_gst, $ut_gst,$state_code,$status)
     {
         $taxClassId = TaxClass::where('name', 'Union Territory GST')->pluck('id')->toArray(); //Get the class Id  of state
@@ -276,37 +276,37 @@ 
             }
         } else {
             $taxes = [0];
-             $value ='';  
+                $value ='';  
         }
-         return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
+            return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
     }
 
-     /**
-    * When from Other Country and tax is applied for that country or state
-    */
-     public function getTaxForSpecificCountry($taxClassId,$productid,$status)
-     {
-       $taxes = $this->getTaxByPriority($taxClassId);
-       $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
-       if ($value == '') {
-           $status = 0;
-       }
-       $rate = $value;
-       return ['taxes'=>$taxes , 'status'=>$status,'value'=>$value,'rate'=>$value];
-     }
+        /**
+         * When from Other Country and tax is applied for that country or state
+         */
+        public function getTaxForSpecificCountry($taxClassId,$productid,$status)
+        {
+        $taxes = $this->getTaxByPriority($taxClassId);
+        $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
+        if ($value == '') {
+            $status = 0;
+        }
+        $rate = $value;
+        return ['taxes'=>$taxes , 'status'=>$status,'value'=>$value,'rate'=>$value];
+        }
 
-      /**
-    * When from Other Country and tax is applied for Any country and state
-    */
-     public function getTaxForAnyCountry($taxClassId,$productid,$status)
-     {
-       $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId,$productid,$status);
-       $taxes = $this->getTaxByPriority($taxClassId);
-       $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
-       if ($value == '') {
-           $status = 0;
-       }
-       $rate = $value;
-       return ['taxes'=>$taxes , 'status'=>$status,'value'=>$value,'rate'=>$value];
-     }
+        /**
+         * When from Other Country and tax is applied for Any country and state
+         */
+        public function getTaxForAnyCountry($taxClassId,$productid,$status)
+        {
+        $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId,$productid,$status);
+        $taxes = $this->getTaxByPriority($taxClassId);
+        $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
+        if ($value == '') {
+            $status = 0;
+        }
+        $rate = $value;
+        return ['taxes'=>$taxes , 'status'=>$status,'value'=>$value,'rate'=>$value];
+        }
 }

Spacing +14 added lines, -14 removed lines

@@ -224,7 +224,7 @@ 
     /**
     * When from same Indian State
     */
-    public function getTaxWhenIndianSameState($user_state,$origin_state,$productid,$c_gst,$s_gst,$state_code,$status)
+    public function getTaxWhenIndianSameState($user_state, $origin_state, $productid, $c_gst, $s_gst, $state_code, $status)
     {
            $taxClassId = TaxClass::where('name', 'Intra State GST')->pluck('id')->toArray(); //Get the class Id  of state
            if ($taxClassId) {
@@ -236,17 +236,17 @@ 
                }
            } else {
                $taxes = [0];
-               $value ='';  
+               $value = '';  
            }
        
-       return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
+       return ['taxes'=>$taxes, 'status'=>$status, 'value'=>$value];
     }
     
 
     /**
     * When from other Indian State
     */
-    public function getTaxWhenIndianOtherState($user_state,$origin_state,$productid,$i_gst,$state_code,$status)
+    public function getTaxWhenIndianOtherState($user_state, $origin_state, $productid, $i_gst, $state_code, $status)
     {
        $taxClassId = TaxClass::where('name', 'Inter State GST')->pluck('id')->toArray(); //Get the class Id  of state
        if ($taxClassId) {
@@ -257,15 +257,15 @@ 
            }
        } else {
            $taxes = [0];
-           $value ='';  
+           $value = '';  
        }
-       return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
+       return ['taxes'=>$taxes, 'status'=>$status, 'value'=>$value];
     }
 
      /**
     * When from Union Territory
     */
-    public function getTaxWhenUnionTerritory($user_state,$origin_state,$productid,$c_gst, $ut_gst,$state_code,$status)
+    public function getTaxWhenUnionTerritory($user_state, $origin_state, $productid, $c_gst, $ut_gst, $state_code, $status)
     {
         $taxClassId = TaxClass::where('name', 'Union Territory GST')->pluck('id')->toArray(); //Get the class Id  of state
         if ($taxClassId) {
@@ -276,15 +276,15 @@ 
             }
         } else {
             $taxes = [0];
-             $value ='';  
+             $value = '';  
         }
-         return ['taxes'=>$taxes,'status'=>$status,'value'=>$value];
+         return ['taxes'=>$taxes, 'status'=>$status, 'value'=>$value];
     }
 
      /**
     * When from Other Country and tax is applied for that country or state
     */
-     public function getTaxForSpecificCountry($taxClassId,$productid,$status)
+     public function getTaxForSpecificCountry($taxClassId, $productid, $status)
      {
        $taxes = $this->getTaxByPriority($taxClassId);
        $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
@@ -292,21 +292,21 @@ 
            $status = 0;
        }
        $rate = $value;
-       return ['taxes'=>$taxes , 'status'=>$status,'value'=>$value,'rate'=>$value];
+       return ['taxes'=>$taxes, 'status'=>$status, 'value'=>$value, 'rate'=>$value];
      }
 
       /**
     * When from Other Country and tax is applied for Any country and state
     */
-     public function getTaxForAnyCountry($taxClassId,$productid,$status)
+     public function getTaxForAnyCountry($taxClassId, $productid, $status)
      {
-       $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId,$productid,$status);
+       $taxForAnyCountry = $this->getTaxForAnyCountry($taxClassId, $productid, $status);
        $taxes = $this->getTaxByPriority($taxClassId);
        $value = $this->getValueForOthers($productid, $taxClassId, $taxes);
        if ($value == '') {
            $status = 0;
        }
        $rate = $value;
-       return ['taxes'=>$taxes , 'status'=>$status,'value'=>$value,'rate'=>$value];
+       return ['taxes'=>$taxes, 'status'=>$status, 'value'=>$value, 'rate'=>$value];
      }
 }

app/Http/Controllers/RazorpayController.php

Indentation +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
 
     public function getState($stateCode)
     {
-       if (\Auth::user()->country != 'IN') {
+        if (\Auth::user()->country != 'IN') {
             $state = State::where('state_subdivision_code', $stateCode)->pluck('state_subdivision_name')->first();
         } else {
             $state = TaxByState::where('state_code', \Auth::user()->state)->pluck('state')->first();

Spacing +4 added lines, -4 removed lines

@@ -122,8 +122,8 @@ 
 
         \Cart::clear();
         $status = 'success';
-        $message = view('themes.default1.front.postPaymentTemplate', compact('invoice','date','order',
-            'product','invoiceItem'))->render();
+        $message = view('themes.default1.front.postPaymentTemplate', compact('invoice', 'date', 'order',
+            'product', 'invoiceItem'))->render();
         return ['status'=>$status, 'message'=>$message];
     }
 
@@ -141,8 +141,8 @@ 
         \Cart::clear();
         $status = 'success';
 
-        $message =view('themes.default1.front.postRenewTemplate', compact('invoice','date','order',
-            'product','invoiceItem'))->render(); 
+        $message = view('themes.default1.front.postRenewTemplate', compact('invoice', 'date', 'order',
+            'product', 'invoiceItem'))->render(); 
         return ['status'=>$status, 'message'=>$message];
     }
 }

app/Http/Controllers/Order/InvoiceController.php

Indentation +11 added lines, -11 removed lines

@@ -120,21 +120,21 @@ 
 
                             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 = date_create($model->created_at);
 
                             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 = '';
@@ -148,7 +148,7 @@ 
                                     ."   $action";
                         })
 
-                         ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
+                            ->rawColumns(['checkbox', 'user_id', 'number', 'date', 'grand_total', 'status', 'action'])
                         ->make(true);
     }
 
@@ -472,7 +472,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 other tax is available and tax is not enabled
+                        ->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);
                         $taxs = $rate['taxes'];

app/Http/Controllers/Order/ExtendedOrderController.php

Indentation +22 added lines, -22 removed lines

@@ -27,7 +27,7 @@ 
             $fromdate = date_create($from);
             $from = date_format($fromdate, 'Y-m-d H:m:i');
             $tills = date('Y-m-d H:m:i');
-             $tillDate = $this->getTillDate($from,$till,$tills);
+                $tillDate = $this->getTillDate($from,$till,$tills);
             $join = $join->whereBetween('orders.created_at', [$from, $tillDate]);
         }
         if ($till) {
@@ -51,17 +51,17 @@ 
 
     public function getTillDate($from,$till,$tills)
     {
-         if ($till) 
-         {
+            if ($till) 
+            {
             $todate = date_create($till);
             $tills = date_format($todate, 'Y-m-d H:m:i');
-         }
-         return $tills;
+            }
+            return $tills;
     }
 
     public function getFromDate($from,$froms)
     {
-     if ($from) {
+        if ($from) {
             $fromdate = date_create($from);
             $froms = date_format($fromdate, 'Y-m-d H:m:i');
         }
@@ -69,12 +69,12 @@ 
     }
 
         /**
-     * Create orders.
-     *
-     * @param Request $request
-     *
-     * @return type
-     */
+         * Create orders.
+         *
+         * @param Request $request
+         *
+         * @return type
+         */
     public function orderExecute(Request $request)
     {
         try {
@@ -92,15 +92,15 @@ 
         }
     }
 
-     /**
-     * generating serial key if product type is downloadable.
-     *
-     * @param type $product_type
-     *
-     * @throws \Exception
-     *
-     * @return type
-     */
+        /**
+         * generating serial key if product type is downloadable.
+         *
+         * @param type $product_type
+         *
+         * @throws \Exception
+         *
+         * @return type
+         */
     public function generateSerialKey($product_type)
     {
         try {
@@ -108,7 +108,7 @@ 
                 $str = str_random(16);
                 $str = strtoupper($str);
                 $str = Crypt::encrypt($str);
-                 return $str;
+                    return $str;
             }
         } catch (\Exception $ex) {
             Bugsnag::notifyException($ex);

Spacing +4 added lines, -4 removed lines

@@ -27,14 +27,14 @@ 
             $fromdate = date_create($from);
             $from = date_format($fromdate, 'Y-m-d H:m:i');
             $tills = date('Y-m-d H:m:i');
-             $tillDate = $this->getTillDate($from,$till,$tills);
+             $tillDate = $this->getTillDate($from, $till, $tills);
             $join = $join->whereBetween('orders.created_at', [$from, $tillDate]);
         }
         if ($till) {
             $tilldate = date_create($till);
             $till = date_format($tilldate, 'Y-m-d H:m:i');
             $froms = Order::first()->created_at;
-            $fromDate = $this->getFromDate($from,$froms);
+            $fromDate = $this->getFromDate($from, $froms);
             $join = $join->whereBetween('orders.created_at', [$fromDate, $till]);
         }
         if ($domain) {
@@ -49,7 +49,7 @@ 
         return $join;
     }
 
-    public function getTillDate($from,$till,$tills)
+    public function getTillDate($from, $till, $tills)
     {
          if ($till) 
          {
@@ -59,7 +59,7 @@ 
          return $tills;
     }
 
-    public function getFromDate($from,$froms)
+    public function getFromDate($from, $froms)
     {
      if ($from) {
             $fromdate = date_create($from);

Braces +2 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 class ExtendedOrderController extends Controller
 {
         public function advanceSearch($order_no = '', $product_id = '', $expiry = '', $from = '', $till = '', $domain = '')
-    {
+        {
         $join = Order::leftJoin('subscriptions', 'orders.id', '=', 'subscriptions.order_id');
         if ($order_no) {
             $join = $join->where('number', $order_no);
@@ -51,8 +51,7 @@ 
 
     public function getTillDate($from,$till,$tills)
     {
-         if ($till) 
-         {
+         if ($till) {
             $todate = date_create($till);
             $tills = date_format($todate, 'Y-m-d H:m:i');
          }

app/Http/Controllers/Order/BaseInvoiceController.php

Indentation +14 added lines, -14 removed lines

@@ -83,13 +83,13 @@ 
         $ut_gst = $user_state->ut_gst;
         $state_code = $user_state->state_code;
         if ($state_code == $origin_state) {//If user and origin state are same
-             $taxClassId = TaxClass::where('name', 'Intra State GST')->pluck('id')->toArray(); //Get the class Id  of state
-               if ($taxClassId) {
-                   $taxes = $cartController->getTaxByPriority($taxClassId);
-                   $value = $cartController->getValueForSameState($productid, $c_gst, $s_gst, $taxClassId, $taxes);
-               } else {
-                   $taxes = [0];
-               }
+                $taxClassId = TaxClass::where('name', 'Intra State GST')->pluck('id')->toArray(); //Get the class Id  of state
+                if ($taxClassId) {
+                    $taxes = $cartController->getTaxByPriority($taxClassId);
+                    $value = $cartController->getValueForSameState($productid, $c_gst, $s_gst, $taxClassId, $taxes);
+                } else {
+                    $taxes = [0];
+                }
         } elseif ($state_code != $origin_state && $ut_gst == 'NULL') {//If user is from other state
 
             $taxClassId = TaxClass::where('name', 'Inter State GST')->pluck('id')->toArray(); //Get the class Id  of state
@@ -101,12 +101,12 @@ 
             }
         } elseif ($state_code != $origin_state && $ut_gst != 'NULL') {//if user from Union Territory
         $taxClassId = TaxClass::where('name', 'Union Territory GST')->pluck('id')->toArray(); //Get the class Id  of state
-         if ($taxClassId) {
-             $taxes = $cartController->getTaxByPriority($taxClassId);
-             $value = $cartController->getValueForUnionTerritory($productid, $c_gst, $ut_gst, $taxClassId, $taxes);
-         } else {
-             $taxes = [0];
-         }
+            if ($taxClassId) {
+                $taxes = $cartController->getTaxByPriority($taxClassId);
+                $value = $cartController->getValueForUnionTerritory($productid, $c_gst, $ut_gst, $taxClassId, $taxes);
+            } else {
+                $taxes = [0];
+            }
         }
 
         return ['taxes'=>$taxes, 'value'=>$value];
@@ -278,7 +278,7 @@ 
                 case 1:
                     $percentage = $price * ($value / 100);
 
-                     return $price - $percentage;
+                        return $price - $percentage;
                 case 2:
                     return $price - $value;
                 case 3:

Spacing +1 added lines, -1 removed lines

@@ -238,7 +238,7 @@
     {
         try {
             if ($code != '') {
-                $promotion =Promotin::where('code', $code)->first();
+                $promotion = Promotin::where('code', $code)->first();
                 $start = $promotion->start;
                 $end = $promotion->expiry;
                 $now = \Carbon\Carbon::now();