@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | } |
237 | 237 | |
238 | 238 | // Action called when page is submitted |
239 | -if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status == 2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) { |
|
239 | +if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status == 2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) { |
|
240 | 240 | $error = 0; |
241 | 241 | |
242 | 242 | $urlback = ''; |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | |
352 | 352 | $resultfetchthirdparty = 0; |
353 | 353 | |
354 | - $genericcompanyname = $langs->trans('EventParticipant') . ' ' . ($emailcompany ? $emailcompany : $email); // Keep this label simple so we can retrieve same thirdparty for another event |
|
354 | + $genericcompanyname = $langs->trans('EventParticipant') . ' ' . ($emailcompany ? $emailcompany : $email); // Keep this label simple so we can retrieve same thirdparty for another event |
|
355 | 355 | |
356 | 356 | // Getting the thirdparty or creating it |
357 | 357 | $thirdparty = new Societe($db); |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | print ' - '; |
758 | 758 | print dol_print_date($project->date_end); |
759 | 759 | }*/ |
760 | - $maxattendees = $project->max_attendees; // Max attendeed for the project/event |
|
760 | + $maxattendees = $project->max_attendees; // Max attendeed for the project/event |
|
761 | 761 | } |
762 | 762 | |
763 | 763 | if ($maxattendees && $currentnbofattendees >= $maxattendees) { |
@@ -398,7 +398,7 @@ |
||
398 | 398 | $baseurl = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', constant('BASE_URL') . '/public/ticket/'); |
399 | 399 | |
400 | 400 | $formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1', |
401 | - 'returnurl' => $baseurl . 'view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '')); |
|
401 | + 'returnurl' => $baseurl . 'view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '')); |
|
402 | 402 | |
403 | 403 | $formticket->withfile = 2; |
404 | 404 | $formticket->withcancel = 1; |
@@ -384,9 +384,9 @@ discard block |
||
384 | 384 | $sql .= " AND ((tc.source = 'external'"; |
385 | 385 | $sql .= " AND tc.element='" . $db->escape($object->element) . "'"; |
386 | 386 | $sql .= " AND tc.active=1"; |
387 | - $sql .= " AND sp.email='" . $db->escape($_SESSION['email_customer']) . "')"; // email found into an external contact |
|
388 | - $sql .= " OR s.email='" . $db->escape($_SESSION['email_customer']) . "'"; // or email of the linked company |
|
389 | - $sql .= " OR t.origin_email='" . $db->escape($_SESSION['email_customer']) . "')"; // or email of the requester |
|
387 | + $sql .= " AND sp.email='" . $db->escape($_SESSION['email_customer']) . "')"; // email found into an external contact |
|
388 | + $sql .= " OR s.email='" . $db->escape($_SESSION['email_customer']) . "'"; // or email of the linked company |
|
389 | + $sql .= " OR t.origin_email='" . $db->escape($_SESSION['email_customer']) . "')"; // or email of the requester |
|
390 | 390 | // Manage filter |
391 | 391 | if (!empty($filter)) { |
392 | 392 | foreach ($filter as $key => $value) { |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | |
435 | 435 | // allow to display information before list |
436 | 436 | $parameters = array('arrayfields' => $arrayfields); |
437 | - $reshook = $hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
437 | + $reshook = $hookmanager->executeHooks('printFieldListHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
438 | 438 | print $hookmanager->resPrint; |
439 | 439 | |
440 | 440 | print '<div class="div-table-responsive">'; |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | if (!defined('NOLOGIN')) { |
31 | - define('NOLOGIN', '1'); // If this page is public (can be called outside logged session) |
|
31 | + define('NOLOGIN', '1'); // If this page is public (can be called outside logged session) |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | if (!defined('NOIPCHECK')) { |
35 | - define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip |
|
35 | + define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | if (!defined('NOBROWSERNOTIF')) { |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | print '<a href="list.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '') . '" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15 fa-list-alt valignmiddle btnTitle-icon"></span><br>' . dol_escape_htmltag($langs->trans("ViewMyTicketList")) . '</div></a>'; |
97 | 97 | print '<a href="view.php' . (!empty($entity) && isModEnabled('multicompany') ? '?entity=' . $entity : '') . '" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">' . img_picto('', 'ticket', 'class="fa-15"') . '<br>' . dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")) . '</div></a>'; |
98 | 98 | print '<div class="clearboth"></div>'; |
99 | -print '</div>'; // ends '<div class="ticketform">'; |
|
100 | -print '</div>'; // ends '<div class="ticketpublicarea ticketlargemargin centpercent">'; |
|
99 | +print '</div>'; // ends '<div class="ticketform">'; |
|
100 | +print '</div>'; // ends '<div class="ticketpublicarea ticketlargemargin centpercent">'; |
|
101 | 101 | |
102 | 102 | if (getDolGlobalInt('TICKET_SHOW_COMPANY_FOOTER')) { |
103 | 103 | // End of page |
@@ -325,15 +325,15 @@ discard block |
||
325 | 325 | global $stripearrayofkeysbyenv; |
326 | 326 | $error = 0; |
327 | 327 | $object = $event->data->object; |
328 | - $TRANSACTIONID = $object->id; // Example pi_123456789... |
|
328 | + $TRANSACTIONID = $object->id; // Example pi_123456789... |
|
329 | 329 | $ipaddress = $object->metadata->ipaddress; |
330 | 330 | $now = dol_now(); |
331 | 331 | $currencyCodeType = strtoupper($object->currency); |
332 | 332 | $paymentmethodstripeid = $object->payment_method; |
333 | 333 | $customer_id = $object->customer; |
334 | 334 | $invoice_id = ""; |
335 | - $paymentTypeCode = ""; // payment type according to Stripe |
|
336 | - $paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr |
|
335 | + $paymentTypeCode = ""; // payment type according to Stripe |
|
336 | + $paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr |
|
337 | 337 | $payment_amount = 0; |
338 | 338 | $payment_amountInDolibarr = 0; |
339 | 339 | |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | $s = new \Stripe\StripeClient($stripeacc); |
399 | 399 | |
400 | 400 | $paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid); |
401 | - $paymentTypeCode = $paymentmethodstripe->type; |
|
401 | + $paymentTypeCode = $paymentmethodstripe->type; |
|
402 | 402 | if ($paymentTypeCode == "ban" || $paymentTypeCode == "sepa_debit") { |
403 | 403 | $paymentTypeCode = "PRE"; |
404 | 404 | } elseif ($paymentTypeCode == "card") { |
@@ -424,9 +424,9 @@ discard block |
||
424 | 424 | $paiement->datepaye = $now; |
425 | 425 | $paiement->date = $now; |
426 | 426 | if ($currencyCodeType == $conf->currency) { |
427 | - $paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id |
|
427 | + $paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id |
|
428 | 428 | } else { |
429 | - $paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching |
|
429 | + $paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching |
|
430 | 430 | |
431 | 431 | $postactionmessages[] = 'Payment was done in a currency (' . $currencyCodeType . ') other than the expected currency of company (' . $conf->currency . ')'; |
432 | 432 | $ispostactionok = -1; |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $paiement->num_payment = ''; |
451 | 451 | $paiement->note_public = ''; |
452 | 452 | $paiement->note_private = 'StripeSepa payment received by IPN webhook - ' . dol_print_date($now, 'standard') . ' using servicestatus=' . $servicestatus . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID; |
453 | - $paiement->ext_payment_id = $TRANSACTIONID . ':' . $customer_id . '@' . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
453 | + $paiement->ext_payment_id = $TRANSACTIONID . ':' . $customer_id . '@' . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
454 | 454 | $paiement->ext_payment_site = $service; |
455 | 455 | |
456 | 456 | $ispaymentdone = 0; |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | $error++; |
683 | 683 | } |
684 | 684 | |
685 | - if (! $error) { |
|
685 | + if (!$error) { |
|
686 | 686 | $db->commit(); |
687 | 687 | } else { |
688 | 688 | $db->rollback(); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | } else { |
224 | 224 | // Create the prospect |
225 | 225 | if (GETPOST('societe')) { |
226 | - $thirdparty->name = GETPOST('societe'); |
|
226 | + $thirdparty->name = GETPOST('societe'); |
|
227 | 227 | $thirdparty->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname')); |
228 | 228 | } else { |
229 | 229 | $thirdparty->name = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname')); |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | $proj->title = $langs->trans("LeadFromPublicForm"); |
309 | 309 | $proj->description = GETPOST("description", "alphanohtml"); |
310 | 310 | $proj->opp_status = $defaultoppstatus; |
311 | - $proj->fk_opp_status = $defaultoppstatus; |
|
311 | + $proj->fk_opp_status = $defaultoppstatus; |
|
312 | 312 | |
313 | 313 | $proj->ip = getUserRemoteIP(); |
314 | 314 | $nb_post_max = getDolGlobalInt("MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS", 200); |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | } |
552 | 552 | |
553 | 553 | // Other attributes |
554 | -$parameters['tpl_context'] = 'public'; // define template context to public |
|
554 | +$parameters['tpl_context'] = 'public'; // define template context to public |
|
555 | 555 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
556 | 556 | // Comments |
557 | 557 | print '<tr>'; |
@@ -312,7 +312,7 @@ |
||
312 | 312 | print '<input type="submit" value="' . $langs->trans("ViewAndVote") . '" id="viewandvote" name="viewandvote" class="button minwidth250">'; |
313 | 313 | } |
314 | 314 | |
315 | -if (! $foundaction) { |
|
315 | +if (!$foundaction) { |
|
316 | 316 | print '<span class="opacitymedium">' . $langs->trans("NoPublicActionsAllowedForThisEvent") . '</span>'; |
317 | 317 | } |
318 | 318 |
@@ -585,7 +585,7 @@ |
||
585 | 585 | 'metadata' => $metadata, |
586 | 586 | 'customer' => $customer->id, |
587 | 587 | 'source' => $card, |
588 | - 'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description) |
|
588 | + 'statement_descriptor_suffix' => dol_trunc($FULLTAG, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description) |
|
589 | 589 | ), array("idempotency_key" => "$FULLTAG", "stripe_account" => "$stripeacc")); |
590 | 590 | // Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...) |
591 | 591 | if (empty($charge)) { |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $tokenisok = ($conf->global->PAYMENT_SECURITY_TOKEN == $SECUREKEY); |
320 | 320 | } |
321 | 321 | |
322 | - if (! $tokenisok) { |
|
322 | + if (!$tokenisok) { |
|
323 | 323 | if (!getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) { |
324 | 324 | $valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility |
325 | 325 | } else { |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | if (!empty($conf->global->$paramcreditorlong)) { |
351 | 351 | $creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show |
352 | 352 | } elseif (!empty($conf->global->$paramcreditor)) { |
353 | - $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show |
|
353 | + $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | $mesg = ''; |
@@ -798,8 +798,8 @@ discard block |
||
798 | 798 | $remoteip = getUserRemoteIP(); |
799 | 799 | |
800 | 800 | $_SESSION["onlinetoken"] = $stripeToken; |
801 | - $_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php. |
|
802 | - $_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php. |
|
801 | + $_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php. |
|
802 | + $_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php. |
|
803 | 803 | $_SESSION["paymentType"] = ''; |
804 | 804 | $_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip |
805 | 805 | $_SESSION['payerID'] = is_object($customer) ? $customer->id : ''; |
@@ -981,7 +981,7 @@ discard block |
||
981 | 981 | print $text; |
982 | 982 | |
983 | 983 | // Output payment summary form |
984 | -print '<tr><td align="center">'; // class=center does not have the payment button centered so we keep align here. |
|
984 | +print '<tr><td align="center">'; // class=center does not have the payment button centered so we keep align here. |
|
985 | 985 | print '<table class="centpercent left" id="tablepublicpayment">'; |
986 | 986 | print '<tr class="hideonsmartphone"><td colspan="2" align="left" class="opacitymedium">' . $langs->trans("ThisIsInformationOnPayment") . ' :</td></tr>' . "\n"; |
987 | 987 | |
@@ -1021,7 +1021,7 @@ discard block |
||
1021 | 1021 | // Currency |
1022 | 1022 | print ' <b>' . $langs->trans("Currency" . $currency) . '</b>'; |
1023 | 1023 | } else { |
1024 | - print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1024 | + print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1025 | 1025 | print '<input type="hidden" name="amount" value="' . $amount . '">'; |
1026 | 1026 | print '<input type="hidden" name="newamount" value="' . $amount . '">'; |
1027 | 1027 | } |
@@ -1122,7 +1122,7 @@ discard block |
||
1122 | 1122 | // Currency |
1123 | 1123 | print ' <b>' . $langs->trans("Currency" . $currency) . '</b>'; |
1124 | 1124 | } else { |
1125 | - print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1125 | + print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1126 | 1126 | print '<input type="hidden" name="amount" value="' . $amount . '">'; |
1127 | 1127 | print '<input type="hidden" name="newamount" value="' . $amount . '">'; |
1128 | 1128 | } |
@@ -1254,12 +1254,12 @@ discard block |
||
1254 | 1254 | print '<input class="flat maxwidth75" type="text" name="newamount" value="' . price2num(GETPOST("newamount", "alpha"), 'MT') . '">'; |
1255 | 1255 | print ' <b>' . $langs->trans("Currency" . $currency) . '</b>'; |
1256 | 1256 | } else { |
1257 | - print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1257 | + print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1258 | 1258 | print '<input type="hidden" name="amount" value="' . $amount . '">'; |
1259 | 1259 | print '<input type="hidden" name="newamount" value="' . $amount . '">'; |
1260 | 1260 | } |
1261 | 1261 | } else { |
1262 | - print '<b class="amount">' . price($object->total_ttc, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1262 | + print '<b class="amount">' . price($object->total_ttc, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1263 | 1263 | } |
1264 | 1264 | print '<input type="hidden" name="currency" value="' . $currency . '">'; |
1265 | 1265 | print '</td></tr>' . "\n"; |
@@ -1463,7 +1463,7 @@ discard block |
||
1463 | 1463 | // Currency |
1464 | 1464 | print ' <b>' . $langs->trans("Currency" . $currency) . '</b>'; |
1465 | 1465 | } else { |
1466 | - print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1466 | + print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1467 | 1467 | print '<input type="hidden" name="amount" value="' . $amount . '">'; |
1468 | 1468 | print '<input type="hidden" name="newamount" value="' . $amount . '">'; |
1469 | 1469 | } |
@@ -1681,7 +1681,7 @@ discard block |
||
1681 | 1681 | print '<input type="text" class="width75" name="newamount" value="' . price($amount, 1, $langs, 1, -1, -1) . '">'; |
1682 | 1682 | } |
1683 | 1683 | } else { |
1684 | - print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1684 | + print '<b class="amount">' . price($amount, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1685 | 1685 | if ($minimumamount > $amount) { |
1686 | 1686 | print ' <span class="opacitymedium small">' . $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)) . '</span>'; |
1687 | 1687 | } |
@@ -1842,7 +1842,7 @@ discard block |
||
1842 | 1842 | $valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow); |
1843 | 1843 | $amount = $valtoshow; |
1844 | 1844 | } |
1845 | - print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1845 | + print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1846 | 1846 | print '<input type="hidden" name="amount" value="' . $valtoshow . '">'; |
1847 | 1847 | print '<input type="hidden" name="newamount" value="' . $valtoshow . '">'; |
1848 | 1848 | } |
@@ -1918,7 +1918,7 @@ discard block |
||
1918 | 1918 | print '</b>'; |
1919 | 1919 | print '</td></tr>' . "\n"; |
1920 | 1920 | |
1921 | - if (! is_object($attendee->project)) { |
|
1921 | + if (!is_object($attendee->project)) { |
|
1922 | 1922 | $text = 'ErrorProjectNotFound'; |
1923 | 1923 | } else { |
1924 | 1924 | $text = $langs->trans("PaymentEvent") . ' - ' . $attendee->project->title; |
@@ -1935,7 +1935,7 @@ discard block |
||
1935 | 1935 | print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Amount"); |
1936 | 1936 | print '</td><td class="CTableRow2">'; |
1937 | 1937 | $valtoshow = $amount; |
1938 | - print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1938 | + print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
1939 | 1939 | print '<input type="hidden" name="amount" value="' . $valtoshow . '">'; |
1940 | 1940 | print '<input type="hidden" name="newamount" value="' . $valtoshow . '">'; |
1941 | 1941 | print '<input type="hidden" name="currency" value="' . $currency . '">'; |
@@ -2019,7 +2019,7 @@ discard block |
||
2019 | 2019 | print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Amount"); |
2020 | 2020 | print '</td><td class="CTableRow2">'; |
2021 | 2021 | $valtoshow = $amount; |
2022 | - print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
2022 | + print '<b class="amount">' . price($valtoshow, 1, $langs, 1, -1, -1, $currency) . '</b>'; // Price with currency |
|
2023 | 2023 | print '<input type="hidden" name="amount" value="' . $valtoshow . '">'; |
2024 | 2024 | print '<input type="hidden" name="newamount" value="' . $valtoshow . '">'; |
2025 | 2025 | print '<input type="hidden" name="currency" value="' . $currency . '">'; |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | if (getDolGlobalString($paramcreditorlong)) { |
151 | 151 | $creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show |
152 | 152 | } elseif (getDolGlobalString($paramcreditor)) { |
153 | - $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show |
|
153 | + $creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | // Set by newpayment.php |
280 | 280 | $currencyCodeType = $_SESSION['currencyCodeType']; |
281 | 281 | $FinalPaymentAmt = $_SESSION["FinalPaymentAmt"]; |
282 | - $paymentType = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example |
|
282 | + $paymentType = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example |
|
283 | 283 | // From env |
284 | 284 | $ipaddress = $_SESSION['ipaddress']; |
285 | 285 | |
@@ -382,10 +382,10 @@ discard block |
||
382 | 382 | $ipaddress = $_SESSION['ipaddress']; |
383 | 383 | } |
384 | 384 | if (empty($TRANSACTIONID)) { |
385 | - $TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_... |
|
385 | + $TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_... |
|
386 | 386 | if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) { |
387 | 387 | // For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2 |
388 | - $TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml'); |
|
388 | + $TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml'); |
|
389 | 389 | } |
390 | 390 | } |
391 | 391 | if (empty($FinalPaymentAmt)) { |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | |
491 | 491 | // Set amount for the subscription: |
492 | 492 | // - First check the amount of the member type. |
493 | - $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
493 | + $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
494 | 494 | $amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid]; |
495 | 495 | // - If not found, take the default amount |
496 | 496 | if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) { |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | dol_syslog("Failed to validate member (bad currency check): " . $errmsg, LOG_ERR, 0, '_payment'); |
528 | 528 | } |
529 | 529 | |
530 | - if (! $error) { |
|
530 | + if (!$error) { |
|
531 | 531 | // We validate the member (no effect if it is already validated) |
532 | 532 | $result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible |
533 | 533 | if ($result < 0 || empty($object->datevalid)) { |
@@ -690,7 +690,7 @@ discard block |
||
690 | 690 | $thirdparty = new Societe($db); |
691 | 691 | $thirdparty->fetch($thirdparty_id); |
692 | 692 | |
693 | - include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv |
|
693 | + include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv |
|
694 | 694 | $stripe = new Stripe($db); |
695 | 695 | //$stripeacc = $stripe->getStripeAccount($service); Already defined previously |
696 | 696 | |
@@ -705,7 +705,7 @@ discard block |
||
705 | 705 | |
706 | 706 | if (preg_match('/^pi_/', $TRANSACTIONID)) { |
707 | 707 | // This may throw an error if not found. |
708 | - $chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...) |
|
708 | + $chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...) |
|
709 | 709 | } else { |
710 | 710 | // This throw an error if not found |
711 | 711 | $chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...) |
@@ -908,7 +908,7 @@ discard block |
||
908 | 908 | $paiement->paiementid = $paymentTypeId; |
909 | 909 | $paiement->num_payment = ''; |
910 | 910 | $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
911 | - $paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
911 | + $paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue. |
|
912 | 912 | //$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer->id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // TODO LDR It would be better if we could store this. Do we have customer->id and publishable_key ? |
913 | 913 | $paiement->ext_payment_site = $service; |
914 | 914 | |
@@ -1037,8 +1037,8 @@ discard block |
||
1037 | 1037 | $paiement->paiementid = $paymentTypeId; |
1038 | 1038 | $paiement->num_payment = ''; |
1039 | 1039 | $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
1040 | - $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
1041 | - $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
1040 | + $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
1041 | + $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
1042 | 1042 | |
1043 | 1043 | if (!$error) { |
1044 | 1044 | $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents |
@@ -1169,7 +1169,7 @@ discard block |
||
1169 | 1169 | $paiement->datep = $now; |
1170 | 1170 | $paiement->paymenttype = $paymentTypeId; |
1171 | 1171 | $paiement->num_payment = ''; |
1172 | - $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
|
1172 | + $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
|
1173 | 1173 | $paiement->ext_payment_id = $TRANSACTIONID; |
1174 | 1174 | $paiement->ext_payment_site = $service; |
1175 | 1175 | |
@@ -1386,7 +1386,7 @@ discard block |
||
1386 | 1386 | $db->rollback(); |
1387 | 1387 | } |
1388 | 1388 | |
1389 | - if (! $error) { |
|
1389 | + if (!$error) { |
|
1390 | 1390 | // Sending mail |
1391 | 1391 | $thirdparty = new Societe($db); |
1392 | 1392 | $resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc); |
@@ -1749,8 +1749,8 @@ discard block |
||
1749 | 1749 | $paiement->paiementid = $paymentTypeId; |
1750 | 1750 | $paiement->num_payment = ''; |
1751 | 1751 | $paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress; |
1752 | - $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
1753 | - $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
1752 | + $paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ... |
|
1753 | + $paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ... |
|
1754 | 1754 | |
1755 | 1755 | if (!$error) { |
1756 | 1756 | $paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents |
@@ -1847,7 +1847,7 @@ discard block |
||
1847 | 1847 | // Set by newpayment.php |
1848 | 1848 | $currencyCodeType = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType']; |
1849 | 1849 | $FinalPaymentAmt = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"]; |
1850 | - $paymentType = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only |
|
1850 | + $paymentType = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only |
|
1851 | 1851 | |
1852 | 1852 | if (is_object($object) && method_exists($object, 'call_trigger')) { |
1853 | 1853 | // Call trigger |