/**
 * @author:		office@consultsoft.net
 * @copyright: 	2010
 */

//////////////////////////////////
//	Econt Shipping Module	//
//////////////////////////////////

!!!!Модула работи със Encoding UTF-8!!!!

1. Files:
(Paths and names to all new files and modified existing files)
	1.1. New Files:
	
		/** ADMIN SIDE BOF **/
		- catalog/admin/languages/bulgarian/modules/shipping/econt.php
		- catalog/admin/languages/english/modules/shipping/econt.php
		
		- catalog/admin/includes/modules/shipping/econt/functions.php
		
		- catalog/admin/econt_callback.php
		/** ADMIN SIDE EOF **/
	
		/** FRONT-END SIDE BOF **/
		- catalog/images/icons/logo_and_sign_ee_bg.jpg
		
		- catalog/images/infobox/button_ok.png
		- catalog/images/infobox/econt_button_search.png
		- catalog/images/infobox/forward.png
		- catalog/images/infobox/nearest_office_active.png
		- catalog/images/infobox/nearest_office_inactive.png
		- catalog/images/infobox/next.png
		- catalog/images/infobox/pbar-ani.gif
		- catalog/images/infobox/shop_configuration.png
		- catalog/images/infobox/shop_orders.png
		- catalog/images/infobox/shop_users.png
		- catalog/images/infobox/shop_vendors.png
		
		- catalog/includes/languages/bulgarian/modules/shipping/econt.php
		- catalog/includes/languages/english/modules/shipping/econt.php
		
		- catalog/includes/modules/shipping/econt/admin/modules_econt_apps_top.php
		- catalog/includes/modules/shipping/econt/admin/modules_popup_shop_config.php
		- catalog/includes/modules/shipping/econt/admin/orders_econt_apps_top.php
		- catalog/includes/modules/shipping/econt/admin/orders_popup_shop_config.php
		
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_glass_65_ffffff_1x400.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_glass_75_dadada_1x400.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_glass_75_ffffff_1x400.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-bg_inset-soft_95_fef1ec_1x100.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-icons_2e83ff_256x240.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-icons_222222_256x240.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-icons_454545_256x240.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-icons_888888_256x240.png
		- catalog/includes/modules/shipping/econt/javascript/jquery/images/ui-icons_cd0a0a_256x240.png
		
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.effects.core.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.button.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.core.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.dialog.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.draggable.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.mouse.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.position.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.resizable.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/ui/jquery.ui.widget.js
		
		- catalog/includes/modules/shipping/econt/javascript/jquery/demos.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.autocomplete-style.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.accordion.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.all.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.autocomplete.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.base.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.button.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.core.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.datepicker.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.dialog.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.progressbar.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.resizable.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.selectable.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.slider.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.tabs.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery.ui.theme.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery-1.4.3.js
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery-ui-1.8.6.custom.css
		- catalog/includes/modules/shipping/econt/javascript/jquery/jquery-ui-1.8.6.custom.min.js
		
		- catalog/includes/modules/shipping/econt/addressbookprocess_econt_apps_top.php
		- catalog/includes/modules/shipping/econt/checkoutshipping_notice.php
		- catalog/includes/modules/shipping/econt/checkoutshippingaddress_econt_apps_top.php
		- catalog/includes/modules/shipping/econt/createaccount_econt_apps_top.php
		- catalog/includes/modules/shipping/econt/functions.php
		
		- catalog/includes/modules/shipping/econt.php
		
		- catalog/econt_callback.php
		- catalog/econt_search_popup.php
		
		/** FRONT-END SIDE EOF **/

		
	1.2. Existing (Modified) Files:
		/** ADMIN SIDE BOF **/
		
		- catalog/admin/includes/functions/database.php
		
		- catalog/admin/modules.php
		- catalog/admin/orders.php
		
		/** ADMIN SIDE EOF **/
		
		
		/** FRONT-END SIDE BOF **/
		
		- catalog/includes/functions/database.php
		
		- catalog/includes/languages/bulgarian.php
		- catalog/includes/languages/english.php
		
		- catalog/includes/application_top.php
		
		- catalog/address_book_process.php
		- catalog/checkout_process.php
		- catalog/checkout_shipping.php
		- catalog/checkout_shipping_address.php
		- catalog/create_account.php

		- catalog/includes/modules/address_book_details.php
		- catalog/includes/modules/checkout_new_address.php
		
		/** FRONT-END SIDE EOF **/
	

2. Instalation:
	2.1. Upload all New Files from 1.1. to your store catalog location.
	
	2.2. Modifying existend files:
		
		
		############# ADMIN SIDE BOF ################
		
		2.2.1 - catalog/admin/includes/functions/database.php
		
===================
			2.2.1.1
			Tursi:
    if (defined('STORE_DB_TRANSACTIONS') && (STORE_DB_TRANSACTIONS == 'true')) {
      if (!is_object($logger)) $logger = new logger;
      $logger->write($query, 'QUERY');
    }
		    
			Dobavi sled:
	/** Econt Shipping Module BOF **/
	mysql_query("SET NAMES 'utf8'", $$link) or tep_db_error($query, mysql_errno(), mysql_error());
	/** Econt Shipping Module EOF **/
===================
		
		2.2.2 - catalog/admin/modules.php
		
===================
			2.2.2.1
			Tursi:
<title><?php echo TITLE; ?></title>
			
			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	include(DIR_WS_LANGUAGES . $language . '/modules/shipping/econt.php'); 
	include_once('../includes/modules/shipping/econt/admin/modules_econt_apps_top.php');
} 
?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.2.2
			Sled taga <body>:
			
			Dobavi:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<?php include_once('../includes/modules/shipping/econt/admin/modules_popup_shop_config.php'); ?>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================
		
		2.2.3 - catalog/admin/orders.php

===================
			2.2.3.1
			Tursi:
