@@ -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 | - } |
|
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 | 138 | |
139 | - return $end; |
|
140 | - }) |
|
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) { |
@@ -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')); |
@@ -135,18 +135,21 @@ |
||
135 | 135 | if ($this->checkPlanSession() === true) { |
136 | 136 | $planid = Session::get('plan'); |
137 | 137 | } |
138 | - if (!$planid) {//When Product Is Added from Cart |
|
138 | + if (!$planid) { |
|
139 | +//When Product Is Added from Cart |
|
139 | 140 | $planid = Plan::where('product', $productid)->pluck('id')->first(); |
140 | 141 | } |
141 | 142 | $plan = Plan::where('id', $planid)->where('product', $productid)->first(); |
142 | - if ($plan) { //Get the Total Plan Cost if the Plan Exists For a Product |
|
143 | + if ($plan) { |
|
144 | +//Get the Total Plan Cost if the Plan Exists For a Product |
|
143 | 145 | $months = 1; |
144 | 146 | $cont = new CartController(); |
145 | 147 | $currency = $cont->currency($userid); |
146 | 148 | $product = Product::find($productid); |
147 | 149 | $days = $plan->periods->pluck('days')->first(); |
148 | 150 | $price = ($product->planRelation->find($planid)->planPrice->where('currency', $currency['currency'])->first()->add_price); |
149 | - if ($days) { //If Period Is defined for a Particular Plan ie no. of Days Generated |
|
151 | + if ($days) { |
|
152 | +//If Period Is defined for a Particular Plan ie no. of Days Generated |
|
150 | 153 | $months = $days >= '365' ? $days / 30 / 12 : $days / 30; |
151 | 154 | } |
152 | 155 | $finalPrice = str_replace(',', '', $price); |
@@ -150,36 +150,36 @@ |
||
150 | 150 | return $url; |
151 | 151 | }) |
152 | 152 | |
153 | - ->filterColumn('created_at', function ($query, $keyword) { |
|
154 | - $sql = 'created_at like ?'; |
|
155 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
156 | - }) |
|
157 | - |
|
158 | - ->filterColumn('client', function ($query, $keyword) { |
|
159 | - $sql = 'client like ?'; |
|
160 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
161 | - }) |
|
162 | - |
|
163 | - ->filterColumn('number', function ($query, $keyword) { |
|
164 | - $sql = 'number like ?'; |
|
165 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
166 | - }) |
|
153 | + ->filterColumn('created_at', function ($query, $keyword) { |
|
154 | + $sql = 'created_at like ?'; |
|
155 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
156 | + }) |
|
157 | + |
|
158 | + ->filterColumn('client', function ($query, $keyword) { |
|
159 | + $sql = 'client like ?'; |
|
160 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
161 | + }) |
|
162 | + |
|
163 | + ->filterColumn('number', function ($query, $keyword) { |
|
164 | + $sql = 'number like ?'; |
|
165 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
166 | + }) |
|
167 | 167 | ->filterColumn('price_override', function ($query, $keyword) { |
168 | 168 | $sql = 'price_override like ?'; |
169 | 169 | $query->whereRaw($sql, ["%{$keyword}%"]); |
170 | 170 | }) |
171 | - ->filterColumn('order_status', function ($query, $keyword) { |
|
172 | - $sql = 'order_status like ?'; |
|
173 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
174 | - }) |
|
175 | - |
|
176 | - ->filterColumn('update_ends_at', function ($query, $keyword) { |
|
177 | - $sql = 'update_ends_at like ?'; |
|
178 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
179 | - }) |
|
180 | - |
|
181 | - ->rawColumns(['checkbox', 'date', 'client', 'number', |
|
182 | - 'price_override', 'order_status', 'productname', 'update_ends_at', 'action', ]) |
|
171 | + ->filterColumn('order_status', function ($query, $keyword) { |
|
172 | + $sql = 'order_status like ?'; |
|
173 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
174 | + }) |
|
175 | + |
|
176 | + ->filterColumn('update_ends_at', function ($query, $keyword) { |
|
177 | + $sql = 'update_ends_at like ?'; |
|
178 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
179 | + }) |
|
180 | + |
|
181 | + ->rawColumns(['checkbox', 'date', 'client', 'number', |
|
182 | + 'price_override', 'order_status', 'productname', 'update_ends_at', 'action', ]) |
|
183 | 183 | ->make(true); |
184 | 184 | } |
185 | 185 |
@@ -105,16 +105,16 @@ discard block |
||
105 | 105 | |
106 | 106 | return \DataTables::of($query->take(50)) |
107 | 107 | ->setTotalRecords($query->count()) |
108 | - ->addColumn('checkbox', function ($model) { |
|
108 | + ->addColumn('checkbox', function($model) { |
|
109 | 109 | return "<input type='checkbox' class='order_checkbox' value=". |
110 | 110 | $model->id.' name=select[] id=check>'; |
111 | 111 | }) |
112 | - ->addColumn('date', function ($model) { |
|
112 | + ->addColumn('date', function($model) { |
|
113 | 113 | $date = $model->created_at; |
114 | 114 | |
115 | 115 | return "<span style='display:none'>$model->id</span>".$date; |
116 | 116 | }) |
117 | - ->addColumn('client', function ($model) { |
|
117 | + ->addColumn('client', function($model) { |
|
118 | 118 | $user = $this->user->where('id', $model->client)->first(); |
119 | 119 | $first = $user->first_name; |
120 | 120 | $last = $user->last_name; |
@@ -122,30 +122,30 @@ discard block |
||
122 | 122 | |
123 | 123 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>'; |
124 | 124 | }) |
125 | - ->addColumn('productname', function ($model) { |
|
125 | + ->addColumn('productname', function($model) { |
|
126 | 126 | $productid = ($model->product); |
127 | 127 | $productName = Product::where('id', $productid)->pluck('name')->first(); |
128 | 128 | |
129 | 129 | return $productName; |
130 | 130 | }) |
131 | - ->addColumn('number', function ($model) { |
|
131 | + ->addColumn('number', function($model) { |
|
132 | 132 | return ucfirst($model->number); |
133 | 133 | }) |
134 | - ->addColumn('price_override', function ($model) { |
|
134 | + ->addColumn('price_override', function($model) { |
|
135 | 135 | $currency = $model->user()->find($model->client)->currency; |
136 | 136 | |
137 | 137 | return currency_format($model->price_override, $code = $currency); |
138 | 138 | }) |
139 | - ->addColumn('order_status', function ($model) { |
|
139 | + ->addColumn('order_status', function($model) { |
|
140 | 140 | return ucfirst($model->order_status); |
141 | 141 | }) |
142 | 142 | // ->showColumns('number', 'price_override', 'order_status') |
143 | - ->addColumn('update_ends_at', function ($model) { |
|
143 | + ->addColumn('update_ends_at', function($model) { |
|
144 | 144 | $end = $this->getEndDate($model); |
145 | 145 | |
146 | 146 | return $end; |
147 | 147 | }) |
148 | - ->addColumn('action', function ($model) { |
|
148 | + ->addColumn('action', function($model) { |
|
149 | 149 | $sub = $model->subscription()->first(); |
150 | 150 | $status = $this->checkInvoiceStatusByOrderId($model->id); |
151 | 151 | $url = $this->getUrl($model, $status, $sub); |
@@ -153,30 +153,30 @@ discard block |
||
153 | 153 | return $url; |
154 | 154 | }) |
155 | 155 | |
156 | - ->filterColumn('created_at', function ($query, $keyword) { |
|
156 | + ->filterColumn('created_at', function($query, $keyword) { |
|
157 | 157 | $sql = 'created_at like ?'; |
158 | 158 | $query->whereRaw($sql, ["%{$keyword}%"]); |
159 | 159 | }) |
160 | 160 | |
161 | - ->filterColumn('client', function ($query, $keyword) { |
|
161 | + ->filterColumn('client', function($query, $keyword) { |
|
162 | 162 | $sql = 'client like ?'; |
163 | 163 | $query->whereRaw($sql, ["%{$keyword}%"]); |
164 | 164 | }) |
165 | 165 | |
166 | - ->filterColumn('number', function ($query, $keyword) { |
|
166 | + ->filterColumn('number', function($query, $keyword) { |
|
167 | 167 | $sql = 'number like ?'; |
168 | 168 | $query->whereRaw($sql, ["%{$keyword}%"]); |
169 | 169 | }) |
170 | - ->filterColumn('price_override', function ($query, $keyword) { |
|
170 | + ->filterColumn('price_override', function($query, $keyword) { |
|
171 | 171 | $sql = 'price_override like ?'; |
172 | 172 | $query->whereRaw($sql, ["%{$keyword}%"]); |
173 | 173 | }) |
174 | - ->filterColumn('order_status', function ($query, $keyword) { |
|
174 | + ->filterColumn('order_status', function($query, $keyword) { |
|
175 | 175 | $sql = 'order_status like ?'; |
176 | 176 | $query->whereRaw($sql, ["%{$keyword}%"]); |
177 | 177 | }) |
178 | 178 | |
179 | - ->filterColumn('update_ends_at', function ($query, $keyword) { |
|
179 | + ->filterColumn('update_ends_at', function($query, $keyword) { |
|
180 | 180 | $sql = 'update_ends_at like ?'; |
181 | 181 | $query->whereRaw($sql, ["%{$keyword}%"]); |
182 | 182 | }) |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | return\ DataTables::of($product_group) |
53 | 53 | // return \Datatable::of($this->group->select('id', 'name')->get()) |
54 | 54 | |
55 | - ->addColumn('checkbox', function ($model) { |
|
56 | - return "<input type='checkbox' class='group_checkbox' |
|
55 | + ->addColumn('checkbox', function ($model) { |
|
56 | + return "<input type='checkbox' class='group_checkbox' |
|
57 | 57 | value=".$model->id.' name=select[] id=check>'; |
58 | - }) |
|
58 | + }) |
|
59 | 59 | |
60 | 60 | ->addColumn('name', function ($model) { |
61 | 61 | return ucfirst($model->name); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | 'pricing_templates_id' => 'required', |
102 | 102 | ], [ |
103 | 103 | 'pricing_templates_id.required'=> 'Please Select a Template', |
104 | - ]); |
|
104 | + ]); |
|
105 | 105 | |
106 | 106 | try { |
107 | 107 | $this->group->fill($request->input())->save(); |
@@ -52,22 +52,22 @@ |
||
52 | 52 | return\ DataTables::of($product_group) |
53 | 53 | // return \Datatable::of($this->group->select('id', 'name')->get()) |
54 | 54 | |
55 | - ->addColumn('checkbox', function ($model) { |
|
55 | + ->addColumn('checkbox', function($model) { |
|
56 | 56 | return "<input type='checkbox' class='group_checkbox' |
57 | 57 | value=".$model->id.' name=select[] id=check>'; |
58 | 58 | }) |
59 | 59 | |
60 | - ->addColumn('name', function ($model) { |
|
60 | + ->addColumn('name', function($model) { |
|
61 | 61 | return ucfirst($model->name); |
62 | 62 | }) |
63 | 63 | // ->showColumns('name') |
64 | 64 | |
65 | - ->addColumn('action', function ($model) { |
|
65 | + ->addColumn('action', function($model) { |
|
66 | 66 | return '<a href='.url('groups/'.$model->id.'/edit'). |
67 | 67 | " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' |
68 | 68 | style='color:white;'> </i> Edit</a>"; |
69 | 69 | }) |
70 | - ->rawColumns(['checkbox', 'name', 'action']) |
|
70 | + ->rawColumns(['checkbox', 'name', 'action']) |
|
71 | 71 | ->make(true); |
72 | 72 | } |
73 | 73 |
@@ -146,7 +146,7 @@ |
||
146 | 146 | public function checkUpdatesExpiry(Request $request) |
147 | 147 | { |
148 | 148 | $v = \Validator::make($request->all(), [ |
149 | - 'order_number' => 'required', |
|
149 | + 'order_number' => 'required', |
|
150 | 150 | ]); |
151 | 151 | if ($v->fails()) { |
152 | 152 | $error = $v->errors(); |