|
@@ -307,7 +307,7 @@ discard block |
|
|
block discarded – undo |
|
307
|
307
|
{ |
|
308
|
308
|
$aFilesToSend = []; |
|
309
|
309
|
if ( |
|
310
|
|
- isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]) |
|
|
310
|
+ isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]) |
|
311
|
311
|
&& file_exists( |
|
312
|
312
|
PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'] |
|
313
|
313
|
.'/'.HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' |
|
@@ -316,7 +316,7 @@ discard block |
|
|
block discarded – undo |
|
316
|
316
|
) { |
|
317
|
317
|
$aFilesToSend[] = |
|
318
|
318
|
PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/' |
|
319
|
|
- .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]; |
|
|
319
|
+ .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]; |
|
320
|
320
|
} |
|
321
|
321
|
|
|
322
|
322
|
Helper::mailWrapper( |
|
@@ -390,9 +390,9 @@ discard block |
|
|
block discarded – undo |
|
390
|
390
|
'country' => !empty($postcountry) ? |
|
391
|
391
|
( |
|
392
|
392
|
isset( |
|
393
|
|
- HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry] |
|
|
393
|
+ HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry] |
|
394
|
394
|
) |
|
395
|
|
- ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry] |
|
|
395
|
+ ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry] |
|
396
|
396
|
: $postcountry) |
|
397
|
397
|
: '', |
|
398
|
398
|
'remarks' => $this->getPostValue('remarks'), |
|
@@ -401,7 +401,7 @@ discard block |
|
|
block discarded – undo |
|
401
|
401
|
'paymentmethod' => $this->getPostValue('paymentmethod'), |
|
402
|
402
|
'shippingcost' => empty($_SESSION['shippingcost']) ? false : $_SESSION['shippingcost'], |
|
403
|
403
|
'paypallink' => $postpaymentmethod === 'paypal' ? $serverservername.'/_misc/paypal.html?id='.$iId : '', |
|
404
|
|
- 'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
|
404
|
+ 'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
405
|
405
|
'SESSION' => !$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : '', |
|
406
|
406
|
'POST' => !$bCust ? Tools::debug($_POST, '$_POST', true, true) : '', |
|
407
|
407
|
'orderid' => $iId, |
|
@@ -442,7 +442,7 @@ discard block |
|
|
block discarded – undo |
|
442
|
442
|
} else { |
|
443
|
443
|
$return .= $getcartkey; |
|
444
|
444
|
} |
|
445
|
|
- $return.= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2'); |
|
|
445
|
+ $return .= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2'); |
|
446
|
446
|
if ($getmsg === 'updated') { |
|
447
|
447
|
$return .= ' '.$getamount; |
|
448
|
448
|
} |