ladybirdweb / agorainvoicing

app/Model/Common/StatusSetting.php

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
 {
     protected $table = 'status_settings';
     public $timestamps = false;
-    protected $fillable = ['expiry_mail', 'activity_log_delete', 'license_status', 'github_status', 'mailchimp_status', 'twitter_status', 'msg91_status', 'emailverification_status', 'recaptcha_status', 'update_status', 'zoho_status', 'rzp_status', 'mailchimp_product_status', 'mailchimp_ispaid_status', 'terms','pipedrive_status'];
+    protected $fillable = ['expiry_mail', 'activity_log_delete', 'license_status', 'github_status', 'mailchimp_status', 'twitter_status', 'msg91_status', 'emailverification_status', 'recaptcha_status', 'update_status', 'zoho_status', 'rzp_status', 'mailchimp_product_status', 'mailchimp_ispaid_status', 'terms', 'pipedrive_status'];
 }

app/Http/Controllers/Auth/BaseAuthController.php

Spacing +4 added lines, -4 removed lines

@@ -215,9 +215,9 @@
         $countryFullName = Country::where('country_code_char2', $user->country)->pluck('nicename')->first();
         $pipedrive = new \Devio\Pipedrive\Pipedrive($token);
         $orgId  = $pipedrive->organizations->add(['name'=>$user->company])->getContent()->data->id;
-        $person = $pipedrive->persons()->add(['name' => $user->first_name .' '. $user->last_name,'email'=>$user->email,
-            'phone'=>'+'.$user->mobile_code.$user->mobile,'org_id'=>$orgId,'af1c1908b70a61f2baf8b33a975a185cce1aefe5'=>$countryFullName]);
-        $personId= $person->getContent()->data->id;
-        $organization = $pipedrive->deals()->add(['title'=>$user->company.' '.'deal','person_id'=>$personId,'org_id'=>$orgId]);
+        $person = $pipedrive->persons()->add(['name' => $user->first_name.' '.$user->last_name, 'email'=>$user->email,
+            'phone'=>'+'.$user->mobile_code.$user->mobile, 'org_id'=>$orgId, 'af1c1908b70a61f2baf8b33a975a185cce1aefe5'=>$countryFullName]);
+        $personId = $person->getContent()->data->id;
+        $organization = $pipedrive->deals()->add(['title'=>$user->company.' '.'deal', 'person_id'=>$personId, 'org_id'=>$orgId]);
     }
 }

app/Http/Controllers/Auth/AuthController.php

Indentation +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
                 $pipedriveStatus = StatusSetting::pluck('pipedrive_status')->first();
                 $zohoStatus = StatusSetting::pluck('zoho_status')->first();
                 $mailchimpStatus = StatusSetting::pluck('mailchimp_status')->first();
