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

Merge pull request #12000 from frederic34/zapier2

Browse Source 
zapier trigger
This commit is contained in:
Laurent Destailleur 2019-10-01 11:16:27 +02:00 committed by GitHub
commit f151dc1951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
View File

@ -58,7 +58,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
$this->description = "Zapier triggers."; $this->description = "Zapier triggers.";
// 'development', 'experimental', 'dolibarr' or version // 'development', 'experimental', 'dolibarr' or version
$this->version = 'development'; $this->version = 'development';
$this->picto = 'zapier@zapier'; $this->picto = 'zapier';
} }
/** /**
@ -102,6 +102,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
return 0; return 0;
} }
$logtriggeraction = false; $logtriggeraction = false;
$sql = '';
if ($action!='') { if ($action!='') {
$actions = explode('_', $action); $actions = explode('_', $action);
$sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook'; $sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook';
@ -460,7 +461,7 @@ function cleanObjectDatas($toclean)
if (isset($toclean->lines) && count($toclean->lines) > 0) { if (isset($toclean->lines) && count($toclean->lines) > 0) {
$nboflines = count($toclean->lines); $nboflines = count($toclean->lines);
for ($i=0; $i < $nboflines; $i++) { for ($i=0; $i < $nboflines; $i++) {
$this->cleanObjectDatas($toclean->lines[$i]); cleanObjectDatas($toclean->lines[$i]);
} }
} }

2
htdocs/societe/class/api_contacts.class.php
View File

@ -75,7 +75,7 @@ class Contacts extends DolibarrApi
throw new RestException(401, 'No permission to read contacts'); throw new RestException(401, 'No permission to read contacts');
} }
if ($id ==0) { if ($id ==0) {
$result = $this->contact->intiAsSpecimen(); $result = $this->contact->initAsSpecimen();
} else { } else {
$result = $this->contact->fetch($id); $result = $this->contact->fetch($id);
} }

2
htdocs/societe/class/api_thirdparties.class.php
View File

@ -77,7 +77,7 @@ class Thirdparties extends DolibarrApi
throw new RestException(401); throw new RestException(401);
} }
if ($id ==0) { if ($id ==0) {
$result = $this->company->intiAsSpecimen(); $result = $this->company->initAsSpecimen();
} else { } else {
$result = $this->company->fetch($id); $result = $this->company->fetch($id);
} }

4
htdocs/zapier/class/api_zapier.class.php
View File

@ -211,6 +211,7 @@ class ZapierApi extends DolibarrApi
} }
$result = $db->query($sql); $result = $db->query($sql);
$i = 0;
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
while ($i < $num) { while ($i < $num) {
@ -240,9 +241,6 @@ class ZapierApi extends DolibarrApi
*/ */
public function post($request_data = null) public function post($request_data = null)
{ {
// $debug = '<pre>'.print_r($request_data, true).'</pre>';
// $debug .= '<pre>'.print_r(DolibarrApiAccess::$user->rights->zapier, true).'</pre>';
// mail('frederic.france@free.fr', 'test hook', $debug);
if (! DolibarrApiAccess::$user->rights->zapier->write) { if (! DolibarrApiAccess::$user->rights->zapier->write) {
throw new RestException(401); throw new RestException(401);
} }

2
htdocs/zapier/hook_agenda.php
View File

@ -196,7 +196,7 @@ if ($object->id > 0)
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
$object->info($object->id); $object->info($object->id);
print dol_print_object_info($object, 1); dol_print_object_info($object, 1);
print '</div>'; print '</div>';