| @@ -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 | ]; | 
| @@ -49,8 +49,8 @@ discard block | ||
| 49 | 49 | $aData = $this->textcats->getCompleteTextcatForCurrentLang(); | 
| 50 | 50 | |
| 51 | 51 | $aListSetting = [ | 
| 52 | -                ['title' => HardcodedText::get('textcatadmin_list_title_key'), 'key' => 'tc_key', 'width' => '20%', 'linked' => false,], | |
| 53 | -                ['title' => HardcodedText::get('textcatadmin_list_title_text'), 'key' => 'tcl_text', 'width' => '80%', 'linked' => false, 'escapehtmlspecialchars' => true,], | |
| 52 | +                ['title' => HardcodedText::get('textcatadmin_list_title_key'), 'key' => 'tc_key', 'width' => '20%', 'linked' => false, ], | |
| 53 | +                ['title' => HardcodedText::get('textcatadmin_list_title_text'), 'key' => 'tcl_text', 'width' => '80%', 'linked' => false, 'escapehtmlspecialchars' => true, ], | |
| 54 | 54 | [ | 
| 55 | 55 |                      'title' => HardcodedText::get('textcatadmin_list_title_edit'), | 
| 56 | 56 | 'key' => 'tc_id', | 
| @@ -112,8 +112,8 @@ discard block | ||
| 112 | 112 | |
| 113 | 113 |                  if ($iArchivedRows > 0) { | 
| 114 | 114 | $aListSetting = [ | 
| 115 | - ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,], | |
| 116 | - ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true,], | |
| 115 | + ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ], | |
| 116 | + ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true, ], | |
| 117 | 117 | ]; | 
| 118 | 118 | $aData = $statement->fetchAll(); | 
| 119 | 119 | $this->P->cb_customdata['archived_list'] = Tools::makeListtable($aListSetting, | 
| @@ -223,11 +223,11 @@ | ||
| 223 | 223 | |
| 224 | 224 |                  if ($iArchivedRows > 0) { | 
| 225 | 225 | $aListSetting = [ | 
| 226 | - ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false,], | |
| 227 | - ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true,], | |
| 228 | - ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,], | |
| 229 | - ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,], | |
| 230 | - ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true,], | |
| 226 | + ['title' => 'cla_timestamp', 'key' => 'cla_timestamp', 'width' => '15%', 'linked' => false, ], | |
| 227 | + ['title' => 'cl_html', 'key' => 'cl_html', 'width' => '40%', 'linked' => false, 'escapehtmlspecialchars' => true, ], | |
| 228 | + ['title' => 'cl_keywords', 'key' => 'cl_keywords', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ], | |
| 229 | + ['title' => 'cl_description', 'key' => 'cl_description', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ], | |
| 230 | + ['title' => 'cl_title', 'key' => 'cl_title', 'width' => '15%', 'linked' => false, 'escapehtmlspecialchars' => true, ], | |
| 231 | 231 | ]; | 
| 232 | 232 | $aData = $statement->fetchAll(); | 
| 233 | 233 | $this->P->cb_customdata['archived_list'] = \HaaseIT\Toolbox\Tools::makeListtable( | 
| @@ -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 | |
| @@ -220,8 +220,8 @@ discard block | ||
| 220 | 220 |                      } else { | 
| 221 | 221 | $sZahlungsmethode = '<span style="color: red;">'; | 
| 222 | 222 | } | 
| 223 | -                    $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_' .$aRow['o_paymentmethod'], true); | |
| 224 | -                    if ($mZahlungsmethode ) { | |
| 223 | +                    $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_'.$aRow['o_paymentmethod'], true); | |
| 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 (!($bIgnoreStorno && $aRow['o_ordercompleted'] === 's')) { | 
| 267 | 267 | $fGesamtnetto += $aRow['o_sumnettoall']; | 
| 268 | - $j ++; | |
| 268 | + $j++; | |
| 269 | 269 |                      } else { | 
| 270 | 270 | $k++; | 
| 271 | 271 | } | 
| @@ -163,12 +163,12 @@ discard block | ||
| 163 | 163 |              if (!$bEnableItemGroups || \trim($aRow['itm_group']) == 0) { | 
| 164 | 164 | $aAssembly['item'][$aRow['itm_no']] = $aRow; | 
| 165 | 165 |              } else { | 
| 166 | -                if (isset($aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']])) { | |
| 167 | - $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']][$aRow['itm_no']] = $aRow; | |
| 166 | +                if (isset($aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']])) { | |
| 167 | + $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']][$aRow['itm_no']] = $aRow; | |
| 168 | 168 |                  } else { | 
| 169 | - $aAssembly['item']['ITEMGROUP-' .$aRow['itm_group']]['group'] = 'ITEMGROUP-' .$aRow['itm_group']; | |
| 170 | - $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']]['ITEMGROUP-DATA'] = $this->getGroupdata($aRow['itm_group']); | |
| 171 | - $aAssembly['groups']['ITEMGROUP-' .$aRow['itm_group']][$aRow['itm_no']] = $aRow; | |
| 169 | + $aAssembly['item']['ITEMGROUP-'.$aRow['itm_group']]['group'] = 'ITEMGROUP-'.$aRow['itm_group']; | |
| 170 | + $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']]['ITEMGROUP-DATA'] = $this->getGroupdata($aRow['itm_group']); | |
| 171 | + $aAssembly['groups']['ITEMGROUP-'.$aRow['itm_group']][$aRow['itm_no']] = $aRow; | |
| 172 | 172 | } | 
| 173 | 173 | } | 
| 174 | 174 | } | 
| @@ -209,7 +209,7 @@ discard block | ||
| 209 | 209 | $aData['itm_vatid'] = 'full'; | 
| 210 | 210 | } | 
| 211 | 211 | |
| 212 | -        if(is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) { | |
| 212 | +        if (is_numeric($aData['itm_price']) && (float) $aData['itm_price'] > 0) { | |
| 213 | 213 | $aPrice['netto_list'] = $aData['itm_price']; | 
| 214 | 214 | $aPrice['brutto_list'] = $this->addVat($aPrice['netto_list'], HelperConfig::$shop['vat'][$aData['itm_vatid']]); | 
| 215 | 215 | if ( | 
| @@ -231,7 +231,7 @@ discard block | ||
| 231 | 231 | bcdiv( | 
| 232 | 232 | bcsub( | 
| 233 | 233 | '100', | 
| 234 | -                                (string)HelperConfig::$shop['rebate_groups'][$aData['itm_rg']][CHelper::getUserData('cust_group')] | |
| 234 | +                                (string) HelperConfig::$shop['rebate_groups'][$aData['itm_rg']][CHelper::getUserData('cust_group')] | |
| 235 | 235 | ), | 
| 236 | 236 | '100' | 
| 237 | 237 | ) | 
| @@ -263,7 +263,7 @@ discard block | ||
| 263 | 263 | bcdiv( | 
| 264 | 264 | bcmul( | 
| 265 | 265 | $price, | 
| 266 | - (string)$vat | |
| 266 | + (string) $vat | |
| 267 | 267 | ), | 
| 268 | 268 | '100' | 
| 269 | 269 | ), | 
| @@ -188,9 +188,9 @@ | ||
| 188 | 188 | public function getGroupdata($sGroup) | 
| 189 | 189 |      { | 
| 190 | 190 | $sql = 'SELECT '.DB_ITEMGROUPFIELDS.' FROM itemgroups_base' | 
| 191 | - .' LEFT OUTER JOIN itemgroups_text ON itemgroups_base.itmg_id = itemgroups_text.itmgt_pid' | |
| 192 | - .' AND itmgt_lang = :lang' | |
| 193 | - .' WHERE itmg_id = :group'; | |
| 191 | + .' LEFT OUTER JOIN itemgroups_text ON itemgroups_base.itmg_id = itemgroups_text.itmgt_pid' | |
| 192 | + .' AND itmgt_lang = :lang' | |
| 193 | + .' WHERE itmg_id = :group'; | |
| 194 | 194 | |
| 195 | 195 | $hResult = $this->db->prepare($sql); | 
| 196 | 196 |          $hResult->bindValue(':lang', HelperConfig::$lang, \PDO::PARAM_STR); | 
| @@ -66,13 +66,13 @@ | ||
| 66 | 66 |          if (HelperConfig::$customer['validate_fax'] && (!isset($_POST['fax']) || strlen(trim($_POST['fax']))) < 6) { | 
| 67 | 67 | $aErr['fax'] = true; | 
| 68 | 68 | } | 
| 69 | -        if (HelperConfig::$customer['validate_country'] && (!isset($_POST['country']) || !isset(HelperConfig::$countries['countries_' .$sLang][$_POST['country']]))) { | |
| 69 | +        if (HelperConfig::$customer['validate_country'] && (!isset($_POST['country']) || !isset(HelperConfig::$countries['countries_'.$sLang][$_POST['country']]))) { | |
| 70 | 70 | $aErr['country'] = true; | 
| 71 | 71 | } | 
| 72 | 72 |          if (!$bEdit && (!isset($_POST['tos']) || $_POST['tos'] !== 'y')) { | 
| 73 | 73 | $aErr['tos'] = true; | 
| 74 | 74 | } | 
| 75 | -        if (!$bEdit && (!isset( $_POST['cancellationdisclaimer'] ) || $_POST['cancellationdisclaimer'] !== 'y')) { | |
| 75 | +        if (!$bEdit && (!isset($_POST['cancellationdisclaimer']) || $_POST['cancellationdisclaimer'] !== 'y')) { | |
| 76 | 76 | $aErr['cancellationdisclaimer'] = true; | 
| 77 | 77 | } | 
| 78 | 78 | |
| @@ -105,7 +105,7 @@ | ||
| 105 | 105 | /** | 
| 106 | 106 | * @param string $sKeyConfig | 
| 107 | 107 | * @param string $sKeyForm | 
| 108 | - * @param array|bool $aUserData | |
| 108 | + * @param boolean $aUserData | |
| 109 | 109 | * @return bool | 
| 110 | 110 | */ | 
| 111 | 111 |      public static function getCustomerFormDefaultValue($sKeyConfig, $sKeyForm, $aUserData) { | 
| @@ -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')); | 
| @@ -100,7 +100,7 @@ | ||
| 100 | 100 |                              ->setParameter(':cust_email', $sEmail) | 
| 101 | 101 |                              ->setParameter(':cust_corp', filter_var(trim(Tools::getFormfield('corpname')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | 
| 102 | 102 |                              ->setParameter(':cust_name', filter_var(trim(Tools::getFormfield('name')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | 
| 103 | -                            ->setParameter(':cust_street', filter_var(trim(Tools::getFormfield('street')),FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | |
| 103 | +                            ->setParameter(':cust_street', filter_var(trim(Tools::getFormfield('street')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | |
| 104 | 104 |                              ->setParameter(':cust_zip', filter_var(trim(Tools::getFormfield('zip')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | 
| 105 | 105 |                              ->setParameter(':cust_town', filter_var(trim(Tools::getFormfield('town')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | 
| 106 | 106 |                              ->setParameter(':cust_phone', filter_var(trim(Tools::getFormfield('phone')), FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW)) | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | |
| 42 | 42 | $this->setupHardcodedTextcats(); | 
| 43 | 43 | |
| 44 | -        $this->serviceManager->setFactory('db', function () { | |
| 44 | +        $this->serviceManager->setFactory('db', function() { | |
| 45 | 45 | return null; | 
| 46 | 46 | }); | 
| 47 | 47 | |
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 | $this->setupTwig(); | 
| 55 | 55 | |
| 56 | 56 |          if (HelperConfig::$core['enable_module_shop']) { | 
| 57 | -            $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) { | |
| 57 | +            $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) { | |
| 58 | 58 | return new \HaaseIT\HCSF\Shop\Items($serviceManager); | 
| 59 | 59 | }); | 
| 60 | 60 | } | 
| @@ -67,7 +67,7 @@ discard block | ||
| 67 | 67 |      { | 
| 68 | 68 | // PSR-7 Stuff | 
| 69 | 69 | // Init request object | 
| 70 | -        $this->serviceManager->setFactory('request', function () { | |
| 70 | +        $this->serviceManager->setFactory('request', function() { | |
| 71 | 71 | $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals(); | 
| 72 | 72 | |
| 73 | 73 | // cleanup request | 
| @@ -127,7 +127,7 @@ discard block | ||
| 127 | 127 | |
| 128 | 128 | protected function setupDB() | 
| 129 | 129 |      { | 
| 130 | -        $this->serviceManager->setFactory('dbal', function () { | |
| 130 | +        $this->serviceManager->setFactory('dbal', function() { | |
| 131 | 131 | $config = new \Doctrine\DBAL\Configuration(); | 
| 132 | 132 | |
| 133 | 133 | $connectionParams = [ | 
| @@ -148,14 +148,14 @@ discard block | ||
| 148 | 148 | return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); | 
| 149 | 149 | }); | 
| 150 | 150 | |
| 151 | -        $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) { | |
| 151 | +        $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) { | |
| 152 | 152 |              return $serviceManager->get('dbal')->getWrappedConnection(); | 
| 153 | 153 | }); | 
| 154 | 154 | } | 
| 155 | 155 | |
| 156 | 156 | protected function setupTextcats() | 
| 157 | 157 |      { | 
| 158 | -        $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) { | |
| 158 | +        $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) { | |
| 159 | 159 | $langavailable = HelperConfig::$core['lang_available']; | 
| 160 | 160 | $textcats = new \HaaseIT\Toolbox\Textcat( | 
| 161 | 161 | HelperConfig::$lang, | 
| @@ -172,7 +172,7 @@ discard block | ||
| 172 | 172 | |
| 173 | 173 | protected function setupTwig() | 
| 174 | 174 |      { | 
| 175 | -        $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) { | |
| 175 | +        $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) { | |
| 176 | 176 | $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']); | 
| 177 | 177 | |
| 178 | 178 | $twig_options = [ | 
| @@ -297,7 +297,7 @@ discard block | ||
| 297 | 297 | } | 
| 298 | 298 | |
| 299 | 299 | $aP['countrylist'][] = ' | '; | 
| 300 | -        foreach (HelperConfig::$countries['countries_' .HelperConfig::$lang] as $sKey => $sValue) { | |
| 300 | +        foreach (HelperConfig::$countries['countries_'.HelperConfig::$lang] as $sKey => $sValue) { | |
| 301 | 301 | $aP['countrylist'][] = $sKey.'|'.$sValue; | 
| 302 | 302 | } | 
| 303 | 303 | |