<title><?php echo TITLE; ?></title>
			
			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	include(DIR_WS_LANGUAGES . $language . '/modules/shipping/econt.php'); 
	include_once('../includes/modules/shipping/econt/admin/orders_econt_apps_top.php');
} 
?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.3.2
			Sled taga <body>:
			
			Dobavi:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<?php include_once('../includes/modules/shipping/econt/admin/orders_popup_shop_config.php'); ?>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.3.3
			Tursi:
        <td colspan="2" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS_INVOICE, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_invoice.gif', IMAGE_ORDERS_INVOICE) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS_PACKINGSLIP, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_packingslip.gif', IMAGE_ORDERS_PACKINGSLIP) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('action'))) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; ?></td>
			
			Zamesti sus:
		<!-- Econt Shipping Module BOF //-->
		<?php 
		if(MODULE_SHIPPING_ECONT_STATUS == 'True') {				
			$statuscheck_query = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_LOADINGS." WHERE order_id = ".(int)$_GET['oID']."");
			if(tep_db_num_rows($statuscheck_query)) {
				$statuscheck = tep_db_fetch_array($statuscheck_query);
				if(($statuscheck['is_imported'] == '1') && ($statuscheck['receiver_time'] == "0000-00-00 00:00:00")) {
					$statuscheck_icon = 'forward.png';
				} else if(($statuscheck['is_imported'] == '1') && ($statuscheck['receiver_time'] != "0000-00-00 00:00:00")) {
					$statuscheck_icon = 'button_ok.png';
				} else {
					$statuscheck_icon = 'next.png';
				}
				$econt_button = '<div id="loadingurl-form">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/'.$icon_next, MODULE_SHIPPING_ECONT_ICON_REQUEST_COURIER_TEXT).'</div>&nbsp;';
			} else {
				$econt_button = '<div id="requestcourier-form">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/shop_users.png', MODULE_SHIPPING_ECONT_ICON_REQUEST_COURIER_TEXT).'</div>&nbsp;'.tep_draw_hidden_field('econtorderid', $_GET['oID'], 'id="econtorderid"');
			}
			?>
			<tr>
				<td colspan="2" align="right"><?php echo $econt_button; ?><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS_INVOICE, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_invoice.gif', IMAGE_ORDERS_INVOICE) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS_PACKINGSLIP, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_packingslip.gif', IMAGE_ORDERS_PACKINGSLIP) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('action'))) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; ?></td>
			</tr>
			<?php
		} else {
			?>
			<tr>
				<td colspan="2" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS_INVOICE, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_invoice.gif', IMAGE_ORDERS_INVOICE) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS_PACKINGSLIP, 'oID=' . $HTTP_GET_VARS['oID']) . '" TARGET="_blank">' . tep_image_button('button_packingslip.gif', IMAGE_ORDERS_PACKINGSLIP) . '</a> <a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('action'))) . '">' . tep_image_button('button_back.gif', IMAGE_BACK) . '</a>'; ?></td>
			</tr>
			<?php
		}
		?>
		<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.3.4
			Tursi:
                <td class="dataTableContent"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $orders['orders_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'preview.gif', ICON_PREVIEW) . '</a>&nbsp;' . $orders['customers_name']; ?></td>
			
			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<?php
	$statuscheck_query = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_LOADINGS." WHERE order_id = ".(int)$orders['orders_id']."");
	if(!tep_db_num_rows($statuscheck_query)) {
		$statuscheck_icon = 'shop_users.png';
	} else {
		$statuscheck = tep_db_fetch_array($statuscheck_query);
		if(($statuscheck['is_imported'] == '1') && ($statuscheck['receiver_time'] == "0000-00-00 00:00:00")) {
			$statuscheck_icon = 'forward.png';
		} else if(($statuscheck['is_imported'] == '1') && ($statuscheck['receiver_time'] != "0000-00-00 00:00:00")) {
			$statuscheck_icon = 'button_ok.png';
		} else {
			$statuscheck_icon = 'next.png';
		}
	}
	$econt_courier_button = '<div id="requestcourier-form-non">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/'.$statuscheck_icon, MODULE_SHIPPING_ECONT_ICON_REQUEST_COURIER_TEXT).'</div>';
	?>
	<td class="dataTableContent"><?php echo $econt_courier_button; ?><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $orders['orders_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'preview.gif', ICON_PREVIEW) . '</a>&nbsp;' . $orders['customers_name']; ?></td>
<?php } else { ?>
	<td class="dataTableContent"><?php echo '<a href="' . tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $orders['orders_id'] . '&action=edit') . '">' . tep_image(DIR_WS_ICONS . 'preview.gif', ICON_PREVIEW) . '</a>&nbsp;' . $orders['customers_name']; ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================
		
===================
			2.2.3.5
			Tursi:
        $contents[] = array('text' => '<br>' . TEXT_INFO_PAYMENT_METHOD . ' '  . $oInfo->payment_method);
			
			Dobavi sled:
		/** Econt Shipping Module BOF **/
		if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
			$statuscheck_query = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_LOADINGS." WHERE order_id = ".(int)$oInfo->orders_id."");
			if(tep_db_num_rows($statuscheck_query)) {
				$statuscheck = tep_db_fetch_array($statuscheck_query);
				if(($statuscheck['is_imported'] == '1') && ($statuscheck['receiver_time'] == "0000-00-00 00:00:00")) {
					$statuscheck_icon = 'forward.png';
				} else if(($statuscheck['is_imported'] == '1') && ($statuscheck['receiver_time'] != "0000-00-00 00:00:00")) {
					$statuscheck_icon = 'button_ok.png';
				} else {
					$statuscheck_icon = 'next.png';
				}
				$contents[] = array('text' => '<br /><b>' . MODULE_SHIPPING_ECONT_ICON_LOADING_INFO_TEXT . '</b><br/>' .'<div id="loadingurl-form">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/'.$statuscheck_icon, MODULE_SHIPPING_ECONT_ICON_LOADING_INFO_TEXT).'</div><br/><b>' . MODULE_SHIPPING_ECONT_ICON_LOADING_UPDATE_TEXT . '</b><br/>' .'<div class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" role="button"><span class="ui-button-text">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/shop_orders.png', MODULE_SHIPPING_ECONT_ICON_LOADING_UPDATE_TEXT, "", "", 'onclick="location.href=\''.tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=update_loadings').'\'"').'</span></div>');
			} else {
				$contents[] = array('text' => '<br /><b>' . MODULE_SHIPPING_ECONT_ICON_REQUEST_COURIER_TEXT . '</b><br/>' .'<div id="requestcourier-form">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/shop_users.png', MODULE_SHIPPING_ECONT_ICON_REQUEST_COURIER_TEXT).'</div>'.tep_draw_hidden_field('econtorderid', $oInfo->orders_id, 'id="econtorderid"').'<br/><b>' . MODULE_SHIPPING_ECONT_ICON_LOADING_UPDATE_TEXT . '</b><br/><div class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" role="button"><span class="ui-button-text">'. tep_image(DIR_WS_CATALOG_IMAGES . 'infobox/shop_orders.png', MODULE_SHIPPING_ECONT_ICON_LOADING_UPDATE_TEXT, "", "", 'onclick="location.href=\''.tep_href_link(FILENAME_ORDERS, tep_get_all_get_params(array('oID', 'action')) . 'oID=' . $oInfo->orders_id . '&action=update_loadings').'\'"').'</span></div>');
			}
		}
		/** Econt Shipping Module EOF **/
