@@ -36,39 +36,39 @@ |
||
| 36 | 36 | protected function schedule(Schedule $schedule) |
| 37 | 37 | { |
| 38 | 38 | $schedule->command('reshoot:offlineSms') |
| 39 | - ->hourly(); |
|
| 39 | + ->hourly(); |
|
| 40 | 40 | |
| 41 | 41 | $schedule->command('birthday:sms') |
| 42 | - ->dailyAt('00:01'); |
|
| 42 | + ->dailyAt('00:01'); |
|
| 43 | 43 | |
| 44 | 44 | $schedule->command('set:expired') |
| 45 | - ->dailyAt('00:05'); |
|
| 45 | + ->dailyAt('00:05'); |
|
| 46 | 46 | |
| 47 | 47 | $schedule->command('sms:event') |
| 48 | - ->dailyAt('09:00'); |
|
| 48 | + ->dailyAt('09:00'); |
|
| 49 | 49 | |
| 50 | 50 | $schedule->command('sms:expiring') |
| 51 | - ->dailyAt('10:00'); |
|
| 51 | + ->dailyAt('10:00'); |
|
| 52 | 52 | |
| 53 | 53 | $schedule->command('expense:alert') |
| 54 | - ->dailyAt('10:30') |
|
| 55 | - ->when(function () { |
|
| 54 | + ->dailyAt('10:30') |
|
| 55 | + ->when(function () { |
|
| 56 | 56 | return (\Utilities::getSetting('primary_contact') != null); |
| 57 | 57 | }); |
| 58 | 58 | |
| 59 | 59 | $schedule->command('pending:invoice') |
| 60 | - ->dailyAt('11:00'); |
|
| 60 | + ->dailyAt('11:00'); |
|
| 61 | 61 | |
| 62 | 62 | $schedule->command('followup:sms') |
| 63 | - ->dailyAt('11:30'); |
|
| 63 | + ->dailyAt('11:30'); |
|
| 64 | 64 | |
| 65 | 65 | $schedule->command('sms:expired') |
| 66 | - ->dailyAt('11:45'); |
|
| 66 | + ->dailyAt('11:45'); |
|
| 67 | 67 | |
| 68 | 68 | $schedule->command('repeat:expense') |
| 69 | - ->dailyAt('23:00'); |
|
| 69 | + ->dailyAt('23:00'); |
|
| 70 | 70 | |
| 71 | 71 | $schedule->command('sms:status') |
| 72 | - ->dailyAt('23:45'); |
|
| 72 | + ->dailyAt('23:45'); |
|
| 73 | 73 | } |
| 74 | 74 | } |
@@ -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 | } |
@@ -46,14 +46,14 @@ discard block |
||
| 46 | 46 | if ($expense->repeat == 1) |
| 47 | 47 | { |
| 48 | 48 | $expenseData = array('name' => $expense->name, |
| 49 | - 'category_id' => $expense->category_id, |
|
| 50 | - 'due_date' => $expense->due_date->addDays(1), |
|
| 51 | - 'repeat' => $expense->repeat, |
|
| 52 | - 'note' => $expense->note, |
|
| 53 | - 'amount' => $expense->amount, |
|
| 54 | - 'paid' => 0, |
|
| 55 | - 'created_by' => 1, |
|
| 56 | - 'updated_by' => 1); |
|
| 49 | + 'category_id' => $expense->category_id, |
|
| 50 | + 'due_date' => $expense->due_date->addDays(1), |
|
| 51 | + 'repeat' => $expense->repeat, |
|
| 52 | + 'note' => $expense->note, |
|
| 53 | + 'amount' => $expense->amount, |
|
| 54 | + 'paid' => 0, |
|
| 55 | + 'created_by' => 1, |
|
| 56 | + 'updated_by' => 1); |
|
| 57 | 57 | |
| 58 | 58 | $newExpense = new Expense($expenseData); |
| 59 | 59 | $newExpense->save(); |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | elseif ($expense->repeat == 2) |
| 62 | 62 | { |
| 63 | 63 | $expenseData = array('name' => $expense->name, |
| 64 | - 'category_id' => $expense->category_id, |
|
| 65 | - 'due_date' => $expense->due_date->addWeek(), |
|
| 66 | - 'repeat' => $expense->repeat, |
|
| 67 | - 'note' => $expense->note, |
|
| 68 | - 'amount' => $expense->amount, |
|
| 69 | - 'paid' => 0, |
|
| 70 | - 'created_by' => 1, |
|
| 71 | - 'updated_by' => 1); |
|
| 64 | + 'category_id' => $expense->category_id, |
|
| 65 | + 'due_date' => $expense->due_date->addWeek(), |
|
| 66 | + 'repeat' => $expense->repeat, |
|
| 67 | + 'note' => $expense->note, |
|
| 68 | + 'amount' => $expense->amount, |
|
| 69 | + 'paid' => 0, |
|
| 70 | + 'created_by' => 1, |
|
| 71 | + 'updated_by' => 1); |
|
| 72 | 72 | |
| 73 | 73 | $newExpense = new Expense($expenseData); |
| 74 | 74 | $newExpense->save(); |
@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | elseif ($expense->repeat == 3) |
| 77 | 77 | { |
| 78 | 78 | $expenseData = array('name' => $expense->name, |
| 79 | - 'category_id' => $expense->category_id, |
|
| 80 | - 'due_date' => $expense->due_date->addMonth(), |
|
| 81 | - 'repeat' => $expense->repeat, |
|
| 82 | - 'note' => $expense->note, |
|
| 83 | - 'amount' => $expense->amount, |
|
| 84 | - 'paid' => 0, |
|
| 85 | - 'created_by' => 1, |
|
| 86 | - 'updated_by' => 1); |
|
| 79 | + 'category_id' => $expense->category_id, |
|
| 80 | + 'due_date' => $expense->due_date->addMonth(), |
|
| 81 | + 'repeat' => $expense->repeat, |
|
| 82 | + 'note' => $expense->note, |
|
| 83 | + 'amount' => $expense->amount, |
|
| 84 | + 'paid' => 0, |
|
| 85 | + 'created_by' => 1, |
|
| 86 | + 'updated_by' => 1); |
|
| 87 | 87 | |
| 88 | 88 | $newExpense = new Expense($expenseData); |
| 89 | 89 | $newExpense->save(); |
@@ -91,14 +91,14 @@ discard block |
||
| 91 | 91 | elseif ($expense->repeat == 4) |
| 92 | 92 | { |
| 93 | 93 | $expenseData = array('name' => $expense->name, |
| 94 | - 'category_id' => $expense->category_id, |
|
| 95 | - 'due_date' => $expense->due_date->addYear(), |
|
| 96 | - 'repeat' => $expense->repeat, |
|
| 97 | - 'note' => $expense->note, |
|
| 98 | - 'amount' => $expense->amount, |
|
| 99 | - 'paid' => 0, |
|
| 100 | - 'created_by' => 1, |
|
| 101 | - 'updated_by' => 1); |
|
| 94 | + 'category_id' => $expense->category_id, |
|
| 95 | + 'due_date' => $expense->due_date->addYear(), |
|
| 96 | + 'repeat' => $expense->repeat, |
|
| 97 | + 'note' => $expense->note, |
|
| 98 | + 'amount' => $expense->amount, |
|
| 99 | + 'paid' => 0, |
|
| 100 | + 'created_by' => 1, |
|
| 101 | + 'updated_by' => 1); |
|
| 102 | 102 | |
| 103 | 103 | $newExpense = new Expense($expenseData); |
| 104 | 104 | $newExpense->save(); |
@@ -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, |
@@ -11,15 +11,15 @@ discard block |
||
| 11 | 11 | protected $table = 'mst_plans'; |
| 12 | 12 | |
| 13 | 13 | protected $fillable = [ |
| 14 | - 'plan_code', |
|
| 14 | + 'plan_code', |
|
| 15 | 15 | 'plan_name', |
| 16 | - 'service_id', |
|
| 17 | - 'plan_details', |
|
| 18 | - 'days', |
|
| 19 | - 'amount', |
|
| 20 | - 'status', |
|
| 21 | - 'created_by', |
|
| 22 | - 'updated_by' |
|
| 16 | + 'service_id', |
|
| 17 | + 'plan_details', |
|
| 18 | + 'days', |
|
| 19 | + 'amount', |
|
| 20 | + 'status', |
|
| 21 | + 'created_by', |
|
| 22 | + 'updated_by' |
|
| 23 | 23 | ]; |
| 24 | 24 | |
| 25 | 25 | //Eloquence Search mapping |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function scopeExcludeArchive($query) |
| 40 | 40 | { |
| 41 | - return $query->where('status','!=', \constStatus::Archive); |
|
| 41 | + return $query->where('status','!=', \constStatus::Archive); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | public function scopeOnlyActive($query) |
@@ -7,18 +7,18 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | class Payment_detail extends Model |
| 9 | 9 | { |
| 10 | - protected $table = 'trn_payment_details'; |
|
| 10 | + protected $table = 'trn_payment_details'; |
|
| 11 | 11 | |
| 12 | - protected $fillable = [ |
|
| 13 | - 'payment_amount', |
|
| 14 | - 'note', |
|
| 15 | - 'mode', |
|
| 16 | - 'invoice_id', |
|
| 17 | - 'created_by', |
|
| 18 | - 'updated_by', |
|
| 19 | - ]; |
|
| 12 | + protected $fillable = [ |
|
| 13 | + 'payment_amount', |
|
| 14 | + 'note', |
|
| 15 | + 'mode', |
|
| 16 | + 'invoice_id', |
|
| 17 | + 'created_by', |
|
| 18 | + 'updated_by', |
|
| 19 | + ]; |
|
| 20 | 20 | |
| 21 | - //Eloquence Search mapping |
|
| 21 | + //Eloquence Search mapping |
|
| 22 | 22 | use Eloquence; |
| 23 | 23 | |
| 24 | 24 | protected $searchableColumns = [ |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | if ($drp_start == null or $drp_end == null) |
| 36 | 36 | { |
| 37 | 37 | return $query->leftJoin('trn_invoice','trn_payment_details.invoice_id','=','trn_invoice.id') |
| 38 | - ->leftJoin('mst_members','trn_invoice.member_id','=','mst_members.id') |
|
| 39 | - ->select('trn_payment_details.id','trn_payment_details.created_at','trn_payment_details.payment_amount','trn_payment_details.mode','trn_payment_details.invoice_id','trn_invoice.invoice_number','mst_members.id as member_id','mst_members.name as member_name','mst_members.member_code') |
|
| 40 | - ->orderBy($sorting_field,$sorting_direction); |
|
| 38 | + ->leftJoin('mst_members','trn_invoice.member_id','=','mst_members.id') |
|
| 39 | + ->select('trn_payment_details.id','trn_payment_details.created_at','trn_payment_details.payment_amount','trn_payment_details.mode','trn_payment_details.invoice_id','trn_invoice.invoice_number','mst_members.id as member_id','mst_members.name as member_name','mst_members.member_code') |
|
| 40 | + ->orderBy($sorting_field,$sorting_direction); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | return $query->leftJoin('trn_invoice','trn_payment_details.invoice_id','=','trn_invoice.id') |
| 44 | - ->leftJoin('mst_members','trn_invoice.member_id','=','mst_members.id') |
|
| 45 | - ->select('trn_payment_details.id','trn_payment_details.created_at','trn_payment_details.payment_amount','trn_payment_details.mode','trn_invoice.invoice_number','mst_members.name as member_name','mst_members.member_code') |
|
| 46 | - ->whereBetween('trn_payment_details.created_at', [$drp_start, $drp_end]) |
|
| 47 | - ->orderBy($sorting_field,$sorting_direction); |
|
| 44 | + ->leftJoin('mst_members','trn_invoice.member_id','=','mst_members.id') |
|
| 45 | + ->select('trn_payment_details.id','trn_payment_details.created_at','trn_payment_details.payment_amount','trn_payment_details.mode','trn_invoice.invoice_number','mst_members.name as member_name','mst_members.member_code') |
|
| 46 | + ->whereBetween('trn_payment_details.created_at', [$drp_start, $drp_end]) |
|
| 47 | + ->orderBy($sorting_field,$sorting_direction); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function createdBy() |
|
| 50 | + public function createdBy() |
|
| 51 | 51 | { |
| 52 | 52 | return $this->belongsTo('App\User','created_by'); |
| 53 | 53 | } |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | public function Invoice() |
| 61 | 61 | { |
| 62 | - return $this->belongsTo('App\Invoice','invoice_id'); |
|
| 62 | + return $this->belongsTo('App\Invoice','invoice_id'); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public function Cheque() |
|
| 65 | + public function Cheque() |
|
| 66 | 66 | { |
| 67 | 67 | return $this->hasOne('App\Cheque_detail','payment_id'); |
| 68 | 68 | } |
@@ -8,19 +8,19 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class Subscription extends Model |
| 10 | 10 | { |
| 11 | - protected $table = 'trn_subscriptions'; |
|
| 11 | + protected $table = 'trn_subscriptions'; |
|
| 12 | 12 | |
| 13 | - protected $fillable = [ |
|
| 13 | + protected $fillable = [ |
|
| 14 | 14 | 'member_id', |
| 15 | - 'invoice_id', |
|
| 16 | - 'plan_id', |
|
| 15 | + 'invoice_id', |
|
| 16 | + 'plan_id', |
|
| 17 | 17 | 'status', |
| 18 | 18 | 'is_renewal', |
| 19 | - 'start_date', |
|
| 20 | - 'end_date', |
|
| 21 | - 'created_by', |
|
| 22 | - 'updated_by', |
|
| 23 | - ]; |
|
| 19 | + 'start_date', |
|
| 20 | + 'end_date', |
|
| 21 | + 'created_by', |
|
| 22 | + 'updated_by', |
|
| 23 | + ]; |
|
| 24 | 24 | |
| 25 | 25 | protected $dates = ['created_at', 'updated_at', 'start_date', 'end_date']; |
| 26 | 26 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | return $query->leftJoin('mst_plans', 'trn_subscriptions.plan_id', '=', 'mst_plans.id')->select('trn_subscriptions.*','mst_plans.plan_name')->where('trn_subscriptions.status','=',\constSubscription::Expired)->where('trn_subscriptions.status','!=',\constSubscription::renewed)->whereBetween('trn_subscriptions.created_at', [$drp_start, $drp_end])->orderBy($sorting_field,$sorting_direction); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function createdBy() |
|
| 88 | + public function createdBy() |
|
| 89 | 89 | { |
| 90 | 90 | return $this->belongsTo('App\User','created_by'); |
| 91 | 91 | } |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | public function Member() |
| 99 | 99 | { |
| 100 | - return $this->belongsTo('App\Member','member_id'); |
|
| 100 | + return $this->belongsTo('App\Member','member_id'); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | public function Plan() |
| 104 | 104 | { |
| 105 | - return $this->belongsTo('App\Plan','plan_id'); |
|
| 105 | + return $this->belongsTo('App\Plan','plan_id'); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | public function Invoice() |
@@ -7,27 +7,27 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | class Enquiry extends Model |
| 9 | 9 | { |
| 10 | - protected $table = 'mst_enquiries'; |
|
| 10 | + protected $table = 'mst_enquiries'; |
|
| 11 | 11 | |
| 12 | - protected $fillable = [ |
|
| 13 | - 'name', |
|
| 14 | - 'DOB', |
|
| 15 | - 'email', |
|
| 16 | - 'address', |
|
| 17 | - 'status', |
|
| 18 | - 'gender', |
|
| 19 | - 'contact', |
|
| 20 | - 'pin_code', |
|
| 21 | - 'occupation', |
|
| 22 | - 'start_by', |
|
| 23 | - 'interested_in', |
|
| 24 | - 'aim', |
|
| 25 | - 'source', |
|
| 26 | - 'created_by', |
|
| 27 | - 'updated_by' |
|
| 28 | - ]; |
|
| 12 | + protected $fillable = [ |
|
| 13 | + 'name', |
|
| 14 | + 'DOB', |
|
| 15 | + 'email', |
|
| 16 | + 'address', |
|
| 17 | + 'status', |
|
| 18 | + 'gender', |
|
| 19 | + 'contact', |
|
| 20 | + 'pin_code', |
|
| 21 | + 'occupation', |
|
| 22 | + 'start_by', |
|
| 23 | + 'interested_in', |
|
| 24 | + 'aim', |
|
| 25 | + 'source', |
|
| 26 | + 'created_by', |
|
| 27 | + 'updated_by' |
|
| 28 | + ]; |
|
| 29 | 29 | |
| 30 | - //Eloquence Search mapping |
|
| 30 | + //Eloquence Search mapping |
|
| 31 | 31 | use Eloquence; |
| 32 | 32 | |
| 33 | 33 | protected $searchableColumns = [ |
@@ -36,12 +36,12 @@ discard block |
||
| 36 | 36 | 'contact' => 20, |
| 37 | 37 | ]; |
| 38 | 38 | |
| 39 | - public function Followups() |
|
| 40 | - { |
|
| 41 | - return $this->hasMany('App\Followup'); |
|
| 42 | - } |
|
| 39 | + public function Followups() |
|
| 40 | + { |
|
| 41 | + return $this->hasMany('App\Followup'); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - public function createdBy() |
|
| 44 | + public function createdBy() |
|
| 45 | 45 | { |
| 46 | 46 | return $this->belongsTo('App\User','created_by'); |
| 47 | 47 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function scopeOnlyLeads($query) |
| 68 | 68 | { |
| 69 | - return $query->where('status','=', \constEnquiryStatus::Lead)->orderBy('created_at','desc')->take(10); |
|
| 69 | + return $query->where('status','=', \constEnquiryStatus::Lead)->orderBy('created_at','desc')->take(10); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | } |
| 73 | 73 | \ No newline at end of file |
@@ -11,13 +11,13 @@ |
||
| 11 | 11 | |
| 12 | 12 | protected $fillable = [ |
| 13 | 13 | 'name', |
| 14 | - 'date', |
|
| 14 | + 'date', |
|
| 15 | 15 | 'message', |
| 16 | 16 | 'description', |
| 17 | 17 | 'status', |
| 18 | - 'send_to', |
|
| 19 | - 'created_by', |
|
| 20 | - 'updated_by' |
|
| 18 | + 'send_to', |
|
| 19 | + 'created_by', |
|
| 20 | + 'updated_by' |
|
| 21 | 21 | ]; |
| 22 | 22 | |
| 23 | 23 | protected $dates = ['created_at', 'updated_at', 'date']; |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | protected $fillable = [ |
| 13 | 13 | 'name', |
| 14 | 14 | 'total_expense', |
| 15 | - 'status', |
|
| 16 | - 'created_by', |
|
| 17 | - 'updated_by' |
|
| 15 | + 'status', |
|
| 16 | + 'created_by', |
|
| 17 | + 'updated_by' |
|
| 18 | 18 | ]; |
| 19 | 19 | |
| 20 | 20 | public function scopeExcludeArchive($query) |
| 21 | 21 | { |
| 22 | - return $query->where('status','!=', \constStatus::Archive); |
|
| 22 | + return $query->where('status','!=', \constStatus::Archive); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function Expenses() |