From b72d1489d8263aee3a627b37919295077bce5a55 Mon Sep 17 00:00:00 2001
From: Franz Holzinger <holzinger@ttproducts.de>
Date: Sat, 2 Jul 2016 12:17:58 +0200
Subject: [PATCH] * bugfix: Remove the iban field from TCA. IBAN is only
 supported sice tt_products 2.11.0

---
 Configuration/TCA/sys_products_accounts.php   | 17 +----------------
 Configuration/TCA/tt_products.php             |  5 -----
 Configuration/TCA/tt_products_cat.php         |  1 -
 model/class.tx_ttproducts_language.php        |  2 --
 template/products_css_variants_de.html        |  2 +-
 view/class.tx_ttproducts_relatedlist_view.php |  2 --
 view/class.tx_ttproducts_table_base_view.php  | 10 ----------
 7 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/Configuration/TCA/sys_products_accounts.php b/Configuration/TCA/sys_products_accounts.php
index a1a898f23..ab20fbdc6 100755
--- a/Configuration/TCA/sys_products_accounts.php
+++ b/Configuration/TCA/sys_products_accounts.php
@@ -5,10 +5,6 @@
 
 $accountField = 'ac_number';
 
-if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][TT_PRODUCTS_EXT]['sepa']) {
-	$accountField = 'iban';
-}
-
 // ******************************************************************
 // These are the bank account data used for orders
 // ******************************************************************
@@ -25,16 +21,6 @@
 		'searchFields' => 'owner_name,' . $accountField,
 	),
 	'columns' => array (
-		'iban' => array (
-			'exclude' => 1,
-			'label' => 'LLL:EXT:' . TT_PRODUCTS_EXT . '/locallang_db.xml:sys_products_accounts.iban',
-			'config' => array (
-				'type' => 'input',
-				'size' => '24',
-				'max' => '24',
-				'eval' => 'required,trim',
-			)
-		),
 		'ac_number' => array (
 			'exclude' => 0,
 			'label' => 'LLL:EXT:' . TT_PRODUCTS_EXT . '/locallang_db.xml:sys_products_accounts.ac_number',
@@ -64,7 +50,7 @@
 		),
 	),
 	'types' => array (
-		'1' => array('showitem' => 'hidden;;;;1-1-1, iban, ac_number, owner_name, bic')
+		'1' => array('showitem' => 'hidden;;;;1-1-1, ac_number, owner_name, bic')
 	),
 	'palettes' => array (
 		'1' => array('showitem' => '')
@@ -73,7 +59,6 @@
 
 
 if ($accountField != 'iban') {
-	unset($result['columns']['iban']['config']['eval']);
 	$result['columns'][$accountField]['config']['eval'] = 'required,trim';
 }
 
diff --git a/Configuration/TCA/tt_products.php b/Configuration/TCA/tt_products.php
index 7e5919918..df62706c0 100755
--- a/Configuration/TCA/tt_products.php
+++ b/Configuration/TCA/tt_products.php
@@ -4,7 +4,6 @@
 }
 
 $whereCategory = '';
-$whereTaxCategory = '';
 
 if (
 	isset($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][TT_PRODUCTS_EXT]['where.']) &&
@@ -20,10 +19,6 @@
 }
 
 
-if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded(STATIC_INFO_TABLES_TAXES_EXT)) {
-	$whereTaxCategory = \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('static_tax_categories');
-}
-
 $result = array(
 	'ctrl' => array(
 		'title' =>'LLL:EXT:' . TT_PRODUCTS_EXT . '/locallang_db.xml:tt_products',
diff --git a/Configuration/TCA/tt_products_cat.php b/Configuration/TCA/tt_products_cat.php
index a17437c1d..38456e859 100755
--- a/Configuration/TCA/tt_products_cat.php
+++ b/Configuration/TCA/tt_products_cat.php
@@ -215,6 +215,5 @@
 	}
 }
 
-
 return $result;
 
diff --git a/model/class.tx_ttproducts_language.php b/model/class.tx_ttproducts_language.php
index 88b9cfc95..a4d7b0b7a 100755
--- a/model/class.tx_ttproducts_language.php
+++ b/model/class.tx_ttproducts_language.php
@@ -38,8 +38,6 @@
  */
 
 
-// require_once(PATH_BE_div2007.'class.tx_div2007_alpha_language_base.php');
-
 
 class tx_ttproducts_language extends tx_div2007_alpha_language_base {
 	public function init1 ($pObj, $cObj, &$conf, $scriptRelPath) {
diff --git a/template/products_css_variants_de.html b/template/products_css_variants_de.html
index 0377303d7..af92b7562 100644
--- a/template/products_css_variants_de.html
+++ b/template/products_css_variants_de.html
@@ -1443,7 +1443,7 @@ <h3>BASKET_REQUIRED_INFO_MISSING</h3>
 
 <div class="BASKET_REQUIRED_INFO_MISSING">
   Fehler bei der Eingabe<br />
-  <b>Sie haben nicht alle erforderlichen Felder mit Ihren Adressinformationen ausgefï¿œllt. Bitte gehen Sie zurï¿œck und aktualisieren Ihre Eingaben.</b>
+  <b>Sie haben nicht alle erforderlichen Felder mit Ihren Adressinformationen ausgefüllt. Bitte gehen Sie zurück und aktualisieren Ihre Eingaben.</b>
   <form method="post" action="###FORM_URL###">
   <input type="submit" id="button2" name="products_info" value="Adressdaten eingeben" onclick="document.forms[0].action='###FORM_URL_INFO###';">
   </form>
diff --git a/view/class.tx_ttproducts_relatedlist_view.php b/view/class.tx_ttproducts_relatedlist_view.php
index cf3a2b134..7ede6a592 100755
--- a/view/class.tx_ttproducts_relatedlist_view.php
+++ b/view/class.tx_ttproducts_relatedlist_view.php
@@ -37,8 +37,6 @@
  *
  */
 
-// require_once (PATH_BE_ttproducts.'model/class.tx_ttproducts_pid_list.php');
-
 
 class tx_ttproducts_relatedlist_view {
 	public $conf;
diff --git a/view/class.tx_ttproducts_table_base_view.php b/view/class.tx_ttproducts_table_base_view.php
index d4ba20b0d..86b6db118 100755
--- a/view/class.tx_ttproducts_table_base_view.php
+++ b/view/class.tx_ttproducts_table_base_view.php
@@ -36,8 +36,6 @@
  *
  */
 
-// require_once (PATH_BE_ttproducts.'view/field/class.tx_ttproducts_field_base_view.php');
-
 
 abstract class tx_ttproducts_table_base_view	{
 	private $bHasBeenInitialised = FALSE;
@@ -215,11 +213,6 @@ public function getItemSubpartArrays (
 										continue;
 									}
 								}
-/*								foreach ($row as $field => $v1)	{
-									if (strtoupper($field) == $tagPartArray[1])	{
-										break;
-									}
-								}*/
 								$fieldArray = array($fieldname => array($comparator, intval($comparand)));
 								$bCondition = FALSE;
 
@@ -466,9 +459,6 @@ public function getRowMarkerArray (
 							$rowMarkerArray['###' . $theTag . '###'] = '';
 						}
 					}
-					if (!isset($rowMarkerArray['###' . $theTag . '###']) && strpos($theTag,$markerKey) === 0)	{
-// Todo
-					}
 				}
 			}
 		}