ladybirdweb / agorainvoicing

app/Http/Controllers/Order/SubscriptionController.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         //dd($this->invoice->get());
         return \Datatable::collection($this->subscription->get())
 
-                        ->addColumn('user_id', function ($model) {
+                        ->addColumn('user_id', function($model) {
                             $user = $model->user()->first();
                             $first = $user->first_name;
                             $last = $user->last_name;
@@ -55,18 +55,18 @@ 
 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
                         })
-                        ->addColumn('plan_id', function ($model) {
+                        ->addColumn('plan_id', function($model) {
                             $name = $this->plan->where('id', $model->plan_id)->first()->name;
 
                             return $name;
                         })
-                        ->addColumn('order_id', function ($model) {
+                        ->addColumn('order_id', function($model) {
                             $name = $this->order->where('id', $model->order_id)->first()->id;
 
                             return $name;
                         })
                         ->showColumns('ends_at')
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('subscriptions/'.$model->id)." 
                             class='btn btn-sm btn-primary'>View</a>";
                         })

app/Http/Controllers/Order/InvoiceController.php

Braces +10 added lines, -5 removed lines

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

Spacing +14 added lines, -14 removed lines

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

Indentation +44 added lines, -44 removed lines

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

app/Http/Controllers/Product/BundleController.php

Spacing +3 added lines, -3 removed lines

@@ -48,11 +48,11 @@ 
     {
         return \Datatable::collection($this->bundle->select('id', 'name',
          'valid_from', 'valid_till', 'uses', 'maximum_uses')->get())
-                        ->addColumn('#', function ($model) {
+                        ->addColumn('#', function($model) {
                             return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
                         })
                         ->showColumns('name', 'valid_from', 'valid_till', 'uses', 'maximum_uses')
-                        ->addColumn('item', function ($model) {
+                        ->addColumn('item', function($model) {
                             $name = $this->relation->where('bundle_id', $model->id)->pluck('product_id');
                             //dd($name);
                             $result = [];
@@ -62,7 +62,7 @@ 
                             //dd($result);
                             return implode(',', $result);
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('bundles/'.$model->id.'/edit').
                             " class='btn btn-sm btn-primary'>Edit</a>";
                         })

Indentation +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
     public function getBundles()
     {
         return \Datatable::collection($this->bundle->select('id', 'name',
-         'valid_from', 'valid_till', 'uses', 'maximum_uses')->get())
+            'valid_from', 'valid_till', 'uses', 'maximum_uses')->get())
                         ->addColumn('#', function ($model) {
                             return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
                         })
@@ -148,7 +148,7 @@ 
             }
 
             return view('themes.default1.product.bundle.edit',
-             compact('products', 'bundle', 'relation', 'till', 'from'));
+                compact('products', 'bundle', 'relation', 'till', 'from'));
         } catch (\Exception $e) {
             return redirect()->back()->with('fails', $e->getMessage());
         } catch (\InvalidArgumentException $e) {
@@ -157,7 +157,7 @@ 
                 $from = null;
 
                 return view('themes.default1.product.bundle.edit',
-                 compact('products', 'bundle', 'relation', 'till', 'from'));
+                    compact('products', 'bundle', 'relation', 'till', 'from'));
             }
         }
     }

app/Http/Controllers/Product/GroupController.php

Indentation +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
                             return '<a href='.url('groups/'.$model->id.'/edit').
                             " class='btn btn-sm btn-primary'>Edit</a>";
                         })
-                      ->rawColumns(['name', 'features', 'action'])
+                        ->rawColumns(['name', 'features', 'action'])
                         ->make(true);
     }
 

Spacing +3 added lines, -3 removed lines

@@ -52,11 +52,11 @@ 
 
         // return \Datatable::of($this->group->select('id', 'name')->get())
 
