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

bug fixes, senderID polishing, support fees, paperless partial

Browse Source
This commit is contained in:
Kwesi Banson
2024-07-02 09:25:00 +00:00
parent 318fddbff0
commit edb78d1bfc
116 changed files with 1488 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ class GeneralDocumentsController extends Controller
->select(\DB::raw('count(*) as docs_count, network_operators.name, mno_files.mno_id'))
->groupBy('network_operators.name', 'mno_files.mno_id')
->get();
$category_names = [
'api' => 'API Documents',
'presentations' => 'Presentations',
@@ -62,7 +62,7 @@ class GeneralDocumentsController extends Controller
{
#$this->log_query();
$document_arr = \DB::table('general_documents')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at')
->orderBy('general_documents.name', 'ASC')
->paginate(15);
@@ -70,12 +70,12 @@ class GeneralDocumentsController extends Controller
if($request->has('keyword')){
$keyword = $request->keyword;
$document_arr = \DB::table('general_documents')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at')
->orderBy('general_documents.name', 'ASC')
->whereRaw("general_documents.name LIKE '%$keyword%' OR general_documents.description LIKE '%$keyword%' OR general_documents.filename LIKE '%$keyword%' OR auth_users.name LIKE '%$keyword%'")
->paginate(15);
}
->paginate(15);
}
return response()->json($document_arr);
}
public function getDocumentsCategoryJson(Request $request)
@@ -83,7 +83,7 @@ class GeneralDocumentsController extends Controller
//$this->log_query();
$category = $request->category;
$document_arr = \DB::table('general_documents')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at')
->where('general_documents.category', $category)
->orderBy('general_documents.name', 'ASC')
@@ -92,31 +92,30 @@ class GeneralDocumentsController extends Controller
if($request->has('keyword')){
$keyword = $request->keyword;
$document_arr = \DB::table('general_documents')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->join('auth_users', 'auth_users.id', '=', 'general_documents.uploaded_by')
->select('general_documents.id', 'general_documents.name', 'general_documents.filename', 'auth_users.name AS UploadedBy', 'general_documents.created_at')
->orderBy('general_documents.name', 'ASC')
->where('general_documents.category', $category)
->whereRaw("general_documents.name LIKE '%$keyword%' OR general_documents.description LIKE '%$keyword%' OR general_documents.filename LIKE '%$keyword%' OR auth_users.name LIKE '%$keyword%'")
->paginate(15);
}
->paginate(15);
}
return response()->json($document_arr);
}
public function create()
{
public function create(){
$categories = [
'sidwl' => 'Sender ID Whitelisting Letter',
'api' => 'API Docs',
'rates' => 'Rates',
'scfees' => 'Short Code Fees',
'presentations' => 'presentations',
'sidwl' => 'Sender ID Whitelisting Letter',
'api' => 'API Docs',
'rates' => 'Rates',
'scfees' => 'Short Code Fees',
'presentations' => 'presentations',
'vpn_forms' => 'VPN Forms',
'user_guides' => 'User Guides',
'others' => 'Others'
];
];
$data = [
'page_title' => 'Upload Document',
'categories' => $categories
'page_title' => 'Upload Document',
'categories' => $categories
];
return view('generaldocuments.create', $data);
}
@@ -126,16 +125,27 @@ class GeneralDocumentsController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Requests\GeneralDocumentsRequest $request)
{
public function store(Requests\GeneralDocumentsRequest $request){
// dd($request->all());
if ($request->has('document_one') && $request->has('document_one_name') && $request->has('document_one_category')) {
if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension();
//dd($request->all());
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension();
$request->document_one->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_one_category;
# set parameters and push to paperless
$file_path = "documents/general_files/" . $filename; //"documents/oasl.pdf";
$tags_arr = [1,2];
$created_at = date('Y-m-d H:i:s');
$document_type = 1;
$correspondent = 1;
$title = $request->document_one_name;
$retval_paperless = $this->sendToPaperless($file_path, $tags_arr, $created_at, $document_type, $title, $correspondent);
\Log::info($retval_paperless);
$document_arr['file_extension'] = $request->document_one->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_one_name;
@@ -145,11 +155,11 @@ class GeneralDocumentsController extends Controller
}
if ($request->has('document_two') && $request->has('document_two_name') && $request->has('document_two_category')) {
if ($request->file('document_two')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension();
$filename = "erp_" . time() . str_random(6) . "." . $request->document_two->extension();
$request->document_two->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_two_category;
$document_arr['file_extension'] = $request->document_two->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_two_name;
@@ -159,28 +169,27 @@ class GeneralDocumentsController extends Controller
}
if ($request->has('document_three') && $request->has('document_three_name') && $request->has('document_three_category')) {
if ($request->file('document_three')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension();
$filename = "erp_" . time() . str_random(6) . "." . $request->document_three->extension();
$request->document_three->storeAs('general_files', $filename, 'public');
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_three_category;
$document_arr['file_extension'] = $request->document_three->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_three_name;
$document_arr['uploaded_by'] = session('current_user.id');
$result = Models\GeneralDocument::create($document_arr);
}
}
}
Session::flash('success_message', 'Document(s) successfully uploaded');
return redirect(url('generaldocuments'));
}
public function storeBak(Request $request)
{
public function storeBak(Request $request){
$request->validate([
'file' => 'required|mimes:csv,txt,xlx,xls,pdf|max:2048'
]);
$fileName = time().'.'.$request->file->extension();
$fileName = time().'.'.$request->file->extension();
$request->file->move(public_path('uploads'), $fileName);
@@ -195,8 +204,7 @@ class GeneralDocumentsController extends Controller
];
return view('generaldocuments.edit', $data);
}
public function update(Request $request, $id)
{
public function update(Request $request, $id){
$document = Models\GeneralDocument::findOrFail($id);
if ($request->has('document_one')) {
if ($request->file('document_one')->isValid()) {
@@ -204,7 +212,7 @@ class GeneralDocumentsController extends Controller
$request->document_one->storeAs('general_files', $filename, 'public');
$document->filename = $filename;
$document->file_extension = $request->document_one->extension();
$document->file_reff = time() . uniqid();
$document->file_reff = time() . uniqid();
}
}
$document->uploaded_by = session('current_user.id');
@@ -213,15 +221,14 @@ class GeneralDocumentsController extends Controller
Session::flash('success_message', 'Document successfully Updated');
return redirect(url('generaldocuments'));
}
public function getDocument($id)
{
public function getDocument($id){
$general_file = Models\GeneralDocument::find($id);
if (!$general_file) {
return redirect(url('generaldocuments'));
}
//PDF file is stored under project/public/download/info.pdf
$file = public_path('documents/general_files/') . $general_file->filename;
$headers = []; //['Content-Type: application/pdf'];
$filename = $general_file->name; // . "_" . $general_file->file_reff;
$filename = $this->cleanStr($filename);
@@ -236,7 +243,29 @@ class GeneralDocumentsController extends Controller
$string = preg_replace('/[^A-Za-z0-9\-]/', '', $string);
// Replaces multiple hyphens with single one.
$string = preg_replace('/-+/', '_', $string);
return $string;
}
public function getDocumentCorrespondent($category){
switch ($category) {
case 'sidwl':
// code...
break;
case 'api':
// code...
break;
case 'scfees':
// code...
break;
case 'presentations':
// code...
break;
case 'others':
// code...
break;
default:
// code...
break;
}
}
}