@@ -33,7 +33,7 @@ public function index()
3333 public function create ()
3434 {
3535 $ status_lists = $ this ->Statuses ();
36-
36+
3737 return view ('panichd::admin.category.create ' , compact ('status_lists ' ));
3838 }
3939
@@ -47,23 +47,23 @@ public function create()
4747 public function store (Request $ request )
4848 {
4949 list ($ request , $ reason_rules , $ reason_messages , $ a_reasons ) = $ this ->add_reasons_to ($ request );
50-
50+
5151 list ($ request , $ tag_rules , $ tag_messages , $ a_tags_new , $ a_tags_update ) = $ this ->add_tags_to ($ request );
52-
53- // Do Laravel validation
52+
53+ // Do Laravel validation
5454 $ this ->do_validate ($ request , array_merge ($ reason_rules , $ tag_rules ), array_merge ($ reason_messages , $ tag_messages ));
5555
5656 $ category = new Category ();
57-
57+
5858 $ category ->name = $ request ->name ;
59- $ category ->color = $ request ->color ;
60- $ category = $ this ->category_email_fields ($ request , $ category );
59+ $ category ->color = $ request ->color ;
60+ $ category = $ this ->category_email_fields ($ request , $ category );
6161 $ category ->create_level = $ request ->create_level ;
62-
62+
6363 $ category ->save ();
6464
6565 $ this ->sync_reasons ($ request , $ category , $ a_reasons );
66-
66+
6767 $ this ->sync_category_tags ($ request , $ category , $ a_tags_new , $ a_tags_update );
6868
6969 Session::flash ('status ' , trans ('panichd::lang.category-name-has-been-created ' , ['name ' => $ request ->name ]));
@@ -99,12 +99,12 @@ public function edit($id)
9999 $ q ->withCount ('tickets ' );
100100 }
101101 ])->with ('closingReasons.status ' )->findOrFail ($ id );
102-
102+
103103 $ status_lists = $ this ->Statuses ();
104104
105105 return view ('panichd::admin.category.edit ' , compact ('category ' , 'status_lists ' ));
106106 }
107-
107+
108108 /**
109109 * Returns statuses list
110110 * Decouple it with list()
@@ -134,25 +134,25 @@ protected function Statuses()
134134 * @return \Illuminate\Http\RedirectResponse
135135 */
136136 public function update (Request $ request , $ id )
137- {
137+ {
138138 list ($ request , $ reason_rules , $ reason_messages , $ a_reasons ) = $ this ->add_reasons_to ($ request );
139-
139+
140140 list ($ request , $ tag_rules , $ tag_messages , $ a_tags_new , $ a_tags_update ) = $ this ->add_tags_to ($ request );
141-
141+
142142 // Do Laravel validation
143143 $ this ->do_validate ($ request , array_merge ($ reason_rules , $ tag_rules ), array_merge ($ reason_messages , $ tag_messages ));
144-
145- $ category = Category::findOrFail ($ id );
144+
145+ $ category = Category::findOrFail ($ id );
146146
147147 $ category ->name = $ request ->name ;
148148 $ category ->color = $ request ->color ;
149- $ category = $ this ->category_email_fields ($ request , $ category );
149+ $ category = $ this ->category_email_fields ($ request , $ category );
150150 $ category ->create_level = $ request ->create_level ;
151-
151+
152152 $ category ->save ();
153153
154154 $ this ->sync_reasons ($ request , $ category , $ a_reasons );
155-
155+
156156 $ this ->sync_category_tags ($ request , $ category , $ a_tags_new , $ a_tags_update );
157157
158158 Session::flash ('status ' , trans ('panichd::lang.category-name-has-been-modified ' , ['name ' => $ request ->name ]));
@@ -170,18 +170,18 @@ public function update(Request $request, $id)
170170 * Return Array
171171 */
172172 protected function add_reasons_to ($ request )
173- {
173+ {
174174 $ reason_rules = $ reason_messages = $ a_new = $ a_update = $ a_delete = [];
175175 $ regex_text = trans ('panichd::lang.regex-text-inline ' );
176-
176+
177177 $ min_chars = "5 " ;
178178
179- if ($ request ->exists ('reason_ordering ' )){
179+ if ($ request ->exists ('reason_ordering ' )){
180180 foreach ($ request ->input ('reason_ordering ' ) as $ ordering =>$ i ){
181181 if ($ request ->has ('jquery_delete_reason_ ' .$ i )){
182182 $ a_delete [] = $ request ->input ('jquery_reason_id_ ' .$ i );
183183 }elseif ($ request ->has ('jquery_reason_id_ ' .$ i )) {
184-
184+
185185 $ reason = [
186186 'ordering ' =>$ ordering
187187 ];
@@ -190,7 +190,7 @@ protected function add_reasons_to($request)
190190 $ reason_rules ['jquery_reason_text_ ' .$ i ] = "required|min: $ min_chars|regex: " .$ regex_text ;
191191
192192 // Reason message
193- $ reason_messages ['jquery_reason_text_ ' .$ i .'.required ' ] = trans ('panichd::admin.category-reason-is-empty ' , ['number ' => $ i +1 ]);
193+ $ reason_messages ['jquery_reason_text_ ' .$ i .'.required ' ] = trans ('panichd::admin.category-reason-is-empty ' , ['number ' => $ i +1 ]);
194194 $ reason_messages ['jquery_reason_text_ ' .$ i .'.min ' ] = trans ('panichd::admin.category-reason-too-short ' , ['number ' => $ i +1 , 'name ' =>$ reason ['text ' ], 'min ' => $ min_chars ]);
195195 }
196196
@@ -200,22 +200,22 @@ protected function add_reasons_to($request)
200200
201201 // Reason message
202202 $ reason_messages ['jquery_reason_status_id_ ' .$ i .'.required ' ] = trans ('panichd::admin.category-reason-no-status ' , ['number ' => $ i +1 ,'name ' =>$ reason ['text ' ]]);
203- }
204-
203+ }
204+
205205 if ($ request ->input ('jquery_reason_id_ ' .$ i ) == "new " ){
206- $ a_new [] = $ reason ;
206+ $ a_new [] = $ reason ;
207207 }else {
208208 $ a_update [$ request ->input ('jquery_reason_id_ ' .$ i )] = $ reason ;
209209 }
210210 }
211211 }
212212 }
213-
213+
214214 $ a_reasons = ['new ' =>$ a_new , 'update ' =>$ a_update , 'delete ' =>$ a_delete ];
215-
215+
216216 return [$ request , $ reason_rules , $ reason_messages , $ a_reasons ];
217217 }
218-
218+
219219 /**
220220 * Adds tag fields to $request
221221 *
@@ -224,9 +224,9 @@ protected function add_reasons_to($request)
224224 * Return Array
225225 */
226226 protected function add_tags_to ($ request )
227- {
227+ {
228228 $ tag_rules = $ tag_messages = [];
229-
229+
230230 // Allow alphanumeric and the following: ? @ / - _
231231 $ tag_rule = "required|regex:/^[A-Za-z0-9?@\/\-_\s]+$/ " ;
232232
@@ -260,11 +260,11 @@ protected function add_tags_to($request)
260260 $ a_tags_update [$ request ->input ('jquery_tag_id_ ' .$ i )]['color ' ] = $ request ->input ('jquery_tag_color_ ' .$ i );
261261 }
262262 }
263- }
263+ }
264264
265265 return [$ request , $ tag_rules , $ tag_messages , $ a_tags_new , $ a_tags_update ];
266266 }
267-
267+
268268 /**
269269 * Does the request validation.
270270 *
@@ -284,10 +284,10 @@ protected function do_validate($request, $rules, $reason_messages)
284284 'email ' => 'required|email ' ,
285285 ]);
286286 }
287-
287+
288288 $ this ->validate ($ request , $ rules , $ reason_messages );
289289 }
290-
290+
291291 /*
292292 * Returns category instance with email fields updated in object
293293 */
@@ -296,7 +296,7 @@ protected function category_email_fields($request, $category)
296296 if ($ request ->email_scope != 'default ' and $ request ->has ('email_name ' ) and $ request ->has ('email ' )){
297297 $ category ->email_name = $ request ->email_name ;
298298 $ category ->email = $ request ->email ;
299-
299+
300300 if ($ request ->email_replies == 1 ){
301301 $ category ->email_replies = 1 ;
302302 }else {
@@ -307,7 +307,7 @@ protected function category_email_fields($request, $category)
307307 $ category ->email = null ;
308308 $ category ->email_replies = 0 ;
309309 }
310-
310+
311311 return $ category ;
312312 }
313313
@@ -319,17 +319,17 @@ protected function category_email_fields($request, $category)
319319 * @param $category instance of PanicHD\PanicHD\Models\Category
320320 */
321321 protected function sync_reasons ($ request , $ category , $ a_reasons )
322- {
322+ {
323323 // Add new reasons
324324 foreach ($ a_reasons ['new ' ] as $ fields ) {
325325 $ new = new Models \Closingreason ;
326326 $ new ->text = $ fields ['text ' ];
327327 $ new ->status_id = $ fields ['status_id ' ];
328328 $ new ->category_id = $ category ->id ;
329329 $ new ->ordering = $ fields ['ordering ' ];
330- $ new ->save ();
330+ $ new ->save ();
331331 }
332-
332+
333333 // Update reasons
334334 foreach ($ a_reasons ['update ' ] as $ id =>$ fields ) {
335335 $ reason = Models \Closingreason::where ('id ' , $ id )->first ();
@@ -346,14 +346,14 @@ protected function sync_reasons($request, $category, $a_reasons)
346346 $ reason ->ordering =$ fields ['ordering ' ];
347347 $ update = true ;
348348 }
349-
349+
350350 if ($ update ) $ reason ->save ();
351351 }
352-
352+
353353 // Delete marked reasons
354354 if ($ a_reasons ['delete ' ]) Models \Closingreason::destroy ($ a_reasons ['delete ' ]);
355355 }
356-
356+
357357 /**
358358 * Syncs tags for category instance.
359359 *
0 commit comments