gitkwesi/click-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added MNO docs to Paperless, fixed new clients info on dashboard

Browse Source
This commit is contained in:
Kwesi Banson
2024-07-04 11:32:19 +00:00
parent 132f151728
commit 101012c684
20 changed files with 128 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/Http/Controllers/ClientsController.php
View File

@@ -629,6 +629,7 @@ class ClientsController extends Controller
$support_fees = Models\ClientSupportFees::where('client_id', $id)->orderBy('id', 'DESC')->get(); $support_fees = Models\ClientSupportFees::where('client_id', $id)->orderBy('id', 'DESC')->get();
$showdocuments = Models\ClientFile::where('client_id', $id)->get(); $showdocuments = Models\ClientFile::where('client_id', $id)->get();
// dd($showdocuments[0]->name);
if ($showclient->status == 'Live') { if ($showclient->status == 'Live') {
$status_bg = "info"; $status_bg = "info";
} }
@@ -722,6 +723,7 @@ class ClientsController extends Controller
]; ];
return view('client.show', $data); return view('client.show', $data);
} }
public function showReadonly($id){ public function showReadonly($id){
//with('short_code_info')-> //with('short_code_info')->
$showclient = Models\Client::with('service_info', 'country_info', 'auth_user_info', 'short_code_info')->find($id); $showclient = Models\Client::with('service_info', 'country_info', 'auth_user_info', 'short_code_info')->find($id);
@@ -890,7 +892,26 @@ class ClientsController extends Controller
$payment_type = ['Prepaid' => 'Prepaid', 'Postpaid' => 'Postpaid']; // Models\PaymentType::pluck('name', 'id')->toArray(); $payment_type = ['Prepaid' => 'Prepaid', 'Postpaid' => 'Postpaid']; // Models\PaymentType::pluck('name', 'id')->toArray();
$status = ['Live' => 'Live', 'inactive' => 'Inactive', 'Prospective' => 'Prospective']; $status = ['Live' => 'Live', 'inactive' => 'Inactive', 'Prospective' => 'Prospective'];
$currency = Models\Currency::orderBy('name', 'ASC')->pluck('name', 'name'); $currency = Models\Currency::orderBy('name', 'ASC')->pluck('name', 'name');
$existing_documents = Models\ClientFile::where('client_id', $id)->get();
$files = [
'contract' => 'NO',
'non_disclosure' => 'NO',
'technical_doc' => 'NO'
];
foreach ($existing_documents as $value) {
if ($value->name == 'Contract') {
$files['contract'] = "YES";
}
else if($value->name == 'Non Disclosure'){
$files['non_disclosure'] = "YES";
}
else if($value->name == 'Technical Document'){
$files['technical_doc'] = "YES";
}
else{
}
}
$company_types = ['Aggregator/Supplier' => 'Aggregator/Supplier', 'Enterprise' => 'Enterprise']; $company_types = ['Aggregator/Supplier' => 'Aggregator/Supplier', 'Enterprise' => 'Enterprise'];
$auth_users = Models\SystemUser::orderBy('name', 'ASC')->pluck('name', 'id'); $auth_users = Models\SystemUser::orderBy('name', 'ASC')->pluck('name', 'id');
$industries = Models\Industry::orderBy('name', 'ASC')->pluck('name', 'name'); $industries = Models\Industry::orderBy('name', 'ASC')->pluck('name', 'name');
@@ -1033,7 +1054,8 @@ class ClientsController extends Controller
'onboarding_sub_items_progress' => $onboarding_sub_items_progress, 'onboarding_sub_items_progress' => $onboarding_sub_items_progress,
'onboarding_sub_items' => $onboarding_sub_items, 'onboarding_sub_items' => $onboarding_sub_items,
'current_pending_stage' => $client->progress_indicator, 'current_pending_stage' => $client->progress_indicator,
'has_pending' => $has_pending 'has_pending' => $has_pending,
'files' => $files
]; ];
return view('client.edit', $data); return view('client.edit', $data);
} }
@@ -1092,28 +1114,30 @@ class ClientsController extends Controller
} }
} }
$existing_documents = Models\ClientFile::where('client_id', $id)->get();
if ($request->has('document_one') && $request->has('document_one_name')) { if ($request->has('document_one') && $request->has('document_one_name')) {
if ($request->file('document_one')->isValid()) { if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_one->extension();
$request->document_one->storeAs('client_files', $filename, 'public'); $request->document_one->storeAs('client_files', $filename, 'public');
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
$client_update->name = $request->name; $client_update->name = $request->name;
$store_location = "client_files"; $store_location = "client_files";
$top = $paperless->processPaperlessFile($request->document_one_name, $request->document_one_name, $filename, $store_location); $top = $paperless->processPaperlessFile($request->document_one_name, $request->document_one_name, $filename, $store_location);
// dd($top);
$document_arr['file_extension'] = $request->document_one->extension(); $document_arr['file_extension'] = $request->document_one->extension();
$document_arr['file_reff'] = time() . uniqid(); $document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_one_name; $document_arr['name'] = $request->document_one_name;
$document_arr['created_by'] = session('current_user.id'); $document_arr['created_by'] = session('current_user.id');
$document_arr['client_id'] = $id; //$document_arr['client_id'] = $id;
$result = Models\ClientFile::create($document_arr); $result = Models\ClientFile::create($document_arr, ['client_id' => $id]);
} }
} }
if ($request->has('document_two') && $request->has('document_two_name')) { if ($request->has('document_two') && $request->has('document_two_name')) {
if ($request->file('document_two')->isValid()) { if ($request->file('document_two')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_two->extension();
$request->document_two->storeAs('client_files', $filename, 'public'); $request->document_two->storeAs('client_files', $filename, 'public');
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
$client_update->name = $request->name; $client_update->name = $request->name;
@@ -1126,12 +1150,14 @@ class ClientsController extends Controller
$document_arr['name'] = $request->document_two_name; $document_arr['name'] = $request->document_two_name;
$document_arr['created_by'] = session('current_user.id'); $document_arr['created_by'] = session('current_user.id');
$document_arr['client_id'] = $id; $document_arr['client_id'] = $id;
$result = Models\ClientFile::create($document_arr); // $result = Models\ClientFile::create($document_arr);
//$document_arr['client_id'] = $id;
$result = Models\ClientFile::create($document_arr, ['client_id' => $id]);
} }
} }
if ($request->has('document_three') && $request->has('document_three_name')) { if ($request->has('document_three') && $request->has('document_three_name')) {
if ($request->file('document_three')->isValid()) { if ($request->file('document_three')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_three->extension();
$request->document_three->storeAs('client_files', $filename, 'public'); $request->document_three->storeAs('client_files', $filename, 'public');
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
$client_update->name = $request->name; $client_update->name = $request->name;
@@ -1144,12 +1170,14 @@ class ClientsController extends Controller
$document_arr['name'] = $request->document_three_name; $document_arr['name'] = $request->document_three_name;
$document_arr['created_by'] = session('current_user.id'); $document_arr['created_by'] = session('current_user.id');
$document_arr['client_id'] = $id; $document_arr['client_id'] = $id;
$result = Models\ClientFile::create($document_arr); // $result = Models\ClientFile::create($document_arr);
//$document_arr['client_id'] = $id;
$result = Models\ClientFile::create($document_arr, ['client_id' => $id]);
} }
} }
if ($request->has('other_document') && $request->has('other_document_name')) { if ($request->has('other_document') && $request->has('other_document_name')) {
if ($request->file('other_document')->isValid()) { if ($request->file('other_document')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->other_document->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->other_document->extension();
$request->other_document->storeAs('client_files', $filename, 'public'); $request->other_document->storeAs('client_files', $filename, 'public');
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
$client_update->name = $request->name; $client_update->name = $request->name;

5
app/Http/Controllers/Controller.php
View File

@@ -8,9 +8,10 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
use App\Models; use App\Models;
class Controller extends BaseController class Controller extends BaseController{
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
public function log_queryBAK() { public function log_queryBAK() {
\DB::listen(function ($sql) { \DB::listen(function ($sql) {
\Log::info('showing query', array('sql' => $sql)); \Log::info('showing query', array('sql' => $sql));

4
app/Http/Controllers/DashboardController.php
View File

@@ -16,7 +16,9 @@ class DashboardController extends Controller
$voice_clients = Models\Client::where('services', 'LIKE', '%ivr%')->count(); $voice_clients = Models\Client::where('services', 'LIKE', '%ivr%')->count();
$expiring_contracts = Models\Client::where('contract_auto_renew', '<>', 'YES')->where('contract_validity', '<>', null)->orwhere('contract_validity', '<>', '')->orderBy('contract_validity', 'ASC')->take(5)->get(); $expiring_contracts = Models\Client::where('contract_auto_renew', '<>', 'YES')->where('contract_validity', '<>', null)->orwhere('contract_validity', '<>', '')->orderBy('contract_validity', 'ASC')->take(5)->get();
$user_activities = Models\UserActivity::where('user_id', '>', '1')->with('userInfo')->orderBy('created_at', 'DESC')->take(5)->get(); $user_activities = Models\UserActivity::where('user_id', '>', '1')->with('userInfo')->orderBy('created_at', 'DESC')->take(5)->get();
$recent_clients = Models\Client::with('auth_user_info')->orderBy('created_at', 'DESC')->take(5)->get(); $recent_clients = Models\Client::with('auth_user_info')->orderBy('id', 'DESC')->take(5)->get();
// $recent_clients = Models\Client::orderBy('id', 'DESC')->take(5)->get();
// dd($recent_clients);
$data = [ $data = [
'page_title' => 'Dashboard', 'page_title' => 'Dashboard',
'sms' => $sms_clients, 'sms' => $sms_clients,

6
app/Http/Controllers/GeneralDocumentsController.php
View File

@@ -133,7 +133,7 @@ class GeneralDocumentsController extends Controller
if ($request->has('document_one') && $request->has('document_one_name') && $request->has('document_one_category')) { if ($request->has('document_one') && $request->has('document_one_name') && $request->has('document_one_category')) {
if ($request->file('document_one')->isValid()) { if ($request->file('document_one')->isValid()) {
//dd($request->all()); //dd($request->all());
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_one->extension();
$request->document_one->storeAs('general_files', $filename, 'public'); $request->document_one->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename; $document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_one_category; $document_arr['category'] = $request->document_one_category;
@@ -151,7 +151,7 @@ class GeneralDocumentsController extends Controller
} }
if ($request->has('document_two') && $request->has('document_two_name') && $request->has('document_two_category')) { if ($request->has('document_two') && $request->has('document_two_name') && $request->has('document_two_category')) {
if ($request->file('document_two')->isValid()) { if ($request->file('document_two')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_two->extension();
$request->document_two->storeAs('general_files', $filename, 'public'); $request->document_two->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename; $document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_two_category; $document_arr['category'] = $request->document_two_category;
@@ -169,7 +169,7 @@ class GeneralDocumentsController extends Controller
} }
if ($request->has('document_three') && $request->has('document_three_name') && $request->has('document_three_category')) { if ($request->has('document_three') && $request->has('document_three_name') && $request->has('document_three_category')) {
if ($request->file('document_three')->isValid()) { if ($request->file('document_three')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_three->extension();
$request->document_three->storeAs('general_files', $filename, 'public'); $request->document_three->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename; $document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_three_category; $document_arr['category'] = $request->document_three_category;

14
app/Http/Controllers/NetworkOperatorsController.php
View File

@@ -9,6 +9,7 @@ use Illuminate\Support\Arr;
// use App\Http\Requests; // use App\Http\Requests;
use App\Http\Requests; use App\Http\Requests;
use App\Jobs\NewMnoNotesEmailAlerts; use App\Jobs\NewMnoNotesEmailAlerts;
use App\Libs\PaperLessNgx;
// use Illuminate\Http\Request as Requests; // use Illuminate\Http\Request as Requests;
@@ -372,13 +373,17 @@ class NetworkOperatorsController extends Controller
public function update(Requests\UpdateMnoRequest $request, $id) public function update(Requests\UpdateMnoRequest $request, $id)
{ {
$operator_update = Models\NetworkOps::find($id); $operator_update = Models\NetworkOps::find($id);
$paperless = new PaperLessNgx();
if ($request->has('document_one') && $request->has('document_one_name')) { if ($request->has('document_one') && $request->has('document_one_name')) {
if ($request->file('document_one')->isValid()) { if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension(); $filename = "erp_" . time() . str_random(4) . "." . $request->document_one->extension();
$request->document_one->storeAs('mno_files', $filename, 'public'); $request->document_one->storeAs('mno_files', $filename, 'public');
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
$operator_update->name = $request->name; $operator_update->name = $request->name;
$store_location = "mno_files";
$top = $paperless->processPaperlessFile($request->document_one_name, $request->document_one_category, $filename, $store_location);
$document_arr['file_extension'] = $request->document_one->extension(); $document_arr['file_extension'] = $request->document_one->extension();
$document_arr['file_reff'] = time() . uniqid(); $document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_one_name; $document_arr['name'] = $request->document_one_name;
@@ -394,6 +399,9 @@ class NetworkOperatorsController extends Controller
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
$operator_update->name = $request->name; $operator_update->name = $request->name;
$store_location = "mno_files";
$top = $paperless->processPaperlessFile($request->document_two_name, $request->document_two_category, $filename, $store_location);
$document_arr['file_extension'] = $request->document_two->extension(); $document_arr['file_extension'] = $request->document_two->extension();
$document_arr['file_reff'] = time() . uniqid(); $document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_two_name; $document_arr['name'] = $request->document_two_name;
@@ -409,6 +417,10 @@ class NetworkOperatorsController extends Controller
$document_arr['file_path'] = $filename; $document_arr['file_path'] = $filename;
// $operator_update->name = $request->name; // $operator_update->name = $request->name;
$store_location = "mno_files";
$top = $paperless->processPaperlessFile("sliding_rate", 'rates', $filename, $store_location);
$document_arr['file_extension'] = $request->sliding_rate_file->extension(); $document_arr['file_extension'] = $request->sliding_rate_file->extension();
$document_arr['file_reff'] = time() . uniqid(); $document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = "Sliding Scale Rate File"; $document_arr['name'] = "Sliding Scale Rate File";

7
app/Libs/PaperLessNgx.php
View File

@@ -112,10 +112,13 @@ class PaperLessNgx {
# set parameters and push to paperless # set parameters and push to paperless
$tags_correspondent = $this->getDocumentCorrespondent($category); $tags_correspondent = $this->getDocumentCorrespondent($category);
if ($store_location == "general_files") { if ($store_location == "general_files") {
$file_path = "documents/general_files/" . $filename; //"documents/oasl.pdf"; $file_path = "documents/general_files/" . $filename;
}
else if ($store_location == "mno_files") {
$file_path = "documents/mno_files/" . $filename;
} }
else{ else{
$file_path = "documents/client_files/" . $filename; //"documents/oasl.pdf"; $file_path = "documents/client_files/" . $filename;
} }
$tags_arr[] = $tags_correspondent['tags']; //[1,2]; $tags_arr[] = $tags_correspondent['tags']; //[1,2];

BIN
public/documents/client_files/erp_1719956097wKn37m.doc Normal file
View File

Binary file not shown.

BIN
public/documents/client_files/erp_171995640005PYVe.doc Normal file
View File

Binary file not shown.

BIN
public/documents/client_files/erp_1719956402vjlSNu.doc Normal file
View File

Binary file not shown.

BIN
public/documents/client_files/erp_1720008663JE3ixg.doc Normal file
View File

Binary file not shown.

BIN
public/documents/client_files/erp_1720020130Qm0z.pdf Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_1720020204nSzY.pdf Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_1720020233nWMm.pdf Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_172002058008Zr.xlsx Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_17200205802YFyDx.pdf Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_1720020580_sliding_rate.xlsx Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_1720021265xWaB.docx Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_1720021447Xc5C.docx Normal file
View File

Binary file not shown.

BIN
public/documents/mno_files/erp_1720021448_sliding_rate.docx Normal file
View File

Binary file not shown.

29
resources/views/client/edit.blade.php
View File

@@ -231,7 +231,7 @@
<div class="form-group"> <div class="form-group">
<div class=" {{ $errors->has('notes') ? 'has-error' : ''}}"> <div class=" {{ $errors->has('notes') ? 'has-error' : ''}}">
<label class="" for="clientNotes">Notes</label> <label class="" for="clientNotes">Notes</label>
{!! Form::textarea('notes', old('notes'), ['class' => 'form-control ', 'placeholder'=>'Enter additional information here', 'rows' => '5', 'id' => 'clientNotes']) !!} {!! Form::textarea('notes', old('notes'), ['class' => 'form-control ', 'placeholder'=>'Enter additional information here', 'rows' => '3', 'id' => 'clientNotes']) !!}
{!! $errors->first('notes', '<p class="help-block">:message</p>') !!} {!! $errors->first('notes', '<p class="help-block">:message</p>') !!}
</div> </div>
</div> </div>
@@ -254,6 +254,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12">
@if($files['contract'] == 'YES')
<p class="text-danger">Uploading a new Contract will overwrite the existing file</p>
@endif
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@@ -274,6 +279,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12">
@if($files['non_disclosure'] == 'YES')
<p class="text-danger">Uploading a new Non Disclosure will overwrite the existing file</p>
@endif
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@@ -294,6 +304,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12">
@if($files['technical_doc'] == 'YES')
<p class="text-danger">Uploading a Technical Document file will overwrite the existing file</p>
@endif
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@@ -324,14 +339,18 @@
<p > <p >
Live: Live:
<input type="radio" class="flat" name="status" id="statusLive" value="Live" <?php echo ($client->status == 'Live') ? "checked" : ""; ?> /> <input type="radio" class="flat" name="status" id="statusLive" value="Live" <?php echo ($client->status == 'Live') ? "checked" : ""; ?> />
&nbsp;&nbsp;&nbsp;&nbsp;
Prospective:
<input type="radio" class="flat" name="status" id="statusProspect" value="Prospective" <?php echo ($client->status == 'Prospective') ? "checked" : ""; ?> />
&nbsp;&nbsp;&nbsp;&nbsp;
Inactive
<input type="radio" class="flat" name="status" id="statusInactive" value="Inactive" <?php echo ($client->status == 'Inactive') ? "checked" : ""; ?> />
</p> </p>
<p> <p>
Prospective:
<input type="radio" class="flat" name="status" id="statusProspect" value="Prospective" <?php echo ($client->status == 'Prospective') ? "checked" : ""; ?> />
</p> </p>
<p> <p>
Inactive
<input type="radio" class="flat" name="status" id="statusInactive" value="Inactive" <?php echo ($client->status == 'Inactive') ? "checked" : ""; ?> />
</p> </p>
</div> </div>
</div> </div>