ladybirdweb / agorainvoicing

app/Http/Requests/User/ProfileRequest.php

Indentation +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
                     'zip'              => 'required|numeric',
                     'user_name'        => 'required|unique:users,user_name,'.$userid,
                     'bussiness'        => 'required',
-                     'profile_pic'           => 'sometimes|mimes:jpeg,jpg,png,gif|max:100000',
+                        'profile_pic'           => 'sometimes|mimes:jpeg,jpg,png,gif|max:100000',
 
         ];
         }
@@ -45,9 +45,9 @@ 
             $userid = \Auth::user()->id;
 
             return [
-                     'first_name'            => 'required|min:3|max:20',
+                        'first_name'            => 'required|min:3|max:20',
                     'last_name'              => 'required|max:20',
-                     'mobile'                => 'required|regex:/[0-9]/|min:5|max:20',
+                        'mobile'                => 'required|regex:/[0-9]/|min:5|max:20',
                     'mobile_code'            => 'required|numeric',
 
                     'zip'                   => 'required|numeric',

app/Http/Controllers/Front/CartController.php

Indentation +115 added lines, -115 removed lines

@@ -198,146 +198,146 @@ 
                 $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([
@@ -355,7 +355,7 @@ 
             'attributes'         => ['tax' => $tax_attribute,
             'currency'                     => $currency_attribute, ], ];
         } catch (\Exception $ex) {
-          return redirect()->back()->with('fails',$ex->getMessage());
+            return redirect()->back()->with('fails',$ex->getMessage());
             Bugsnag::notifyException($ex);
 
             throw new \Exception('Can not check the tax');

Spacing +1 added lines, -1 removed lines

@@ -355,7 +355,7 @@
             'attributes'         => ['tax' => $tax_attribute,
             'currency'                     => $currency_attribute, ], ];
         } catch (\Exception $ex) {
-          return redirect()->back()->with('fails',$ex->getMessage());
+          return redirect()->back()->with('fails', $ex->getMessage());
             Bugsnag::notifyException($ex);
 
             throw new \Exception('Can not check the tax');

app/Http/Controllers/Front/ExtendedBaseCartController.php

Indentation +4 added lines, -4 removed lines

@@ -197,9 +197,9 @@ 
         $geoip_country = '';
         if (\Auth::user()){
         if (\Auth::user()->role == 'admin') {
-             $geoip_country = $user_country;
+                $geoip_country = $user_country;
         } elseif(\Auth::user()->role == 'user') {
-             $geoip_country = \Auth::user()->country;
+                $geoip_country = \Auth::user()->country;
         }
 
         if ($geoip_country == '') {
@@ -217,10 +217,10 @@ 
         if (\Auth::user()->role == 'admin') {
             $geoip_state = $user_state;
         } elseif(\Auth::user()->role == 'user') {
-             $geoip_state = \Auth::user()->state;
+                $geoip_state = \Auth::user()->state;
         }
         if ($geoip_state == '') {
-             $geoip_state_array = \App\Http\Controllers\Front\CartController::getStateByCode($state_code);
+                $geoip_state_array = \App\Http\Controllers\Front\CartController::getStateByCode($state_code);
             if (array_key_exists('id', $geoip_state_array)) {
                 $geoip_state = $geoip_state_array['id'];
             }

Spacing +4 added lines, -4 removed lines

@@ -195,10 +195,10 @@ 
     public function getGeoipCountry($country_iso, $user_country = '')
     {
         $geoip_country = '';
-        if (\Auth::user()){
+        if (\Auth::user()) {
         if (\Auth::user()->role == 'admin') {
              $geoip_country = $user_country;
-        } elseif(\Auth::user()->role == 'user') {
+        } elseif (\Auth::user()->role == 'user') {
              $geoip_country = \Auth::user()->country;
         }
 
@@ -213,10 +213,10 @@ 
     public function getGeoipState($state_code, $user_state = '')
     {
         $geoip_state = '';
-        if (\Auth::user()){
+        if (\Auth::user()) {
         if (\Auth::user()->role == 'admin') {
             $geoip_state = $user_state;
-        } elseif(\Auth::user()->role == 'user') {
+        } elseif (\Auth::user()->role == 'user') {
              $geoip_state = \Auth::user()->state;
         }
         if ($geoip_state == '') {

Braces +2 added lines, -2 removed lines

@@ -195,7 +195,7 @@ 
     public function getGeoipCountry($country_iso, $user_country = '')
     {
         $geoip_country = '';
-        if (\Auth::user()){
+        if (\Auth::user()) {
         if (\Auth::user()->role == 'admin') {
              $geoip_country = $user_country;
         } elseif(\Auth::user()->role == 'user') {
@@ -213,7 +213,7 @@ 
     public function getGeoipState($state_code, $user_state = '')
     {
         $geoip_state = '';
-        if (\Auth::user()){
+        if (\Auth::user()) {
         if (\Auth::user()->role == 'admin') {
             $geoip_state = $user_state;
         } elseif(\Auth::user()->role == 'user') {