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

bug fixes, closed paperless

Browse Source
This commit is contained in:
Kwesi Banson
2024-07-02 21:10:48 +00:00
parent edb78d1bfc
commit 132f151728
35 changed files with 240 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ use App\Jobs\SendNewNotesEmailAlert;
use App\Jobs\SendOnboardingCompletedEmailAlert;
use App\Http\Requests;
use Carbon\Carbon;
use App\Libs\PaperLessNgx;
class ClientsController extends Controller
{
@@ -21,8 +21,7 @@ class ClientsController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
{
public function index(){
/*
$client = Models\Client::find(3);
dd($client->client_services);
@@ -46,8 +45,7 @@ class ClientsController extends Controller
];
return view('client.index-rawjs', $data);
}
public function getClientJson(Request $request)
{
public function getClientJson(Request $request){
/*
$client_arr = new Models\Client;
$client_arr = $client_arr->with('auth_user_info','country_info', 'created_by_info', 'modified_by_info')->orderBy('name', 'ASC')->paginate(20);
@@ -142,8 +140,7 @@ class ClientsController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
public function store(Request $request){
$request->validate([
'name' => 'required|unique:clients,name',
'email' => 'required|email',
@@ -245,8 +242,7 @@ class ClientsController extends Controller
Session::flash('success_message', 'Client successfully added');
return redirect(url('clients'));
}
public function notesStore(Request $request)
{
public function notesStore(Request $request){
$request->validate([
'client_id' => 'required',
'notes_body' => 'required'
@@ -306,8 +302,7 @@ class ClientsController extends Controller
}
}
public function notesUpdate(Request $request)
{
public function notesUpdate(Request $request){
$request->validate([
'client_id' => 'required',
'notes_body' => 'required'
@@ -421,8 +416,7 @@ class ClientsController extends Controller
$this->logUsersActivity($type = 'staff', $content);
return response()->json($data, 200);
}
public function shortcodeStore(Request $request)
{
public function shortcodeStore(Request $request){
$request->validate([
'client_id' => 'required',
'network' => 'required',
@@ -818,8 +812,7 @@ class ClientsController extends Controller
];
return view('client.show-readonly', $data);
}
public function showservices($id)
{
public function showservices($id){
$show_services = Models\ClientCategory::where('client_id', $id)->get();
$data = [
'page_title' => 'Show Services',
@@ -827,8 +820,7 @@ class ClientsController extends Controller
];
return view('client.services', $data);
}
public function editservice($id)
{
public function editservice($id){
$payment = Models\ClientCategory::find($id);
$data = [
'page_title' => 'Show Services',
@@ -890,8 +882,7 @@ class ClientsController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
public function edit($id){
$client = Models\Client::find($id);
$service_type = Models\Service::orderBy('name', 'ASC')->pluck('name', 'name');
$countries = Models\Country::orderBy('en_short_name', 'ASC')->pluck('en_short_name','en_short_name');
@@ -1054,10 +1045,10 @@ class ClientsController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Requests\UpdateClientRequest $request, $id)
{
public function update(Requests\UpdateClientRequest $request, $id){
// dump($request->all());
$client_update = Models\Client::find($id);
$paperless = new PaperLessNgx();
if ($client_update->progress_indicator != 'COMPLETED') {
$current_pending_stage_details = Models\ClientOnboardingMainStage::where('stage', $request->current_pending_stage)->first();
$get_stage_subs_items = Models\ClientOnboardingSubItem::where('stage_id', $current_pending_stage_details->stage_id)->get();
@@ -1100,6 +1091,7 @@ class ClientsController extends Controller
dispatch(new SendOnboardingCompletedEmailAlert($client));
}
}
if ($request->has('document_one') && $request->has('document_one_name')) {
if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension();
@@ -1107,6 +1099,10 @@ class ClientsController extends Controller
$document_arr['file_path'] = $filename;
$client_update->name = $request->name;
$store_location = "client_files";
$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_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_one_name;
@@ -1121,6 +1117,9 @@ class ClientsController extends Controller
$request->document_two->storeAs('client_files', $filename, 'public');
$document_arr['file_path'] = $filename;
$client_update->name = $request->name;
$store_location = "client_files";
$top = $paperless->processPaperlessFile($request->document_two_name, $request->document_two_name, $filename, $store_location);
$document_arr['file_extension'] = $request->document_two->extension();
$document_arr['file_reff'] = time() . uniqid();
@@ -1137,6 +1136,9 @@ class ClientsController extends Controller
$document_arr['file_path'] = $filename;
$client_update->name = $request->name;
$store_location = "client_files";
$top = $paperless->processPaperlessFile($request->document_three_name, $request->document_three_name, $filename, $store_location);
$document_arr['file_extension'] = $request->document_three->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_three_name;
@@ -1152,6 +1154,9 @@ class ClientsController extends Controller
$document_arr['file_path'] = $filename;
$client_update->name = $request->name;
$store_location = "client_files";
$top = $paperless->processPaperlessFile($request->other_document_name, $request->other_document_name, $filename, $store_location);
$document_arr['file_extension'] = $request->other_document->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_three_name;
@@ -1161,6 +1166,8 @@ class ClientsController extends Controller
}
}
$client_update->name = $request->name;
$client_update->email = $request->email;
$client_update->phone = $request->phone ?? "";
@@ -1282,8 +1289,8 @@ class ClientsController extends Controller
}
return true;
}
public function storeFiles(AddFilesRequest $request)
{
public function storeFiles(AddFilesRequest $request){
$document_arr = $request->except('document');
if ($request->hasFile('document')) {
if ($request->file('document')->isValid()) {
@@ -1292,6 +1299,7 @@ class ClientsController extends Controller
$document_arr['document'] = json_encode([$filename]);
}
}
$document_arr['file_extension'] = $request->document->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['last_modified_by'] = session('current_user.id');
@@ -1307,8 +1315,7 @@ class ClientsController extends Controller
return response()->json($data, 200);
}
public function getClientFile($id)
{
public function getClientFile($id){
$client_file = Models\ClientFile::with('client_info')->findOrFail($id);
//PDF file is stored under project/public/download/info.pdf
$file = public_path('documents/client_files/') . $client_file->file_path;

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

@@ -83,92 +83,4 @@ class Controller extends BaseController
}
return true;
}
public function sendToPaperless($file_path, $tags_arr, $created_at, $document_type, $title, $correspondent){
$dir = getcwd();
$prod_url = "http://206.225.84.201:8000/api/documents/post_document/";
$local_url = "http://192.168.68.152:8000/api/documents/post_document/";
// dd($ip);
if ($dir !== '/Users/kwesibanson/Sites/team_tracker') {
$url = $prod_url;
$auth = "";
}
else{
$url = $local_url;
$auth = "cGxhZG1pbjpCcmFuY2gyMDAw";
}
// $pop = new \CURLFILE('/Users/kwesibanson/Documents/36-PropertyBillsRegister-2019.pdf');
// $curl_file = new \CURLFILE(public_path('documents/ultra_host.pdf'));
$curl_file = new \CURLFILE(public_path($file_path));
$curl = curl_init();
$data = [
"document" => $curl_file,
'title' => $title,
'correspondent' => $correspondent,
'created' => $created_at,
'document_type' => $document_type
];
if (count($tags_arr) > 0) {
foreach ($tags_arr as $tag) {
$data['tags'] = $tag;
}
}
// dd($data);
curl_setopt_array($curl, array(
CURLOPT_URL => $url,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => '',
CURLOPT_MAXREDIRS => 10,
CURLOPT_TIMEOUT => 0,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => 'POST',
CURLOPT_POSTFIELDS => $data, //['document' => $curl_file],
// CURLOPT_POSTFIELDS => array('document'=> new CURLFILE('/Users/kwesibanson/Documents/36-PropertyBillsRegister-2019.pdf')),
CURLOPT_HTTPHEADER => array(': ', 'Authorization: Basic ' . $auth),
));
$response = curl_exec($curl);
// print_r(curl_getinfo($ch));
// dump(curl_errno($curl));
// dump(curl_error($curl));
curl_close($curl);
return $response;
}
public function getToPaperlessParamValues($name){
// $name = "document_types/";
$dir = getcwd();
$prod_url = "http://206.225.84.201:8000/api/$name/";
$local_url = "http://192.168.68.152:8000/api/$name/";
// dd($ip);
if ($dir !== '/Users/kwesibanson/Sites/team_tracker') {
$url = $prod_url;
$auth = "";
}
else{
$url = $local_url;
$auth = "cGxhZG1pbjpCcmFuY2gyMDAw";
}
// $pop = new \CURLFILE('/Users/kwesibanson/Documents/36-PropertyBillsRegister-2019.pdf');
// $curl_file = new \CURLFILE(public_path('documents/ultra_host.pdf'));
// dd($data);
$curl = curl_init();
curl_setopt_array($curl, array(
CURLOPT_URL => $url,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => '',
CURLOPT_MAXREDIRS => 10,
CURLOPT_TIMEOUT => 0,
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => 'GET',
CURLOPT_HTTPHEADER => array(': ', 'Authorization: Basic ' . $auth),
));
$response = curl_exec($curl);
curl_close($curl);
return $response;
}
}

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

@@ -6,6 +6,8 @@ use Illuminate\Http\Request;
use App\Models;
use Session;
use App\Http\Requests;
use App\Libs\PaperLessNgx;
class GeneralDocumentsController extends Controller
{
@@ -127,6 +129,7 @@ class GeneralDocumentsController extends Controller
*/
public function store(Requests\GeneralDocumentsRequest $request){
// dd($request->all());
$paperless = new PaperLessNgx();
if ($request->has('document_one') && $request->has('document_one_name') && $request->has('document_one_category')) {
if ($request->file('document_one')->isValid()) {
//dd($request->all());
@@ -135,16 +138,9 @@ class GeneralDocumentsController extends Controller
$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);
#sendToPaperLess
$store_location = "general_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_reff'] = time() . uniqid();
@@ -160,6 +156,10 @@ class GeneralDocumentsController extends Controller
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_two_category;
#sendToPaperLess
$store_location = "general_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_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_two_name;
@@ -174,6 +174,10 @@ class GeneralDocumentsController extends Controller
$document_arr['filename'] = $filename;
$document_arr['category'] = $request->document_three_category;
#sendToPaperLess
$store_location = "general_files";
$top = $paperless->processPaperlessFile($request->document_three_name, $request->document_three_category, $filename, $store_location);
$document_arr['file_extension'] = $request->document_three->extension();
$document_arr['file_reff'] = time() . uniqid();
$document_arr['name'] = $request->document_three_name;
@@ -246,26 +250,5 @@ class GeneralDocumentsController extends Controller
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;
}
}
}

1
app/Http/Controllers/UtilityController.php
View File

@@ -53,6 +53,7 @@ class UtilityController extends Controller
$retval = $this->getToPaperlessParamValues($name);
// dd($retval['results']);
$tip = json_decode($retval);
dd($tip);
foreach ($tip->results as $value) {
dd($value);
}