| @@ -8,5 +8,5 @@ | ||
| 8 | 8 |  { | 
| 9 | 9 | protected $table = 'status_settings'; | 
| 10 | 10 | public $timestamps = false; | 
| 11 | - 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']; | |
| 11 | + 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']; | |
| 12 | 12 | } | 
| @@ -119,16 +119,16 @@ | ||
| 119 | 119 | |
| 120 | 120 | public function updateMailchimpDetails(Request $request) | 
| 121 | 121 |      { | 
| 122 | -       $chimp_auth_key =  $request->input('mailchimp_auth_key'); | |
| 123 | -       $status =  $request->input('status'); | |
| 124 | - StatusSetting::find(1)->update(['mailchimp_status'=>$status]); | |
| 125 | - MailchimpSetting::find(1)->update(['api_key'=>$chimp_auth_key]); | |
| 126 | - return ['message' => 'success', 'update'=>'Mailchimp Settings Updated']; | |
| 122 | +        $chimp_auth_key =  $request->input('mailchimp_auth_key'); | |
| 123 | +        $status =  $request->input('status'); | |
| 124 | + StatusSetting::find(1)->update(['mailchimp_status'=>$status]); | |
| 125 | + MailchimpSetting::find(1)->update(['api_key'=>$chimp_auth_key]); | |
| 126 | + return ['message' => 'success', 'update'=>'Mailchimp Settings Updated']; | |
| 127 | 127 | } | 
| 128 | 128 | |
| 129 | - /** | |
| 130 | - * Get Date. | |
| 131 | - */ | |
| 129 | + /** | |
| 130 | + * Get Date. | |
| 131 | + */ | |
| 132 | 132 | public function getDate($dbdate) | 
| 133 | 133 |      { | 
| 134 | 134 | $created = new DateTime($dbdate); | 
| @@ -119,8 +119,8 @@ | ||
| 119 | 119 | |
| 120 | 120 | public function updateMailchimpDetails(Request $request) | 
| 121 | 121 |      { | 
| 122 | -       $chimp_auth_key =  $request->input('mailchimp_auth_key'); | |
| 123 | -       $status =  $request->input('status'); | |
| 122 | +       $chimp_auth_key = $request->input('mailchimp_auth_key'); | |
| 123 | +       $status = $request->input('status'); | |
| 124 | 124 | StatusSetting::find(1)->update(['mailchimp_status'=>$status]); | 
| 125 | 125 | MailchimpSetting::find(1)->update(['api_key'=>$chimp_auth_key]); | 
| 126 | 126 | return ['message' => 'success', 'update'=>'Mailchimp Settings Updated']; | 
| @@ -68,7 +68,7 @@ discard block | ||
| 68 | 68 |              $mobileauthkey = $apikeys->pluck('msg91_auth_key')->first(); | 
| 69 | 69 |              $updateUrl = $apikeys->pluck('update_api_url')->first(); | 
| 70 | 70 |              $emailStatus = StatusSetting::pluck('emailverification_status')->first(); | 
| 71 | -            $twitterKeys = $apikeys->select('twitter_consumer_key','twitter_consumer_secret', | |
| 71 | +            $twitterKeys = $apikeys->select('twitter_consumer_key', 'twitter_consumer_secret', | |
| 72 | 72 | 'twitter_access_token', 'access_tooken_secret')->first(); | 
| 73 | 73 |              $twitterStatus = $this->statusSetting->pluck('twitter_status')->first(); | 
| 74 | 74 |              $zohoStatus = $this->statusSetting->pluck('zoho_status')->first(); | 
| @@ -79,7 +79,7 @@ discard block | ||
| 79 | 79 |              $mailchimpKey = MailchimpSetting::pluck('api_key')->first(); | 
| 80 | 80 | $model = $apikeys->find(1); | 
| 81 | 81 | |
| 82 | -            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')); | |
| 82 | +            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')); | |
| 83 | 83 |          } catch (\Exception $ex) { | 
| 84 | 84 |              return redirect('/')->with('fails', $ex->getMessage()); | 
| 85 | 85 | } | 
| @@ -302,16 +302,16 @@ discard block | ||
| 302 | 302 | |
| 303 | 303 | return \DataTables::of($query->take(50)) | 
| 304 | 304 | ->setTotalRecords($query->count()) | 
| 305 | -             ->addColumn('checkbox', function ($model) { | |
| 305 | +             ->addColumn('checkbox', function($model) { | |
| 306 | 306 | return "<input type='checkbox' class='activity' value=".$model->id.' name=select[] id=check>'; | 
| 307 | 307 | }) | 
| 308 | -                           ->addColumn('name', function ($model) { | |
| 308 | +                           ->addColumn('name', function($model) { | |
| 309 | 309 | return ucfirst($model->log_name); | 
| 310 | 310 | }) | 
| 311 | -                             ->addColumn('description', function ($model) { | |
| 311 | +                             ->addColumn('description', function($model) { | |
| 312 | 312 | return ucfirst($model->description); | 
| 313 | 313 | }) | 
| 314 | -                          ->addColumn('username', function ($model) { | |
| 314 | +                          ->addColumn('username', function($model) { | |
| 315 | 315 | $causer_id = $model->causer_id; | 
| 316 | 316 |                                $names = User::where('id', $causer_id)->pluck('last_name', 'first_name'); | 
| 317 | 317 |                                foreach ($names as $key => $value) { | 
| @@ -320,41 +320,41 @@ discard block | ||
| 320 | 320 | return $fullName; | 
| 321 | 321 | } | 
| 322 | 322 | }) | 
| 323 | -                              ->addColumn('role', function ($model) { | |
| 323 | +                              ->addColumn('role', function($model) { | |
| 324 | 324 | $causer_id = $model->causer_id; | 
| 325 | 325 |                                    $role = User::where('id', $causer_id)->pluck('role'); | 
| 326 | 326 | |
| 327 | 327 | return json_decode($role); | 
| 328 | 328 | }) | 
| 329 | -                               ->addColumn('new', function ($model) { | |
| 329 | +                               ->addColumn('new', function($model) { | |
| 330 | 330 | $properties = ($model->properties); | 
| 331 | 331 | $newEntry = $this->getNewEntry($properties, $model); | 
| 332 | 332 | |
| 333 | 333 | return $newEntry; | 
| 334 | 334 | }) | 
| 335 | -                                ->addColumn('old', function ($model) { | |
| 335 | +                                ->addColumn('old', function($model) { | |
| 336 | 336 | $data = ($model->properties); | 
| 337 | 337 | $oldEntry = $this->getOldEntry($data, $model); | 
| 338 | 338 | |
| 339 | 339 | return $oldEntry; | 
| 340 | 340 | }) | 
| 341 | -                                ->addColumn('created_at', function ($model) { | |
| 341 | +                                ->addColumn('created_at', function($model) { | |
| 342 | 342 | $newDate = $this->getDate($model->created_at); | 
| 343 | 343 | |
| 344 | 344 | return $newDate; | 
| 345 | 345 | }) | 
| 346 | 346 | |
| 347 | -                                    ->filterColumn('log_name', function ($query, $keyword) { | |
| 347 | +                                    ->filterColumn('log_name', function($query, $keyword) { | |
| 348 | 348 | $sql = 'log_name like ?'; | 
| 349 | 349 |                                          $query->whereRaw($sql, ["%{$keyword}%"]); | 
| 350 | 350 | }) | 
| 351 | 351 | |
| 352 | -                                ->filterColumn('description', function ($query, $keyword) { | |
| 352 | +                                ->filterColumn('description', function($query, $keyword) { | |
| 353 | 353 | $sql = 'description like ?'; | 
| 354 | 354 |                                      $query->whereRaw($sql, ["%{$keyword}%"]); | 
| 355 | 355 | }) | 
| 356 | 356 | |
| 357 | -                            ->filterColumn('causer_id', function ($query, $keyword) { | |
| 357 | +                            ->filterColumn('causer_id', function($query, $keyword) { | |
| 358 | 358 | $sql = 'first_name like ?'; | 
| 359 | 359 |                                  $query->whereRaw($sql, ["%{$keyword}%"]); | 
| 360 | 360 | }) | 
| @@ -376,37 +376,37 @@ discard block | ||
| 376 | 376 |              $email_log = \DB::table('email_log')->get(); | 
| 377 | 377 | |
| 378 | 378 | return\ DataTables::of($email_log) | 
| 379 | -             ->addColumn('checkbox', function ($model) { | |
| 379 | +             ->addColumn('checkbox', function($model) { | |
| 380 | 380 | return "<input type='checkbox' class='email' value=".$model->id.' name=select[] id=check>'; | 
| 381 | 381 | }) | 
| 382 | -                           ->addColumn('date', function ($model) { | |
| 382 | +                           ->addColumn('date', function($model) { | |
| 383 | 383 | return ucfirst($model->date); | 
| 384 | 384 | }) | 
| 385 | -                             ->addColumn('from', function ($model) { | |
| 385 | +                             ->addColumn('from', function($model) { | |
| 386 | 386 | $from = Markdown::convertToHtml(ucfirst($model->from)); | 
| 387 | 387 | |
| 388 | 388 | return $from; | 
| 389 | 389 | }) | 
| 390 | -                              ->addColumn('to', function ($model) { | |
| 390 | +                              ->addColumn('to', function($model) { | |
| 391 | 391 | $to = Markdown::convertToHtml(ucfirst($model->to)); | 
| 392 | 392 | |
| 393 | 393 | return $to; | 
| 394 | 394 | }) | 
| 395 | -                             ->addColumn('cc', function ($model) { | |
| 395 | +                             ->addColumn('cc', function($model) { | |
| 396 | 396 | $cc = '--'; | 
| 397 | 397 | |
| 398 | 398 | return $cc; | 
| 399 | 399 | }) | 
| 400 | 400 | |
| 401 | -                               ->addColumn('subject', function ($model) { | |
| 401 | +                               ->addColumn('subject', function($model) { | |
| 402 | 402 | return ucfirst($model->subject); | 
| 403 | 403 | }) | 
| 404 | -                                ->addColumn('headers', function ($model) { | |
| 404 | +                                ->addColumn('headers', function($model) { | |
| 405 | 405 | $headers = Markdown::convertToHtml(ucfirst($model->headers)); | 
| 406 | 406 | |
| 407 | 407 | return $headers; | 
| 408 | 408 | }) | 
| 409 | -                              ->addColumn('status', function ($model) { | |
| 409 | +                              ->addColumn('status', function($model) { | |
| 410 | 410 | return ucfirst($model->status); | 
| 411 | 411 | }) | 
| 412 | 412 | |
| @@ -62,7 +62,7 @@ discard block | ||
| 62 | 62 |          try { | 
| 63 | 63 | $merge_fields = $this->field($email); | 
| 64 | 64 | $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No | 
| 65 | - $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes | |
| 65 | + $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes | |
| 66 | 66 |              $result = $this->mailchimp->post("lists/$this->list_id/members", [ | 
| 67 | 67 | 'status' => $this->mailchimp_set->subscribe_status, | 
| 68 | 68 | 'email_address' => $email, | 
| @@ -84,7 +84,7 @@ discard block | ||
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 | //Update to Mailchimp For Paid Product | 
| 87 | - public function addSubscriberByClientPanel(Request $request) | |
| 87 | + public function addSubscriberByClientPanel(Request $request) | |
| 88 | 88 |      { | 
| 89 | 89 | $this->validate($request, [ | 
| 90 | 90 | 'email' => 'required|email', | 
| @@ -120,7 +120,7 @@ discard block | ||
| 120 | 120 |              $country = Country::where('country_code_char2', $user->country)->pluck('nicename')->first(); | 
| 121 | 121 |              if ($user) { | 
| 122 | 122 | $fields = ['first_name', 'last_name', 'company', 'mobile', | 
| 123 | - 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ]; | |
| 123 | + 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ]; | |
| 124 | 124 | $relation = $this->relation; | 
| 125 | 125 | $merge_fields = []; | 
| 126 | 126 |                  foreach ($fields as $field) { | 
| @@ -249,11 +249,11 @@ discard block | ||
| 249 | 249 | |
| 250 | 250 | $this->addProductInterestFieldsToAgora(); //add all the fields in Product Section of Groups to the db | 
| 251 | 251 |              $group_fields = $this->groups->where('list_id', $this->list_id) | 
| 252 | -          ->select('category_name', 'category_option_id', 'category_id')->get()->toArray(); | |
| 252 | +            ->select('category_name', 'category_option_id', 'category_id')->get()->toArray(); | |
| 253 | 253 | // dd($group_fields[0]); | 
| 254 | 254 |              $relations = MailchimpGroupAgoraRelation::where('id', '!=', 0) | 
| 255 | -          ->select('agora_product_id', 'mailchimp_group_cat_id') | |
| 256 | -          ->orderBy('id', 'asc')->get()->toArray(); | |
| 255 | +            ->select('agora_product_id', 'mailchimp_group_cat_id') | |
| 256 | +            ->orderBy('id', 'asc')->get()->toArray(); | |
| 257 | 257 | $productList = []; | 
| 258 | 258 | $categoryList = []; | 
| 259 | 259 |              if (count($relations) != 0) { | 
| @@ -262,8 +262,8 @@ discard block | ||
| 262 | 262 |                      $productList[] = Product::where('id', $value['agora_product_id'])->pluck('name')->first(); | 
| 263 | 263 | } | 
| 264 | 264 | } | 
| 265 | -           $isPaidYesId = MailchimpFieldAgoraRelation::first()->pluck('is_paid_yes')->toArray(); | |
| 266 | -           $selectedIsPaid[] =  $isPaidYesId ? MailchimpGroup::where('category_option_id',$isPaidYesId)->pluck('category_id')->first() :''; | |
| 265 | +            $isPaidYesId = MailchimpFieldAgoraRelation::first()->pluck('is_paid_yes')->toArray(); | |
| 266 | +            $selectedIsPaid[] =  $isPaidYesId ? MailchimpGroup::where('category_option_id',$isPaidYesId)->pluck('category_id')->first() :''; | |
| 267 | 267 |              $status = StatusSetting::select('mailchimp_product_status','mailchimp_ispaid_status')->first(); | 
| 268 | 268 |              return view('themes.default1.common.mailchimp.map', compact('mailchimp_fields', 'model2', 'model', 'agoraProducts', 'display', 'selectedProducts', 'relations', 'group_fields', 'categoryList', 'productList','status','selectedIsPaid')); | 
| 269 | 269 |          } catch (Exception $ex) { | 
| @@ -286,7 +286,7 @@ discard block | ||
| 286 | 286 |              foreach ($fields as $field) { | 
| 287 | 287 |                  $selectedCategory = MailchimpGroupAgoraRelation::where('mailchimp_group_cat_id', $field['category_option_id'])->pluck('mailchimp_group_cat_id')->first(); | 
| 288 | 288 | echo '<option value='.$field['category_option_id'].'>'.$field['category_option_name'].'</option>'; | 
| 289 | - } | |
| 289 | + } | |
| 290 | 290 | } | 
| 291 | 291 | |
| 292 | 292 | } | 
| @@ -297,7 +297,7 @@ discard block | ||
| 297 | 297 |      if(count($checkCategory) > 0) { | 
| 298 | 298 |          foreach ($checkCategory as $interest) { | 
| 299 | 299 |          $groupInterests = $this->mailchimp->get("lists/$this->list_id/interest-categories/$interest->id/interests?count=20");  | 
| 300 | -          if (count($groupInterests['interests']) > 0) { | |
| 300 | +            if (count($groupInterests['interests']) > 0) { | |
| 301 | 301 |          foreach ($groupInterests['interests'] as $key => $value) { | 
| 302 | 302 | $category_id = $value->category_id; | 
| 303 | 303 | $list_id = $value->list_id; | 
| @@ -310,11 +310,11 @@ discard block | ||
| 310 | 310 | 'category_name' => $category_option_name, | 
| 311 | 311 | ]); | 
| 312 | 312 | |
| 313 | - } | |
| 314 | - } | |
| 315 | - } | |
| 313 | + } | |
| 314 | + } | |
| 315 | + } | |
| 316 | + } | |
| 316 | 317 | } | 
| 317 | - } | |
| 318 | 318 | |
| 319 | 319 | |
| 320 | 320 | public function postMapField(Request $request) | 
| @@ -334,7 +334,7 @@ discard block | ||
| 334 | 334 |              MailchimpGroupAgoraRelation::where('id', '!=', 0)->delete(); | 
| 335 | 335 |              foreach ($request->row as $key => $value) { | 
| 336 | 336 | MailchimpGroupAgoraRelation::create(['agora_product_id'=> $value[0], | 
| 337 | - 'mailchimp_group_cat_id' => $value[1], ]); | |
| 337 | + 'mailchimp_group_cat_id' => $value[1], ]); | |
| 338 | 338 | } | 
| 339 | 339 | |
| 340 | 340 |              return redirect()->back()->with('success', \Lang::get('message.updated-successfully')); | 
| @@ -204,7 +204,7 @@ discard block | ||
| 204 | 204 | $set = $this->mailchimp_set; | 
| 205 | 205 |              $allists = $this->mailchimp->get('lists?count=20')['lists']; | 
| 206 | 206 | $selectedList[] = $set->list_id; | 
| 207 | -            return view('themes.default1.common.mailchimp.settings', compact('set','allists','selectedList')); | |
| 207 | +            return view('themes.default1.common.mailchimp.settings', compact('set', 'allists', 'selectedList')); | |
| 208 | 208 |          } catch (Exception $ex) { | 
| 209 | 209 |              return redirect()->back()->with('fails', $ex->getMessage()); | 
| 210 | 210 | } | 
| @@ -263,9 +263,9 @@ discard block | ||
| 263 | 263 | } | 
| 264 | 264 | } | 
| 265 | 265 |             $isPaidYesId = MailchimpFieldAgoraRelation::first()->pluck('is_paid_yes')->toArray(); | 
| 266 | -           $selectedIsPaid[] =  $isPaidYesId ? MailchimpGroup::where('category_option_id',$isPaidYesId)->pluck('category_id')->first() :''; | |
| 267 | -            $status = StatusSetting::select('mailchimp_product_status','mailchimp_ispaid_status')->first(); | |
| 268 | -            return view('themes.default1.common.mailchimp.map', compact('mailchimp_fields', 'model2', 'model', 'agoraProducts', 'display', 'selectedProducts', 'relations', 'group_fields', 'categoryList', 'productList','status','selectedIsPaid')); | |
| 266 | +           $selectedIsPaid[] = $isPaidYesId ? MailchimpGroup::where('category_option_id', $isPaidYesId)->pluck('category_id')->first() : ''; | |
| 267 | +            $status = StatusSetting::select('mailchimp_product_status', 'mailchimp_ispaid_status')->first(); | |
| 268 | +            return view('themes.default1.common.mailchimp.map', compact('mailchimp_fields', 'model2', 'model', 'agoraProducts', 'display', 'selectedProducts', 'relations', 'group_fields', 'categoryList', 'productList', 'status', 'selectedIsPaid')); | |
| 269 | 269 |          } catch (Exception $ex) { | 
| 270 | 270 |              return redirect()->back()->with('fails', $ex->getMessage()); | 
| 271 | 271 | } | 
| @@ -294,7 +294,7 @@ discard block | ||
| 294 | 294 | public function addProductInterestFieldsToAgora() | 
| 295 | 295 |      { | 
| 296 | 296 |      $checkCategory = ($this->mailchimp->get("lists/$this->list_id/interest-categories")['categories']); | 
| 297 | -    if(count($checkCategory) > 0) { | |
| 297 | +    if (count($checkCategory) > 0) { | |
| 298 | 298 |          foreach ($checkCategory as $interest) { | 
| 299 | 299 |          $groupInterests = $this->mailchimp->get("lists/$this->list_id/interest-categories/$interest->id/interests?count=20");  | 
| 300 | 300 |            if (count($groupInterests['interests']) > 0) { | 
| @@ -350,17 +350,17 @@ discard block | ||
| 350 | 350 |              $groupInterests = $this->mailchimp->get("lists/$this->list_id/interest-categories/$group/interests?count=20")['interests'];  | 
| 351 | 351 |              foreach ($groupInterests as $interest) { | 
| 352 | 352 | //IS Paid Should be either Yes/No or True/False | 
| 353 | -            if((strcasecmp($interest->name , 'Yes') == 0) || (strcasecmp($interest->name , 'True') == 0)) { | |
| 353 | +            if ((strcasecmp($interest->name, 'Yes') == 0) || (strcasecmp($interest->name, 'True') == 0)) { | |
| 354 | 354 | MailchimpFieldAgoraRelation::find(1)->update(['is_paid_yes'=>$interest->id]); | 
| 355 | -            } elseif((strcasecmp($interest->name , 'No') == 0) || (strcasecmp($interest->name , 'False') == 0)) { | |
| 355 | +            } elseif ((strcasecmp($interest->name, 'No') == 0) || (strcasecmp($interest->name, 'False') == 0)) { | |
| 356 | 356 | MailchimpFieldAgoraRelation::find(1)->update(['is_paid_no'=>$interest->id]); | 
| 357 | 357 |              } else { | 
| 358 | -                return redirect()->back()->with('fails','The Group Should have Dropdown with values either Yes/No or True/False'); | |
| 358 | +                return redirect()->back()->with('fails', 'The Group Should have Dropdown with values either Yes/No or True/False'); | |
| 359 | 359 | } | 
| 360 | 360 | } | 
| 361 | -        return redirect()->back()->with('success','Settings Updated Successfully'); | |
| 362 | -        } catch(Exception $ex) { | |
| 363 | -            return redirect()->back()->with('fails',$ex->getMessage()); | |
| 361 | +        return redirect()->back()->with('success', 'Settings Updated Successfully'); | |
| 362 | +        } catch (Exception $ex) { | |
| 363 | +            return redirect()->back()->with('fails', $ex->getMessage()); | |
| 364 | 364 | } | 
| 365 | 365 | } | 
| 366 | 366 | } | 
| @@ -85,7 +85,7 @@ | ||
| 85 | 85 | |
| 86 | 86 | //Update to Mailchimp For Paid Product | 
| 87 | 87 | public function addSubscriberByClientPanel(Request $request) | 
| 88 | -    { | |
| 88 | +     { | |
| 89 | 89 | $this->validate($request, [ | 
| 90 | 90 | 'email' => 'required|email', | 
| 91 | 91 | ]); | 
| @@ -120,10 +120,10 @@ discard block | ||
| 120 | 120 |                              ->addColumn('name', function ($model) { | 
| 121 | 121 | return ucfirst($model->name); | 
| 122 | 122 | }) | 
| 123 | -                              ->addColumn('image', function ($model) { | |
| 124 | - // return $model->image; | |
| 125 | - return "<img src= '$model->image' + height=\"80\"/>"; | |
| 126 | - }) | |
| 123 | +                                ->addColumn('image', function ($model) { | |
| 124 | + // return $model->image; | |
| 125 | + return "<img src= '$model->image' + height=\"80\"/>"; | |
| 126 | + }) | |
| 127 | 127 |                              ->addColumn('type', function ($model) { | 
| 128 | 128 |                                  if ($this->type->where('id', $model->type)->first()) { | 
| 129 | 129 |                                      return $this->type->where('id', $model->type)->first()->name; | 
| @@ -141,8 +141,8 @@ discard block | ||
| 141 | 141 | }) | 
| 142 | 142 | |
| 143 | 143 |                              ->addColumn('Action', function ($model) { | 
| 144 | - $permissions = LicensePermissionsController::getPermissionsForProduct($model->id); | |
| 145 | - $url = ''; | |
| 144 | + $permissions = LicensePermissionsController::getPermissionsForProduct($model->id); | |
| 145 | + $url = ''; | |
| 146 | 146 |                                  if ($permissions['downloadPermission'] == 1) { | 
| 147 | 147 |                                      $url = '<a href='.url('product/download/'.$model->id). | 
| 148 | 148 | " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-download' | 
| @@ -113,18 +113,18 @@ discard block | ||
| 113 | 113 |              $new_product = Product::select('id', 'name', 'type', 'image', 'group', 'image')->get(); | 
| 114 | 114 | return\ DataTables::of($new_product) | 
| 115 | 115 | |
| 116 | -                            ->addColumn('checkbox', function ($model) { | |
| 116 | +                            ->addColumn('checkbox', function($model) { | |
| 117 | 117 | return "<input type='checkbox' class='product_checkbox' | 
| 118 | 118 | value=".$model->id.' name=select[] id=check>'; | 
| 119 | 119 | }) | 
| 120 | -                            ->addColumn('name', function ($model) { | |
| 120 | +                            ->addColumn('name', function($model) { | |
| 121 | 121 | return ucfirst($model->name); | 
| 122 | 122 | }) | 
| 123 | -                              ->addColumn('image', function ($model) { | |
| 123 | +                              ->addColumn('image', function($model) { | |
| 124 | 124 | // return $model->image; | 
| 125 | 125 | return "<img src= '$model->image' + height=\"80\"/>"; | 
| 126 | 126 | }) | 
| 127 | -                            ->addColumn('type', function ($model) { | |
| 127 | +                            ->addColumn('type', function($model) { | |
| 128 | 128 |                                  if ($this->type->where('id', $model->type)->first()) { | 
| 129 | 129 |                                      return $this->type->where('id', $model->type)->first()->name; | 
| 130 | 130 |                                  } else { | 
| @@ -132,7 +132,7 @@ discard block | ||
| 132 | 132 | } | 
| 133 | 133 | }) | 
| 134 | 134 | |
| 135 | -                            ->addColumn('group', function ($model) { | |
| 135 | +                            ->addColumn('group', function($model) { | |
| 136 | 136 |                                  if ($this->group->where('id', $model->group)->first()) { | 
| 137 | 137 |                                      return $this->group->where('id', $model->group)->first()->name; | 
| 138 | 138 |                                  } else { | 
| @@ -140,7 +140,7 @@ discard block | ||
| 140 | 140 | } | 
| 141 | 141 | }) | 
| 142 | 142 | |
| 143 | -                            ->addColumn('Action', function ($model) { | |
| 143 | +                            ->addColumn('Action', function($model) { | |
| 144 | 144 | $permissions = LicensePermissionsController::getPermissionsForProduct($model->id); | 
| 145 | 145 | $url = ''; | 
| 146 | 146 |                                  if ($permissions['downloadPermission'] == 1) { |