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

Fix phpunit

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-23 14:09:08 +02:00
parent 3a81318c15
commit 470cbb52f8
2 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/facture/class/facture.class.php
View File

@ -1503,8 +1503,9 @@ class Facture extends CommonInvoice
$use_all_lines = empty($lines); $use_all_lines = empty($lines);
$num = count($object->lines); $num = count($object->lines);
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
if (!$use_all_lines && !in_array($object->lines[$i]->id, $lines)) {
if (!$use_all_lines && !in_array($object->lines[$i]->id, $lines)) continue; continue;
}
$line = new FactureLigne($this->db); $line = new FactureLigne($this->db);

185
htdocs/public/payment/paymentok.php
View File

@ -1583,130 +1583,129 @@ if ($ispaymentok) {
include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php'; include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
$object = new Contrat($db); $object = new Contrat($db);
$result = $object->fetch((int) $tmptag['CON']); $result = $object->fetch((int) $tmptag['CON']);
if ($result) { if ($result) {
$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"]; $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
$paymentTypeId = 0; $paymentTypeId = 0;
if ($paymentmethod == 'paybox') { if ($paymentmethod == 'paybox') {
$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS; $paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
}
if ($paymentmethod == 'paypal') {
$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
}
if ($paymentmethod == 'stripe') {
$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
}
if (empty($paymentTypeId)) {
dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
if (empty($paymentType)) {
$paymentType = 'CB';
} }
if ($paymentmethod == 'paypal') { // May return nothing when paymentType means nothing
$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS; // (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
if (empty($paymentTypeId) || $paymentTypeId < 0) {
$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
} }
if ($paymentmethod == 'stripe') { }
$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
}
if (empty($paymentTypeId)) {
dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
if (empty($paymentType)) { $currencyCodeType = $_SESSION['currencyCodeType'];
$paymentType = 'CB'; $contract_lines = (array_key_exists('COL', $tmptag) && $tmptag['COL'] > 0) ? $tmptag['COL'] : null;
}
// May return nothing when paymentType means nothing
// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB'). // Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
if (empty($paymentTypeId) || $paymentTypeId < 0) { if (isModEnabled('facture')) {
$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1); if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
} include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
} $invoice = new Facture($db);
$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
if ($result > 0) {
// $object->classifyBilled($user);
$invoice->validate($user);
// Creation of payment line
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
$paiement = new Paiement($db);
$paiement->datepaye = $now;
if ($currencyCodeType == $conf->currency) {
$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
} else {
$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
$currencyCodeType = $_SESSION['currencyCodeType']; $postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
$contract_lines = (array_key_exists('COL', $tmptag) && $tmptag['COL'] > 0) ? $tmptag['COL'] : null; $ispostactionok = -1;
$error++;
}
$paiement->paiementid = $paymentTypeId;
$paiement->num_payment = '';
$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time) if (!$error) {
if (isModEnabled('facture')) { $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) { if ($paiement_id < 0) {
include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; $postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
$invoice = new Facture($db);
$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
if ($result > 0) {
// $object->classifyBilled($user);
$invoice->validate($user);
// Creation of payment line
include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
$paiement = new Paiement($db);
$paiement->datepaye = $now;
if ($currencyCodeType == $conf->currency) {
$paiement->amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
} else {
$paiement->multicurrency_amounts = array($invoice->id => $FinalPaymentAmt); // Array with all payments dispatching
$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
$ispostactionok = -1; $ispostactionok = -1;
$error++; $error++;
} else {
$postactionmessages[] = 'Payment created';
$ispostactionok = 1;
} }
$paiement->paiementid = $paymentTypeId; }
$paiement->num_payment = '';
$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
if (!$error) { if (!$error && isModEnabled("banque")) {
$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents $bankaccountid = 0;
if ($paiement_id < 0) { if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
if ($bankaccountid > 0) {
$label = '(CustomerInvoicePayment)';
if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
if ($result < 0) {
$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors); $postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
$ispostactionok = -1; $ispostactionok = -1;
$error++; $error++;
} else { } else {
$postactionmessages[] = 'Payment created'; $postactionmessages[] = 'Bank transaction of payment created';
$ispostactionok = 1; $ispostactionok = 1;
} }
}
if (!$error && isModEnabled("banque")) {
$bankaccountid = 0;
if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
if ($bankaccountid > 0) {
$label = '(CustomerInvoicePayment)';
if ($object->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
if ($result < 0) {
$postactionmessages[] = $paiement->error . ' ' . join("<br>\n", $paiement->errors);
$ispostactionok = -1;
$error++;
} else {
$postactionmessages[] = 'Bank transaction of payment created';
$ispostactionok = 1;
}
} else {
$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
$ispostactionok = -1;
$error++;
}
}
if (!$error) {
$db->commit();
} else { } else {
$db->rollback(); $postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
$ispostactionok = -1;
$error++;
} }
}
if (!$error) {
$db->commit();
} else { } else {
$msg = 'Failed to create invoice form contract ' . $tmptag['CON']; $db->rollback();
if (!empty($cols)) $msg .= ' and col '. $cols .'.';
$postactionmessages[] = $msg;
$ispostactionok = -1;
} }
} else { } else {
$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.'; $msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
if (!empty($cols)) $msg .= ' and col '. $cols .'.';
$postactionmessages[] = $msg;
$ispostactionok = -1; $ispostactionok = -1;
} }
} else { } else {
$postactionmessages[] = 'Invoice module is not enable'; $postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.';
$ispostactionok = -1; $ispostactionok = -1;
} }
} else { } else {
$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found'; $postactionmessages[] = 'Invoice module is not enable';
if (!empty($cols)) $msg .= ' for col '.$tmptag['COL'] .'.';
$postactionmessages[] = $msg;
$ispostactionok = -1; $ispostactionok = -1;
} }
} else {
$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
if (!empty($cols)) $msg .= ' for col '.$tmptag['COL'] .'.';
$postactionmessages[] = $msg;
$ispostactionok = -1;
} }
else { } else {
// Nothing done // Nothing done
} }
} }