-                 if($pipedriveStatus == 1) {//Add to Pipedrive
-                     $this->addToPipedrive($user);
+                    if($pipedriveStatus == 1) {//Add to Pipedrive
+                        $this->addToPipedrive($user);
                 }
                 if ($zohoStatus) {//Add to Zoho
                     $zoho = $this->reqFields($user, $email);

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
                 $pipedriveStatus = StatusSetting::pluck('pipedrive_status')->first();
                 $zohoStatus = StatusSetting::pluck('zoho_status')->first();
                 $mailchimpStatus = StatusSetting::pluck('mailchimp_status')->first();
-                 if($pipedriveStatus == 1) {//Add to Pipedrive
+                 if ($pipedriveStatus == 1) {//Add to Pipedrive
                      $this->addToPipedrive($user);
                 }
                 if ($zohoStatus) {//Add to Zoho

Braces +6 added lines, -3 removed lines

@@ -72,10 +72,12 @@ 
                 $pipedriveStatus = StatusSetting::pluck('pipedrive_status')->first();
                 $zohoStatus = StatusSetting::pluck('zoho_status')->first();
                 $mailchimpStatus = StatusSetting::pluck('mailchimp_status')->first();
-                 if($pipedriveStatus == 1) {//Add to Pipedrive
+                 if($pipedriveStatus == 1) {
+//Add to Pipedrive
                      $this->addToPipedrive($user);
                 }
-                if ($zohoStatus) {//Add to Zoho
+                if ($zohoStatus) {
+//Add to Zoho
                     $zoho = $this->reqFields($user, $email);
                     $auth = ApiKey::where('id', 1)->value('zoho_api_key');
                     $zohoUrl = 'https://crm.zoho.com/crm/private/xml/Leads/insertRecords??duplicateCheck=1&';
@@ -98,7 +100,8 @@ 
                     curl_close($ch);
                 }
 
-                if ($mailchimpStatus == 1) {//Add to Mailchimp
+                if ($mailchimpStatus == 1) {
+//Add to Mailchimp
                     $mailchimp = new \App\Http\Controllers\Common\MailChimpController();
                     $r = $mailchimp->addSubscriber($user->email);
                 }

app/Http/Controllers/Common/SettingsController.php

Spacing +20 added lines, -20 removed lines

@@ -68,7 +68,7 @@ 
             $mobileauthkey = $apikeys->pluck('msg91_auth_key')->first();
             $updateUrl = $apikeys->pluck('update_api_url')->first();
             $emailStatus = StatusSetting::pluck('emailverification_status')->first();
-            $twitterKeys = $apikeys->select('twitter_consumer_key','twitter_consumer_secret',
+            $twitterKeys = $apikeys->select('twitter_consumer_key', 'twitter_consumer_secret',
                 'twitter_access_token', 'access_tooken_secret')->first();
             $twitterStatus = $this->statusSetting->pluck('twitter_status')->first();
             $zohoStatus = $this->statusSetting->pluck('zoho_status')->first();
@@ -83,7 +83,7 @@ 
             $pipedriveStatus = StatusSetting::pluck('pipedrive_status')->first();
             $model = $apikeys->find(1);
 
-            return view('themes.default1.common.apikey', compact('model', 'status', 'licenseSecret', 'licenseUrl', 'siteKey', 'secretKey', 'captchaStatus', 'updateStatus', 'updateSecret', 'updateUrl', 'mobileStatus', 'mobileauthkey', 'emailStatus', 'twitterStatus', 'twitterKeys', 'zohoStatus', 'zohoKey', 'rzpStatus', 'rzpKeys', 'mailchimpSetting', 'mailchimpKey', 'termsStatus', 'termsUrl','pipedriveKey','pipedriveStatus'));
+            return view('themes.default1.common.apikey', compact('model', 'status', 'licenseSecret', 'licenseUrl', 'siteKey', 'secretKey', 'captchaStatus', 'updateStatus', 'updateSecret', 'updateUrl', 'mobileStatus', 'mobileauthkey', 'emailStatus', 'twitterStatus', 'twitterKeys', 'zohoStatus', 'zohoKey', 'rzpStatus', 'rzpKeys', 'mailchimpSetting', 'mailchimpKey', 'termsStatus', 'termsUrl', 'pipedriveKey', 'pipedriveStatus'));
         } catch (\Exception $ex) {
             return redirect('/')->with('fails', $ex->getMessage());
         }
@@ -305,16 +305,16 @@ 
 
             return \DataTables::of($query->take(50))
              ->setTotalRecords($query->count())
-             ->addColumn('checkbox', function ($model) {
+             ->addColumn('checkbox', function($model) {
                  return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>';
              })
-                           ->addColumn('name', function ($model) {
+                           ->addColumn('name', function($model) {
                                return ucfirst($model->log_name);
                            })
-                             ->addColumn('description', function ($model) {
+                             ->addColumn('description', function($model) {
                                  return ucfirst($model->description);
                              })
-                          ->addColumn('username', function ($model) {
+                          ->addColumn('username', function($model) {
                               $causer_id = $model->causer_id;
                               $names = User::where('id', $causer_id)->pluck('last_name', 'first_name');
                               foreach ($names as $key => $value) {
@@ -323,41 +323,41 @@ 
                                   return $fullName;
                               }
                           })
-                              ->addColumn('role', function ($model) {
+                              ->addColumn('role', function($model) {
                                   $causer_id = $model->causer_id;
                                   $role = User::where('id', $causer_id)->pluck('role');
 
                                   return json_decode($role);
                               })
-                               ->addColumn('new', function ($model) {
+                               ->addColumn('new', function($model) {
                                    $properties = ($model->properties);
                                    $newEntry = $this->getNewEntry($properties, $model);
 
                                    return $newEntry;
                                })
-                                ->addColumn('old', function ($model) {
+                                ->addColumn('old', function($model) {
                                     $data = ($model->properties);
                                     $oldEntry = $this->getOldEntry($data, $model);
 
                                     return $oldEntry;
                                 })
-                                ->addColumn('created_at', function ($model) {
+                                ->addColumn('created_at', function($model) {
                                     $newDate = $this->getDate($model->created_at);
 
                                     return $newDate;
                                 })
 
-                                    ->filterColumn('log_name', function ($query, $keyword) {
+                                    ->filterColumn('log_name', function($query, $keyword) {
                                         $sql = 'log_name like ?';
                                         $query->whereRaw($sql, ["%{$keyword}%"]);
                                     })
 
-                                ->filterColumn('description', function ($query, $keyword) {
+                                ->filterColumn('description', function($query, $keyword) {
                                     $sql = 'description like ?';
                                     $query->whereRaw($sql, ["%{$keyword}%"]);
                                 })
 
-                            ->filterColumn('causer_id', function ($query, $keyword) {
+                            ->filterColumn('causer_id', function($query, $keyword) {
                                 $sql = 'first_name like ?';
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
                             })
@@ -378,10 +378,10 @@ 
             $email_log = \DB::table('email_log')->orderBy('date', 'desc')->get();
 
             return\ DataTables::of($email_log)
-             ->addColumn('checkbox', function ($model) {
+             ->addColumn('checkbox', function($model) {
                  return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>';
              })
-                           ->addColumn('date', function ($model) {
+                           ->addColumn('date', function($model) {
                                $date = $model->date;
                                if ($date) {
                                    $date1 = new \DateTime($date);
@@ -392,18 +392,18 @@ 
 
                                return $finalDate;
                            })
-                             ->addColumn('from', function ($model) {
+                             ->addColumn('from', function($model) {
                                  $from = Markdown::convertToHtml($model->from);
 
                                  return $from;
                              })
-                              ->addColumn('to', function ($model) {
+                              ->addColumn('to', function($model) {
                                   $to = Markdown::convertToHtml($model->to);
 
                                   return $to;
                               })
 
-                               ->addColumn('subject', function ($model) {
+                               ->addColumn('subject', function($model) {
                                    return ucfirst($model->subject);
                                })
                                 // ->addColumn('headers', function ($model) {
@@ -411,12 +411,12 @@ 
 
                                 //     return $headers;
                                 // })
-                              ->addColumn('status', function ($model) {
+                              ->addColumn('status', function($model) {
                                   return ucfirst($model->status);
                               })
 
                             ->rawColumns(['checkbox', 'date', 'from', 'to',
-                                'bcc', 'subject',  'status', ])
+                                'bcc', 'subject', 'status', ])
                             ->make(true);
         } catch (\Exception $e) {
             Bugsnag::notifyException($e);