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

code syntax

Browse Source
This commit is contained in:
Frédéric FRANCE 2021-01-16 14:12:09 +01:00
parent 5fe5a7c888
commit 2df0acd419
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 301 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

535
htdocs/core/class/CMailFile.class.php
View File

File diff suppressed because it is too large Load Diff

22
htdocs/core/class/html.formmail.class.php
View File

@ -1132,7 +1132,7 @@ class FormMail extends Form
} }
/** /**
* get Html For Asking for Deliveriy Receipt * get Html For Asking for Delivery Receipt
* *
* @return string html * @return string html
*/ */
@ -1445,7 +1445,9 @@ class FormMail extends Form
// Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__ // Create dynamic tags for __PRODUCT_EXTRAFIELD_FIELD__
if (!empty($line->fk_product)) { if (!empty($line->fk_product)) {
if (!is_object($extrafields)) $extrafields = new ExtraFields($this->db); if (!is_object($extrafields)) {
$extrafields = new ExtraFields($this->db);
}
$extrafields->fetch_name_optionals_label('product', true); $extrafields->fetch_name_optionals_label('product', true);
$product = new Product($this->db); $product = new Product($this->db);
$product->fetch($line->fk_product, '', '', 1); $product->fetch($line->fk_product, '', '', 1);
@ -1509,9 +1511,15 @@ class FormMail extends Form
//,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing //,'__PERSONALIZED__' => 'Personalized' // Hidden because not used yet in mass emailing
$onlinepaymentenabled = 0; $onlinepaymentenabled = 0;
if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++; if (!empty($conf->paypal->enabled)) {
if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++; $onlinepaymentenabled++;
if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++; }
if (!empty($conf->paybox->enabled)) {
$onlinepaymentenabled++;
}
if (!empty($conf->stripe->enabled)) {
$onlinepaymentenabled++;
}
if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) { if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN; $tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) { if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
@ -1540,7 +1548,9 @@ class FormMail extends Form
} }
foreach ($tmparray as $key => $val) { foreach ($tmparray as $key => $val) {
if (empty($val)) $tmparray[$key] = $key; if (empty($val)) {
$tmparray[$key] = $key;
}
} }
return $tmparray; return $tmparray;