@@ -49,11 +49,11 @@
-
+
-

Recent Activities

- +

Additional Info

+
@@ -69,7 +69,7 @@ {{ $userrow->content }}
- {{ $userrow->activity_time }} + {{ $userrow->activity_time }}

@@ -78,17 +78,52 @@ @endforeach @endif - +
-
-
+
+
+
+
+

Recent Activities

+ +
+
+
+
+ +
    + @if($user_activities->isEmpty() == false) + @foreach($user_activities as $userrow) +
  • +
    +
    +

    + {{ $userrow->content }} +

    +
    + {{ $userrow->activity_time }} + +
    +

    +
    +
    +
    • + @endforeach + @endif + +
+
+
+
+
+

Contracts Expiry Dates

- +
@@ -96,7 +131,7 @@ @foreach($expiring_contracts as $row)
@endif - +
-
+
-

Newly Added Clients

+

Newly Added Clients

@@ -137,7 +172,7 @@ @foreach($recent_clients as $recentrow)
- +
@@ -179,4 +214,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/emails/client_renewal-alert.blade.php b/resources/views/emails/client_renewal-alert.blade.php new file mode 100644 index 0000000..c38d0d3 --- /dev/null +++ b/resources/views/emails/client_renewal-alert.blade.php @@ -0,0 +1,25 @@ + + + + + + +
+ Click Mobile Banner Logo +
+

{{ date('F d, Y') }} Client Contract Renewal Alert

+ + + Hello Team
+
+ + Renewal Details +
+ {{ $alert_body }} + +

+ Sincerely,
+ Click Mobile ERP +

+ + diff --git a/resources/views/emails/renewal-alert.blade.php b/resources/views/emails/renewal-alert.blade.php new file mode 100644 index 0000000..0ab64c4 --- /dev/null +++ b/resources/views/emails/renewal-alert.blade.php @@ -0,0 +1,25 @@ + + + + + + +
+ Click Mobile Banner Logo +
+

{{ date('F d, Y') }} Contract Renewal Alert

+ + + Hello Team
+
+ + Renewal Details +
+ {{ $alert_body }} + +

+ Sincerely,
+ Click Mobile ERP +

