@@ -488,7 +488,7 @@ discard block |
||
488 | 488 | "confirmation_method" => $mode, |
489 | 489 | "amount" => $stripeamount, |
490 | 490 | "currency" => $currency_code, |
491 | - "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
491 | + "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
492 | 492 | /* |
493 | 493 | 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php', |
494 | 494 | 'automatic_payment_methods' => array( |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | ); |
504 | 504 | if ($descriptor) { |
505 | 505 | $dataforintent["statement_descriptor_suffix"] = $descriptor; // For card payment, 22 chars that appears on bank receipt (prefix into stripe setup + this suffix) |
506 | - $dataforintent["statement_descriptor"] = $descriptor; // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix |
|
506 | + $dataforintent["statement_descriptor"] = $descriptor; // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix |
|
507 | 507 | } |
508 | 508 | if (!is_null($customer)) { |
509 | 509 | $dataforintent["customer"] = $customer; |
@@ -712,7 +712,7 @@ discard block |
||
712 | 712 | |
713 | 713 | $dataforintent = array( |
714 | 714 | "confirm" => $confirmnow, // Do not confirm immediately during creation of intent |
715 | - "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
715 | + "payment_method_types" => $paymentmethodtypes, // When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard |
|
716 | 716 | /* |
717 | 717 | 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php', |
718 | 718 | 'automatic_payment_methods' => array( |
@@ -1128,7 +1128,7 @@ discard block |
||
1128 | 1128 | } catch (Exception $e) { |
1129 | 1129 | $sepa = null; |
1130 | 1130 | $this->error = 'Stripe error: ' . $e->getMessage() . '. Check the BAN information.'; |
1131 | - dol_syslog($this->error, LOG_WARNING); // Error from Stripe, so a warning on Dolibarr |
|
1131 | + dol_syslog($this->error, LOG_WARNING); // Error from Stripe, so a warning on Dolibarr |
|
1132 | 1132 | } |
1133 | 1133 | } |
1134 | 1134 | } |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | '', |
91 | 91 | array( |
92 | 92 | 'dolibarrkey' => array('name' => 'dolibarrkey', 'type' => 'xsd:string'), |
93 | - 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
94 | - 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
93 | + 'sourceapplication' => array('name' => 'sourceapplication', 'type' => 'xsd:string'), |
|
94 | + 'login' => array('name' => 'login', 'type' => 'xsd:string'), |
|
95 | 95 | 'password' => array('name' => 'password', 'type' => 'xsd:string'), |
96 | 96 | 'entity' => array('name' => 'entity', 'type' => 'xsd:string') |
97 | 97 | ) |
@@ -120,12 +120,12 @@ discard block |
||
120 | 120 | 'amount' => array('name' => 'amount', 'type' => 'xsd:double'), |
121 | 121 | 'num_payment' => array('name' => 'num_payment', 'type' => 'xsd:string'), |
122 | 122 | 'thirdparty_id' => array('name' => 'thirdparty_id', 'type' => 'xsd:int'), |
123 | - 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
124 | - 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
125 | - 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
126 | - 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
127 | - 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
128 | - 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
123 | + 'bank_account' => array('name' => 'bank_account', 'type' => 'xsd:int'), |
|
124 | + 'payment_mode_id' => array('name' => 'payment_mode_id', 'type' => 'xsd:int'), |
|
125 | + 'invoice_id' => array('name' => 'invoice_id', 'type' => 'xsd:int'), |
|
126 | + 'int_label' => array('name' => 'int_label', 'type' => 'xsd:string'), |
|
127 | + 'emitter' => array('name' => 'emitter', 'type' => 'xsd:string'), |
|
128 | + 'bank_source' => array('name' => 'bank_source', 'type' => 'xsd:string'), |
|
129 | 129 | ) |
130 | 130 | ); |
131 | 131 | |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $now = dol_now(); |
166 | 166 | |
167 | 167 | dol_syslog("Function: createPayment login=" . $authentication['login'] . " id=" . $payment->id . |
168 | - ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
168 | + ", ref=" . $payment->ref . ", ref_ext=" . $payment->ref_ext); |
|
169 | 169 | |
170 | 170 | if ($authentication['entity']) { |
171 | 171 | $conf->entity = $authentication['entity']; |
@@ -64,8 +64,7 @@ |
||
64 | 64 | $dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php |
65 | 65 | |
66 | 66 | $tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? |
67 | - (empty($dolibarr_main_cookie_cryptkey) ? '' : |
|
68 | - $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; |
|
67 | + (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; |
|
69 | 68 | // Unique id of instance |
70 | 69 | |
71 | 70 | // The recommended value (may be not defined for old versions) |
@@ -113,7 +113,7 @@ |
||
113 | 113 | 'maxTopMenu' => & $maxTopMenu |
114 | 114 | ); |
115 | 115 | |
116 | -$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
116 | +$reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action); // Note that $action and $object may have been modified by hook |
|
117 | 117 | if ($reshook < 0) { |
118 | 118 | $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
119 | 119 | } |
@@ -49,7 +49,9 @@ |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | // Not sure this is required |
52 | -if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
52 | +if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) { |
|
53 | + unset($_SESSION['webportal_logged_thirdparty_account_id']); |
|
54 | +} |
|
53 | 55 | |
54 | 56 | if (GETPOST('noredirect')) { |
55 | 57 | return; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | //permissions |
86 | 86 | |
87 | -$permissiontoadd = $user->hasRight('societe', 'creer'); |
|
87 | +$permissiontoadd = $user->hasRight('societe', 'creer'); |
|
88 | 88 | |
89 | 89 | // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context |
90 | 90 | $hookmanager->initHooks(array('publicnewmembercard', 'globalcard')); |
@@ -218,19 +218,19 @@ discard block |
||
218 | 218 | |
219 | 219 | $societe->client = GETPOSTINT('client') ? GETPOSTINT('client') : $societe->client; |
220 | 220 | |
221 | - $societe->address = GETPOST('address', 'alphanohtml'); |
|
221 | + $societe->address = GETPOST('address', 'alphanohtml'); |
|
222 | 222 | |
223 | - $societe->country_id = GETPOSTINT('country_id'); |
|
223 | + $societe->country_id = GETPOSTINT('country_id'); |
|
224 | 224 | |
225 | - $societe->phone = GETPOST('phone', 'alpha'); |
|
225 | + $societe->phone = GETPOST('phone', 'alpha'); |
|
226 | 226 | |
227 | - $societe->fax = GETPOST('fax', 'alpha'); |
|
227 | + $societe->fax = GETPOST('fax', 'alpha'); |
|
228 | 228 | |
229 | - $societe->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); |
|
229 | + $societe->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); |
|
230 | 230 | |
231 | - $societe->client = 2 ; // our client is a prospect |
|
231 | + $societe->client = 2; // our client is a prospect |
|
232 | 232 | |
233 | - $societe->code_client = '-1'; |
|
233 | + $societe->code_client = '-1'; |
|
234 | 234 | |
235 | 235 | $societe->name_alias = GETPOST('name_alias', 'alphanohtml'); |
236 | 236 |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | } |
708 | 708 | |
709 | 709 | // Other attributes |
710 | - $parameters['tpl_context'] = 'public'; // define template context to public |
|
710 | + $parameters['tpl_context'] = 'public'; // define template context to public |
|
711 | 711 | include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php'; |
712 | 712 | |
713 | 713 | // Comments |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | |
770 | 770 | // Set amount for the subscription: |
771 | 771 | // - First check the amount of the member type. |
772 | - $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
772 | + $amountbytype = $adht->amountByType(1); // Load the array of amount per type |
|
773 | 773 | $amount = empty($amountbytype[$typeid]) ? (isset($amount) ? $amount : 0) : $amountbytype[$typeid]; |
774 | 774 | // - If not found, take the default amount only of the user is authorized to edit it |
775 | 775 | if ($caneditamount && empty($amount) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) { |
@@ -167,7 +167,7 @@ |
||
167 | 167 | if (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) { |
168 | 168 | print '<div class="clearboth"></div><strong>' . (getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') ? getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC') : $langs->trans("BookCalSystem")) . '</strong>'; |
169 | 169 | } |
170 | - if (empty($urllogo) && ! getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) { |
|
170 | + if (empty($urllogo) && !getDolGlobalString('BOOKCAL_PUBLIC_INTERFACE_TOPIC')) { |
|
171 | 171 | print $mysoc->name; |
172 | 172 | } |
173 | 173 | print '</div>'; |
@@ -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) { |