-                        ->editColumn('#', function ($model) {
+                        ->editColumn('#', function($model) {
                             return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
                         })
                         // ->showColumns('name')
-                        ->editColumn('features', function ($model) {
+                        ->editColumn('features', function($model) {
                             $features = $this->feature->select('features')->where('group_id', $model->id)->get();
                             //dd($features);
                             $result = [];
@@ -67,7 +67,7 @@ 
                             //dd($result);
                             return implode(',', $result);
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('groups/'.$model->id.'/edit').
                             " class='btn btn-sm btn-primary'>Edit</a>";
                         })

app/Http/Controllers/Product/ServiceController.php

Spacing +3 added lines, -3 removed lines

@@ -35,14 +35,14 @@
     public function getServices()
     {
         return \Datatable::collection($this->service->get())
-                        ->addColumn('#', function ($model) {
+                        ->addColumn('#', function($model) {
                             return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
                         })
                         ->showColumns('name')
-                        ->addColumn('plan', function ($model) {
+                        ->addColumn('plan', function($model) {
                             //return $this->product->plan()->name;
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             return '<a href='.url('products/'.$model->id.'/edit')
                             ." class='btn btn-sm btn-primary'>Edit</a>";
                         })

app/Http/Controllers/Product/ExtendedBaseProductController.php

Spacing +7 added lines, -7 removed lines

@@ -18,28 +18,28 @@
         ->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="'

Indentation +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
         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>';
+            .$model->version.'" data-id="'.$model->id.'" onclick="openEditPopup(this)" >Edit</a>';
     })
     ->rawcolumns(['checkbox', 'product_id', 'title', 'description', 'version', 'file', 'action'])
     ->make(true);
@@ -92,7 +92,7 @@ 
                 if ($product->require_domain == 1) {
                     $field .= "<div class='col-md-4 form-group'>
                         <label class='required'>"./* @scrutinizer ignore-type */
-                         \Lang::get('message.domain')."</label>
+                            \Lang::get('message.domain')."</label>
                         <input type='text' name='domain' class='form-control' 
                         id='domain' placeholder='http://example.com'>
                 </div>";

app/Model/Common/State.php

Indentation +1 added lines, -1 removed lines

@@ -13,6 +13,6 @@
         'state_subdivision_id', 'country_code_char2',
         'country_code_char3', 'state_subdivision_name',
         'state_subdivision_alternate_names', 'primary_level_name',
-         'state_subdivision_code',
+            'state_subdivision_code',
     ];
 }

app/Console/Commands/Install.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             $dbpassword = $this->ask('Enter your database password (blank if not entered)', false);
             $port = $this->ask('Enter your sql port (blank if not entered)', false);
             $array = ['DB_TYPE' => $default, 'DB_HOST' => $host,
-             'DB_DATABASE'      => $database, 'DB_USERNAME' => $dbusername, 'DB_PASSWORD' => $dbpassword, ];
+                'DB_DATABASE'      => $database, 'DB_USERNAME' => $dbusername, 'DB_PASSWORD' => $dbpassword, ];
             $this->updateDBEnv($array);
             $this->call('key:generate');
             $this->call('migrate');

app/Http/Controllers/Front/CartController.php

Indentation +120 added lines, -120 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.'%';
@@ -711,7 +711,7 @@ 
             if ($subregion) {
                 $result = ['id' => $subregion->state_subdivision_code,
 
-                     'name' => $subregion->state_subdivision_name, ];
+                        'name' => $subregion->state_subdivision_name, ];
             }
 
             return $result;

Braces +28 added lines, -14 removed lines

@@ -178,8 +178,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 = '';
@@ -190,45 +192,52 @@ 
                        $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();
@@ -269,7 +278,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', '')
@@ -294,13 +304,15 @@ 
                                             'value'  => $value,
                                         ]);
                                }
-                           } else {//In case of other country
+                           } 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 == '') {
@@ -882,7 +894,8 @@ 
         try {
             $currency = Setting::find(1)->default_currency;
             $currency_symbol = Setting::find(1)->default_symbol;
-            if (!\Auth::user()) {//When user is not logged in
+            if (!\Auth::user()) {
+//When user is not logged in
                 $cont = new \App\Http\Controllers\Front\PageController();
                 $location = $cont->getLocation();
                 $country = \App\Http\Controllers\Front\CartController::findCountryByGeoip($location['iso_code']);
@@ -901,7 +914,8 @@ 
                 $currency = \Auth::user()->currency;
                 $currency_symbol = \Auth::user()->currency_symbol;
             }
-            if ($userid != '') {//For Admin Panel Clients
+            if ($userid != '') {
+//For Admin Panel Clients
                 $currencyAndSymbol = $this->getCurrency($userid);
                 $currency = $currencyAndSymbol['currency'];
                 $currency_symbol = $currencyAndSymbol['symbol'];