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

Merge pull request #11715 from ptibogxiv/patch-226

Browse Source 
NEW :  Platforme compliance with Stripe Connect
This commit is contained in:
Laurent Destailleur 2019-08-22 12:54:09 +02:00 committed by GitHub
commit 134c116021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/mysql/migration/10.0.0-11.0.0.sql
View File

@ -76,3 +76,5 @@ ALTER TABLE llx_c_price_expression MODIFY COLUMN expression varchar(255) NOT NUL
UPDATE llx_bank_url set url = REPLACE( url, 'compta/salaries/', 'salaries/'); UPDATE llx_bank_url set url = REPLACE( url, 'compta/salaries/', 'salaries/');
ALTER TABLE llx_stock_mouvement ADD COLUMN fk_projet INTEGER NOT NULL DEFAULT 0 AFTER model_pdf; ALTER TABLE llx_stock_mouvement ADD COLUMN fk_projet INTEGER NOT NULL DEFAULT 0 AFTER model_pdf;
ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;

1
htdocs/install/mysql/tables/llx_oauth_token.sql
View File

@ -20,6 +20,7 @@ CREATE TABLE llx_oauth_token (
service varchar(36), service varchar(36),
token text, -- token in serialize() format, of an object StdOAuth2Token of library phpoauth2 token text, -- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
tokenstring text, -- token in json format '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"} tokenstring text, -- token in json format '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
fk_soc integer,
fk_user integer, fk_user integer,
fk_adherent integer, fk_adherent integer,
entity integer DEFAULT 1 entity integer DEFAULT 1

10
htdocs/stripe/class/stripe.class.php
View File

@ -78,9 +78,10 @@ class Stripe extends CommonObject
* Return main company OAuth Connect stripe account * Return main company OAuth Connect stripe account
* *
* @param string $mode 'StripeTest' or 'StripeLive' * @param string $mode 'StripeTest' or 'StripeLive'
* @param int $fk_soc Id of thirdparty
* @return string Stripe account 'acc_....' or '' if no OAuth token found * @return string Stripe account 'acc_....' or '' if no OAuth token found
*/ */
public function getStripeAccount($mode = 'StripeTest') public function getStripeAccount($mode = 'StripeTest', $fk_soc = 0)
{ {
global $conf; global $conf;
@ -88,6 +89,13 @@ class Stripe extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token"; $sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
$sql.= " WHERE entity = ".$conf->entity; $sql.= " WHERE entity = ".$conf->entity;
$sql.= " AND service = '".$mode."'"; $sql.= " AND service = '".$mode."'";
if ($fk_soc > 0) {
$sql.= " AND fk_soc = ".$fk_soc;
}
else {
$sql.= " AND fk_soc IS NULL";
}
$sql.= " AND fk_user IS NULL AND fk_adherent IS NULL";
dol_syslog(get_class($this) . "::fetch", LOG_DEBUG); dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);