===================

		############# ADMIN SIDE EOF ################
		
		
		############# FRONT-END SIDE BOF ################
		
		2.2.4 - catalog/includes/functions/database.php
		
===================
			2.2.4.1
			Tursi:
    if (defined('STORE_DB_TRANSACTIONS') && (STORE_DB_TRANSACTIONS == 'true')) {
      error_log('QUERY ' . $query . "\n", 3, STORE_PAGE_PARSE_TIME_LOG);
    }
		    
			Dobavi sled:
	/** Econt Shipping Module BOF **/
	mysql_query("SET NAMES 'utf8'", $$link) or tep_db_error($query, mysql_errno(), mysql_error());
	/** Econt Shipping Module EOF **/
===================
		
		2.2.5 - catalog/includes/languages/bulgarian.php
		
===================
			2.2.5.1
			Dobavi predi poslednia "?>":
/** Econt Shipping Module BOF **/
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR', 'Липсва номер на улица!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_MISSING_STREET_SUBURB_ERROR', 'Посочете улица или район!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR', 'Липсва допълнителна информация за район!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NOT_VALID_ERROR', 'Невалидна улица!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NOT_VALID_ERROR', 'Невалиден район/квартал!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR', 'Невалиден Град/Пощенски Код!');
/** Econt Shipping Module EOF **/
===================

		2.2.6 - catalog/includes/languages/english.php
		
===================
			2.2.6.1
			Dobavi predi poslednia "?>":
/** Econt Shipping Module BOF **/
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR', 'Street number is required!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_MISSING_STREET_SUBURB_ERROR', 'Street OR Suburb is required!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR', 'Suburb additional info is required!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NOT_VALID_ERROR', 'Invalid street!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NOT_VALID_ERROR', 'Invalid suburb!');
define('MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR', 'Invalid Post Code/City!');
/** Econt Shipping Module EOF **/
===================

		2.2.7 - catalog/includes/application_top.php
		
===================
			2.2.7.1
			Tursi:
        $broken_navigation = $navigation;
        $navigation = new navigationHistory;
        $navigation->unserialize($broken_navigation);

			Zamesti sus:
    /** Econt Shipping Module BOF **/
    if (PHP_VERSION < 4) {
        $broken_navigation = $navigation;
        $navigation = new navigationHistory;
        $navigation->unserialize($broken_navigation);
    } else {
        $navigation = new navigationHistory;
    }
    /** Econt Shipping Module EOF **/
===================

		2.2.8 - catalog/address_book_process.php
		
===================
			2.2.8.1
			Tursi:
    if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
      $error = true;

      $messageStack->add('addressbook', ENTRY_LAST_NAME_ERROR);
    }
			
			Dobavi sled:
/** Econt Shipping Module BOF **/
	if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
		$suburb_else = tep_db_prepare_input($HTTP_POST_VARS['suburb_else']);
		$street_number = tep_db_prepare_input($HTTP_POST_VARS['street_number']);
		
		if(($street_address == "") && ($suburb == "")) {
			$error = true;
			$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_MISSING_STREET_SUBURB_ERROR);
		} else {
			$validate_full_client_address = tep_db_fetch_array(tep_db_query("SELECT param_value FROM ".MODULE_SHIPPING_ECONT_DB_SHOP_INFO." WHERE param_name = 'validate_full_client_address'"));
			$valid_address = $validate_full_client_address['param_value'];
			if($valid_address == 'yes') {
				$streetid = tep_db_prepare_input($HTTP_POST_VARS['streetid']);
				$suburbid = tep_db_prepare_input($HTTP_POST_VARS['suburbid']);
				if((isset($streetid)) && ($streetid != "")) {
					
					$checkpoint_street = tep_db_fetch_array(tep_db_query("SELECT street_name FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_STREETS_TABLE." WHERE id = '".$streetid."'"));
					if(trim($street_address) != trim($checkpoint_street["street_name"])) {
						$error = true;
						$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NOT_VALID_ERROR);
					}
				}
				
				if(($street_address != "") && ($street_number == "")) {
					$error = true;
					$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR);
				} else if (($suburb != "") && ($suburb_else == "")) {
					$error = true;
					$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR);
				}
				
				if((isset($suburb)) && ($suburb != "")) {
					$checkpoint_suburb = tep_db_query("SELECT quarter_name FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_QUARTERS_TABLE." WHERE quarter_name = '".$suburb."'");
					if(!tep_db_num_rows($checkpoint_suburb)) {
						$error = true;
						$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NOT_VALID_ERROR);
					}
				}
				
				if($city && $postcode) {
					$check_city_zip = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$city."' AND post_code = '".$postcode."'");
					if(!tep_db_num_rows($check_city_zip)) {
						$error = true;
						$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR);
					}
				}
			} else if($valid_address == 'cityzip') {
				
				if($city && $postcode) {
					$check_city_zip = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$city."' AND post_code = '".$postcode."'");
					if(!tep_db_num_rows($check_city_zip)) {
						$error = true;
						$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR);
					}
				}
				
			} else {
				if(($street_address != "") && ($street_number == "")) {
					$error = true;
					$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR);
				} else if (($suburb != "") && ($suburb_else == "")) {
					$error = true;
					$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR);
				}
			}
			$street_address = $street_address ? $street_address . "|" . $street_number : '';
			$suburb = $suburb ? $suburb . "|" . $suburb_else : '';
		}

	}
