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

Fix php code

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-10 23:50:41 +01:00
parent 390618db47
commit 0389664b1e
2 changed files with 329 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
htdocs/public/stripe/ipn.php
View File

@ -1,4 +1,19 @@
<?php <?php
/* Copyright (C) 2018
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOLOGIN",1); // This means this output page does not require to be logged.
define("NOCSRFCHECK",1); // We accept to go on this page from external web site. define("NOCSRFCHECK",1); // We accept to go on this page from external web site.
@ -23,27 +38,27 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
// You can find your endpoint's secret in your webhook settings // You can find your endpoint's secret in your webhook settings
if (isset($_GET['connect'])){ if (isset($_GET['connect'])){
if (isset($_GET['test'])) if (isset($_GET['test']))
{ {
$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY; $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
$service = 'StripeTest'; $service = 'StripeTest';
} }
else else
{ {
$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY; $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
$service = 'StripeLive'; $service = 'StripeLive';
} }
}else { }else {
if (isset($_GET['test'])) if (isset($_GET['test']))
{ {
$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY; $endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
$service = 'StripeTest'; $service = 'StripeTest';
} }
else else
{ {
$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY; $endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
$service = 'StripeLive'; $service = 'StripeLive';
} }
} }
$payload = @file_get_contents("php://input"); $payload = @file_get_contents("php://input");
$sig_header = $_SERVER["HTTP_STRIPE_SIGNATURE"]; $sig_header = $_SERVER["HTTP_STRIPE_SIGNATURE"];
@ -52,7 +67,7 @@ $event = null;
$error = 0; $error = 0;
try { try {
$event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret); $event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret);
} }
catch(\UnexpectedValueException $e) { catch(\UnexpectedValueException $e) {
// Invalid payload // Invalid payload
@ -86,12 +101,14 @@ if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabl
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$key=$obj->entity; $key=$obj->entity;
} }
else {$key=1;} else {$key=1;
} }
else {$key=1;} }
$ret=$mc->switchEntity($key); else {$key=1;
if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php"); }
if (! $res) die("Include of main fails"); $ret=$mc->switchEntity($key);
if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");
if (! $res) die("Include of main fails");
} }
// list of action // list of action
@ -103,10 +120,10 @@ if ($event->type == 'payout.created') {
if ($result > 0) if ($result > 0)
{ {
$body = "Un virement de ".price2num($event->data->object->amount/100)." ".$event->data->object->currency." est attendu sur votre compte le ".date('d-m-Y H:i:s',$event->data->object->arrival_date); $body = "Un virement de ".price2num($event->data->object->amount/100)." ".$event->data->object->currency." est attendu sur votre compte le ".date('d-m-Y H:i:s',$event->data->object->arrival_date);
$subject = '[NOTIFICATION] Virement programmée'; $subject = '[NOTIFICATION] Virement programmée';
$headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; TODO convert in dolibarr standard $headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; // TODO convert in dolibarr standard
mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers); mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers);
return 1; return 1;
} }
else else
@ -116,7 +133,7 @@ mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers);
} }
} }
elseif ($event->type == 'payout.paid') { elseif ($event->type == 'payout.paid') {
global $conf; global $conf;
$error=0; $error=0;
$result=dolibarr_set_const($db, $service."_NEXTPAYOUT",null,'chaine',0,'',$conf->entity); $result=dolibarr_set_const($db, $service."_NEXTPAYOUT",null,'chaine',0,'',$conf->entity);
if ($result) if ($result)
@ -127,7 +144,7 @@ global $conf;
$label = $event->data->object->description; $label = $event->data->object->description;
$amount= $event->data->object->amount/100; $amount= $event->data->object->amount/100;
$amount_to= $event->data->object->amount/100; $amount_to= $event->data->object->amount/100;
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$accountfrom=new Account($db); $accountfrom=new Account($db);
$accountfrom->fetch($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS); $accountfrom->fetch($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS);
@ -163,10 +180,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
if (! ($result > 0)) $error++; if (! ($result > 0)) $error++;
} }
$body = "Un virement de ".price2num($event->data->object->amount/100)." ".$event->data->object->currency." a ete effectue sur votre compte le ".date('d-m-Y H:i:s',$event->data->object->arrival_date); $body = "Un virement de ".price2num($event->data->object->amount/100)." ".$event->data->object->currency." a ete effectue sur votre compte le ".date('d-m-Y H:i:s',$event->data->object->arrival_date);
$subject = '[NOTIFICATION] Virement effectué'; $subject = '[NOTIFICATION] Virement effectué';
$headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; TODO convert in dolibarr standard $headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; // TODO convert in dolibarr standard
mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers); mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers);
return 1; return 1;
} }
@ -178,76 +195,76 @@ mail(''.$conf->global->MAIN_INFO_SOCIETE_MAIL.'', $subject, $body, $headers);
} }
elseif ($event->type == 'charge.succeeded') { elseif ($event->type == 'charge.succeeded') {
//TODO: create fees //TODO: create fees
} }
elseif ($event->type == 'customer.source.created') { elseif ($event->type == 'customer.source.created') {
//TODO: save customer's source //TODO: save customer's source
} }
elseif ($event->type == 'customer.source.updated') { elseif ($event->type == 'customer.source.updated') {
//TODO: update customer's source //TODO: update customer's source
} }
elseif ($event->type == 'customer.source.delete') { elseif ($event->type == 'customer.source.delete') {
//TODO: delete customer's source //TODO: delete customer's source
} }
elseif ($event->type == 'charge.failed') { elseif ($event->type == 'charge.failed') {
$subject = 'Your payment has been received: '.$event->data->object->id.''; $subject = 'Your payment has been received: '.$event->data->object->id.'';
$headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; $headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
//mail('ptibogxiv@msn.com', $subject, 'test', $headers); //mail('ptibogxiv@msn.com', $subject, 'test', $headers);
} }
elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated==true)) { elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated==true)) {
$stripe=new Stripe($db); $stripe=new Stripe($db);
$charge=$stripe->CreatePaymentStripe($event->data->object->amount/100,$event->data->object->currency,$event->data->object->metadata->source,$event->data->object->metadata->idsource,$event->data->object->id,$event->data->object->metadata->customer,$stripe->getStripeAccount($service)); $charge=$stripe->CreatePaymentStripe($event->data->object->amount/100,$event->data->object->currency,$event->data->object->metadata->source,$event->data->object->metadata->idsource,$event->data->object->id,$event->data->object->metadata->customer,$stripe->getStripeAccount($service));
if (isset($charge->id) && $charge->statut=='error'){ if (isset($charge->id) && $charge->statut=='error'){
$msg=$charge->message; $msg=$charge->message;
$code=$charge->code; $code=$charge->code;
$error++; $error++;
} }
elseif (isset($charge->id) && $charge->statut=='success' && $event->data->object->metadata->source=='order') { elseif (isset($charge->id) && $charge->statut=='success' && $event->data->object->metadata->source=='order') {
$order=new Commande($db); $order=new Commande($db);
$order->fetch($event->data->object->metadata->idsource); $order->fetch($event->data->object->metadata->idsource);
$invoice = new Facture($db); $invoice = new Facture($db);
$idinv=$invoice->createFromOrder($order); $idinv=$invoice->createFromOrder($order);
if ($idinv > 0) if ($idinv > 0)
{ {
$result=$invoice->validate($user); $result=$invoice->validate($user);
if ($result > 0) { if ($result > 0) {
$invoice->fetch($idinv); $invoice->fetch($idinv);
$paiement = $invoice->getSommePaiement(); $paiement = $invoice->getSommePaiement();
$creditnotes=$invoice->getSumCreditNotesUsed(); $creditnotes=$invoice->getSumCreditNotesUsed();
$deposits=$invoice->getSumDepositsUsed(); $deposits=$invoice->getSumDepositsUsed();
$ref=$invoice->ref; $ref=$invoice->ref;
$ifverif=$invoice->socid; $ifverif=$invoice->socid;
$currency=$invoice->multicurrency_code; $currency=$invoice->multicurrency_code;
$total=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT'); $total=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
}else{ }else{
$msg=$invoice->error; $msg=$invoice->error;
$error++; $error++;
} }
}else{ }else{
$msg=$invoice->error; $msg=$invoice->error;
$error++; $error++;
} }
} }
if (!$error){ if (!$error){
$datepaye = dol_now(); $datepaye = dol_now();
$paiementcode ="CB"; $paiementcode ="CB";
$amounts=array(); $amounts=array();
$amounts[$invoice->id] = $total; $amounts[$invoice->id] = $total;
$multicurrency_amounts=array(); $multicurrency_amounts=array();
//$multicurrency_amounts[$item] = $total; //$multicurrency_amounts[$item] = $total;
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->datepaye = $datepaye; $paiement->datepaye = $datepaye;
$paiement->amounts = $amounts; // Array with all payments dispatching $paiement->amounts = $amounts; // Array with all payments dispatching
@ -255,12 +272,12 @@ $multicurrency_amounts=array();
$paiement->paiementid = dol_getIdFromCode($db,$paiementcode,'c_paiement'); $paiement->paiementid = dol_getIdFromCode($db,$paiementcode,'c_paiement');
$paiement->num_paiement = $charge->message; $paiement->num_paiement = $charge->message;
$paiement->note = ''; $paiement->note = '';
} }
if (! $error){ if (! $error){
$paiement_id=$paiement->create($user, 0); $paiement_id=$paiement->create($user, 0);
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($invoice->lines)){ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($invoice->lines)){
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09'); if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
@ -272,18 +289,19 @@ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($invoice->lines))
$model=$invoice->modelpdf; $model=$invoice->modelpdf;
$ret = $invoice->fetch($invoice->id); // Reload to get new records $ret = $invoice->fetch($invoice->id); // Reload to get new records
$invoice->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);} $invoice->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($paiement_id < 0){ }
if ($paiement_id < 0){
$msg=$paiement->errors; $msg=$paiement->errors;
$error++; $error++;
}else{ }else{
if ($event->data->object->metadata->source=='order') { if ($event->data->object->metadata->source=='order') {
$order->classifyBilled($user); $order->classifyBilled($user);
} }
} }
} }
if (! $error){ if (! $error){
$label='(CustomerInvoicePayment)'; $label='(CustomerInvoicePayment)';
if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)'; if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
$paiement->addPaymentToBank($user,'payment',$label,$conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS,'',''); $paiement->addPaymentToBank($user,'payment',$label,$conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS,'','');
@ -292,13 +310,13 @@ if (! $error){
$msg=$paiement->errors; $msg=$paiement->errors;
$error++; $error++;
} }
$invoice->set_paid($user); $invoice->set_paid($user);
} }
$body = ""; $body = "";
$subject = 'Facture '.$invoice->ref; $subject = 'Facture '.$invoice->ref;
$headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>'; $headers = 'From: "'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'" <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
//mail('ptibogxiv@msn.com', $subject, $body, $headers); TODO convert in dolibarr standard //mail('ptibogxiv@msn.com', $subject, $body, $headers); TODO convert in dolibarr standard
} }
elseif ($event->type == 'customer.deleted') { elseif ($event->type == 'customer.deleted') {
$db->begin(); $db->begin();
@ -308,6 +326,3 @@ elseif ($event->type == 'customer.deleted') {
$db->commit(); $db->commit();
} }
?>

2
htdocs/public/stripe/paymentko.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or * the Free Software Foundation; either version 3 of the License, or