@@ -105,7 +105,9 @@ |
||
| 105 | 105 | ]; |
| 106 | 106 | $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id'); |
| 107 | 107 | $hResult = $this->db->prepare($sql); |
| 108 | - foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue); |
|
| 108 | + foreach ($aData as $sKey => $sValue) { |
|
| 109 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 110 | + } |
|
| 109 | 111 | $hResult->execute(); |
| 110 | 112 | |
| 111 | 113 | $sTargetAddress = $aResult['cust_email']; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $hResult->bindValue(':email', $sEmail, \PDO::PARAM_STR); |
| 83 | 83 | $hResult->execute(); |
| 84 | 84 | $iRows = $hResult->rowCount(); |
| 85 | - if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>'; |
|
| 85 | + if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse").'<br>'; |
|
| 86 | 86 | $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true); |
| 87 | 87 | |
| 88 | 88 | if ($sErr == '') { |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id'); |
| 111 | 111 | $hResult = $this->db->prepare($sql); |
| 112 | 112 | foreach ($aData as $sKey => $sValue) { |
| 113 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 113 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 114 | 114 | } |
| 115 | 115 | $hResult->execute(); |
| 116 | 116 | $aPData["infochangessaved"] = true; |
@@ -82,7 +82,9 @@ |
||
| 82 | 82 | $hResult->bindValue(':email', $sEmail, \PDO::PARAM_STR); |
| 83 | 83 | $hResult->execute(); |
| 84 | 84 | $iRows = $hResult->rowCount(); |
| 85 | - if ($iRows == 1) $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>'; |
|
| 85 | + if ($iRows == 1) { |
|
| 86 | + $sErr .= $this->textcats->T("userprofile_emailalreadyinuse") . '<br>'; |
|
| 87 | + } |
|
| 86 | 88 | $sErr = CHelper::validateCustomerForm(HelperConfig::$lang, $sErr, true); |
| 87 | 89 | |
| 88 | 90 | if ($sErr == '') { |
@@ -108,8 +108,12 @@ discard block |
||
| 108 | 108 | if ( |
| 109 | 109 | strlen($_POST["pwd"]) < HelperConfig::$customer["minimum_length_password"] |
| 110 | 110 | || strlen($_POST["pwd"]) > HelperConfig::$customer["maximum_length_password"] |
| 111 | - ) $aErr[] = 'pwlength'; |
|
| 112 | - if ($_POST["pwd"] != $_POST["pwdc"]) $aErr[] = 'pwmatch'; |
|
| 111 | + ) { |
|
| 112 | + $aErr[] = 'pwlength'; |
|
| 113 | + } |
|
| 114 | + if ($_POST["pwd"] != $_POST["pwdc"]) { |
|
| 115 | + $aErr[] = 'pwmatch'; |
|
| 116 | + } |
|
| 113 | 117 | if (count($aErr) == 0) { |
| 114 | 118 | $sEnc = password_hash($_POST["pwd"], PASSWORD_DEFAULT); |
| 115 | 119 | $aData = [ |
@@ -119,7 +123,9 @@ discard block |
||
| 119 | 123 | ]; |
| 120 | 124 | $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id'); |
| 121 | 125 | $hResult = $this->db->prepare($sql); |
| 122 | - foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue); |
|
| 126 | + foreach ($aData as $sKey => $sValue) { |
|
| 127 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 128 | + } |
|
| 123 | 129 | $hResult->execute(); |
| 124 | 130 | } |
| 125 | 131 | } else { |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $sLogData = ''; |
| 57 | 57 | |
| 58 | 58 | $iId = \filter_input(INPUT_POST, 'custom', FILTER_SANITIZE_NUMBER_INT); |
| 59 | - $sql = 'SELECT * FROM orders WHERE o_id = ' . $iId . ' AND o_paymentmethod' . " = 'paypal' AND o_paymentcompleted = 'n'"; |
|
| 59 | + $sql = 'SELECT * FROM orders WHERE o_id = '.$iId.' AND o_paymentmethod'." = 'paypal' AND o_paymentcompleted = 'n'"; |
|
| 60 | 60 | |
| 61 | 61 | $hResult = $this->db->query($sql); |
| 62 | 62 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $postdata = ''; |
| 68 | 68 | |
| 69 | 69 | foreach ($_POST as $i => $v) { |
| 70 | - $postdata .= $i . '=' . urlencode($v) . '&'; |
|
| 70 | + $postdata .= $i.'='.urlencode($v).'&'; |
|
| 71 | 71 | } |
| 72 | 72 | $postdata .= 'cmd=_notify-validate'; |
| 73 | 73 | $web = parse_url(HelperConfig::$shop["paypal"]["url"]); |
@@ -79,15 +79,15 @@ discard block |
||
| 79 | 79 | $web['port'] = 80; |
| 80 | 80 | $ssl = ''; |
| 81 | 81 | } |
| 82 | - $fp = @fsockopen($ssl . $web['host'], $web['port'], $errnum, $errstr, 30); |
|
| 82 | + $fp = @fsockopen($ssl.$web['host'], $web['port'], $errnum, $errstr, 30); |
|
| 83 | 83 | |
| 84 | 84 | if ($fp) { |
| 85 | - fputs($fp, "POST " . $web['path'] . " HTTP/1.1\r\n"); |
|
| 86 | - fputs($fp, "Host: " . $web['host'] . "\r\n"); |
|
| 85 | + fputs($fp, "POST ".$web['path']." HTTP/1.1\r\n"); |
|
| 86 | + fputs($fp, "Host: ".$web['host']."\r\n"); |
|
| 87 | 87 | fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n"); |
| 88 | - fputs($fp, "Content-length: " . strlen($postdata) . "\r\n"); |
|
| 88 | + fputs($fp, "Content-length: ".strlen($postdata)."\r\n"); |
|
| 89 | 89 | fputs($fp, "Connection: close\r\n\r\n"); |
| 90 | - fputs($fp, $postdata . "\r\n\r\n"); |
|
| 90 | + fputs($fp, $postdata."\r\n\r\n"); |
|
| 91 | 91 | |
| 92 | 92 | $info = []; |
| 93 | 93 | while (!feof($fp)) { |
@@ -97,9 +97,9 @@ discard block |
||
| 97 | 97 | $info = implode(',', $info); |
| 98 | 98 | if (!(strpos($info, 'VERIFIED') === false)) { |
| 99 | 99 | |
| 100 | - $sLogData .= "-- new entry - " . date(HelperConfig::$core['locale_format_date_time']) . " --\n\n"; |
|
| 100 | + $sLogData .= "-- new entry - ".date(HelperConfig::$core['locale_format_date_time'])." --\n\n"; |
|
| 101 | 101 | $sLogData .= "W00T!\n\n"; |
| 102 | - $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true) . "\n\n"; |
|
| 102 | + $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true)."\n\n"; |
|
| 103 | 103 | |
| 104 | 104 | // Check if the transaction id has been used before |
| 105 | 105 | $sTxn_idQ = 'SELECT o_paypal_tx FROM orders WHERE o_paypal_tx = :txn_id'; |
@@ -123,31 +123,31 @@ discard block |
||
| 123 | 123 | $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aTxnUpdateData, 'orders', 'o_id'); |
| 124 | 124 | $hResult = $this->db->prepare($sql); |
| 125 | 125 | foreach ($aTxnUpdateData as $sKey => $sValue) { |
| 126 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 126 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 127 | 127 | } |
| 128 | 128 | $hResult->execute(); |
| 129 | 129 | |
| 130 | - $sLogData .= "-- Alles ok. Zahlung erfolgreich. TXNID: " . $_REQUEST["txn_id"] . " --\n\n"; |
|
| 130 | + $sLogData .= "-- Alles ok. Zahlung erfolgreich. TXNID: ".$_REQUEST["txn_id"]." --\n\n"; |
|
| 131 | 131 | } else { |
| 132 | 132 | $sLogData .= "-- In my country we have problem; Problem is evaluation. Throw the data down the log!\n"; |
| 133 | - $sLogData .= "mc_gross: " . $_REQUEST["mc_gross"] . ' - number_format($fGesamtbrutto, 2, \'.\', \'\'): ' . number_format($fGesamtbrutto, |
|
| 134 | - 2, '.', '') . "\n"; |
|
| 135 | - $sLogData .= "custom: " . $_REQUEST["custom"] . ' - $aOrder[\'o_id\']: ' . $aOrder['o_id'] . "\n"; |
|
| 136 | - $sLogData .= "payment_status: " . $_REQUEST["payment_status"] . "\n"; |
|
| 137 | - $sLogData .= "mc_currency: " . $_REQUEST["mc_currency"] . ' - HelperConfig::$shop["paypal"]["currency_id"]: ' . HelperConfig::$shop["paypal"]["currency_id"] . "\n"; |
|
| 138 | - $sLogData .= "business: " . $_REQUEST["receiver_email"] . ' - HelperConfig::$shop["paypal"]["business"]: ' . HelperConfig::$shop["paypal"]["business"] . "\n\n"; |
|
| 133 | + $sLogData .= "mc_gross: ".$_REQUEST["mc_gross"].' - number_format($fGesamtbrutto, 2, \'.\', \'\'): '.number_format($fGesamtbrutto, |
|
| 134 | + 2, '.', '')."\n"; |
|
| 135 | + $sLogData .= "custom: ".$_REQUEST["custom"].' - $aOrder[\'o_id\']: '.$aOrder['o_id']."\n"; |
|
| 136 | + $sLogData .= "payment_status: ".$_REQUEST["payment_status"]."\n"; |
|
| 137 | + $sLogData .= "mc_currency: ".$_REQUEST["mc_currency"].' - HelperConfig::$shop["paypal"]["currency_id"]: '.HelperConfig::$shop["paypal"]["currency_id"]."\n"; |
|
| 138 | + $sLogData .= "business: ".$_REQUEST["receiver_email"].' - HelperConfig::$shop["paypal"]["business"]: '.HelperConfig::$shop["paypal"]["business"]."\n\n"; |
|
| 139 | 139 | } |
| 140 | 140 | } else { |
| 141 | 141 | // INVALID LOGGING ERROR |
| 142 | - $sLogData .= "-- new entry - " . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL\n\n"; |
|
| 143 | - $sLogData .= "!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: " . $_REQUEST["txn_id"] . " !!!\n\n"; |
|
| 142 | + $sLogData .= "-- new entry - ".date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL\n\n"; |
|
| 143 | + $sLogData .= "!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: ".$_REQUEST["txn_id"]." !!!\n\n"; |
|
| 144 | 144 | $sLogData .= "!!! INVALID !!!\n\n"; |
| 145 | 145 | } |
| 146 | 146 | } else { |
| 147 | - $sLogData .= "-- new entry - " . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: " . $_REQUEST["txn_id"] . "\n" . $info . "\n\n"; |
|
| 147 | + $sLogData .= "-- new entry - ".date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: ".$_REQUEST["txn_id"]."\n".$info."\n\n"; |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - $fp = fopen(PATH_LOGS . FILE_PAYPALLOG, 'a'); |
|
| 150 | + $fp = fopen(PATH_LOGS.FILE_PAYPALLOG, 'a'); |
|
| 151 | 151 | // Write $somecontent to our opened file. |
| 152 | 152 | fwrite($fp, $sLogData); |
| 153 | 153 | fclose($fp); |
@@ -69,17 +69,17 @@ |
||
| 69 | 69 | |
| 70 | 70 | $sPaypalURL = HelperConfig::$shop["paypal"]["url"] |
| 71 | 71 | .'?cmd=_xclick&rm=2&custom=' |
| 72 | - .$iId . '&business='.HelperConfig::$shop["paypal"]["business"]; |
|
| 73 | - $sPaypalURL .= '¬ify_url=http://' . $_SERVER["SERVER_NAME"] . '/_misc/paypal_notify.html&item_name=' . $this->textcats->T("misc_paypaypal_paypaltitle") . ' ' . $iId; |
|
| 74 | - $sPaypalURL .= '¤cy_code=' . HelperConfig::$shop["paypal"]["currency_id"] |
|
| 75 | - .'&amount=' . str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', '')); |
|
| 72 | + .$iId.'&business='.HelperConfig::$shop["paypal"]["business"]; |
|
| 73 | + $sPaypalURL .= '¬ify_url=http://'.$_SERVER["SERVER_NAME"].'/_misc/paypal_notify.html&item_name='.$this->textcats->T("misc_paypaypal_paypaltitle").' '.$iId; |
|
| 74 | + $sPaypalURL .= '¤cy_code='.HelperConfig::$shop["paypal"]["currency_id"] |
|
| 75 | + .'&amount='.str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', '')); |
|
| 76 | 76 | if (HelperConfig::$shop["interactive_paymentmethods_redirect_immediately"]) { |
| 77 | - header('Location: ' . $sPaypalURL); |
|
| 77 | + header('Location: '.$sPaypalURL); |
|
| 78 | 78 | die(); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $this->P->oPayload->cl_html = $this->textcats->T("misc_paypaypal_greeting") . '<br><br>'; |
|
| 82 | - $this->P->oPayload->cl_html .= '<a href="' . $sPaypalURL . '">' . $this->textcats->T("misc_paypaypal") . '</a>'; |
|
| 81 | + $this->P->oPayload->cl_html = $this->textcats->T("misc_paypaypal_greeting").'<br><br>'; |
|
| 82 | + $this->P->oPayload->cl_html .= '<a href="'.$sPaypalURL.'">'.$this->textcats->T("misc_paypaypal").'</a>'; |
|
| 83 | 83 | } else { |
| 84 | 84 | $this->P->oPayload->cl_html = $this->textcats->T("misc_paypaypal_paymentnotavailable"); |
| 85 | 85 | } |
@@ -42,24 +42,24 @@ |
||
| 42 | 42 | |
| 43 | 43 | header("Content-Type: text/html; charset=UTF-8"); |
| 44 | 44 | $return = '<div>'; |
| 45 | - $return .= '<div id="shippingcostbrutto_new">' . number_format($_SESSION["cartpricesums"]["fVersandkostenbrutto"], |
|
| 45 | + $return .= '<div id="shippingcostbrutto_new">'.number_format($_SESSION["cartpricesums"]["fVersandkostenbrutto"], |
|
| 46 | 46 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
| 47 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
| 48 | - $return .= '<div id="vatfull_new">' . number_format(round($_SESSION["cartpricesums"]["fSteuervoll"], 2), |
|
| 47 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
| 48 | + $return .= '<div id="vatfull_new">'.number_format(round($_SESSION["cartpricesums"]["fSteuervoll"], 2), |
|
| 49 | 49 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
| 50 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
| 51 | - $return .= '<div id="totalbrutto_new">' . number_format(round($_SESSION["cartpricesums"]["fGesamtbrutto"], 2), |
|
| 50 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
| 51 | + $return .= '<div id="totalbrutto_new">'.number_format(round($_SESSION["cartpricesums"]["fGesamtbrutto"], 2), |
|
| 52 | 52 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
| 53 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
| 54 | - $return .= '<div id="shippingcostnetto_new">' . number_format($_SESSION["cartpricesums"]["fVersandkostennetto"], |
|
| 53 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
| 54 | + $return .= '<div id="shippingcostnetto_new">'.number_format($_SESSION["cartpricesums"]["fVersandkostennetto"], |
|
| 55 | 55 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
| 56 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
| 57 | - $return .= '<div id="vatreduced_new">' . number_format(round($_SESSION["cartpricesums"]["fSteuererm"], 2), |
|
| 56 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
| 57 | + $return .= '<div id="vatreduced_new">'.number_format(round($_SESSION["cartpricesums"]["fSteuererm"], 2), |
|
| 58 | 58 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
| 59 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
| 60 | - $return .= '<div id="totalnetto_new">' . number_format(round($_SESSION["cartpricesums"]["fGesamtnetto"], 2), |
|
| 59 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
| 60 | + $return .= '<div id="totalnetto_new">'.number_format(round($_SESSION["cartpricesums"]["fGesamtnetto"], 2), |
|
| 61 | 61 | HelperConfig::$core['numberformat_decimals'], HelperConfig::$core['numberformat_decimal_point'], |
| 62 | - HelperConfig::$core['numberformat_thousands_seperator']) . '</div>'; |
|
| 62 | + HelperConfig::$core['numberformat_thousands_seperator']).'</div>'; |
|
| 63 | 63 | $return .= '</div>'; |
| 64 | 64 | die($return); |
| 65 | 65 | } |
@@ -56,14 +56,14 @@ discard block |
||
| 56 | 56 | if (!CHelper::getUserData()) { |
| 57 | 57 | $this->P->oPayload->cl_html = $this->textcats->T("denied_notloggedin"); |
| 58 | 58 | } else { |
| 59 | - require_once PATH_BASEDIR . 'src/shop/functions.shoppingcart.php'; |
|
| 59 | + require_once PATH_BASEDIR.'src/shop/functions.shoppingcart.php'; |
|
| 60 | 60 | |
| 61 | 61 | $this->P->cb_customcontenttemplate = 'shop/myorders'; |
| 62 | 62 | |
| 63 | 63 | if (isset($_GET["action"]) && $_GET["action"] == 'show' && isset($_GET["id"])) { |
| 64 | 64 | $iId = \filter_input(INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT); |
| 65 | 65 | |
| 66 | - $sql = "SELECT * FROM " . 'orders WHERE o_id = :id AND o_custno = \'' . $_SESSION['user']['cust_no'] . '\' AND o_ordercompleted != \'d\''; |
|
| 66 | + $sql = "SELECT * FROM ".'orders WHERE o_id = :id AND o_custno = \''.$_SESSION['user']['cust_no'].'\' AND o_ordercompleted != \'d\''; |
|
| 67 | 67 | $hResult = $this->db->prepare($sql); |
| 68 | 68 | $hResult->bindValue(':id', $iId); |
| 69 | 69 | $hResult->execute(); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $aOrder["o_ordertimestamp"] |
| 77 | 77 | ); |
| 78 | 78 | $this->P->cb_customdata['orderdata']['orderremarks'] = $aOrder["o_remarks"]; |
| 79 | - $this->P->cb_customdata['orderdata']['paymentmethod'] = $this->textcats->T("order_paymentmethod_" . $aOrder["o_paymentmethod"]); |
|
| 79 | + $this->P->cb_customdata['orderdata']['paymentmethod'] = $this->textcats->T("order_paymentmethod_".$aOrder["o_paymentmethod"]); |
|
| 80 | 80 | $this->P->cb_customdata['orderdata']['paymentcompleted'] = (($aOrder["o_paymentcompleted"] == 'y') ? $this->textcats->T("myorders_paymentstatus_completed") : $this->textcats->T("myorders_paymentstatus_open")); |
| 81 | 81 | $this->P->cb_customdata['orderdata']['orderstatus'] = SHelper::showOrderStatusText($this->textcats, $aOrder["o_ordercompleted"]); |
| 82 | 82 | $this->P->cb_customdata['orderdata']['shippingservice'] = $aOrder["o_shipping_service"]; |
@@ -118,12 +118,12 @@ discard block |
||
| 118 | 118 | } |
| 119 | 119 | } else { |
| 120 | 120 | $COList = [ |
| 121 | - ['title' => $this->textcats->T("order_head_orderdate"), 'key' => 'o_ordertime', 'width' => 110, 'linked' => false,], |
|
| 122 | - ['title' => $this->textcats->T("order_head_paymenthethod"), 'key' => 'o_paymentmethod', 'width' => 125, 'linked' => false,], |
|
| 123 | - ['title' => $this->textcats->T("order_head_paid"), 'key' => 'o_paymentcompleted', 'width' => 60, 'linked' => false,], |
|
| 124 | - ['title' => $this->textcats->T("order_head_status"), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,], |
|
| 125 | - ['title' => $this->textcats->T("order_head_shipping_service"), 'key' => 'o_shipping_service', 'width' => 90, 'linked' => false,], |
|
| 126 | - ['title' => $this->textcats->T("order_head_shipping_trackingno"), 'key' => 'o_shipping_trackingno', 'width' => 130, 'linked' => false,], |
|
| 121 | + ['title' => $this->textcats->T("order_head_orderdate"), 'key' => 'o_ordertime', 'width' => 110, 'linked' => false, ], |
|
| 122 | + ['title' => $this->textcats->T("order_head_paymenthethod"), 'key' => 'o_paymentmethod', 'width' => 125, 'linked' => false, ], |
|
| 123 | + ['title' => $this->textcats->T("order_head_paid"), 'key' => 'o_paymentcompleted', 'width' => 60, 'linked' => false, ], |
|
| 124 | + ['title' => $this->textcats->T("order_head_status"), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ], |
|
| 125 | + ['title' => $this->textcats->T("order_head_shipping_service"), 'key' => 'o_shipping_service', 'width' => 90, 'linked' => false, ], |
|
| 126 | + ['title' => $this->textcats->T("order_head_shipping_trackingno"), 'key' => 'o_shipping_trackingno', 'width' => 130, 'linked' => false, ], |
|
| 127 | 127 | [ |
| 128 | 128 | 'title' => $this->textcats->T("order_show"), |
| 129 | 129 | 'key' => 'o_id', |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | 'linked' => true, |
| 132 | 132 | 'ltarget' => '/_misc/myorders.html', |
| 133 | 133 | 'lkeyname' => 'id', |
| 134 | - 'lgetvars' => ['action' => 'show',], |
|
| 134 | + 'lgetvars' => ['action' => 'show', ], |
|
| 135 | 135 | ], |
| 136 | 136 | ]; |
| 137 | 137 | |
@@ -158,14 +158,23 @@ discard block |
||
| 158 | 158 | while ($aRow = $hResult->fetch()) { |
| 159 | 159 | $sStatus = SHelper::showOrderStatusText($this->textcats, $aRow["o_ordercompleted"]); |
| 160 | 160 | |
| 161 | - if ($aRow["o_paymentmethod"] == 'prepay') $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay"); |
|
| 162 | - elseif ($aRow["o_paymentmethod"] == 'paypal') $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal"); |
|
| 163 | - elseif ($aRow["o_paymentmethod"] == 'debit') $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit"); |
|
| 164 | - elseif ($aRow["o_paymentmethod"] == 'invoice') $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice"); |
|
| 165 | - else $sPaymentmethod = ucwords($aRow["o_paymentmethod"]); |
|
| 161 | + if ($aRow["o_paymentmethod"] == 'prepay') { |
|
| 162 | + $sPaymentmethod = $this->textcats->T("order_paymentmethod_prepay"); |
|
| 163 | + } elseif ($aRow["o_paymentmethod"] == 'paypal') { |
|
| 164 | + $sPaymentmethod = $this->textcats->T("order_paymentmethod_paypal"); |
|
| 165 | + } elseif ($aRow["o_paymentmethod"] == 'debit') { |
|
| 166 | + $sPaymentmethod = $this->textcats->T("order_paymentmethod_debit"); |
|
| 167 | + } elseif ($aRow["o_paymentmethod"] == 'invoice') { |
|
| 168 | + $sPaymentmethod = $this->textcats->T("order_paymentmethod_invoice"); |
|
| 169 | + } else { |
|
| 170 | + $sPaymentmethod = ucwords($aRow["o_paymentmethod"]); |
|
| 171 | + } |
|
| 166 | 172 | |
| 167 | - if ($aRow["o_paymentcompleted"] == 'y') $sPaymentstatus = ucwords($this->textcats->T("misc_yes")); |
|
| 168 | - else $sPaymentstatus = ucwords($this->textcats->T("misc_no")); |
|
| 173 | + if ($aRow["o_paymentcompleted"] == 'y') { |
|
| 174 | + $sPaymentstatus = ucwords($this->textcats->T("misc_yes")); |
|
| 175 | + } else { |
|
| 176 | + $sPaymentstatus = ucwords($this->textcats->T("misc_no")); |
|
| 177 | + } |
|
| 169 | 178 | |
| 170 | 179 | $aData[] = [ |
| 171 | 180 | 'o_id' => $aRow["o_id"], |
@@ -181,7 +190,9 @@ discard block |
||
| 181 | 190 | ]; |
| 182 | 191 | } |
| 183 | 192 | $return .= \HaaseIT\Toolbox\Tools::makeListtable($COList, $aData, $this->serviceManager->get('twig')); |
| 184 | - } else $return .= $this->textcats->T("myorders_no_orders_to_display"); |
|
| 193 | + } else { |
|
| 194 | + $return .= $this->textcats->T("myorders_no_orders_to_display"); |
|
| 195 | + } |
|
| 185 | 196 | |
| 186 | 197 | return $return; |
| 187 | 198 | } |
@@ -72,14 +72,14 @@ |
||
| 72 | 72 | .'&project_id='.HelperConfig::$shop["sofortueberweisung"]["project_id"].'&amount=' |
| 73 | 73 | .number_format($fGesamtbrutto, 2, '.', '') |
| 74 | 74 | .'&currency_id='.HelperConfig::$shop["sofortueberweisung"]["currency_id"].'&reason_1=' |
| 75 | - .urlencode($this->textcats->T("misc_paysofortueberweisung_ueberweisungsbetreff") . ' ').$iId; |
|
| 75 | + .urlencode($this->textcats->T("misc_paysofortueberweisung_ueberweisungsbetreff").' ').$iId; |
|
| 76 | 76 | if (HelperConfig::$shop["interactive_paymentmethods_redirect_immediately"]) { |
| 77 | - header('Location: ' . $sPURL); |
|
| 77 | + header('Location: '.$sPURL); |
|
| 78 | 78 | die(); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - $this->P->oPayload->cl_html = $this->textcats->T("misc_paysofortueberweisung_greeting") . '<br><br>'; |
|
| 82 | - $this->P->oPayload->cl_html .= '<a href="' . $sPURL . '">' . $this->textcats->T("misc_paysofortueberweisung") . '</a>'; |
|
| 81 | + $this->P->oPayload->cl_html = $this->textcats->T("misc_paysofortueberweisung_greeting").'<br><br>'; |
|
| 82 | + $this->P->oPayload->cl_html .= '<a href="'.$sPURL.'">'.$this->textcats->T("misc_paysofortueberweisung").'</a>'; |
|
| 83 | 83 | } else { |
| 84 | 84 | $this->P->oPayload->cl_html = $this->textcats->T("misc_paysofortueberweisung_paymentnotavailable"); |
| 85 | 85 | } |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | 'cache' => PATH_GLIDECACHE, |
| 49 | 49 | 'max_image_size' => HelperConfig::$core['glide_max_imagesize'], |
| 50 | 50 | ]); |
| 51 | - $glideserver->setBaseUrl('/' . HelperConfig::$core['directory_images'] . '/'); |
|
| 51 | + $glideserver->setBaseUrl('/'.HelperConfig::$core['directory_images'].'/'); |
|
| 52 | 52 | // Generate a URL |
| 53 | 53 | |
| 54 | 54 | try { |