/** Econt Shipping Module EOF **/
===================
		
===================
			2.2.8.2
			Tursi:
    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
      $error = true;

      $messageStack->add('addressbook', ENTRY_STREET_ADDRESS_ERROR);
    }

			Zamesti sus:
/** Econt Shipping Module BOF **/
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	
} else {
    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
        $error = true;

        $messageStack->add('addressbook', ENTRY_STREET_ADDRESS_ERROR);
    }
}
/** Econt Shipping Module EOF **/
===================

===================
			2.2.8.3
			Tursi:
<title><?php echo TITLE; ?></title>

			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	include(DIR_WS_LANGUAGES . $language . '/modules/shipping/econt.php'); 
	include_once('includes/modules/shipping/econt/addressbookprocess_econt_apps_top.php');
} 
?>
<!-- Econt Shipping Module EOF //-->
===================

		2.2.9 - catalog/checkout_process.php
		
===================
			2.2.9.1
			Tursi:
  for ($i=0, $n=sizeof($order_totals); $i<$n; $i++) {
    $sql_data_array = array('orders_id' => $insert_id,
                            'title' => $order_totals[$i]['title'],
                            'text' => $order_totals[$i]['text'],
                            'value' => $order_totals[$i]['value'], 
                            'class' => $order_totals[$i]['code'], 
                            'sort_order' => $order_totals[$i]['sort_order']);
    tep_db_perform(TABLE_ORDERS_TOTAL, $sql_data_array);
  }

			Dobavi sled:
/** Econt Shipping Module BOF **/
	if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
		
		$check_order = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_ORDERS_INFO." WHERE order_id = ".(int)$insert_id."");
		if(!tep_db_num_rows($check_order)) {
			tep_db_query("INSERT INTO ".MODULE_SHIPPING_ECONT_DB_ORDERS_INFO." (order_id) VALUES(".(int)$insert_id.")");
			
			if((isset($_SESSION['econtofficecode'])) && ($_SESSION['econtofficecode'] != '')) {
				tep_db_query("UPDATE ".MODULE_SHIPPING_ECONT_DB_ORDERS_INFO." SET office = ".(int)$_SESSION['econtofficecode']." WHERE order_id = ".(int)$insert_id."");
			}
			
			if((isset($_SESSION['vendor_enable_oc'])) && ($_SESSION['vendor_enable_oc'] == 'on')) {
				tep_db_query("UPDATE ".MODULE_SHIPPING_ECONT_DB_ORDERS_INFO." SET oc = 1 WHERE order_id = ".(int)$insert_id."");
			}
			
			if((isset($_SESSION['vendor_priority_hour'])) && ($_SESSION['vendor_priority_hour'] == 'on')) {
				tep_db_query("UPDATE ".MODULE_SHIPPING_ECONT_DB_ORDERS_INFO." SET p_type = '".$_SESSION['econt_priority_type']."', p_hour = '".$_SESSION['econt_priority_text']."' WHERE order_id = ".(int)$insert_id."");
			}
			
			if((isset($order->info['econt_cd_checked'])) && ($order->info['econt_cd_checked'] == '1')) {
				tep_db_query("UPDATE ".MODULE_SHIPPING_ECONT_DB_ORDERS_INFO." SET econt_cd = '1' WHERE order_id = ".(int)$insert_id."");
			}
		}
	}
/** Econt Shipping Module EOF **/
===================

		2.2.10 - catalog/checkout_shipping.php
		
