@@ -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 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | $html .= implode("\n", |
44 | 44 | array_map( |
45 | 45 | function($i) { |
46 | - return '.phpinfodisplay ' . preg_replace( '/,/', ',.phpinfodisplay ', $i ); |
|
46 | + return '.phpinfodisplay '.preg_replace('/,/', ',.phpinfodisplay ', $i); |
|
47 | 47 | }, |
48 | 48 | preg_split('/\n/', $matches[1]) |
49 | 49 | ) |
@@ -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 | ), |
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | if ($aOrder['iMindergebuehr_id'] > 0) { |
105 | - $aOrder['fVoll'] += HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']]; |
|
106 | - $aOrder['fGesamtnetto'] += HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']]; |
|
105 | + $aOrder['fVoll'] += HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']]; |
|
106 | + $aOrder['fGesamtnetto'] += HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']]; |
|
107 | 107 | $aOrder['fSteuervoll'] = $aOrder['fVoll'] * $iVATfull / 100; |
108 | 108 | $aOrder['fGesamtbrutto'] = $aOrder['fGesamtnetto'] + $aOrder['fSteuervoll'] + $aOrder['fSteuererm']; |
109 | - $aOrder['fMindergebuehr'] = HelperConfig::$shop['reducedorderamountfee' . $aOrder['iMindergebuehr_id']]; |
|
109 | + $aOrder['fMindergebuehr'] = HelperConfig::$shop['reducedorderamountfee'.$aOrder['iMindergebuehr_id']]; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | $aOrder['fVersandkosten'] = 0; |
@@ -423,12 +423,12 @@ discard block |
||
423 | 423 | } |
424 | 424 | // because array_rand will change numerical (string) values to integer, we have to do this awkward dance |
425 | 425 | foreach ($keysAddSuggsTMP as $key => $item) { |
426 | - $keysAddSuggs[] = (string)$item; |
|
426 | + $keysAddSuggs[] = (string) $item; |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | // iterate suggestions and remove those that which will not be kept |
430 | 430 | foreach ($suggestions['additional'] as $addSuggsKey => $addSuggsVal) { |
431 | - if (!in_array((string)$addSuggsKey, $keysAddSuggs, true)) { |
|
431 | + if (!in_array((string) $addSuggsKey, $keysAddSuggs, true)) { |
|
432 | 432 | unset($suggestions['additional'][$addSuggsKey]); |
433 | 433 | } |
434 | 434 | } |
@@ -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')); |
@@ -72,13 +72,13 @@ |
||
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 | 77 | \HaaseIT\HCSF\Helper::redirectToPage($sPURL); |
78 | 78 | } |
79 | 79 | |
80 | - $this->P->oPayload->cl_html = $this->textcats->T('misc_paysofortueberweisung_greeting') . '<br><br>'; |
|
81 | - $this->P->oPayload->cl_html .= '<a href="' . $sPURL . '">' . $this->textcats->T('misc_paysofortueberweisung') . '</a>'; |
|
80 | + $this->P->oPayload->cl_html = $this->textcats->T('misc_paysofortueberweisung_greeting').'<br><br>'; |
|
81 | + $this->P->oPayload->cl_html .= '<a href="'.$sPURL.'">'.$this->textcats->T('misc_paysofortueberweisung').'</a>'; |
|
82 | 82 | } else { |
83 | 83 | $this->P->oPayload->cl_html = $this->textcats->T('misc_paysofortueberweisung_paymentnotavailable'); |
84 | 84 | } |
@@ -69,16 +69,16 @@ |
||
69 | 69 | |
70 | 70 | $sPaypalURL = HelperConfig::$shop['paypal']['url'] |
71 | 71 | .'?cmd=_xclick&rm=2&custom=' |
72 | - .$iId . '&business='.HelperConfig::$shop['paypal']['business']; |
|
73 | - $sPaypalURL .= '¬ify_url=http://' . $_SERVER['SERVER_NAME'] . '/_misc/paypal_notify.html&item_name=' . $this->textcats->T('misc_paypaypal_paypaltitle') . ' ' . $iId; |
|
74 | - $sPaypalURL .= '¤cy_code=' . HelperConfig::$shop['paypal']['currency_id'] |
|
75 | - .'&amount=' . str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', '')); |
|
72 | + .$iId.'&business='.HelperConfig::$shop['paypal']['business']; |
|
73 | + $sPaypalURL .= '¬ify_url=http://'.$_SERVER['SERVER_NAME'].'/_misc/paypal_notify.html&item_name='.$this->textcats->T('misc_paypaypal_paypaltitle').' '.$iId; |
|
74 | + $sPaypalURL .= '¤cy_code='.HelperConfig::$shop['paypal']['currency_id'] |
|
75 | + .'&amount='.str_replace(',', '.', number_format($fGesamtbrutto, 2, '.', '')); |
|
76 | 76 | if (HelperConfig::$shop['interactive_paymentmethods_redirect_immediately']) { |
77 | 77 | \HaaseIT\HCSF\Helper::redirectToPage($sPaypalURL); |
78 | 78 | } |
79 | 79 | |
80 | - $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_greeting') . '<br><br>'; |
|
81 | - $this->P->oPayload->cl_html .= '<a href="' . $sPaypalURL . '">' . $this->textcats->T('misc_paypaypal') . '</a>'; |
|
80 | + $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_greeting').'<br><br>'; |
|
81 | + $this->P->oPayload->cl_html .= '<a href="'.$sPaypalURL.'">'.$this->textcats->T('misc_paypaypal').'</a>'; |
|
82 | 82 | } else { |
83 | 83 | $this->P->oPayload->cl_html = $this->textcats->T('misc_paypaypal_paymentnotavailable'); |
84 | 84 | } |
@@ -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)) |