7dbc1e0c by Jeff Balicki

ee

1 parent 78d5bd03
......@@ -107,6 +107,7 @@ class ApiController extends Controller
$json = json_encode($json);
$json = json_decode($json);
$pdfLocation = $json->pdf[0]->pdfLocation;
$cust_id = $json->pdf[0]->custId;
......@@ -144,7 +145,7 @@ class ApiController extends Controller
$response = $pdfId;
$statusCode = 200;
$UploaqdPdf = new GoogledriveuploadpdfController();
$UploaqdPdf->google_drive_upload($folder, 'new_'.$pdfLocation,$pdfId);
$UploaqdPdf->google_drive_upload($folder, 'new_'.$pdfLocation,$pdfId,$cust_id);
return Response::json( $response, $statusCode);
......@@ -183,7 +184,7 @@ public function getpdfgoogle($json)
$rows = new pdfModel();
$id = $rows->getpdfid($json)->get();
// $rows = new pdfModel();
$rows = $rows->getpdf($id[0]->pdfid)->get();
$response = $rows;
$statusCode = 200;
......
......@@ -26,14 +26,14 @@ use Imagick;
class GoogledriveuploadpdfController extends Controller
{
public function google_drive_upload($folder, $filename,$PdfId)
public function google_drive_upload($folder, $filename,$PdfId,$cust_id)
{
session_start();
$pdffile = new FileEntryController();
$pdfFile = $pdffile->getPDF($folder, $filename);
$user = new pdfModel();
$user = $user->getGoogleUserOath('2')->get();;
$user = $user->getGoogleUserOath($cust_id)->get();;
......
......@@ -120,7 +120,7 @@ class pdfModel extends Model
$fileName = explode('.', $fileName);
$pdfId = DB::table('PDF')->insertGetId(
array('name' => $json->pdf[0]->name, 'folder' => $folder, 'file' => end($file), 'apiCallId' => $apiCallId, 'image'=> $fileName[0].'.jpg','pheight' => $json->pdf[0]->pageHeight, 'pwidth' => $json->pdf[0]->pageWidth)
array('name' => $json->pdf[0]->name, 'folder' => $folder, 'file' => end($file), 'custId' => $json->pdf[0]->custId, 'image'=> $fileName[0].'.jpg','pheight' => $json->pdf[0]->pageHeight, 'pwidth' => $json->pdf[0]->pageWidth)
);
foreach($json->changes as $change) {
......
......@@ -34,7 +34,7 @@ function getAuth() {
$.ajax(settings).done(function(response) {
console.log(response);
token = response;
});
});
}
......@@ -136,6 +136,7 @@ function getJson(user_id) {
// Get the element with id summary and set the inner text to the result.
var json = JSON.stringify(data);
pickPdfFromList(json);
});
});
}
......@@ -480,7 +481,7 @@ function returnOptions(form) {
var jsonReturn = '{"pdf":[{"name":"' + json[0].name + '", "folder":"' + json[0].folder + '", "pdfLocation":"' + json[0].file + '","pageWidth":"' + json[0].pwidth + '","pageHeight":"' + json[0].pheight + '"}],"changes":['
var jsonReturn = '{"pdf":[{"name":"' + json[0].name + '", "folder":"' + json[0].folder + '", "pdfLocation":"' + json[0].file + '","pageWidth":"' + json[0].pwidth + '","pageHeight":"' + json[0].pheight + '", "custId":"' +user_id + '"}],"changes":['
var e = 1;
for (i = 0; i < json.length; ++i) {
......