@@ -35,8 +35,7 @@ discard block |
||
| 35 | 35 | if (!$request->has('drp_start') or !$request->has('drp_end')) |
| 36 | 36 | { |
| 37 | 37 | $drp_placeholder = "Select daterange filter"; |
| 38 | - } |
|
| 39 | - else |
|
| 38 | + } else |
|
| 40 | 39 | { |
| 41 | 40 | $drp_placeholder = $request->drp_start. ' - ' .$request->drp_end; |
| 42 | 41 | } |
@@ -117,9 +116,7 @@ discard block |
||
| 117 | 116 | DB::commit(); |
| 118 | 117 | flash()->success('Enquiry was successfully created'); |
| 119 | 118 | return redirect (action('EnquiriesController@show', ['id' => $enquiry->id])); |
| 120 | - } |
|
| 121 | - |
|
| 122 | - catch (\Exception $e) |
|
| 119 | + } catch (\Exception $e) |
|
| 123 | 120 | { |
| 124 | 121 | DB::rollback(); |
| 125 | 122 | flash()->error('Error while creating the Enquiry'); |
@@ -322,16 +322,13 @@ discard block |
||
| 322 | 322 | if($amount_due == 0) |
| 323 | 323 | { |
| 324 | 324 | $paymentStatus = \constPaymentStatus::Paid; |
| 325 | - } |
|
| 326 | - elseif($amount_due > 0 && $amount_due < $invoice_total) |
|
| 325 | + } elseif($amount_due > 0 && $amount_due < $invoice_total) |
|
| 327 | 326 | { |
| 328 | 327 | $paymentStatus = \constPaymentStatus::Partial; |
| 329 | - } |
|
| 330 | - elseif($amount_due == $invoice_total) |
|
| 328 | + } elseif($amount_due == $invoice_total) |
|
| 331 | 329 | { |
| 332 | 330 | $paymentStatus = \constPaymentStatus::Unpaid; |
| 333 | - } |
|
| 334 | - else |
|
| 331 | + } else |
|
| 335 | 332 | { |
| 336 | 333 | $paymentStatus = \constPaymentStatus::Overpaid; |
| 337 | 334 | } |
@@ -583,14 +580,12 @@ discard block |
||
| 583 | 580 | if(Utilities::isDomainAvailible($api_url)) |
| 584 | 581 | { |
| 585 | 582 | return true; |
| 586 | - } |
|
| 587 | - else |
|
| 583 | + } else |
|
| 588 | 584 | { |
| 589 | 585 | return false; |
| 590 | 586 | } |
| 591 | 587 | |
| 592 | - } |
|
| 593 | - catch(Exception $e) |
|
| 588 | + } catch(Exception $e) |
|
| 594 | 589 | { |
| 595 | 590 | return false; |
| 596 | 591 | } |
@@ -618,7 +613,9 @@ discard block |
||
| 618 | 613 | |
| 619 | 614 | curl_close($curlInit); |
| 620 | 615 | |
| 621 | - if ($response) return true; |
|
| 616 | + if ($response) { |
|
| 617 | + return true; |
|
| 618 | + } |
|
| 622 | 619 | |
| 623 | 620 | return false; |
| 624 | 621 | } |
@@ -659,8 +656,7 @@ discard block |
||
| 659 | 656 | } |
| 660 | 657 | //Update SMS balance |
| 661 | 658 | Utilities::smsBalance(); |
| 662 | - } |
|
| 663 | - else |
|
| 659 | + } else |
|
| 664 | 660 | { |
| 665 | 661 | $SmsLogData = array('shoot_id' => '', |
| 666 | 662 | 'number' => $member_contact, |
@@ -67,8 +67,7 @@ discard block |
||
| 67 | 67 | if ($category == 0) |
| 68 | 68 | { |
| 69 | 69 | return $query->leftJoin('mst_expenses_categories', 'trn_expenses.category_id', '=', 'mst_expenses_categories.id')->select('trn_expenses.*','mst_expenses_categories.name as category_name')->orderBy($sorting_field,$sorting_direction); |
| 70 | - } |
|
| 71 | - else |
|
| 70 | + } else |
|
| 72 | 71 | { |
| 73 | 72 | return $query->leftJoin('mst_expenses_categories', 'trn_expenses.category_id', '=', 'mst_expenses_categories.id')->select('trn_expenses.*','mst_expenses_categories.name as category_name')->where('category_id',$category)->orderBy($sorting_field,$sorting_direction); |
| 74 | 73 | } |
@@ -78,8 +77,7 @@ discard block |
||
| 78 | 77 | if ($category == 0) |
| 79 | 78 | { |
| 80 | 79 | return $query->leftJoin('mst_expenses_categories', 'trn_expenses.category_id', '=', 'mst_expenses_categories.id')->select('trn_expenses.*','mst_expenses_categories.name as category_name')->whereBetween('trn_expenses.created_at', [$drp_start, $drp_end])->orderBy($sorting_field,$sorting_direction); |
| 81 | - } |
|
| 82 | - else |
|
| 80 | + } else |
|
| 83 | 81 | { |
| 84 | 82 | return $query->leftJoin('mst_expenses_categories', 'trn_expenses.category_id', '=', 'mst_expenses_categories.id')->select('trn_expenses.*','mst_expenses_categories.name as category_name')->where('category_id',$category)->whereBetween('trn_expenses.created_at', [$drp_start, $drp_end])->orderBy($sorting_field,$sorting_direction); |
| 85 | 83 | } |