===================
			2.2.10.1
			Tursi:
                if (isset($quote['error'])) {
                    tep_session_unregister('shipping');
                } else {

			Dobavi sled:
                	/** Econt Shipping Module BOF **/
                	if((MODULE_SHIPPING_ECONT_STATUS == 'True') && (preg_match('/econt/', $quote[0]['id']))) {
                		$_SESSION['econtofficecode'] = '';
                		$vendor_enable_oc = $_POST['vendor_enable_oc'];
						if($vendor_enable_oc == 'on') $_SESSION['vendor_enable_oc'] = 'on';
						else unset($_SESSION['vendor_enable_oc']);
						
						if($_POST['vendor_priority_hour'] == 'on') {
							$vendor_priority_hour = 'on';
							$econtloadingp = $_SESSION['econtloadingp'];
							$_SESSION['vendor_priority_hour'] = 'on';
							$_SESSION['econt_priority_type'] = $_POST['econt_priority_type'];
							$_SESSION['econt_priority_text'] = $_POST['econt_priority_text'];
						} else {
							$econtloadingp = 0;
							unset($_SESSION['econtloadingp']);
							unset($_SESSION['vendor_priority_hour']);
							unset($_SESSION['econt_priority_type']);
							unset($_SESSION['econt_priority_text']);
						}

                		foreach($quote[0]['methods'] as $emethod) {
							if($vendor_enable_oc == 'on') $emethod['cost'] = (float)$emethod['cost'] + (float)$_SESSION['econtloadingoc'];
							if($vendor_priority_hour == 'on') $emethod['cost'] = (float)$emethod['cost'] + (float)$econtloadingp;
							
                			switch($_POST['shipping']) {
                				case 'econt_OFFICE_DOOR':
                					$emethod_title_array = explode('<', $emethod['title']);
               						$emethod['title'] = trim(substr($emethod_title_array[0], 0, -1));
               						
                					if('econt_'.$emethod['id'] == 'econt_OFFICE_DOOR') {
                						$shipping = array('id' => $shipping, 'title' => (($free_shipping == true) ? $emethod['title'] : $quote[0]['module'] . ' (' . $emethod['title'] . ')'), 'cost' => $emethod['cost']);
                					}
                					break;
               					case 'econt_OFFICE_OFFICE':
               						$emethod_title_array = explode('<', $emethod['title']);
               						$emethod['title'] = trim(substr($emethod_title_array[0], 0, -1));
               						
               						$office_query = tep_db_fetch_array(tep_db_query("SELECT name, code FROM ".MODULE_SHIPPING_ECONT_DB_OFFICES_TABLE." WHERE code = ".(int)$_POST['office_select'].";"));
               						$office_name_code = $office_query['name'].'|'.$office_query['code'];
               						
               						if('econt_'.$emethod['id'] == 'econt_OFFICE_OFFICE') {
                						$shipping = array('id' => $shipping, 'title' => (($free_shipping == true) ? $emethod['title'] : $quote[0]['module'] . ' (' . $emethod['title'] . ' - '.$office_name_code.')'), 'cost' => $emethod['cost']);
                					}
                					break;
               					case 'econt_DOOR_OFFICE':
               					
               						$emethod_title_array = explode('<', $emethod['title']);
               						$emethod['title'] = trim(substr($emethod_title_array[0], 0, -1));
               						
               						$office_query = tep_db_fetch_array(tep_db_query("SELECT name, code FROM ".MODULE_SHIPPING_ECONT_DB_OFFICES_TABLE." WHERE code = ".(int)$_POST['office_select'].";"));
               						$office_name_code = $office_query['name'].'|'.$office_query['code'];
               						
               						if('econt_'.$emethod['id'] == 'econt_DOOR_OFFICE') {
                						$shipping = array('id' => $shipping, 'title' => (($free_shipping == true) ? $emethod['title'] : $quote[0]['module'] . ' (' . $emethod['title'] . ' - '.$office_name_code.')'), 'cost' => $emethod['cost']);
                					}
                					break;
               					case 'econt_DOOR_DOOR':
               						$emethod_title_array = explode('<', $emethod['title']);
               						$emethod['title'] = trim(substr($emethod_title_array[0], 0, -1));
               					
               						if('econt_'.$emethod['id'] == 'econt_DOOR_DOOR') {
                						$shipping = array('id' => $shipping, 'title' => (($free_shipping == true) ? $emethod['title'] : $quote[0]['module'] . ' (' . $emethod['title'] . ')'), 'cost' => $emethod['cost']);
                					}
                					break;
                			}
                		}
                		if((isset($office_query['code'])) && ($office_query['code'] != "")) {
                			$_SESSION['econtofficecode'] = $office_query['code'];
                		}
                		tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
                		
               		} else {
               			if ((isset($quote[0]['methods'][0]['title'])) && (isset($quote[0]['methods'][0]['cost']))) {
	                        $shipping = array('id' => $shipping, 'title' => (($free_shipping == true) ? $quote[0]['methods'][0]['title'] :
	                            $quote[0]['module'] . ' (' . $quote[0]['methods'][0]['title'] . ')'), 'cost' =>
	                            $quote[0]['methods'][0]['cost']);
	
	                        tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
	                    }
               		}
                	/** Econt Shipping Module EOF **/
===================

===================
			2.2.10.2
			Tursi:
<?php
if (tep_count_shipping_modules() > 0) {
?>

			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<?php include_once('includes/modules/shipping/econt/checkoutshipping_notice.php'); ?>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.10.3
			Tursi:
<title><?php echo TITLE; ?></title>

			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<script type="text/javascript">
	function popupWindow(url) {
		window.open(url,'popupWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=920,height=560,screenX=150,screenY=150,top=10,left=10')
	}
	</script>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================


		2.2.11 - catalog/checkout_shipping_address.php
		
===================
			2.2.11.1
			Tursi:
      if (strlen($lastname) < ENTRY_LAST_NAME_MIN_LENGTH) {
        $error = true;

        $messageStack->add('checkout_address', ENTRY_LAST_NAME_ERROR);
      }

			Dobavi sled:
/** Econt Shipping Module BOF **/
	if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
		$suburb_else = tep_db_prepare_input($HTTP_POST_VARS['suburb_else']);
		$street_number = tep_db_prepare_input($HTTP_POST_VARS['street_number']);
		
		if(($street_address == "") && ($suburb == "")) {
			$error = true;
			$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_MISSING_STREET_SUBURB_ERROR);
		} else {
			$validate_full_client_address = tep_db_fetch_array(tep_db_query("SELECT param_value FROM ".MODULE_SHIPPING_ECONT_DB_SHOP_INFO." WHERE param_name = 'validate_full_client_address'"));
			$valid_address = $validate_full_client_address['param_value'];
			if($valid_address == 'yes') {
				$streetid = tep_db_prepare_input($HTTP_POST_VARS['streetid']);
				$suburbid = tep_db_prepare_input($HTTP_POST_VARS['suburbid']);
				
				if((isset($streetid)) && ($streetid != "")) {
					
					$checkpoint_street = tep_db_fetch_array(tep_db_query("SELECT street_name FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_STREETS_TABLE." WHERE id = '".$streetid."'"));
					if(trim($street_address) != trim($checkpoint_street["street_name"])) {
						$error = true;
						$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NOT_VALID_ERROR);
					}
				}
				
				if(($street_address != "") && ($street_number == "")) {
					$error = true;
					$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR);
				} else if (($suburb != "") && ($suburb_else == "")) {
					$error = true;
					$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR);
				}
				
				if((isset($suburb)) && ($suburb != "")) {
					$checkpoint_suburb = tep_db_query("SELECT quarter_name FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_QUARTERS_TABLE." WHERE quarter_name = '".$suburb."'");
					if(!tep_db_num_rows($checkpoint_suburb)) {
						$error = true;
						$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NOT_VALID_ERROR);
					}
				}
				
				if($city && $postcode) {
					$check_city_zip = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$city."' AND post_code = '".$postcode."'");
					if(!tep_db_num_rows($check_city_zip)) {
						$error = true;
						$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR);
					}
				}
			} else if($valid_address == 'cityzip') {
				
				if($city && $postcode) {
					$check_city_zip = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$city."' AND post_code = '".$postcode."'");
					if(!tep_db_num_rows($check_city_zip)) {
						$error = true;
						$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR);
					}
				}
				
			} else {
				if(($street_address != "") && ($street_number == "")) {
					$error = true;
					$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR);
				} else if (($suburb != "") && ($suburb_else == "")) {
					$error = true;
					$messageStack->add('checkout_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR);
				}
			}
			$street_address = $street_address ? $street_address . "|" . $street_number : '';
			$suburb = $suburb ? $suburb . "|" . $suburb_else : '';
		}

	}
