@@ -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 | |
@@ -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 { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | } elseif (count(HelperConfig::$secrets['admin_users'])) { |
| 81 | 81 | |
| 82 | 82 | if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) { // fix for php cgi mode |
| 83 | - list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':' , base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6))); |
|
| 83 | + list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6))); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { |
@@ -96,12 +96,12 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | if (!$validated) { |
| 99 | - header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"'); |
|
| 99 | + header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"'); |
|
| 100 | 100 | header('HTTP/1.0 401 Unauthorized'); |
| 101 | 101 | die("Not authorized"); |
| 102 | 102 | } |
| 103 | 103 | } else { |
| 104 | - header('WWW-Authenticate: Basic realm="' . HelperConfig::$secrets['admin_authrealm'] . '"'); |
|
| 104 | + header('WWW-Authenticate: Basic realm="'.HelperConfig::$secrets['admin_authrealm'].'"'); |
|
| 105 | 105 | header('HTTP/1.0 401 Unauthorized'); |
| 106 | 106 | die('Not authorized'); |
| 107 | 107 | } |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | $this->P->cb_subnav = 'admin'; |
| 58 | 58 | |
| 59 | 59 | $CUA = [ |
| 60 | - ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 61 | - ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 62 | - ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 63 | - ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 64 | - ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 60 | + ['title' => HardcodedText::get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 61 | + ['title' => HardcodedText::get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 62 | + ['title' => HardcodedText::get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 63 | + ['title' => HardcodedText::get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 64 | + ['title' => HardcodedText::get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 65 | 65 | [ |
| 66 | 66 | 'title' => HardcodedText::get('customeradmin_list_edit'), |
| 67 | 67 | 'key' => 'cust_id', |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | 'linked' => true, |
| 70 | 70 | 'ltarget' => '/_admin/customeradmin.html', |
| 71 | 71 | 'lkeyname' => 'id', |
| 72 | - 'lgetvars' => ['action' => 'edit',], |
|
| 72 | + 'lgetvars' => ['action' => 'edit', ], |
|
| 73 | 73 | ], |
| 74 | 74 | ]; |
| 75 | 75 | $aPData = $this->handleCustomerAdmin($CUA, $this->serviceManager->get('twig')); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | } |
| 162 | 162 | $sql = \HaaseIT\Toolbox\DBTools::buildPSUpdateQuery($aData, 'customer', 'cust_id'); |
| 163 | 163 | $hResult = $this->db->prepare($sql); |
| 164 | - foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue); |
|
| 164 | + foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue); |
|
| 165 | 165 | $hResult->execute(); |
| 166 | 166 | $aInfo["changeswritten"] = true; |
| 167 | 167 | } |
@@ -88,10 +88,10 @@ discard block |
||
| 88 | 88 | $this->P->cb_customdata['rows_textcat_lang'] = $hResult->rowCount(); |
| 89 | 89 | if ($this->P->cb_customdata['rows_textcat_lang'] > 0) { |
| 90 | 90 | $aListSetting = [ |
| 91 | - ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false,], |
|
| 92 | - ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false,], |
|
| 93 | - ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false,], |
|
| 94 | - ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '82%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 91 | + ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false, ], |
|
| 92 | + ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false, ], |
|
| 93 | + ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false, ], |
|
| 94 | + ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '82%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 95 | 95 | ]; |
| 96 | 96 | $aData = $hResult->fetchAll(); |
| 97 | 97 | $this->P->cb_customdata['rows_textcat_lang_list'] = Tools::makeListtable( |
@@ -115,12 +115,12 @@ discard block |
||
| 115 | 115 | $this->P->cb_customdata['rows_textcat_lang_archive'] = $hResult->rowCount(); |
| 116 | 116 | if ($this->P->cb_customdata['rows_textcat_lang_archive'] > 0) { |
| 117 | 117 | $aListSetting = [ |
| 118 | - ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,], |
|
| 119 | - ['title' => 'tcla_id', 'key' => 'tcla_id', 'width' => '6%', 'linked' => false,], |
|
| 120 | - ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false,], |
|
| 121 | - ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false,], |
|
| 122 | - ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false,], |
|
| 123 | - ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '61%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 118 | + ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ], |
|
| 119 | + ['title' => 'tcla_id', 'key' => 'tcla_id', 'width' => '6%', 'linked' => false, ], |
|
| 120 | + ['title' => 'tcl_id', 'key' => 'tcl_id', 'width' => '6%', 'linked' => false, ], |
|
| 121 | + ['title' => 'tcl_tcid', 'key' => 'tcl_tcid', 'width' => '6%', 'linked' => false, ], |
|
| 122 | + ['title' => 'tcl_lang', 'key' => 'tcl_lang', 'width' => '6%', 'linked' => false, ], |
|
| 123 | + ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '61%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 124 | 124 | ]; |
| 125 | 125 | $aData = $hResult->fetchAll(); |
| 126 | 126 | $this->P->cb_customdata['rows_textcat_lang_archive_list'] = Tools::makeListtable($aListSetting, |
@@ -141,13 +141,13 @@ discard block |
||
| 141 | 141 | $this->P->cb_customdata['rows_content_lang'] = $hResult->rowCount(); |
| 142 | 142 | if ($this->P->cb_customdata['rows_content_lang'] > 0) { |
| 143 | 143 | $aListSetting = [ |
| 144 | - ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false,], |
|
| 145 | - ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false,], |
|
| 146 | - ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false,], |
|
| 147 | - ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '43%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 148 | - ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 149 | - ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 150 | - ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 144 | + ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false, ], |
|
| 145 | + ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false, ], |
|
| 146 | + ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false, ], |
|
| 147 | + ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '43%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 148 | + ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 149 | + ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 150 | + ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '13%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 151 | 151 | ]; |
| 152 | 152 | $aData = $hResult->fetchAll(); |
| 153 | 153 | $this->P->cb_customdata['rows_content_lang_list'] = Tools::makeListtable($aListSetting, |
@@ -168,15 +168,15 @@ discard block |
||
| 168 | 168 | $this->P->cb_customdata['rows_content_lang_archive'] = $hResult->rowCount(); |
| 169 | 169 | if ($this->P->cb_customdata['rows_content_lang_archive'] > 0) { |
| 170 | 170 | $aListSetting = [ |
| 171 | - ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,], |
|
| 172 | - ['title' => 'cla_id', 'key' => 'cla_id', 'width' => '6%', 'linked' => false,], |
|
| 173 | - ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false,], |
|
| 174 | - ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false,], |
|
| 175 | - ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false,], |
|
| 176 | - ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '33%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 177 | - ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 178 | - ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 179 | - ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 171 | + ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ], |
|
| 172 | + ['title' => 'cla_id', 'key' => 'cla_id', 'width' => '6%', 'linked' => false, ], |
|
| 173 | + ['title' => 'cl_id', 'key' => 'cl_id', 'width' => '6%', 'linked' => false, ], |
|
| 174 | + ['title' => 'cl_cb', 'key' => 'cl_cb', 'width' => '6%', 'linked' => false, ], |
|
| 175 | + ['title' => 'cl_lang', 'key' => 'cl_lang', 'width' => '6%', 'linked' => false, ], |
|
| 176 | + ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '33%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 177 | + ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 178 | + ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 179 | + ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '10%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 180 | 180 | ]; |
| 181 | 181 | $aData = $hResult->fetchAll(); |
| 182 | 182 | $this->P->cb_customdata['rows_content_lang_archive_list'] = Tools::makeListtable($aListSetting, |
@@ -197,9 +197,9 @@ discard block |
||
| 197 | 197 | $this->P->cb_customdata['rows_item_lang'] = $hResult->rowCount(); |
| 198 | 198 | if ($this->P->cb_customdata['rows_item_lang'] > 0) { |
| 199 | 199 | $aListSetting = [ |
| 200 | - ['title' => 'itml_id', 'key' => 'itml_id', 'width' => '6%', 'linked' => false,], |
|
| 201 | - ['title' => 'itml_pid', 'key' => 'itml_pid', 'width' => '6%', 'linked' => false,], |
|
| 202 | - ['title' => 'itml_lang', 'key' => 'itml_lang', 'width' => '6%', 'linked' => false,], |
|
| 200 | + ['title' => 'itml_id', 'key' => 'itml_id', 'width' => '6%', 'linked' => false, ], |
|
| 201 | + ['title' => 'itml_pid', 'key' => 'itml_pid', 'width' => '6%', 'linked' => false, ], |
|
| 202 | + ['title' => 'itml_lang', 'key' => 'itml_lang', 'width' => '6%', 'linked' => false, ], |
|
| 203 | 203 | [ |
| 204 | 204 | 'title' => 'itml_name_override', |
| 205 | 205 | 'key' => 'itml_name_override', |
@@ -241,9 +241,9 @@ discard block |
||
| 241 | 241 | $this->P->cb_customdata['rows_itemgroups_text'] = $hResult->rowCount(); |
| 242 | 242 | if ($this->P->cb_customdata['rows_itemgroups_text'] > 0) { |
| 243 | 243 | $aListSetting = [ |
| 244 | - ['title' => 'itmgt_id', 'key' => 'itmgt_id', 'width' => '6%', 'linked' => false,], |
|
| 245 | - ['title' => 'itmgt_pid', 'key' => 'itmgt_pid', 'width' => '6%', 'linked' => false,], |
|
| 246 | - ['title' => 'itmgt_lang', 'key' => 'itmgt_lang', 'width' => '6%', 'linked' => false,], |
|
| 244 | + ['title' => 'itmgt_id', 'key' => 'itmgt_id', 'width' => '6%', 'linked' => false, ], |
|
| 245 | + ['title' => 'itmgt_pid', 'key' => 'itmgt_pid', 'width' => '6%', 'linked' => false, ], |
|
| 246 | + ['title' => 'itmgt_lang', 'key' => 'itmgt_lang', 'width' => '6%', 'linked' => false, ], |
|
| 247 | 247 | [ |
| 248 | 248 | 'title' => 'itmgt_shorttext', |
| 249 | 249 | 'key' => 'itmgt_shorttext', |
@@ -278,17 +278,17 @@ discard block |
||
| 278 | 278 | $this->P->cb_customdata['rows_orders_items'] = $hResult->rowCount(); |
| 279 | 279 | if ($this->P->cb_customdata['rows_orders_items'] > 0) { |
| 280 | 280 | $aListSetting = [ |
| 281 | - ['title' => 'oi_id', 'key' => 'oi_id', 'width' => '8%', 'linked' => false,], |
|
| 282 | - ['title' => 'oi_o_id', 'key' => 'oi_o_id', 'width' => '9%', 'linked' => false,], |
|
| 283 | - ['title' => 'oi_cartkey', 'key' => 'oi_cartkey', 'width' => '13%', 'linked' => false,], |
|
| 284 | - ['title' => 'oi_amount', 'key' => 'oi_amount', 'width' => '9%', 'linked' => false,], |
|
| 285 | - ['title' => 'oi_vat', 'key' => 'oi_vat', 'width' => '8%', 'linked' => false,], |
|
| 286 | - ['title' => 'oi_rg', 'key' => 'oi_rg', 'width' => '8%', 'linked' => false,], |
|
| 287 | - ['title' => 'oi_rg_rebate', 'key' => 'oi_rg_rebate', 'width' => '9%', 'linked' => false,], |
|
| 288 | - ['title' => 'oi_price_netto_list', 'key' => 'oi_price_netto_list', 'width' => '9%', 'linked' => false,], |
|
| 289 | - ['title' => 'oi_price_netto_sale', 'key' => 'oi_price_netto_sale', 'width' => '9%', 'linked' => false,], |
|
| 290 | - ['title' => 'oi_price_netto_rebated', 'key' => 'oi_price_netto_rebated', 'width' => '9%', 'linked' => false,], |
|
| 291 | - ['title' => 'oi_price_brutto_use', 'key' => 'oi_price_brutto_use', 'width' => '9%', 'linked' => false,], |
|
| 281 | + ['title' => 'oi_id', 'key' => 'oi_id', 'width' => '8%', 'linked' => false, ], |
|
| 282 | + ['title' => 'oi_o_id', 'key' => 'oi_o_id', 'width' => '9%', 'linked' => false, ], |
|
| 283 | + ['title' => 'oi_cartkey', 'key' => 'oi_cartkey', 'width' => '13%', 'linked' => false, ], |
|
| 284 | + ['title' => 'oi_amount', 'key' => 'oi_amount', 'width' => '9%', 'linked' => false, ], |
|
| 285 | + ['title' => 'oi_vat', 'key' => 'oi_vat', 'width' => '8%', 'linked' => false, ], |
|
| 286 | + ['title' => 'oi_rg', 'key' => 'oi_rg', 'width' => '8%', 'linked' => false, ], |
|
| 287 | + ['title' => 'oi_rg_rebate', 'key' => 'oi_rg_rebate', 'width' => '9%', 'linked' => false, ], |
|
| 288 | + ['title' => 'oi_price_netto_list', 'key' => 'oi_price_netto_list', 'width' => '9%', 'linked' => false, ], |
|
| 289 | + ['title' => 'oi_price_netto_sale', 'key' => 'oi_price_netto_sale', 'width' => '9%', 'linked' => false, ], |
|
| 290 | + ['title' => 'oi_price_netto_rebated', 'key' => 'oi_price_netto_rebated', 'width' => '9%', 'linked' => false, ], |
|
| 291 | + ['title' => 'oi_price_brutto_use', 'key' => 'oi_price_brutto_use', 'width' => '9%', 'linked' => false, ], |
|
| 292 | 292 | //['title' => 'oi_img', 'key' => 'oi_img', 'width' => '41%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
| 293 | 293 | |
| 294 | 294 | ]; |
@@ -94,12 +94,12 @@ discard block |
||
| 94 | 94 | $CSA = [ |
| 95 | 95 | 'list_orders' => [ |
| 96 | 96 | ['title' => '', 'key' => 'o_id', 'width' => 30, 'linked' => false, 'callback' => 'shopadminMakeCheckbox'], |
| 97 | - ['title' => HardcodedText::get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false,], |
|
| 98 | - ['title' => HardcodedText::get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false,], |
|
| 99 | - ['title' => HardcodedText::get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false,], |
|
| 100 | - ['title' => HardcodedText::get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,], |
|
| 101 | - ['title' => HardcodedText::get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false,], |
|
| 102 | - ['title' => HardcodedText::get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false,], |
|
| 97 | + ['title' => HardcodedText::get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false, ], |
|
| 98 | + ['title' => HardcodedText::get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false, ], |
|
| 99 | + ['title' => HardcodedText::get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false, ], |
|
| 100 | + ['title' => HardcodedText::get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ], |
|
| 101 | + ['title' => HardcodedText::get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false, ], |
|
| 102 | + ['title' => HardcodedText::get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false, ], |
|
| 103 | 103 | [ |
| 104 | 104 | 'title' => HardcodedText::get('shopadmin_list_edit'), |
| 105 | 105 | 'key' => 'o_id', |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | ], |
| 114 | 114 | ], |
| 115 | 115 | 'list_orderitems' => [ |
| 116 | - ['title' => HardcodedText::get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false,], |
|
| 117 | - ['title' => HardcodedText::get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false,], |
|
| 118 | - ['title' => HardcodedText::get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;',], |
|
| 119 | - ['title' => HardcodedText::get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false,], |
|
| 120 | - ['title' => HardcodedText::get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false,], |
|
| 116 | + ['title' => HardcodedText::get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false, ], |
|
| 117 | + ['title' => HardcodedText::get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false, ], |
|
| 118 | + ['title' => HardcodedText::get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;', ], |
|
| 119 | + ['title' => HardcodedText::get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false, ], |
|
| 120 | + ['title' => HardcodedText::get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false, ], |
|
| 121 | 121 | ], |
| 122 | 122 | ]; |
| 123 | 123 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $sZahlungsmethode = '<span style="color: red;">'; |
| 222 | 222 | } |
| 223 | 223 | $mZahlungsmethode = $this->serviceManager->get('textcats')->T("order_paymentmethod_".$aRow["o_paymentmethod"], true); |
| 224 | - if ($mZahlungsmethode ) { |
|
| 224 | + if ($mZahlungsmethode) { |
|
| 225 | 225 | $sZahlungsmethode .= $mZahlungsmethode; |
| 226 | 226 | } else { |
| 227 | 227 | $sZahlungsmethode .= ucwords($aRow["o_paymentmethod"]); |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | ]; |
| 266 | 266 | if (!($aRow["o_ordercompleted"] == 's' && $bIgnoreStorno)) { |
| 267 | 267 | $fGesamtnetto += $aRow["o_sumnettoall"]; |
| 268 | - $j ++; |
|
| 268 | + $j++; |
|
| 269 | 269 | } else { |
| 270 | 270 | $k++; |
| 271 | 271 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | if ($iRows > 0) { |
| 129 | 129 | $aErr["itemnoalreadytaken"] = true; |
| 130 | 130 | } else { |
| 131 | - $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)),]; |
|
| 131 | + $aData = ['itm_no' => trim(\filter_input(INPUT_POST, 'itemno', FILTER_SANITIZE_SPECIAL_CHARS)), ]; |
|
| 132 | 132 | $sql = DBTools::buildInsertQuery($aData, 'item_base'); |
| 133 | 133 | $this->db->exec($sql); |
| 134 | 134 | $iInsertID = $this->db->lastInsertId(); |
@@ -229,10 +229,10 @@ discard block |
||
| 229 | 229 | private function admin_prepareItemlist($aItemlist) |
| 230 | 230 | { |
| 231 | 231 | $aList = [ |
| 232 | - ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon',], |
|
| 233 | - ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false,], |
|
| 234 | - ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false,], |
|
| 235 | - ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'],], |
|
| 232 | + ['title' => HardcodedText::get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon', ], |
|
| 233 | + ['title' => HardcodedText::get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false, ], |
|
| 234 | + ['title' => HardcodedText::get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false, ], |
|
| 235 | + ['title' => HardcodedText::get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'], ], |
|
| 236 | 236 | ]; |
| 237 | 237 | $aData = []; |
| 238 | 238 | foreach ($aItemlist["data"] as $aValue) { |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | private function admin_prepareItem($aItemdata) |
| 289 | 289 | { |
| 290 | 290 | $aData = [ |
| 291 | - 'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata["base"]['itm_no']]),], |
|
| 291 | + 'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata["base"]['itm_no']]), ], |
|
| 292 | 292 | 'id' => $aItemdata["base"]['itm_id'], |
| 293 | 293 | 'itemno' => $aItemdata["base"]['itm_no'], |
| 294 | 294 | 'name' => $aItemdata["base"]['itm_name'], |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | $aGroups = $this->admin_getItemgroups(''); |
| 320 | 320 | $aData["groupoptions"][] = ''; |
| 321 | 321 | foreach ($aGroups as $aValue) { |
| 322 | - $aData["groupoptions"][] = $aValue['itmg_id'] . '|' . $aValue['itmg_no'] . ' - ' . $aValue['itmg_name']; |
|
| 322 | + $aData["groupoptions"][] = $aValue['itmg_id'].'|'.$aValue['itmg_no'].' - '.$aValue['itmg_name']; |
|
| 323 | 323 | } |
| 324 | 324 | unset($aGroups); |
| 325 | 325 | |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | $sql = DBTools::buildPSUpdateQuery($aData, 'item_base', 'itm_id'); |
| 362 | 362 | $hResult = $this->db->prepare($sql); |
| 363 | 363 | foreach ($aData as $sKey => $sValue) { |
| 364 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 364 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 365 | 365 | } |
| 366 | 366 | $hResult->execute(); |
| 367 | 367 | if (isset($this->post["textid"])) { |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | $sql = DBTools::buildPSUpdateQuery($aData, 'item_lang', 'itml_id'); |
| 375 | 375 | $hResult = $this->db->prepare($sql); |
| 376 | 376 | foreach ($aData as $sKey => $sValue) { |
| 377 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 377 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 378 | 378 | } |
| 379 | 379 | $hResult->execute(); |
| 380 | 380 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * @param $purifier |
| 151 | 151 | * @return string |
| 152 | 152 | */ |
| 153 | - private function admin_updateGroup( $purifier) |
|
| 153 | + private function admin_updateGroup($purifier) |
|
| 154 | 154 | { |
| 155 | 155 | $sql = 'SELECT * FROM itemgroups_base WHERE itmg_id != :id AND itmg_no = :gno'; |
| 156 | 156 | $hResult = $this->db->prepare($sql); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_base', 'itmg_id'); |
| 174 | 174 | $hResult = $this->db->prepare($sql); |
| 175 | 175 | foreach ($aData as $sKey => $sValue) { |
| 176 | - $hResult->bindValue(':' . $sKey, $sValue); |
|
| 176 | + $hResult->bindValue(':'.$sKey, $sValue); |
|
| 177 | 177 | } |
| 178 | 178 | $hResult->execute(); |
| 179 | 179 | |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | ]; |
| 195 | 195 | $sql = DBTools::buildPSUpdateQuery($aData, 'itemgroups_text', 'itmgt_id'); |
| 196 | 196 | $hResult = $this->db->prepare($sql); |
| 197 | - foreach ($aData as $sKey => $sValue) $hResult->bindValue(':' . $sKey, $sValue); |
|
| 197 | + foreach ($aData as $sKey => $sValue) $hResult->bindValue(':'.$sKey, $sValue); |
|
| 198 | 198 | $hResult->execute(); |
| 199 | 199 | } |
| 200 | 200 | |