+ + diff --git a/resources/views/finance/dashboard.blade.php b/resources/views/finance/dashboard.blade.php index 14050c9..cef49f1 100644 --- a/resources/views/finance/dashboard.blade.php +++ b/resources/views/finance/dashboard.blade.php @@ -12,23 +12,23 @@
2500
- Metric 1 + Metric 2
123.50
- Metric 1 + Metric 3
2,500
- Metric 1 + Metric 4
4,567
- Metric 1 + Metric 5
2,315
- Metric 1 + Metric 6
7,325
diff --git a/resources/views/marketer_report/.DS_Store b/resources/views/marketer_report/.DS_Store new file mode 100755 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0S5Z-O8Nhm@N3Oz1(E!ZHEf|n5W1&ruHr6#0kFlI}W+CwSitS{t~_&m<+ zZotwWJc-yD*nG3|v%B*__J=XX!&&Mv<}$`?Xowt@4T9#4u9gW#=_aw^(?--xt2W z?2CoxoecY8cJS$gtTo~&XjkcgbP-U5(1#fK1qQwVpaM-M literal 0 HcmV?d00001 diff --git a/resources/views/network_ops/edit.blade.php b/resources/views/network_ops/edit.blade.php index 99079bd..232d767 100755 --- a/resources/views/network_ops/edit.blade.php +++ b/resources/views/network_ops/edit.blade.php @@ -35,16 +35,16 @@ {!! Form::model($network_arr, ['method' => 'PATCH', 'url' => ['mnos', $network_arr], 'class' => 'form-horizontal form-label-left', 'files' => 'true' ]) !!}
-
-
-
+
+
+
{!! Form::text('name', old('name'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter name' , 'id' => 'name']) !!} {!! $errors->first('name', '

:message

') !!}
-
-
+
+
{!! Form::select('country', $countries ,old('country'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter Country' , 'id' => 'country']) !!} @@ -52,14 +52,14 @@
-
+
{!! Form::select('account_manager_id', $account_manager ,old('account_manager_id'), ['class' => 'form-control col-md-7 col-xs-12', 'placeholder'=>'Enter Account Manager' , 'id' => 'account_manager_id']) !!} {!! $errors->first('account_manager_id', '

:message

') !!}
-
+
-
+
{!! Form::text('contact_person_email', old('contact_person_email'), ['class' => 'form-control ', 'placeholder'=>'Enter email' , 'id' => 'email']) !!} {!! $errors->first('contact_person_email', '

:message

') !!}
-
+
@@ -100,7 +100,7 @@

Live: - connection_status == 'Active') ? "checked" : ""; ?> /> + connection_status == 'Active') ? "checked" : ""; ?> />

Pending: @@ -113,7 +113,7 @@

-
+
@@ -127,36 +127,36 @@ {!! Form::text('contact_person_finance', old('contact_person_finance'), ['class' => 'form-control', 'placeholder'=>'Enter Finance Contact Person' , 'id' => 'contactPersonFinance']) !!} {!! $errors->first('contact_person', '

:message

') !!}
-
-
+
+
{!! Form::select('services[]', $services, $current_services, ['class' => 'form-control typeServices' , 'id' => 'services', 'multiple'=> 'true']) !!} {!! $errors->first('services', '

:message

') !!}
-
+
{!! Form::select('support_skype[]', $support_skype_arr, $old_support_skype_arr, ['class' => 'form-control supportSkype', 'id' => 'supportSkype', 'multiple' => 'true']) !!} {!! $errors->first('support_skype', '

:message

') !!}
-
+
{!! Form::select('support_emails[]', $support_emails, $old_support_emails, ['class' => 'form-control supportEmail', 'id' => 'supportEmail', 'multiple' => 'true']) !!} {!! $errors->first('support_emails', '

:message

') !!}
-
+
{!! Form::select('finance_emails[]', $finance_emails, $old_finance_emails, ['class' => 'form-control financeEmail', 'id' => 'financeEmail', 'multiple' => 'true']) !!} {!! $errors->first('finance_emails', '

:message

') !!}
-
-
+
+
{!! Form::select('support_phones[]', $support_phones, $old_support_phones, ['class' => 'form-control supportPhones', 'id' => 'supportPhones', 'multiple' => 'true']) !!} @@ -170,33 +170,33 @@ {!! $errors->first('contract_validity', '

:message

') !!}
-
+
{!! Form::select('contract_auto_renew', ['YES' => 'YES','NO' => 'NO'], old('contract_auto_renew'), ['class' => 'form-control ' , 'id' => 'contractAutoRenew' ]) !!} {!! $errors->first('contract_auto_renew', '

:message

') !!}
-
+
-
+

Recent Payments

@include('network_ops.partials.recent-payments')
-
-
-
-
+
+
+
+
{!! Form::select('connection_type[]', $connection_types, $old_connection_type, ['class' => 'form-control' , 'id' => 'connectionType', 'multiple'=> 'true']) !!} {!! $errors->first('connection_type', '

:message

') !!}
-
+
-
-
+
+
{!! Form::text('document_one_name', '', ['class' => 'form-control' , 'id' => 'documentOneName']) !!} @@ -216,7 +216,7 @@
-
+
{!! Form::text('document_two_name', '', ['class' => 'form-control' , 'id' => 'documentTwoName']) !!} @@ -233,9 +233,9 @@
-
+
+ -

IP Addresses Add IP

@@ -289,7 +289,7 @@ {!! Form::close() !!}
-
+
@@ -312,6 +312,9 @@ $('.financeEmail').select2({ tags:true }); + $('#contractValidity').datetimepicker({ + format: 'YYYY-MM-DD' + }); }); diff --git a/routes/.DS_Store b/routes/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0name('home'); //Route::post('ipstore', 'NetworkOperatorsController@ipStore'); Route::get('testemail', 'UtilityController@EmailTest'); +Route::get('testmno', 'ContractRenewalReminderController@getMnos'); +Route::get('ntfy', 'UtilityController@ntfyTest'); +Route::get('client-renewal', 'ClientContractRenewalAlertsController@getClientDetails'); //insertOnboardingProgress @@ -70,10 +73,10 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::get('generaldocuments/list/{category}', 'GeneralDocumentsController@listcategory'); Route::get('generaldocuments/list/json/{category}', 'GeneralDocumentsController@getDocumentsCategoryJson'); - + Route::get('generaldocuments/download/{id}', 'GeneralDocumentsController@getDocument'); Route::get('generaldocuments/all', 'GeneralDocumentsController@getDocumentsJson'); - + Route::resource('generaldocuments', 'GeneralDocumentsController'); Route::get('senderids/all', 'SenderIdController@getSenderIdsJson'); @@ -81,7 +84,7 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::get('staffmembers/all', 'StaffMembersController@getstaffMemberssJson'); Route::resource('staffmembers', 'StaffMembersController'); - + Route::get('clients/downloadfile/{id}', 'ClientsController@getClientFile'); @@ -91,12 +94,12 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::post('clients/notes_store', 'ClientsController@notesStore'); Route::post('clients/finance_store', 'ClientsController@financeStore'); Route::post('clients/finance_update', 'ClientsController@financeUpdate'); - + Route::get('clients/get_payment/{id}', 'ClientsController@getPayment'); Route::get('clients/get_note/{id}', 'ClientsController@getSingleNote'); Route::get('clients/create-notes', 'ClientsController@createNotes'); Route::get('clients/shortcodes/{type}', 'ClientsController@getShortCodes'); - + Route::get('clients/readonly/{id}', 'ClientsController@showReadonly'); Route::get('clients/all', 'ClientsController@getClientJson'); Route::post('clients/raw', 'ClientsController@getClientJsonRawJs'); @@ -122,7 +125,7 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::get('infrastructure/revealpassword/{id}', 'ClickInfrastructureController@reveal_password'); Route::post('infrastructure/updateserver', 'ClickInfrastructureController@updateserver'); - + Route::post('infrastructure/storeserver', 'ClickInfrastructureController@storeserver'); Route::get('infrastructure/all', 'ClickInfrastructureController@getServerListJson'); @@ -151,7 +154,7 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::get('clickapps/shortcodes', 'ClickAppsController@getShortCodes'); Route::resource('clickapps', 'ClickAppsController'); - + Route::get('clientpaymentreports/all', 'ClientPaymentReportsController@getClientPaymentsJson'); Route::get('clientpaymentreports', 'ClientPaymentReportsController@index'); @@ -163,4 +166,3 @@ Route::group(['middleware' => ['checklogin', 'checkcurrentlylogged']], function( Route::get('finance', 'Finance\DashboardController@index'); }); - diff --git a/scrap-board.php b/scrap-board.php index b3dd404..da2c0fe 100644 --- a/scrap-board.php +++ b/scrap-board.php @@ -13,8 +13,10 @@ "Agreement" => "COMPLETED", "interconnectivity" => "PENDING" ] +* * * * * php /Users/kwesibanson/sites/team_tracker/artisan schedule:run >> /dev/null 2>&1 +* * * * * php /var/www/html/general/team_tracker/artisan schedule:run >> /dev/null 2>&1 -if(date('D') == 'Sat' || date('D') == 'Sun') { +if(date('D') == 'Sat' || date('D') == 'Sun') { echo "Today is Saturday or Sunday."; } else { echo "Today is not Saturday or Sunday."; @@ -24,13 +26,13 @@ if(date('D') == 'Sat' || date('D') == 'Sun') { $current_date = new \DateTime(date('Y-m-d')); $expiry_date = new \DateTime($showclient->contract_validity); - + $diff = date_diff($current_date, $expiry_date); dd($diff); $polar = $diff->format("%R"); - + $months = $diff->format("%m"); - + $days = $diff->format("%a"); dd($days); */ @@ -45,4 +47,4 @@ if(date('D') == 'Sat' || date('D') == 'Sun') { $days = floor($diff / (60*60*24)); */ - ?> \ No newline at end of file + ?>