lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24366 from frederic34/printing

Browse Source 
work on printing
This commit is contained in:
Laurent Destailleur 2023-03-29 14:14:04 +02:00 committed by GitHub
commit e6ca58582e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/modules/printing/printgcp.modules.php
View File

@ -121,7 +121,7 @@ class printing_printgcp extends PrintingDriver
$this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID'); $this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID');
$this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET'); $this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET');
// Token storage // Token storage
$storage = new DoliStorage($this->db, $this->conf, $keyforprovider); $storage = new DoliStorage($this->db, $conf, $keyforprovider);
//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE); //$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
// Setup the credentials for the requests // Setup the credentials for the requests
$credentials = new Credentials( $credentials = new Credentials(
@ -255,12 +255,13 @@ class printing_printgcp extends PrintingDriver
*/ */
public function getlistAvailablePrinters() public function getlistAvailablePrinters()
{ {
global $conf;
$ret = array(); $ret = array();
$keyforprovider = ''; // @FIXME $keyforprovider = ''; // @FIXME
// Token storage // Token storage
$storage = new DoliStorage($this->db, $this->conf, $keyforprovider); $storage = new DoliStorage($this->db, $conf, $keyforprovider);
// Setup the credentials for the requests // Setup the credentials for the requests
$credentials = new Credentials( $credentials = new Credentials(
$this->google_id, $this->google_id,
@ -377,6 +378,7 @@ class printing_printgcp extends PrintingDriver
*/ */
public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype) public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
{ {
global $conf;
// Check if printer id // Check if printer id
if (empty($printerid)) { if (empty($printerid)) {
return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID'); return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
@ -401,7 +403,7 @@ class printing_printgcp extends PrintingDriver
$keyforprovider = ''; // @FIXME $keyforprovider = ''; // @FIXME
// Dolibarr Token storage // Dolibarr Token storage
$storage = new DoliStorage($this->db, $this->conf, $keyforprovider); $storage = new DoliStorage($this->db, $conf, $keyforprovider);
// Setup the credentials for the requests // Setup the credentials for the requests
$credentials = new Credentials( $credentials = new Credentials(
$this->google_id, $this->google_id,
@ -453,7 +455,7 @@ class printing_printgcp extends PrintingDriver
$keyforprovider = ''; // @FIXME $keyforprovider = ''; // @FIXME
// Token storage // Token storage
$storage = new DoliStorage($this->db, $this->conf, $keyforprovider); $storage = new DoliStorage($this->db, $conf, $keyforprovider);
// Setup the credentials for the requests // Setup the credentials for the requests
$credentials = new Credentials( $credentials = new Credentials(
$this->google_id, $this->google_id,