@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | date_default_timezone_set(HelperConfig::$core['defaulttimezone']); |
| 62 | 62 | |
| 63 | - $this->serviceManager->setFactory('hardcodedtextcats', function () { |
|
| 63 | + $this->serviceManager->setFactory('hardcodedtextcats', function() { |
|
| 64 | 64 | return $this->setupHardcodedTextcats(); |
| 65 | 65 | }); |
| 66 | 66 | |
| 67 | - $this->serviceManager->setFactory('db', function () { |
|
| 67 | + $this->serviceManager->setFactory('db', function() { |
|
| 68 | 68 | return null; |
| 69 | 69 | }); |
| 70 | 70 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | if (HelperConfig::$core['enable_module_shop']) { |
| 82 | - $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) { |
|
| 82 | + $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) { |
|
| 83 | 83 | return new \HaaseIT\HCSF\Shop\Items($serviceManager); |
| 84 | 84 | }); |
| 85 | 85 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | { |
| 97 | 97 | // PSR-7 Stuff |
| 98 | 98 | // Init request object |
| 99 | - $this->serviceManager->setFactory('request', function () { |
|
| 99 | + $this->serviceManager->setFactory('request', function() { |
|
| 100 | 100 | $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals(); |
| 101 | 101 | |
| 102 | 102 | // cleanup request |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | protected function setupDB() |
| 160 | 160 | { |
| 161 | - $this->serviceManager->setFactory('dbal', function () { |
|
| 161 | + $this->serviceManager->setFactory('dbal', function() { |
|
| 162 | 162 | $config = new \Doctrine\DBAL\Configuration(); |
| 163 | 163 | |
| 164 | 164 | $connectionParams = [ |
@@ -179,14 +179,14 @@ discard block |
||
| 179 | 179 | return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
| 180 | 180 | }); |
| 181 | 181 | |
| 182 | - $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) { |
|
| 182 | + $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) { |
|
| 183 | 183 | return $serviceManager->get('dbal')->getWrappedConnection(); |
| 184 | 184 | }); |
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | protected function setupTextcats() |
| 188 | 188 | { |
| 189 | - $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) { |
|
| 189 | + $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) { |
|
| 190 | 190 | $langavailable = HelperConfig::$core['lang_available']; |
| 191 | 191 | $textcats = new \HaaseIT\Toolbox\Textcat( |
| 192 | 192 | HelperConfig::$lang, |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | |
| 204 | 204 | protected function setupTwig() |
| 205 | 205 | { |
| 206 | - $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) { |
|
| 206 | + $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) { |
|
| 207 | 207 | $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']); |
| 208 | 208 | |
| 209 | 209 | $twig_options = [ |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | $aP['countrylist'][] = ' | '; |
| 328 | - foreach (HelperConfig::$countries['countries_' .HelperConfig::$lang] as $sKey => $sValue) { |
|
| 328 | + foreach (HelperConfig::$countries['countries_'.HelperConfig::$lang] as $sKey => $sValue) { |
|
| 329 | 329 | $aP['countrylist'][] = $sKey.'|'.$sValue; |
| 330 | 330 | } |
| 331 | 331 | |
@@ -62,11 +62,11 @@ discard block |
||
| 62 | 62 | $this->P->cb_subnav = 'admin'; |
| 63 | 63 | |
| 64 | 64 | $CUA = [ |
| 65 | - ['title' => $this->hardcodedtextcats->get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 66 | - ['title' => $this->hardcodedtextcats->get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 67 | - ['title' => $this->hardcodedtextcats->get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 68 | - ['title' => $this->hardcodedtextcats->get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 69 | - ['title' => $this->hardcodedtextcats->get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false,'stylehead' => 'text-align: left;',], |
|
| 65 | + ['title' => $this->hardcodedtextcats->get('customeradmin_list_no'), 'key' => 'cust_no', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 66 | + ['title' => $this->hardcodedtextcats->get('customeradmin_list_company'), 'key' => 'cust_corp', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 67 | + ['title' => $this->hardcodedtextcats->get('customeradmin_list_name'), 'key' => 'cust_name', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 68 | + ['title' => $this->hardcodedtextcats->get('customeradmin_list_town'), 'key' => 'cust_town', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 69 | + ['title' => $this->hardcodedtextcats->get('customeradmin_list_active'), 'key' => 'cust_active', 'width' => '16%', 'linked' => false, 'stylehead' => 'text-align: left;', ], |
|
| 70 | 70 | [ |
| 71 | 71 | 'title' => $this->hardcodedtextcats->get('customeradmin_list_edit'), |
| 72 | 72 | 'key' => 'cust_id', |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | 'linked' => true, |
| 75 | 75 | 'ltarget' => '/_admin/customeradmin.html', |
| 76 | 76 | 'lkeyname' => 'id', |
| 77 | - 'lgetvars' => ['action' => 'edit',], |
|
| 77 | + 'lgetvars' => ['action' => 'edit', ], |
|
| 78 | 78 | ], |
| 79 | 79 | ]; |
| 80 | 80 | $aPData = $this->handleCustomerAdmin($CUA, $this->serviceManager->get('twig')); |
@@ -106,12 +106,12 @@ discard block |
||
| 106 | 106 | $CSA = [ |
| 107 | 107 | 'list_orders' => [ |
| 108 | 108 | ['title' => '', 'key' => 'o_id', 'width' => 30, 'linked' => false, 'callback' => 'shopadminMakeCheckbox'], |
| 109 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false,], |
|
| 110 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false,], |
|
| 111 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false,], |
|
| 112 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false,], |
|
| 113 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false,], |
|
| 114 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false,], |
|
| 109 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_orderid'), 'key' => 'o_id', 'width' => 30, 'linked' => false, ], |
|
| 110 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_customer'), 'key' => 'o_cust', 'width' => 280, 'linked' => false, ], |
|
| 111 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_sumnettoall'), 'key' => 'o_sumnettoall', 'width' => 75, 'linked' => false, ], |
|
| 112 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_orderstatus'), 'key' => 'o_order_status', 'width' => 80, 'linked' => false, ], |
|
| 113 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_ordertimenumber'), 'key' => 'o_ordertime_number', 'width' => 100, 'linked' => false, ], |
|
| 114 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_hostpayment'), 'key' => 'o_order_host_payment', 'width' => 140, 'linked' => false, ], |
|
| 115 | 115 | [ |
| 116 | 116 | 'title' => $this->hardcodedtextcats->get('shopadmin_list_edit'), |
| 117 | 117 | 'key' => 'o_id', |
@@ -125,11 +125,11 @@ discard block |
||
| 125 | 125 | ], |
| 126 | 126 | ], |
| 127 | 127 | 'list_orderitems' => [ |
| 128 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false,], |
|
| 129 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false,], |
|
| 130 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;',], |
|
| 131 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false,], |
|
| 132 | - ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false,], |
|
| 128 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemno'), 'key' => 'oi_itemno', 'width' => 95, 'linked' => false, ], |
|
| 129 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemname'), 'key' => 'oi_itemname', 'width' => 350, 'linked' => false, ], |
|
| 130 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemamount'), 'key' => 'oi_amount', 'width' => 50, 'linked' => false, 'style-data' => 'text-align: center;', ], |
|
| 131 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemnetto'), 'key' => 'oi_price_netto', 'width' => 70, 'linked' => false, ], |
|
| 132 | + ['title' => $this->hardcodedtextcats->get('shopadmin_list_itemsumnetto'), 'key' => 'ges_netto', 'width' => 75, 'linked' => false, ], |
|
| 133 | 133 | ], |
| 134 | 134 | ]; |
| 135 | 135 | |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | } else { |
| 250 | 250 | $sZahlungsmethode = '<span style="color: red;">'; |
| 251 | 251 | } |
| 252 | - $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_' .$aRow['o_paymentmethod'], true); |
|
| 253 | - if ($mZahlungsmethode ) { |
|
| 252 | + $mZahlungsmethode = $this->serviceManager->get('textcats')->T('order_paymentmethod_'.$aRow['o_paymentmethod'], true); |
|
| 253 | + if ($mZahlungsmethode) { |
|
| 254 | 254 | $sZahlungsmethode .= $mZahlungsmethode; |
| 255 | 255 | } else { |
| 256 | 256 | $sZahlungsmethode .= ucwords($aRow['o_paymentmethod']); |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | ]; |
| 295 | 295 | if (!($bIgnoreStorno && $aRow['o_ordercompleted'] === 's')) { |
| 296 | 296 | $fGesamtnetto += $aRow['o_sumnettoall']; |
| 297 | - $j ++; |
|
| 297 | + $j++; |
|
| 298 | 298 | } else { |
| 299 | 299 | $k++; |
| 300 | 300 | } |
@@ -246,10 +246,10 @@ discard block |
||
| 246 | 246 | private function prepareItemlist($aItemlist) |
| 247 | 247 | { |
| 248 | 248 | $aList = [ |
| 249 | - ['title' => $this->hardcodedtextcats->get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon',], |
|
| 250 | - ['title' => $this->hardcodedtextcats->get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false,], |
|
| 251 | - ['title' => $this->hardcodedtextcats->get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false,], |
|
| 252 | - ['title' => $this->hardcodedtextcats->get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'],], |
|
| 249 | + ['title' => $this->hardcodedtextcats->get('itemadmin_list_active'), 'key' => 'itemindex', 'width' => 30, 'linked' => false, 'callback' => 'renderItemStatusIcon', ], |
|
| 250 | + ['title' => $this->hardcodedtextcats->get('itemadmin_list_itemno'), 'key' => 'itemno', 'width' => 100, 'linked' => false, ], |
|
| 251 | + ['title' => $this->hardcodedtextcats->get('itemadmin_list_name'), 'key' => 'name', 'width' => 350, 'linked' => false, ], |
|
| 252 | + ['title' => $this->hardcodedtextcats->get('itemadmin_list_edit'), 'key' => 'itemno', 'width' => 30, 'linked' => true, 'ltarget' => '/_admin/itemadmin.html', 'lkeyname' => 'itemno', 'lgetvars' => ['action' => 'showitem'], ], |
|
| 253 | 253 | ]; |
| 254 | 254 | $aData = []; |
| 255 | 255 | foreach ($aItemlist['data'] as $aValue) { |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | private function prepareItem($aItemdata) |
| 315 | 315 | { |
| 316 | 316 | $aData = [ |
| 317 | - 'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]),], |
|
| 317 | + 'form' => ['action' => Tools::makeLinkHRefWithAddedGetVars('/_admin/itemadmin.html', ['action' => 'showitem', 'itemno' => $aItemdata['base']['itm_no']]), ], |
|
| 318 | 318 | 'id' => $aItemdata['base']['itm_id'], |
| 319 | 319 | 'itemno' => $aItemdata['base']['itm_no'], |
| 320 | 320 | 'name' => $aItemdata['base']['itm_name'], |
@@ -58,8 +58,8 @@ discard block |
||
| 58 | 58 | $aData = $this->textcats->getCompleteTextcatForCurrentLang(); |
| 59 | 59 | |
| 60 | 60 | $aListSetting = [ |
| 61 | - ['title' => $this->hardcodedtextcats->get('textcatadmin_list_title_key'), 'key' => 'tc_key', 'width' => '20%', 'linked' => false,], |
|
| 62 | - ['title' => $this->hardcodedtextcats->get('textcatadmin_list_title_text'), 'key' => 'tcl_text', 'width' => '80%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 61 | + ['title' => $this->hardcodedtextcats->get('textcatadmin_list_title_key'), 'key' => 'tc_key', 'width' => '20%', 'linked' => false, ], |
|
| 62 | + ['title' => $this->hardcodedtextcats->get('textcatadmin_list_title_text'), 'key' => 'tcl_text', 'width' => '80%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 63 | 63 | [ |
| 64 | 64 | 'title' => $this->hardcodedtextcats->get('textcatadmin_list_title_edit'), |
| 65 | 65 | 'key' => 'tc_id', |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | |
| 125 | 125 | if ($iArchivedRows > 0) { |
| 126 | 126 | $aListSetting = [ |
| 127 | - ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false,], |
|
| 128 | - ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true,], |
|
| 127 | + ['title' => 'tcla_timestamp', 'key' => 'tcla_timestamp', 'width' => '15%', 'linked' => false, ], |
|
| 128 | + ['title' => 'tcl_text', 'key' => 'tcl_text', 'width' => '85%', 'linked' => false, 'escapehtmlspecialchars' => true, ], |
|
| 129 | 129 | ]; |
| 130 | 130 | $aData = $statement->fetchAll(); |
| 131 | 131 | $this->P->cb_customdata['archived_list'] = Tools::makeListtable($aListSetting, |