/** Econt Shipping Module EOF **/
===================

===================
			2.2.11.2
			Tursi:
      if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
        $error = true;

        $messageStack->add('checkout_address', ENTRY_STREET_ADDRESS_ERROR);
      }

			Zamesti sus:
/** Econt Shipping Module BOF **/
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	
} else {
    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
        $error = true;

        $messageStack->add('checkout_address', ENTRY_STREET_ADDRESS_ERROR);
      }
}
/** Econt Shipping Module EOF **/
===================

===================
			2.2.11.3
			Tursi:
<title><?php echo TITLE; ?></title>

			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	include(DIR_WS_LANGUAGES . $language . '/modules/shipping/econt.php'); 
	include_once('includes/modules/shipping/econt/checkoutshippingaddress_econt_apps_top.php');
} 
?>
<!-- Econt Shipping Module EOF //-->
===================

		2.2.12 - catalog/create_account.php
		
===================
			2.2.12.1
			Tursi:
        $check_email_query = tep_db_query("select count(*) as total from " .
            TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) .
            "'");
        $check_email = tep_db_fetch_array($check_email_query);
        if ($check_email['total'] > 0) {
            $error = true;

            $messageStack->add('create_account', ENTRY_EMAIL_ADDRESS_ERROR_EXISTS);
        }
    }

			Dobavi sled:
/** Econt Shipping Module BOF **/
	if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
		$suburb_else = tep_db_prepare_input($HTTP_POST_VARS['suburb_else']);
		$street_number = tep_db_prepare_input($HTTP_POST_VARS['street_number']);
		
		if(($street_address == "") && ($suburb == "")) {
			$error = true;
			$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_MISSING_STREET_SUBURB_ERROR);
		} else {
			$validate_full_client_address = tep_db_fetch_array(tep_db_query("SELECT param_value FROM ".MODULE_SHIPPING_ECONT_DB_SHOP_INFO." WHERE param_name = 'validate_full_client_address'"));
			$valid_address = $validate_full_client_address['param_value'];
			if($valid_address == 'yes') {
				$streetid = tep_db_prepare_input($HTTP_POST_VARS['streetid']);
				
				if((isset($streetid)) && ($streetid != "")) {
					
					$checkpoint_street = tep_db_fetch_array(tep_db_query("SELECT street_name FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_STREETS_TABLE." WHERE id = '".$streetid."'"));
					if(trim($street_address) != trim($checkpoint_street["street_name"])) {
						$error = true;
						$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NOT_VALID_ERROR);
					}
				}
				
				if(($street_address != "") && ($street_number == "")) {
					$error = true;
					$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR);
				} else if (($suburb != "") && ($suburb_else == "")) {
					$error = true;
					$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR);
				}
				
				if((isset($suburb)) && ($suburb != "")) {
					$checkpoint_suburb = tep_db_query("SELECT quarter_name FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_QUARTERS_TABLE." WHERE quarter_name = '".$suburb."'");
					if(!tep_db_num_rows($checkpoint_suburb)) {
						$error = true;
						$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NOT_VALID_ERROR);
					}
				}
				
				if($city && $postcode) {
					$check_city_zip = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$city."' AND post_code = '".$postcode."'");
					if(!tep_db_num_rows($check_city_zip)) {
						$error = true;
						$messageStack->add('addressbook', MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR);
					}
				}
			} else if($valid_address == 'cityzip') {
				
				if($city && $postcode) {
					$check_city_zip = tep_db_query("SELECT * FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$city."' AND post_code = '".$postcode."'");
					if(!tep_db_num_rows($check_city_zip)) {
						$error = true;
						$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_WRONG_CITY_POSTCODE_ERROR);
					}
				}
				
			} else {
				if(($street_address != "") && ($street_number == "")) {
					$error = true;
					$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_NO_NUMBER_ERROR);
				} else if (($suburb != "") && ($suburb_else == "")) {
					$error = true;
					$messageStack->add('create_account', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_NO_ELSE_ERROR);
				}
			}
			$street_address = $street_address ? $street_address . "|" . $street_number : '';
			$suburb = $suburb ? $suburb . "|" . $suburb_else : '';
		}

	}
/** Econt Shipping Module EOF **/
===================

===================
			2.2.12.2
			Tursi:
    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
      $error = true;

      $messageStack->add('create_account', ENTRY_STREET_ADDRESS_ERROR);
    }
			
			Zamesti sus:
/** Econt Shipping Module BOF **/
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	
} else {
    if (strlen($street_address) < ENTRY_STREET_ADDRESS_MIN_LENGTH) {
        $error = true;

        $messageStack->add('create_account', ENTRY_STREET_ADDRESS_ERROR);
    }
}
/** Econt Shipping Module EOF **/
===================

===================
			2.2.12.3
			Tursi:
<title><?php echo TITLE; ?></title>

			Dobavi sled:
