@@ -279,7 +279,7 @@ |
||
| 279 | 279 | StatusSetting::find(1)->update(['github_status'=>$status]); |
| 280 | 280 | Github::find(1)->update(['username'=> $request->input('git_username'), |
| 281 | 281 | 'password' => $request->input('git_password'), 'client_id'=>$request->input('git_client'), |
| 282 | - 'client_secret' => $request->input('git_secret'), ]); |
|
| 282 | + 'client_secret' => $request->input('git_secret'), ]); |
|
| 283 | 283 | |
| 284 | 284 | return ['message' => 'success', 'update'=>'Github Settings Updated']; |
| 285 | 285 | } catch (Exception $ex) { |
@@ -115,18 +115,18 @@ discard block |
||
| 115 | 115 | ); |
| 116 | 116 | |
| 117 | 117 | return\ DataTables::of($user->get()) |
| 118 | - ->addColumn('checkbox', function ($model) { |
|
| 118 | + ->addColumn('checkbox', function($model) { |
|
| 119 | 119 | return "<input type='checkbox' class='user_checkbox' |
| 120 | 120 | value=".$model->id.' name=select[] id=check>'; |
| 121 | 121 | }) |
| 122 | - ->addColumn('first_name', function ($model) { |
|
| 122 | + ->addColumn('first_name', function($model) { |
|
| 123 | 123 | return '<a href='.url('clients/'.$model->id).'>' |
| 124 | 124 | .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>'; |
| 125 | 125 | }) |
| 126 | - ->addColumn('email', function ($model) { |
|
| 126 | + ->addColumn('email', function($model) { |
|
| 127 | 127 | return $model->email; |
| 128 | 128 | }) |
| 129 | - ->addColumn('created_at', function ($model) { |
|
| 129 | + ->addColumn('created_at', function($model) { |
|
| 130 | 130 | $ends = $model->created_at; |
| 131 | 131 | if ($ends) { |
| 132 | 132 | $date1 = new DateTime($ends); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | return $end; |
| 139 | 139 | }) |
| 140 | 140 | // ->showColumns('email', 'created_at') |
| 141 | - ->addColumn('active', function ($model) { |
|
| 141 | + ->addColumn('active', function($model) { |
|
| 142 | 142 | if ($model->active == 1) { |
| 143 | 143 | $email = "<span class='glyphicon glyphicon-envelope' |
| 144 | 144 | style='color:green' title='verified email'></span>"; |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | return $email.' '.$mobile; |
| 158 | 158 | }) |
| 159 | - ->addColumn('action', function ($model) { |
|
| 159 | + ->addColumn('action', function($model) { |
|
| 160 | 160 | return '<a href='.url('clients/'.$model->id.'/edit') |
| 161 | 161 | ." class='btn btn-sm btn-primary btn-xs'> |
| 162 | 162 | <i class='fa fa-edit' style='color:white;'> </i> Edit</a>" |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | <i class='fa fa-eye' style='color:white;'> </i> View</a>"; |
| 166 | 166 | // return 'hhhh'; |
| 167 | 167 | }) |
| 168 | - ->rawColumns(['checkbox', 'first_name', 'email', 'created_at', 'active', 'action']) |
|
| 168 | + ->rawColumns(['checkbox', 'first_name', 'email', 'created_at', 'active', 'action']) |
|
| 169 | 169 | ->make(true); |
| 170 | 170 | |
| 171 | 171 | // ->searchColumns('email', 'first_name') |
@@ -116,28 +116,28 @@ |
||
| 116 | 116 | ); |
| 117 | 117 | |
| 118 | 118 | return\ DataTables::of($user->get()) |
| 119 | - ->addColumn('checkbox', function ($model) { |
|
| 120 | - return "<input type='checkbox' class='user_checkbox' |
|
| 119 | + ->addColumn('checkbox', function ($model) { |
|
| 120 | + return "<input type='checkbox' class='user_checkbox' |
|
| 121 | 121 | value=".$model->id.' name=select[] id=check>'; |
| 122 | - }) |
|
| 122 | + }) |
|
| 123 | 123 | ->addColumn('first_name', function ($model) { |
| 124 | 124 | return '<a href='.url('clients/'.$model->id).'>' |
| 125 | 125 | .ucfirst($model->first_name).' '.ucfirst($model->last_name).'</a>'; |
| 126 | 126 | }) |
| 127 | - ->addColumn('email', function ($model) { |
|
| 128 | - return $model->email; |
|
| 129 | - }) |
|
| 130 | - ->addColumn('created_at', function ($model) { |
|
| 131 | - $ends = $model->created_at; |
|
| 132 | - if ($ends) { |
|
| 133 | - $date1 = new DateTime($ends); |
|
| 134 | - $tz = \Auth::user()->timezone()->first()->name; |
|
| 135 | - $date1->setTimezone(new DateTimeZone($tz)); |
|
| 136 | - $end = $date1->format('M j, Y, g:i a '); |
|
| 137 | - } |
|
| 138 | - |
|
| 139 | - return $end; |
|
| 140 | - }) |
|
| 127 | + ->addColumn('email', function ($model) { |
|
| 128 | + return $model->email; |
|
| 129 | + }) |
|
| 130 | + ->addColumn('created_at', function ($model) { |
|
| 131 | + $ends = $model->created_at; |
|
| 132 | + if ($ends) { |
|
| 133 | + $date1 = new DateTime($ends); |
|
| 134 | + $tz = \Auth::user()->timezone()->first()->name; |
|
| 135 | + $date1->setTimezone(new DateTimeZone($tz)); |
|
| 136 | + $end = $date1->format('M j, Y, g:i a '); |
|
| 137 | + } |
|
| 138 | + |
|
| 139 | + return $end; |
|
| 140 | + }) |
|
| 141 | 141 | // ->showColumns('email', 'created_at') |
| 142 | 142 | ->addColumn('active', function ($model) { |
| 143 | 143 | if ($model->active == 1) { |
@@ -150,9 +150,9 @@ |
||
| 150 | 150 | return \Response::json([]); |
| 151 | 151 | } |
| 152 | 152 | $users = User::where('email', 'LIKE', '%'.$term.'%') |
| 153 | - ->orWhere('first_name', 'LIKE', '%'.$term.'%') |
|
| 154 | - ->orWhere('last_name', 'LIKE', '%'.$term.'%') |
|
| 155 | - ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get(); |
|
| 153 | + ->orWhere('first_name', 'LIKE', '%'.$term.'%') |
|
| 154 | + ->orWhere('last_name', 'LIKE', '%'.$term.'%') |
|
| 155 | + ->select('id', 'email', 'profile_pic', 'first_name', 'last_name')->get(); |
|
| 156 | 156 | $formatted_tags = []; |
| 157 | 157 | |
| 158 | 158 | foreach ($users as $user) { |
@@ -50,18 +50,18 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | if ($interestGroupIdForNo && $productGroupId) { |
| 52 | 52 | $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [ |
| 53 | - 'interests' => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false, $productGroupId =>true], |
|
| 54 | - ]); |
|
| 53 | + 'interests' => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false, $productGroupId =>true], |
|
| 54 | + ]); |
|
| 55 | 55 | //refer to https://us7.api.mailchimp.com/playground |
| 56 | 56 | } elseif ($interestGroupIdForNo && $productGroupId == null) { |
| 57 | 57 | $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [ |
| 58 | - 'interests' => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false], |
|
| 59 | - ]); |
|
| 58 | + 'interests' => [$interestGroupIdForNo => true, $interestGroupIdForYes=>false], |
|
| 59 | + ]); |
|
| 60 | 60 | //refer to https://us7.api.mailchimp.com/playground |
| 61 | 61 | } elseif ($productGroupId && $interestGroupIdForNo == null || $interestGroupIdForYes == null) { |
| 62 | 62 | $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [ |
| 63 | - 'interests' => [$productGroupId =>true], |
|
| 64 | - ]); |
|
| 63 | + 'interests' => [$productGroupId =>true], |
|
| 64 | + ]); |
|
| 65 | 65 | } |
| 66 | 66 | } catch (Exception $ex) { |
| 67 | 67 | $exe = json_decode($ex->getMessage(), true); |
@@ -85,18 +85,18 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | if ($interestGroupIdForNo && $productGroupId) { |
| 87 | 87 | $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [ |
| 88 | - 'interests' => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true, $productGroupId =>true], |
|
| 89 | - //refer to https://us7.api.mailchimp.com/playground |
|
| 90 | - ]); |
|
| 88 | + 'interests' => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true, $productGroupId =>true], |
|
| 89 | + //refer to https://us7.api.mailchimp.com/playground |
|
| 90 | + ]); |
|
| 91 | 91 | } elseif ($interestGroupIdForNo && $productGroupId == null) { |
| 92 | 92 | $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [ |
| 93 | - 'interests' => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true], |
|
| 94 | - ]); |
|
| 93 | + 'interests' => [$interestGroupIdForNo => false, $interestGroupIdForYes=>true], |
|
| 94 | + ]); |
|
| 95 | 95 | //refer to https://us7.api.mailchimp.com/playground |
| 96 | 96 | } elseif ($productGroupId && $interestGroupIdForNo == null || $interestGroupIdForYes == null) { |
| 97 | 97 | $result = $this->mailchimp->patch("lists/$this->list_id/members/$hash", [ |
| 98 | - 'interests' => [$productGroupId =>true], |
|
| 99 | - ]); |
|
| 98 | + 'interests' => [$productGroupId =>true], |
|
| 99 | + ]); |
|
| 100 | 100 | } |
| 101 | 101 | //refer to https://us7.api.mailchimp.com/playground |
| 102 | 102 | } catch (Exception $ex) { |
@@ -121,7 +121,7 @@ |
||
| 121 | 121 | $set = $this->mailchimp_set; |
| 122 | 122 | $allists = $this->mailchimp->get('lists?count=20')['lists']; |
| 123 | 123 | $selectedList[] = $set->list_id; |
| 124 | - return view('themes.default1.common.mailchimp.settings', compact('set','allists','selectedList')); |
|
| 124 | + return view('themes.default1.common.mailchimp.settings', compact('set', 'allists', 'selectedList')); |
|
| 125 | 125 | } catch (Exception $ex) { |
| 126 | 126 | return redirect()->back()->with('fails', $ex->getMessage()); |
| 127 | 127 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | try { |
| 59 | 59 | $merge_fields = $this->field($email); |
| 60 | 60 | $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No |
| 61 | - $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes |
|
| 61 | + $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes |
|
| 62 | 62 | $result = $this->mailchimp->post("lists/$this->list_id/members", [ |
| 63 | 63 | 'status' => $this->mailchimp_set->subscribe_status, |
| 64 | 64 | 'email_address' => $email, |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $country = Country::where('country_code_char2', $user->country)->pluck('nicename')->first(); |
| 115 | 115 | if ($user) { |
| 116 | 116 | $fields = ['first_name', 'last_name', 'company', 'mobile', |
| 117 | - 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ]; |
|
| 117 | + 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ]; |
|
| 118 | 118 | $relation = $this->relation; |
| 119 | 119 | $merge_fields = []; |
| 120 | 120 | foreach ($fields as $field) { |
@@ -241,11 +241,11 @@ discard block |
||
| 241 | 241 | |
| 242 | 242 | $this->addProductInterestFieldsToAgora(); //add all the fields in Product Section of Groups to the db |
| 243 | 243 | $group_fields = $this->groups->where('list_id', $this->list_id) |
| 244 | - ->select('category_name', 'category_option_id', 'category_id')->get()->toArray(); |
|
| 244 | + ->select('category_name', 'category_option_id', 'category_id')->get()->toArray(); |
|
| 245 | 245 | // dd($group_fields[0]); |
| 246 | 246 | $relations = MailchimpGroupAgoraRelation::where('id', '!=', 0) |
| 247 | - ->select('agora_product_id', 'mailchimp_group_cat_id') |
|
| 248 | - ->orderBy('id', 'asc')->get()->toArray(); |
|
| 247 | + ->select('agora_product_id', 'mailchimp_group_cat_id') |
|
| 248 | + ->orderBy('id', 'asc')->get()->toArray(); |
|
| 249 | 249 | $productList = []; |
| 250 | 250 | $categoryList = []; |
| 251 | 251 | if (count($relations) != 0) { |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | MailchimpGroupAgoraRelation::where('id', '!=', 0)->delete(); |
| 325 | 325 | foreach ($request->row as $key => $value) { |
| 326 | 326 | MailchimpGroupAgoraRelation::create(['agora_product_id'=> $value[0], |
| 327 | - 'mailchimp_group_cat_id' => $value[1], ]); |
|
| 327 | + 'mailchimp_group_cat_id' => $value[1], ]); |
|
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | return redirect()->back()->with('success', \Lang::get('message.updated-successfully')); |