Merge pull request #179 from franzholz/develop

fix country code error
franzholz · Apr 13, 2023 · 679c6fe · 679c6fe
2 parents 8915009 + 40a30d7
commit 679c6fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -23,7 +23,7 @@
       'php' => '7.4.0-8.1.99',
       'table' => '0.11.0-0.0.0',
       'tsparser' => '0.9.0-0.0.0',
-      'typo3db_legacy' => '1.0.0-1.1.99',
+      'typo3db_legacy' => '1.0.0-1.2.99',
       'typo3' => '10.4.0-11.5.99',
     ],
     'conflicts' => 

diff --git a/template/products_css_variants_de.html b/template/products_css_variants_de.html
@@ -883,7 +883,7 @@ <h3>BASKET_INFO_TEMPLATE</h3>
       <input type="radio" name="recs[delivery][radio1]" ###DELIVERY_RADIO1_1### value="1"> Ja<br>
     </div>
     <div id="field_DELIVERY_FOUNDBY">
-      ###GW1B###<strong>Wie sind Sie auf uns aufmerksam geworden?:</strong>###GW1E###
+      ###GW1B###<strong>Wie sind Sie auf uns aufmerksam geworden?</strong>###GW1E###
       ###DELIVERY_FOUNDBY_SELECTOR###
     </div>
     <div id="field_DELIVERY_FOUNDBY_OTHERS">

diff --git a/view/class.tx_ttproducts_info_view.php b/view/class.tx_ttproducts_info_view.php
@@ -387,8 +387,8 @@ public function getRowMarkerArray (
 			$bReady = false;
 			$whereCountries = $this->getWhereAllowedCountries($basketExtra);
 			$countryCodeArray = [];
-			$countryCodeArray['billing'] = ($this->infoArray['billing']['country_code'] ?: $context->getPropertyFromAspect('frontend.user', 'isLoggedIn') && ($context->getPropertyFromAspect('frontend.user', 'isLoggedIn') && !empty($GLOBALS['TSFE']->fe_user->user['static_info_country']) ? $GLOBALS['TSFE']->fe_user->user['static_info_country'] : false));
-            $countryCodeArray['delivery'] = ($this->infoArray['delivery']['country_code'] ?: ($context->getPropertyFromAspect('frontend.user', 'isLoggedIn') &&  !empty($GLOBALS['TSFE']->fe_user->user['static_info_country']) ? $GLOBALS['TSFE']->fe_user->user['static_info_country'] : false));
+			$countryCodeArray['billing'] = ($this->infoArray['billing']['country_code'] ?? $context->getPropertyFromAspect('frontend.user', 'isLoggedIn') && ($context->getPropertyFromAspect('frontend.user', 'isLoggedIn') && !empty($GLOBALS['TSFE']->fe_user->user['static_info_country']) ? $GLOBALS['TSFE']->fe_user->user['static_info_country'] : false));
+            $countryCodeArray['delivery'] = ($this->infoArray['delivery']['country_code'] ?? ($context->getPropertyFromAspect('frontend.user', 'isLoggedIn') &&  !empty($GLOBALS['TSFE']->fe_user->user['static_info_country']) ? $GLOBALS['TSFE']->fe_user->user['static_info_country'] : false));
 
             $zoneCodeArray = [];
             $zoneCodeArray['billing'] = (