<!-- Econt Shipping Module BOF //-->
<?php
if(MODULE_SHIPPING_ECONT_STATUS == 'True') {
	include(DIR_WS_LANGUAGES . $language . '/modules/shipping/econt.php'); 
	include_once('includes/modules/shipping/econt/createaccount_econt_apps_top.php');
} 
?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.12.4
			Tursi:
                <td class="main"><?php echo tep_draw_input_field('street_address') . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_STREET_ADDRESS_TEXT . '</span>': ''); ?></td>
              </tr>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main">
		<table border="0" cellspacing="2" cellpadding="2">
			<tr>
				<td class="main">
					<?php echo tep_draw_input_field('street_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_DISABLED_TEXT, 'id="street_suggest" '.($process?'':' disabled="enabled"')); ?>
					<?php echo tep_draw_hidden_field('streetid', '', 'id="streetid"'); ?>
				</td>
				<td class="main">
					<?php echo tep_draw_input_field('street_number', '', 'id="street_number" size="8"'.($process?'':' disabled="enabled"')); ?>
				</td>
			</tr>
		</table>
	</td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('street_address') . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_STREET_ADDRESS_TEXT . '</span>' : ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
              </tr>

<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<tr>
		<td class="main" colspan="2" align="center">  <?php echo MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_OR_QUARTER_TEXT . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">*</span>' : ''); ?></td>
	</tr>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.12.5
			Tursi:
<?php
  if (ACCOUNT_SUBURB == 'true') {
?>
              <tr>
                <td class="main"><?php echo ENTRY_SUBURB; ?></td>
                <td class="main"><?php echo tep_draw_input_field('suburb') . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>': ''); ?></td>
              </tr>
<?php
  }
?>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<tr>
		<td class="main"><?php echo ENTRY_SUBURB; ?></td>
		<td class="main">
			<table border="0" cellspacing="2" cellpadding="2">
				<tr>
					<td class="main">
						<?php echo tep_draw_input_field('suburb', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_DISABLED_TEXT, 'id="suburb_suggest" '.($process?'':' disabled="enabled"')) . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>' : ''); ?>
					</td>
					<td class="main">
						<?php echo tep_draw_input_field('suburb_else', '', 'id="suburb_else"'.($process?'':' disabled="enabled"')); ?>
					</td>
				</tr>
			</table>
		</td>
	</tr>
<?php } else { ?>
<?php
if (ACCOUNT_SUBURB == 'true') {
?>
	<tr>
		<td class="main"><?php echo ENTRY_SUBURB; ?></td>
		<td class="main"><?php echo tep_draw_input_field('suburb') . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>' : ''); ?></td>
	</tr>
<?php
}
?>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.12.6
			Tursi:
                <td class="main"><?php echo tep_draw_input_field('postcode') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main"><?php echo tep_draw_input_field('postcode', '', 'id="postcode_suggest"') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>' : ''); ?></td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('postcode') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>' : ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.12.7
			Tursi:
                <td class="main"><?php echo tep_draw_input_field('city') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main">
		<?php
		echo tep_draw_input_field('city', '', 'id="city_suggest"') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>' : '');
		echo tep_draw_hidden_field('cityid', '', 'id="cityid"');
		?>
	</td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('city') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>' : ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.12.8
			Tursi:
                <td class="main"><?php echo tep_get_country_list('country') . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main"><?php echo tep_get_country_list('country', "33") . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>' : ''); ?></td>
<?php } else { ?>
	<td class="main"><?php echo tep_get_country_list('country') . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>' : ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

		2.2.13 - catalog/includes/modules/address_book_details.php
		
===================
			2.2.13.1
			Tursi:
            <td class="main"><?php echo tep_draw_input_field('street_address', $entry['entry_street_address']) . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_STREET_ADDRESS_TEXT . '</span>': ''); ?></td>
          </tr>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<?php 
	$entry_street_address_array = explode("|", $entry['entry_street_address']);
	$entry_street_address_name = $entry_street_address_array[0];
	$entry_street_address_number = $entry_street_address_array[1];
	?>
	<td class="main">
		<table border="0" cellspacing="2" cellpadding="2">
			<tr>
				<td class="main">
					<?php echo tep_draw_input_field('street_address', $entry_street_address_name, 'id="street_suggest" '.(($process || ((isset($_GET['edit'])) && ($_GET['edit']!="")))?'':' disabled="enabled"')); ?>
					<?php $streetid = tep_db_fetch_array(tep_db_query("SELECT id FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_STREETS_TABLE." WHERE street_name = '".$entry_street_address_name."'")); ?>
					<?php echo tep_draw_hidden_field('streetid', $streetid['id'], 'id="streetid"'); ?>
				</td>
				<td class="main">
					<?php echo tep_draw_input_field('street_number', $entry_street_address_number, 'id="street_number" size="8"'.(($process || ((isset($_GET['edit'])) && ($_GET['edit']!="")))?'':' disabled="enabled"')); ?>
				</td>
			</tr>
		</table>
	</td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('street_address', $entry['entry_street_address']) . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_STREET_ADDRESS_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->

          </tr>

<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<tr>
		<td class="main" colspan="2" align="center">  <?php echo MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_OR_QUARTER_TEXT . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">*&nbsp;'.ENTRY_STREET_ADDRESS_TEXT.'</span>' : ''); ?></td>
	</tr>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.13.2
			Tursi:
<?php
  if (ACCOUNT_SUBURB == 'true') {
?>
          <tr>
            <td class="main"><?php echo ENTRY_SUBURB; ?></td>
            <td class="main"><?php echo tep_draw_input_field('suburb', $entry['entry_suburb']) . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>': ''); ?></td>
          </tr>
<?php
  }
?>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<?php
	$entry_suburb_array = explode("|", $entry['entry_suburb']);
	$entry_suburb = $entry_suburb_array[0];
	$entry_suburb_else = $entry_suburb_array[1];
	?>
	<tr>
		<td class="main"><?php echo ENTRY_SUBURB; ?></td>
		<td class="main">
			<table border="0" cellspacing="2" cellpadding="2">
				<tr>
					<td class="main">
						<?php echo tep_draw_input_field('suburb', $entry_suburb, 'id="suburb_suggest" '.(($process || ((isset($_GET['edit'])) && ($_GET['edit']!="")))?'':' disabled="enabled"')) . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>' : ''); ?>
					</td>
					<td class="main">
						<?php echo tep_draw_input_field('suburb_else', $entry_suburb_else, 'id="suburb_else"'.(($process || ((isset($_GET['edit'])) && ($_GET['edit']!="")))?'':' disabled="enabled"')); ?>
					</td>
				</tr>
			</table>
		</td>
	</tr>
<?php } else { ?>
<?php
if (ACCOUNT_SUBURB == 'true') {
?>
	<tr>
		<td class="main"><?php echo ENTRY_SUBURB; ?></td>
		<td class="main"><?php echo tep_draw_input_field('suburb', $entry['entry_suburb']) . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>': ''); ?></td>
	</tr>
<?php
}
?>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.13.3
			Tursi:
            <td class="main"><?php echo tep_draw_input_field('postcode', $entry['entry_postcode']) . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main"><?php echo tep_draw_input_field('postcode', $entry['entry_postcode'], 'id="postcode_suggest"') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>' : ''); ?></td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('postcode', $entry['entry_postcode']) . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.13.4
			Tursi:
<td class="main"><?php echo tep_draw_input_field('city', $entry['entry_city']) . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main">
		<?php echo tep_draw_input_field('city', $entry['entry_city'], 'id="city_suggest"') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>' : '');
		$cityid = tep_db_fetch_array(tep_db_query("SELECT id FROM ".MODULE_SHIPPING_ECONT_DB_CITIES_TABLE." WHERE name = '".$entry['entry_city']."'")); 
		echo tep_draw_hidden_field('cityid', $cityid['id'], 'id="cityid"');
		?>
	</td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('city', $entry['entry_city']) . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.13.5
			Tursi:
            <td class="main"><?php echo tep_get_country_list('country', $entry['entry_country_id']) . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main"><?php echo tep_get_country_list('country', $entry['entry_country_id'] ? $entry['entry_country_id'] : "33") . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>' : ''); ?></td>
<?php } else { ?>
	<td class="main"><?php echo tep_get_country_list('country', $entry['entry_country_id']) . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

		2.2.14 - catalog/includes/modules/checkout_new_address.php
		
===================
			2.2.14.1
			Tursi:
    <td class="main"><?php echo tep_draw_input_field('street_address') . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_STREET_ADDRESS_TEXT . '</span>': ''); ?></td>
  </tr>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main">
		<table border="0" cellspacing="2" cellpadding="2">
			<tr>
				<td class="main">
					<?php echo tep_draw_input_field('street_address', MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_DISABLED_TEXT, 'id="street_suggest" '.($process?'':' disabled="enabled"')); ?>
					<?php echo tep_draw_hidden_field('streetid', '', 'id="streetid"'); ?>
				</td>
				<td class="main">
					<?php echo tep_draw_input_field('street_number', '', 'id="street_number" size="8"'.($process?'':' disabled="enabled"')); ?>
				</td>
			</tr>
		</table>
	</td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('street_address') . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">' . ENTRY_STREET_ADDRESS_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
  </tr>
  
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<tr>
		<td class="main" colspan="2" align="center">  <?php echo MODULE_SHIPPING_ECONT_CREATEACCOUNT_STREET_OR_QUARTER_TEXT . '&nbsp;' . (tep_not_null(ENTRY_STREET_ADDRESS_TEXT) ? '<span class="inputRequirement">*</span>' : ''); ?></td>
	</tr>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.14.2
			Tursi:
<?php
  if (ACCOUNT_SUBURB == 'true') {
?>
  <tr>
    <td class="main"><?php echo ENTRY_SUBURB; ?></td>
    <td class="main"><?php echo tep_draw_input_field('suburb') . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>': ''); ?></td>
  </tr>
<?php
  }
?>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<tr>
		<td class="main"><?php echo ENTRY_SUBURB; ?></td>
		<td class="main">
			<table border="0" cellspacing="2" cellpadding="2">
				<tr>
					<td class="main">
						<?php echo tep_draw_input_field('suburb', MODULE_SHIPPING_ECONT_CREATEACCOUNT_SUBURB_DISABLED_TEXT, 'id="suburb_suggest" '.($process?'':' disabled="enabled"')) . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>' : ''); ?>
					</td>
					<td class="main">
						<?php echo tep_draw_input_field('suburb_else', '', 'id="suburb_else"'.($process?'':' disabled="enabled"')); ?>
					</td>
				</tr>
			</table>
		</td>
	</tr>
<?php } else { ?>
<?php
if (ACCOUNT_SUBURB == 'true') {
?>
	<tr>
		<td class="main"><?php echo ENTRY_SUBURB; ?></td>
		<td class="main"><?php echo tep_draw_input_field('suburb') . '&nbsp;' . (tep_not_null(ENTRY_SUBURB_TEXT) ? '<span class="inputRequirement">' . ENTRY_SUBURB_TEXT . '</span>': ''); ?></td>
	</tr>
<?php
}
?>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.14.3
			Tursi:
    <td class="main"><?php echo tep_draw_input_field('postcode') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main"><?php echo tep_draw_input_field('postcode', '', 'id="postcode_suggest"') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>' : ''); ?></td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('postcode') . '&nbsp;' . (tep_not_null(ENTRY_POST_CODE_TEXT) ? '<span class="inputRequirement">' . ENTRY_POST_CODE_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.14.4
			Tursi:
    <td class="main"><?php echo tep_draw_input_field('city') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>': ''); ?></td>

			Zamesti sus:
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main">
		<?php
		echo tep_draw_input_field('city', '', 'id="city_suggest"') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>' : '');
		echo tep_draw_hidden_field('cityid', '', 'id="cityid"');
		?>
	</td>
<?php } else { ?>
	<td class="main"><?php echo tep_draw_input_field('city') . '&nbsp;' . (tep_not_null(ENTRY_CITY_TEXT) ? '<span class="inputRequirement">' . ENTRY_CITY_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

===================
			2.2.14.5
			Tursi:
<td class="main"><?php echo tep_get_country_list('country') . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>

			Zamesti sus;
<!-- Econt Shipping Module BOF //-->
<?php if(MODULE_SHIPPING_ECONT_STATUS == 'True') { ?>
	<td class="main"><?php echo tep_get_country_list('country', "33") . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>' : ''); ?></td>
<?php } else { ?>
	<td class="main"><?php echo tep_get_country_list('country') . '&nbsp;' . (tep_not_null(ENTRY_COUNTRY_TEXT) ? '<span class="inputRequirement">' . ENTRY_COUNTRY_TEXT . '</span>': ''); ?></td>
<?php } ?>
<!-- Econt Shipping Module EOF //-->
===================

		############# FRONT-END SIDE EOF ################