@@ -49,8 +49,7 @@ |
||
| 49 | 49 | $sender_id = $log->sender_id; |
| 50 | 50 | \Utilities::retrySms($sender_id,$log->number,$text,$log); |
| 51 | 51 | } |
| 52 | - } |
|
| 53 | - catch(\Exception $e) |
|
| 52 | + } catch(\Exception $e) |
|
| 54 | 53 | { |
| 55 | 54 | |
| 56 | 55 | } |
@@ -57,8 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | $newExpense = new Expense($expenseData); |
| 59 | 59 | $newExpense->save(); |
| 60 | - } |
|
| 61 | - elseif ($expense->repeat == 2) |
|
| 60 | + } elseif ($expense->repeat == 2) |
|
| 62 | 61 | { |
| 63 | 62 | $expenseData = array('name' => $expense->name, |
| 64 | 63 | 'category_id' => $expense->category_id, |
@@ -72,8 +71,7 @@ discard block |
||
| 72 | 71 | |
| 73 | 72 | $newExpense = new Expense($expenseData); |
| 74 | 73 | $newExpense->save(); |
| 75 | - } |
|
| 76 | - elseif ($expense->repeat == 3) |
|
| 74 | + } elseif ($expense->repeat == 3) |
|
| 77 | 75 | { |
| 78 | 76 | $expenseData = array('name' => $expense->name, |
| 79 | 77 | 'category_id' => $expense->category_id, |
@@ -87,8 +85,7 @@ discard block |
||
| 87 | 85 | |
| 88 | 86 | $newExpense = new Expense($expenseData); |
| 89 | 87 | $newExpense->save(); |
| 90 | - } |
|
| 91 | - elseif ($expense->repeat == 4) |
|
| 88 | + } elseif ($expense->repeat == 4) |
|
| 92 | 89 | { |
| 93 | 90 | $expenseData = array('name' => $expense->name, |
| 94 | 91 | 'category_id' => $expense->category_id, |
@@ -34,8 +34,7 @@ discard block |
||
| 34 | 34 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 35 | 35 | { |
| 36 | 36 | $drp_placeholder = "Select daterange filter"; |
| 37 | - } |
|
| 38 | - else |
|
| 37 | + } else |
|
| 39 | 38 | { |
| 40 | 39 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 41 | 40 | } |
@@ -74,9 +73,7 @@ discard block |
||
| 74 | 73 | $cheque_details->createdBy()->associate(Auth::user()); |
| 75 | 74 | $cheque_details->updatedBy()->associate(Auth::user()); |
| 76 | 75 | $cheque_details->save(); |
| 77 | - } |
|
| 78 | - |
|
| 79 | - elseif($request->mode == \constPaymentMode::Cash) |
|
| 76 | + } elseif($request->mode == \constPaymentMode::Cash) |
|
| 80 | 77 | { |
| 81 | 78 | // Updating Invoice Status and amounts |
| 82 | 79 | $invoice_total = $payment_detail->invoice->total; |
@@ -109,8 +106,7 @@ discard block |
||
| 109 | 106 | $sender_id = \Utilities::getSetting('sms_sender_id'); |
| 110 | 107 | |
| 111 | 108 | \Utilities::Sms($sender_id,$payment_detail->invoice->member->contact,$sms_text,$sms_status); |
| 112 | - } |
|
| 113 | - elseif($request->mode == \constPaymentMode::Cheque) |
|
| 109 | + } elseif($request->mode == \constPaymentMode::Cheque) |
|
| 114 | 110 | { |
| 115 | 111 | $sms_trigger = Sms_trigger::where('alias','=','payment_with_cheque')->first(); |
| 116 | 112 | $message = $sms_trigger->message; |
@@ -123,8 +119,7 @@ discard block |
||
| 123 | 119 | DB::commit(); |
| 124 | 120 | flash()->success('Payment Details were successfully stored'); |
| 125 | 121 | return redirect (action('InvoicesController@show', ['id' => $payment_detail->invoice_id])); |
| 126 | - } |
|
| 127 | - catch (Exception $e) |
|
| 122 | + } catch (Exception $e) |
|
| 128 | 123 | { |
| 129 | 124 | DB::rollback(); |
| 130 | 125 | flash()->error('Payment Details weren\'t stored succesfully' ); |
@@ -161,9 +156,7 @@ discard block |
||
| 161 | 156 | ]); |
| 162 | 157 | $cheque_detail->updatedBy()->associate(Auth::user()); |
| 163 | 158 | $cheque_detail->save(); |
| 164 | - } |
|
| 165 | - |
|
| 166 | - elseif($request->mode == \constPaymentMode::Cash) |
|
| 159 | + } elseif($request->mode == \constPaymentMode::Cash) |
|
| 167 | 160 | { |
| 168 | 161 | // Updating Invoice Status and amounts |
| 169 | 162 | $invoice_total = $payment_detail->invoice->total; |
@@ -179,8 +172,7 @@ discard block |
||
| 179 | 172 | DB::commit(); |
| 180 | 173 | flash()->success('Payment Details were successfully updated'); |
| 181 | 174 | return redirect (action('InvoicesController@show', ['id' => $payment_detail->invoice_id])); |
| 182 | - } |
|
| 183 | - catch (Exception $e) |
|
| 175 | + } catch (Exception $e) |
|
| 184 | 176 | { |
| 185 | 177 | DB::rollback(); |
| 186 | 178 | flash()->error('Payment Details weren\'t updated succesfully' ); |
@@ -219,9 +211,7 @@ discard block |
||
| 219 | 211 | |
| 220 | 212 | DB::commit(); |
| 221 | 213 | return redirect('payments/all'); |
| 222 | - } |
|
| 223 | - |
|
| 224 | - catch(\Exception $e) |
|
| 214 | + } catch(\Exception $e) |
|
| 225 | 215 | { |
| 226 | 216 | DB::rollback(); |
| 227 | 217 | return redirect('payments/all'); |
@@ -266,8 +256,7 @@ discard block |
||
| 266 | 256 | DB::commit(); |
| 267 | 257 | flash()->success('Cheque has been marked as cleared'); |
| 268 | 258 | return back(); |
| 269 | - } |
|
| 270 | - catch(Exception $e) |
|
| 259 | + } catch(Exception $e) |
|
| 271 | 260 | { |
| 272 | 261 | DB::rollback(); |
| 273 | 262 | flash()->error('Error while marking the cheque as cleared'); |
@@ -38,8 +38,7 @@ discard block |
||
| 38 | 38 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 39 | 39 | { |
| 40 | 40 | $drp_placeholder = "Select daterange filter"; |
| 41 | - } |
|
| 42 | - else |
|
| 41 | + } else |
|
| 43 | 42 | { |
| 44 | 43 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 45 | 44 | } |
@@ -59,8 +58,7 @@ discard block |
||
| 59 | 58 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 60 | 59 | { |
| 61 | 60 | $drp_placeholder = "Select daterange filter"; |
| 62 | - } |
|
| 63 | - else |
|
| 61 | + } else |
|
| 64 | 62 | { |
| 65 | 63 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 66 | 64 | } |
@@ -79,8 +77,7 @@ discard block |
||
| 79 | 77 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 80 | 78 | { |
| 81 | 79 | $drp_placeholder = "Select daterange filter"; |
| 82 | - } |
|
| 83 | - else |
|
| 80 | + } else |
|
| 84 | 81 | { |
| 85 | 82 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 86 | 83 | } |
@@ -107,9 +104,7 @@ discard block |
||
| 107 | 104 | $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1; |
| 108 | 105 | $invoicePrefix = \Utilities::getSetting('invoice_prefix'); |
| 109 | 106 | $invoice_number = $invoicePrefix.$invoiceCounter; |
| 110 | - } |
|
| 111 | - |
|
| 112 | - else { |
|
| 107 | + } else { |
|
| 113 | 108 | $invoice_number = ''; |
| 114 | 109 | $invoiceCounter = ''; |
| 115 | 110 | } |
@@ -133,16 +128,13 @@ discard block |
||
| 133 | 128 | if ($request->payment_amount == $invoice_total) |
| 134 | 129 | { |
| 135 | 130 | $paymentStatus = \constPaymentStatus::Paid; |
| 136 | - } |
|
| 137 | - elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) |
|
| 131 | + } elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) |
|
| 138 | 132 | { |
| 139 | 133 | $paymentStatus = \constPaymentStatus::Partial; |
| 140 | - } |
|
| 141 | - elseif($request->payment_amount == 0) |
|
| 134 | + } elseif($request->payment_amount == 0) |
|
| 142 | 135 | { |
| 143 | 136 | $paymentStatus = \constPaymentStatus::Unpaid; |
| 144 | - } |
|
| 145 | - else |
|
| 137 | + } else |
|
| 146 | 138 | { |
| 147 | 139 | $paymentStatus = \constPaymentStatus::Overpaid; |
| 148 | 140 | } |
@@ -248,8 +240,7 @@ discard block |
||
| 248 | 240 | $sms_status = $sms_trigger->status; |
| 249 | 241 | |
| 250 | 242 | \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status); |
| 251 | - } |
|
| 252 | - else |
|
| 243 | + } else |
|
| 253 | 244 | { |
| 254 | 245 | $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_paid_invoice')->first(); |
| 255 | 246 | $message = $sms_trigger->message; |
@@ -259,8 +250,7 @@ discard block |
||
| 259 | 250 | \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status); |
| 260 | 251 | } |
| 261 | 252 | |
| 262 | - } |
|
| 263 | - elseif($invoice->status == \constPaymentStatus::Partial) |
|
| 253 | + } elseif($invoice->status == \constPaymentStatus::Partial) |
|
| 264 | 254 | { |
| 265 | 255 | if($request->mode == 0) |
| 266 | 256 | { |
@@ -270,8 +260,7 @@ discard block |
||
| 270 | 260 | $sms_status = $sms_trigger->status; |
| 271 | 261 | |
| 272 | 262 | \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status); |
| 273 | - } |
|
| 274 | - else |
|
| 263 | + } else |
|
| 275 | 264 | { |
| 276 | 265 | $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_partial_invoice')->first(); |
| 277 | 266 | $message = $sms_trigger->message; |
@@ -281,8 +270,7 @@ discard block |
||
| 281 | 270 | \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status); |
| 282 | 271 | } |
| 283 | 272 | |
| 284 | - } |
|
| 285 | - elseif($invoice->status == \constPaymentStatus::Unpaid) |
|
| 273 | + } elseif($invoice->status == \constPaymentStatus::Unpaid) |
|
| 286 | 274 | { |
| 287 | 275 | if($request->mode == 0) |
| 288 | 276 | { |
@@ -292,8 +280,7 @@ discard block |
||
| 292 | 280 | $sms_status = $sms_trigger->status; |
| 293 | 281 | |
| 294 | 282 | \Utilities::Sms($sender_id,$subscription->member->contact,$sms_text,$sms_status); |
| 295 | - } |
|
| 296 | - else |
|
| 283 | + } else |
|
| 297 | 284 | { |
| 298 | 285 | $sms_trigger = Sms_trigger::where('alias','=','subscription_renewal_with_unpaid_invoice')->first(); |
| 299 | 286 | $message = $sms_trigger->message; |
@@ -308,9 +295,7 @@ discard block |
||
| 308 | 295 | DB::commit(); |
| 309 | 296 | flash()->success('Subscription was successfully created'); |
| 310 | 297 | return redirect (action('SubscriptionsController@index')); |
| 311 | - } |
|
| 312 | - |
|
| 313 | - catch (\Exception $e) |
|
| 298 | + } catch (\Exception $e) |
|
| 314 | 299 | { |
| 315 | 300 | DB::rollback(); |
| 316 | 301 | flash()->error('Error while creating the Subscription'); |
@@ -361,9 +346,7 @@ discard block |
||
| 361 | 346 | $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1; |
| 362 | 347 | $invoicePrefix = \Utilities::getSetting('invoice_prefix'); |
| 363 | 348 | $invoice_number = $invoicePrefix.$invoiceCounter; |
| 364 | - } |
|
| 365 | - |
|
| 366 | - else { |
|
| 349 | + } else { |
|
| 367 | 350 | $invoice_number = ''; |
| 368 | 351 | $invoiceCounter = ''; |
| 369 | 352 | } |
@@ -396,8 +379,7 @@ discard block |
||
| 396 | 379 | DB::commit(); |
| 397 | 380 | flash()->success('Subscription was successfully cancelled'); |
| 398 | 381 | return redirect('subscriptions/expired'); |
| 399 | - } |
|
| 400 | - catch (Exception $e) |
|
| 382 | + } catch (Exception $e) |
|
| 401 | 383 | { |
| 402 | 384 | DB::rollback(); |
| 403 | 385 | flash()->error('Error while cancelling the Subscription'); |
@@ -433,9 +415,7 @@ discard block |
||
| 433 | 415 | |
| 434 | 416 | DB::commit(); |
| 435 | 417 | return back(); |
| 436 | - } |
|
| 437 | - |
|
| 438 | - catch(\Exception $e) |
|
| 418 | + } catch(\Exception $e) |
|
| 439 | 419 | { |
| 440 | 420 | DB::rollback(); |
| 441 | 421 | return back(); |
@@ -478,16 +458,13 @@ discard block |
||
| 478 | 458 | if ($total_paid == $invoice_total) |
| 479 | 459 | { |
| 480 | 460 | $paymentStatus = \constPaymentStatus::Paid; |
| 481 | - } |
|
| 482 | - elseif($total_paid > 0 && $total_paid < $invoice_total) |
|
| 461 | + } elseif($total_paid > 0 && $total_paid < $invoice_total) |
|
| 483 | 462 | { |
| 484 | 463 | $paymentStatus = \constPaymentStatus::Partial; |
| 485 | - } |
|
| 486 | - elseif($total_paid == 0) |
|
| 464 | + } elseif($total_paid == 0) |
|
| 487 | 465 | { |
| 488 | 466 | $paymentStatus = \constPaymentStatus::Unpaid; |
| 489 | - } |
|
| 490 | - else |
|
| 467 | + } else |
|
| 491 | 468 | { |
| 492 | 469 | $paymentStatus = \constPaymentStatus::Overpaid; |
| 493 | 470 | } |
@@ -546,9 +523,7 @@ discard block |
||
| 546 | 523 | DB::commit(); |
| 547 | 524 | flash()->success('Subscription was successfully changed'); |
| 548 | 525 | return redirect (action('MembersController@show', ['id' => $subscription->member_id])); |
| 549 | - } |
|
| 550 | - |
|
| 551 | - catch(\Exception $e) |
|
| 526 | + } catch(\Exception $e) |
|
| 552 | 527 | { |
| 553 | 528 | DB::rollback(); |
| 554 | 529 | flash()->error('Error while changing the Subscription'); |
@@ -38,8 +38,7 @@ discard block |
||
| 38 | 38 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 39 | 39 | { |
| 40 | 40 | $drp_placeholder = "Select daterange filter"; |
| 41 | - } |
|
| 42 | - else |
|
| 41 | + } else |
|
| 43 | 42 | { |
| 44 | 43 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 45 | 44 | } |
@@ -60,8 +59,7 @@ discard block |
||
| 60 | 59 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 61 | 60 | { |
| 62 | 61 | $drp_placeholder = "Select daterange filter"; |
| 63 | - } |
|
| 64 | - else |
|
| 62 | + } else |
|
| 65 | 63 | { |
| 66 | 64 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 67 | 65 | } |
@@ -81,8 +79,7 @@ discard block |
||
| 81 | 79 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 82 | 80 | { |
| 83 | 81 | $drp_placeholder = "Select daterange filter"; |
| 84 | - } |
|
| 85 | - else |
|
| 82 | + } else |
|
| 86 | 83 | { |
| 87 | 84 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 88 | 85 | } |
@@ -102,8 +99,7 @@ discard block |
||
| 102 | 99 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 103 | 100 | { |
| 104 | 101 | $drp_placeholder = "Select daterange filter"; |
| 105 | - } |
|
| 106 | - else |
|
| 102 | + } else |
|
| 107 | 103 | { |
| 108 | 104 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 109 | 105 | } |
@@ -123,8 +119,7 @@ discard block |
||
| 123 | 119 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 124 | 120 | { |
| 125 | 121 | $drp_placeholder = "Select daterange filter"; |
| 126 | - } |
|
| 127 | - else |
|
| 122 | + } else |
|
| 128 | 123 | { |
| 129 | 124 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 130 | 125 | } |
@@ -169,8 +164,7 @@ discard block |
||
| 169 | 164 | |
| 170 | 165 | DB::commit(); |
| 171 | 166 | return back(); |
| 172 | - } |
|
| 173 | - catch(\Exception $e) |
|
| 167 | + } catch(\Exception $e) |
|
| 174 | 168 | { |
| 175 | 169 | DB::rollback(); |
| 176 | 170 | return back(); |
@@ -220,8 +214,7 @@ discard block |
||
| 220 | 214 | DB::commit(); |
| 221 | 215 | flash()->success('Discount was successfully updated'); |
| 222 | 216 | return redirect(action('InvoicesController@show', ['id' => $id])); |
| 223 | - } |
|
| 224 | - catch(\Exception $e) |
|
| 217 | + } catch(\Exception $e) |
|
| 225 | 218 | { |
| 226 | 219 | DB::rollback(); |
| 227 | 220 | flash()->error('Error while updating discount. Please try again'); |
@@ -31,8 +31,7 @@ discard block |
||
| 31 | 31 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 32 | 32 | { |
| 33 | 33 | $drp_placeholder = "Select daterange filter"; |
| 34 | - } |
|
| 35 | - else |
|
| 34 | + } else |
|
| 36 | 35 | { |
| 37 | 36 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 38 | 37 | } |
@@ -87,8 +86,7 @@ discard block |
||
| 87 | 86 | if ($request->due_date <= Carbon::today()->format('Y-m-d')) |
| 88 | 87 | { |
| 89 | 88 | $expense->paid = \constPaymentStatus::Paid; |
| 90 | - } |
|
| 91 | - else |
|
| 89 | + } else |
|
| 92 | 90 | { |
| 93 | 91 | $expense->paid = \constPaymentStatus::Unpaid; |
| 94 | 92 | } |
@@ -116,12 +114,10 @@ discard block |
||
| 116 | 114 | if ($request->due_date == Carbon::today()) |
| 117 | 115 | { |
| 118 | 116 | $expense->paid = \constPaymentStatus::Paid; |
| 119 | - } |
|
| 120 | - elseif($request->due_date != Carbon::today() && $expense->paid == \constPaymentStatus::Paid) |
|
| 117 | + } elseif($request->due_date != Carbon::today() && $expense->paid == \constPaymentStatus::Paid) |
|
| 121 | 118 | { |
| 122 | 119 | $expense->paid = \constPaymentStatus::Paid; |
| 123 | - } |
|
| 124 | - else |
|
| 120 | + } else |
|
| 125 | 121 | { |
| 126 | 122 | $expense->paid = \constPaymentStatus::Unpaid; |
| 127 | 123 | } |
@@ -73,9 +73,7 @@ |
||
| 73 | 73 | flash()->success('User was successfully registered'); |
| 74 | 74 | |
| 75 | 75 | return redirect('users'); |
| 76 | - } |
|
| 77 | - |
|
| 78 | - else |
|
| 76 | + } else |
|
| 79 | 77 | { |
| 80 | 78 | flash()->error('Error while user registration'); |
| 81 | 79 | return redirect('users'); |
@@ -42,8 +42,7 @@ discard block |
||
| 42 | 42 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 43 | 43 | { |
| 44 | 44 | $drp_placeholder = "Select daterange filter"; |
| 45 | - } |
|
| 46 | - else |
|
| 45 | + } else |
|
| 47 | 46 | { |
| 48 | 47 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 49 | 48 | } |
@@ -63,8 +62,7 @@ discard block |
||
| 63 | 62 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 64 | 63 | { |
| 65 | 64 | $drp_placeholder = "Select daterange filter"; |
| 66 | - } |
|
| 67 | - else |
|
| 65 | + } else |
|
| 68 | 66 | { |
| 69 | 67 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 70 | 68 | } |
@@ -84,8 +82,7 @@ discard block |
||
| 84 | 82 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 85 | 83 | { |
| 86 | 84 | $drp_placeholder = "Select daterange filter"; |
| 87 | - } |
|
| 88 | - else |
|
| 85 | + } else |
|
| 89 | 86 | { |
| 90 | 87 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 91 | 88 | } |
@@ -131,9 +128,7 @@ discard block |
||
| 131 | 128 | $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1; |
| 132 | 129 | $invoicePrefix = \Utilities::getSetting('invoice_prefix'); |
| 133 | 130 | $invoice_number = $invoicePrefix.$invoiceCounter; |
| 134 | - } |
|
| 135 | - |
|
| 136 | - else { |
|
| 131 | + } else { |
|
| 137 | 132 | $invoice_number = ''; |
| 138 | 133 | $invoiceCounter = ''; |
| 139 | 134 | } |
@@ -143,9 +138,7 @@ discard block |
||
| 143 | 138 | $memberCounter = \Utilities::getSetting('member_last_number') + 1; |
| 144 | 139 | $memberPrefix = \Utilities::getSetting('member_prefix'); |
| 145 | 140 | $member_code = $memberPrefix.$memberCounter; |
| 146 | - } |
|
| 147 | - |
|
| 148 | - else { |
|
| 141 | + } else { |
|
| 149 | 142 | $member_code = ''; |
| 150 | 143 | $memberCounter = ''; |
| 151 | 144 | } |
@@ -213,16 +206,13 @@ discard block |
||
| 213 | 206 | if ($request->payment_amount == $invoice_total) |
| 214 | 207 | { |
| 215 | 208 | $paymentStatus = \constPaymentStatus::Paid; |
| 216 | - } |
|
| 217 | - elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) |
|
| 209 | + } elseif($request->payment_amount > 0 && $request->payment_amount < $invoice_total) |
|
| 218 | 210 | { |
| 219 | 211 | $paymentStatus = \constPaymentStatus::Partial; |
| 220 | - } |
|
| 221 | - elseif($request->payment_amount == 0) |
|
| 212 | + } elseif($request->payment_amount == 0) |
|
| 222 | 213 | { |
| 223 | 214 | $paymentStatus = \constPaymentStatus::Unpaid; |
| 224 | - } |
|
| 225 | - else |
|
| 215 | + } else |
|
| 226 | 216 | { |
| 227 | 217 | $paymentStatus = \constPaymentStatus::Overpaid; |
| 228 | 218 | } |
@@ -322,8 +312,7 @@ discard block |
||
| 322 | 312 | $sms_status = $sms_trigger->status; |
| 323 | 313 | |
| 324 | 314 | \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status); |
| 325 | - } |
|
| 326 | - elseif($invoice->status == \constPaymentStatus::Partial) |
|
| 315 | + } elseif($invoice->status == \constPaymentStatus::Partial) |
|
| 327 | 316 | { |
| 328 | 317 | $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_partial_invoice')->first(); |
| 329 | 318 | $message = $sms_trigger->message; |
@@ -331,8 +320,7 @@ discard block |
||
| 331 | 320 | $sms_status = $sms_trigger->status; |
| 332 | 321 | |
| 333 | 322 | \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status); |
| 334 | - } |
|
| 335 | - elseif($invoice->status == \constPaymentStatus::Unpaid) |
|
| 323 | + } elseif($invoice->status == \constPaymentStatus::Unpaid) |
|
| 336 | 324 | { |
| 337 | 325 | if($request->mode == 0) |
| 338 | 326 | { |
@@ -342,8 +330,7 @@ discard block |
||
| 342 | 330 | $sms_status = $sms_trigger->status; |
| 343 | 331 | |
| 344 | 332 | \Utilities::Sms($sender_id,$member->contact,$sms_text,$sms_status); |
| 345 | - } |
|
| 346 | - else |
|
| 333 | + } else |
|
| 347 | 334 | { |
| 348 | 335 | $sms_trigger = Sms_trigger::where('alias','=','member_admission_with_unpaid_invoice')->first(); |
| 349 | 336 | $message = $sms_trigger->message; |
@@ -384,8 +371,7 @@ discard block |
||
| 384 | 371 | DB::commit(); |
| 385 | 372 | flash()->success('Member was successfully created'); |
| 386 | 373 | return redirect (action('MembersController@show', ['id' => $member->id])); |
| 387 | - } |
|
| 388 | - catch (\Exception $e) |
|
| 374 | + } catch (\Exception $e) |
|
| 389 | 375 | { |
| 390 | 376 | DB::rollback(); |
| 391 | 377 | flash()->error('Error while creating the member'); |
@@ -496,9 +482,7 @@ discard block |
||
| 496 | 482 | $invoiceCounter = \Utilities::getSetting('invoice_last_number') + 1; |
| 497 | 483 | $invoicePrefix = \Utilities::getSetting('invoice_prefix'); |
| 498 | 484 | $invoice_number = $invoicePrefix.$invoiceCounter; |
| 499 | - } |
|
| 500 | - |
|
| 501 | - else { |
|
| 485 | + } else { |
|
| 502 | 486 | $invoice_number = ''; |
| 503 | 487 | $invoiceCounter = ''; |
| 504 | 488 | } |
@@ -508,9 +492,7 @@ discard block |
||
| 508 | 492 | $memberCounter = \Utilities::getSetting('member_last_number') + 1; |
| 509 | 493 | $memberPrefix = \Utilities::getSetting('member_prefix'); |
| 510 | 494 | $member_code = $memberPrefix.$memberCounter; |
| 511 | - } |
|
| 512 | - |
|
| 513 | - else { |
|
| 495 | + } else { |
|
| 514 | 496 | $member_code = ''; |
| 515 | 497 | $memberCounter = ''; |
| 516 | 498 | } |
@@ -120,8 +120,7 @@ discard block |
||
| 120 | 120 | DB::commit(); |
| 121 | 121 | flash()->success('User was successfully deleted'); |
| 122 | 122 | return redirect('user'); |
| 123 | - } |
|
| 124 | - catch (Exception $e) |
|
| 123 | + } catch (Exception $e) |
|
| 125 | 124 | { |
| 126 | 125 | DB::rollback(); |
| 127 | 126 | flash()->error('User was not deleted'); |
@@ -166,8 +165,7 @@ discard block |
||
| 166 | 165 | DB::commit(); |
| 167 | 166 | flash()->success('Role was successfully created'); |
| 168 | 167 | return redirect('role'); |
| 169 | - } |
|
| 170 | - catch (Exception $e) |
|
| 168 | + } catch (Exception $e) |
|
| 171 | 169 | { |
| 172 | 170 | DB::rollback(); |
| 173 | 171 | flash()->error('Role was not created'); |
@@ -220,8 +218,7 @@ discard block |
||
| 220 | 218 | DB::commit(); |
| 221 | 219 | flash()->success('Role was successfully updated'); |
| 222 | 220 | return redirect('role'); |
| 223 | - } |
|
| 224 | - catch (Exception $e) |
|
| 221 | + } catch (Exception $e) |
|
| 225 | 222 | { |
| 226 | 223 | DB::rollback(); |
| 227 | 224 | flash()->error('Role was not updated'); |
@@ -240,8 +237,7 @@ discard block |
||
| 240 | 237 | DB::commit(); |
| 241 | 238 | flash()->success('Role was successfully deleted'); |
| 242 | 239 | return redirect('role'); |
| 243 | - } |
|
| 244 | - catch (Exception $e) |
|
| 240 | + } catch (Exception $e) |
|
| 245 | 241 | { |
| 246 | 242 | DB::rollback(); |
| 247 | 243 | flash()->error('Role was not deleted'); |