@@ -174,7 +174,7 @@ |
||
174 | 174 | } |
175 | 175 | echo $this->serviceManager->get('twig')->render('shop/update-cart.twig', $aAR); |
176 | 176 | } else { |
177 | - $aMSG['msg'] = $sReply; |
|
177 | + $aMSG['msg'] = $sReply; |
|
178 | 178 | if (count($aMore)) { |
179 | 179 | $aMSG = array_merge($aMSG, $aMore); |
180 | 180 | } |
@@ -117,7 +117,7 @@ |
||
117 | 117 | $user = filter_input(INPUT_SERVER, 'PHP_AUTH_USER'); |
118 | 118 | $pass = filter_input(INPUT_SERVER, 'PHP_AUTH_PW'); |
119 | 119 | if (filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION') !== null) { // fix for php cgi mode |
120 | - list($user, $pass) = explode(':' , base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6))); |
|
120 | + list($user, $pass) = explode(':', base64_decode(substr(filter_input(INPUT_SERVER, 'REDIRECT_HTTP_AUTHORIZATION'), 6))); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | if (!empty($user) && !empty($pass)) { |
@@ -449,12 +449,12 @@ |
||
449 | 449 | } |
450 | 450 | // because array_rand will change numerical (string) values to integer, we have to do this awkward dance |
451 | 451 | foreach ($keysAddSuggsTMP as $key => $item) { |
452 | - $keysAddSuggs[] = (string)$item; |
|
452 | + $keysAddSuggs[] = (string) $item; |
|
453 | 453 | } |
454 | 454 | |
455 | 455 | // iterate suggestions and remove those that which will not be kept |
456 | 456 | foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) { |
457 | - if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) { |
|
457 | + if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) { |
|
458 | 458 | unset($suggestions['additional'][$addSuggsKey]); |
459 | 459 | } |
460 | 460 | } |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | { |
308 | 308 | $aFilesToSend = []; |
309 | 309 | if ( |
310 | - isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]) |
|
310 | + isset(HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]) |
|
311 | 311 | && file_exists( |
312 | 312 | PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'] |
313 | 313 | .'/'.HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | ) { |
317 | 317 | $aFilesToSend[] = |
318 | 318 | PATH_DOCROOT.HelperConfig::$core['directory_emailattachments'].'/' |
319 | - .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_' .HelperConfig::$lang]; |
|
319 | + .HelperConfig::$shop['email_orderconfirmation_attachment_cancellationform_'.HelperConfig::$lang]; |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | Helper::mailWrapper( |
@@ -390,9 +390,9 @@ discard block |
||
390 | 390 | 'country' => !empty($postcountry) ? |
391 | 391 | ( |
392 | 392 | isset( |
393 | - HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry] |
|
393 | + HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry] |
|
394 | 394 | ) |
395 | - ? HelperConfig::$countries['countries_' .HelperConfig::$lang][$postcountry] |
|
395 | + ? HelperConfig::$countries['countries_'.HelperConfig::$lang][$postcountry] |
|
396 | 396 | : $postcountry) |
397 | 397 | : '', |
398 | 398 | 'remarks' => $this->getPostValue('remarks'), |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | 'paymentmethod' => $this->getPostValue('paymentmethod'), |
402 | 402 | 'shippingcost' => empty($_SESSION['shippingcost']) ? false : $_SESSION['shippingcost'], |
403 | 403 | 'paypallink' => $postpaymentmethod === 'paypal' ? $serverservername.'/_misc/paypal.html?id='.$iId : '', |
404 | - 'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
404 | + 'sofortueberweisunglink' => $postpaymentmethod === 'sofortueberweisung' ? $serverservername.'/_misc/sofortueberweisung.html?id='.$iId : '', |
|
405 | 405 | 'SESSION' => !$bCust ? Tools::debug($_SESSION, '$_SESSION', true, true) : '', |
406 | 406 | 'POST' => !$bCust ? Tools::debug($_POST, '$_POST', true, true) : '', |
407 | 407 | 'orderid' => $iId, |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | } else { |
443 | 443 | $return .= $getcartkey; |
444 | 444 | } |
445 | - $return.= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2'); |
|
445 | + $return .= ' '.$this->textcats->T('shoppingcart_msg_'.$getmsg.'_2'); |
|
446 | 446 | if ($getmsg === 'updated') { |
447 | 447 | $return .= ' '.$getamount; |
448 | 448 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $postdata = ''; |
76 | 76 | |
77 | 77 | foreach ($_POST as $i => $v) { |
78 | - $postdata .= $i . '=' . urlencode($v) . '&'; |
|
78 | + $postdata .= $i.'='.urlencode($v).'&'; |
|
79 | 79 | } |
80 | 80 | $postdata .= 'cmd=_notify-validate'; |
81 | 81 | $web = parse_url(HelperConfig::$shop['paypal']['url']); |
@@ -87,15 +87,15 @@ discard block |
||
87 | 87 | $web['port'] = 80; |
88 | 88 | $ssl = ''; |
89 | 89 | } |
90 | - $fp = @fsockopen($ssl . $web['host'], $web['port'], $errnum, $errstr, 30); |
|
90 | + $fp = @fsockopen($ssl.$web['host'], $web['port'], $errnum, $errstr, 30); |
|
91 | 91 | |
92 | 92 | if ($fp) { |
93 | - fwrite($fp, 'POST ' . $web['path'] . " HTTP/1.1\r\n"); |
|
94 | - fwrite($fp, 'Host: ' . $web['host'] . "\r\n"); |
|
93 | + fwrite($fp, 'POST '.$web['path']." HTTP/1.1\r\n"); |
|
94 | + fwrite($fp, 'Host: '.$web['host']."\r\n"); |
|
95 | 95 | fwrite($fp, "Content-type: application/x-www-form-urlencoded\r\n"); |
96 | - fwrite($fp, 'Content-length: ' . strlen($postdata) . "\r\n"); |
|
96 | + fwrite($fp, 'Content-length: '.strlen($postdata)."\r\n"); |
|
97 | 97 | fwrite($fp, "Connection: close\r\n\r\n"); |
98 | - fwrite($fp, $postdata . "\r\n\r\n"); |
|
98 | + fwrite($fp, $postdata."\r\n\r\n"); |
|
99 | 99 | |
100 | 100 | $info = []; |
101 | 101 | while (!feof($fp)) { |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | $info = implode(',', $info); |
106 | 106 | if (!(strpos($info, 'VERIFIED') === false)) { |
107 | 107 | |
108 | - $sLogData .= '-- new entry - ' . date(HelperConfig::$core['locale_format_date_time']) . " --\n\n"; |
|
108 | + $sLogData .= '-- new entry - '.date(HelperConfig::$core['locale_format_date_time'])." --\n\n"; |
|
109 | 109 | $sLogData .= "W00T!\n\n"; |
110 | - $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true) . "\n\n"; |
|
110 | + $sLogData .= \HaaseIT\Toolbox\Tools::debug($_REQUEST, '', true, true)."\n\n"; |
|
111 | 111 | |
112 | 112 | // Check if the transaction id has been used before |
113 | 113 | $queryBuilder = $this->dbal->createQueryBuilder(); |
@@ -136,27 +136,27 @@ discard block |
||
136 | 136 | ->setParameter(1, $iId); |
137 | 137 | $queryBuilder->execute(); |
138 | 138 | |
139 | - $sLogData .= '-- Alles ok. Zahlung erfolgreich. TXNID: ' . $_REQUEST['txn_id'] . " --\n\n"; |
|
139 | + $sLogData .= '-- Alles ok. Zahlung erfolgreich. TXNID: '.$_REQUEST['txn_id']." --\n\n"; |
|
140 | 140 | } else { |
141 | 141 | $sLogData .= "-- In my country we have problem; Problem is evaluation. Throw the data down the log!\n"; |
142 | - $sLogData .= 'mc_gross: ' . $_REQUEST['mc_gross'] . ' - number_format($fGesamtbrutto, 2, \'.\', \'\'): ' . number_format($fGesamtbrutto, |
|
143 | - 2, '.', '') . "\n"; |
|
144 | - $sLogData .= 'custom: ' . $_REQUEST['custom'] . ' - $aOrder[\'o_id\']: ' . $aOrder['o_id'] . "\n"; |
|
145 | - $sLogData .= 'payment_status: ' . $_REQUEST['payment_status'] . "\n"; |
|
146 | - $sLogData .= 'mc_currency: ' . $_REQUEST['mc_currency'] . ' - HelperConfig::$shop["paypal"]["currency_id"]: ' . HelperConfig::$shop['paypal']['currency_id'] . "\n"; |
|
147 | - $sLogData .= 'business: ' . $_REQUEST['receiver_email'] . ' - HelperConfig::$shop["paypal"]["business"]: ' . HelperConfig::$shop['paypal']['business'] . "\n\n"; |
|
142 | + $sLogData .= 'mc_gross: '.$_REQUEST['mc_gross'].' - number_format($fGesamtbrutto, 2, \'.\', \'\'): '.number_format($fGesamtbrutto, |
|
143 | + 2, '.', '')."\n"; |
|
144 | + $sLogData .= 'custom: '.$_REQUEST['custom'].' - $aOrder[\'o_id\']: '.$aOrder['o_id']."\n"; |
|
145 | + $sLogData .= 'payment_status: '.$_REQUEST['payment_status']."\n"; |
|
146 | + $sLogData .= 'mc_currency: '.$_REQUEST['mc_currency'].' - HelperConfig::$shop["paypal"]["currency_id"]: '.HelperConfig::$shop['paypal']['currency_id']."\n"; |
|
147 | + $sLogData .= 'business: '.$_REQUEST['receiver_email'].' - HelperConfig::$shop["paypal"]["business"]: '.HelperConfig::$shop['paypal']['business']."\n\n"; |
|
148 | 148 | } |
149 | 149 | } else { |
150 | 150 | // INVALID LOGGING ERROR |
151 | - $sLogData .= '-- new entry - ' . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL\n\n"; |
|
152 | - $sLogData .= '!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: ' . $_REQUEST['txn_id'] . " !!!\n\n"; |
|
151 | + $sLogData .= '-- new entry - '.date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL\n\n"; |
|
152 | + $sLogData .= '!!! JEMAND HAT EINE ALTE TXN_ID BENUTZT: '.$_REQUEST['txn_id']." !!!\n\n"; |
|
153 | 153 | $sLogData .= "!!! INVALID !!!\n\n"; |
154 | 154 | } |
155 | 155 | } else { |
156 | - $sLogData .= '-- new entry - ' . date(HelperConfig::$core['locale_format_date_time']) . " --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: " . $_REQUEST['txn_id'] . "\n" . $info . "\n\n"; |
|
156 | + $sLogData .= '-- new entry - '.date(HelperConfig::$core['locale_format_date_time'])." --\n\nPHAIL - Transaktion fehlgeschlagen. TXNID: ".$_REQUEST['txn_id']."\n".$info."\n\n"; |
|
157 | 157 | } |
158 | 158 | |
159 | - file_put_contents(PATH_LOGS . FILE_PAYPALLOG, $sLogData, FILE_APPEND); |
|
159 | + file_put_contents(PATH_LOGS.FILE_PAYPALLOG, $sLogData, FILE_APPEND); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | if (filter_input(INPUT_GET, 'id') !== null && filter_input(INPUT_GET, 'action') === 'show') { |
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 |
@@ -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 | } |