Permalink
Browse files

Merge remote-tracking branch 'origin/default-countries' into develop

  • Loading branch information...
2 parents b165eb5 + 7203b17 commit a235a6454a2deeb1e7cefd09be2b1e3a725b2980 @aschempp aschempp committed Apr 3, 2012
@@ -224,8 +224,10 @@ CREATE TABLE `tl_iso_config` (
`country` varchar(2) NOT NULL default '',
`shipping_countries` blob NULL,
`shipping_fields` blob NULL,
+ `shipping_country` varchar(2) NOT NULL default '',
`billing_countries` blob NULL,
`billing_fields` blob NULL,
+ `billing_country` varchar(2) NOT NULL default '',
`phone` varchar(64) NOT NULL default '',
`email` varchar(255) NOT NULL default '',
`limitMemberCountries` char(1) NOT NULL default '',
@@ -124,8 +124,9 @@
'__selector__' => array('currencySymbol', 'currencyAutomator'),
'default' => '
{name_legend},name,label,fallback,store_id;
- {config_legend},shipping_countries,billing_countries,shipping_fields,billing_fields,orderPrefix,orderDigits,templateGroup,limitMemberCountries;
{address_legend:hide},firstname,lastname,company,street_1,street_2,street_3,postal,city,country,subdivision,email,phone;
+ {config_legend},orderPrefix,orderDigits,templateGroup;
+ {checkout_legend},shipping_countries,billing_countries,shipping_fields,billing_fields,shipping_country,billing_country,limitMemberCountries;
{price_legend},priceRoundPrecision,priceRoundIncrement,cartMinSubtotal;
{currency_legend},currency,currencyFormat,currencyPosition,currencySymbol;
{converter_legend:hide},priceCalculateFactor,priceCalculateMode,currencyAutomator;
@@ -294,6 +295,14 @@
'inputType' => 'fieldWizard',
'eval' => array('mandatory'=>true, 'multiple'=>true, 'tl_class'=>'w50 w50h', 'table'=>'tl_iso_addresses'),
),
+ 'shipping_country' => array
+ (
+ 'label' => &$GLOBALS['TL_LANG']['tl_iso_config']['shipping_country'],
+ 'exclude' => true,
+ 'inputType' => 'select',
+ 'options' => $this->getCountries(),
+ 'eval' => array('includeBlankOption'=>true, 'tl_class'=>'w50'),
+ ),
'billing_countries' => array
(
'label' => &$GLOBALS['TL_LANG']['tl_iso_config']['billing_countries'],
@@ -309,6 +318,14 @@
'inputType' => 'fieldWizard',
'eval' => array('mandatory'=>true, 'multiple'=>true, 'table'=>'tl_iso_addresses', 'tl_class'=>'w50 w50h'),
),
+ 'billing_country' => array
+ (
+ 'label' => &$GLOBALS['TL_LANG']['tl_iso_config']['billing_country'],
+ 'exclude' => true,
+ 'inputType' => 'select',
+ 'options' => $this->getCountries(),
+ 'eval' => array('includeBlankOption'=>true, 'tl_class'=>'w50'),
+ ),
'orderPrefix' => array
(
'label' => &$GLOBALS['TL_LANG']['tl_iso_config']['orderPrefix'],
@@ -93,10 +93,12 @@
$GLOBALS['TL_LANG']['tl_iso_config']['shipping_countries'][1] = 'Wählen Sie die Ländern die beim Bestellvorgang als Versand-Adressen erlaubt sind.';
$GLOBALS['TL_LANG']['tl_iso_config']['shipping_fields'][0] = 'Versand-Adressfelder';
$GLOBALS['TL_LANG']['tl_iso_config']['shipping_fields'][1] = 'Wählen sie die Felder die für eine neue Versand-Adresse beim Bestellvorgang zur Verfügung stehen.';
+$GLOBALS['TL_LANG']['tl_iso_config']['shipping_country'] = array('Standard Versandland', 'Wählen Sie das Standard-Land für neue Versandadressen.');
$GLOBALS['TL_LANG']['tl_iso_config']['billing_countries'][0] = 'Rechnungs-Länder';
$GLOBALS['TL_LANG']['tl_iso_config']['billing_countries'][1] = 'Wählen Sie die Ländern die beim Bestellvorgang als Rechnungs-Adressen erlaubt sind.';
$GLOBALS['TL_LANG']['tl_iso_config']['billing_fields'][0] = 'Rechnungs-Adressfelder';
$GLOBALS['TL_LANG']['tl_iso_config']['billing_fields'][1] = 'Wählen sie die Felder die für eine neue Rechnungs-Adresse beim Bestellvorgang zur Verfügung stehen.';
+$GLOBALS['TL_LANG']['tl_iso_config']['billing_country'] = array('Standard Rechnungsland', 'Wählen Sie das Standard-Land für neue Rechnungsadressen.');
$GLOBALS['TL_LANG']['tl_iso_config']['orderPrefix'][0] = 'Bestellnummer-Präfix';
$GLOBALS['TL_LANG']['tl_iso_config']['orderPrefix'][1] = 'Sie können für die automatisch hochzählende Bestellnummer einen Präxif (z. B. Fiskaljahr) hinzufügen.';
$GLOBALS['TL_LANG']['tl_iso_config']['orderDigits'][0] = 'Bestellnummern-Länge';
@@ -65,8 +65,10 @@
$GLOBALS['TL_LANG']['tl_iso_config']['email'] = array('Shipping E-mail address', 'Please enter a valid e-mail address.');
$GLOBALS['TL_LANG']['tl_iso_config']['shipping_countries'] = array('Shipping countries', 'Select the countries you want to allow for checkout shipping address.');
$GLOBALS['TL_LANG']['tl_iso_config']['shipping_fields'] = array('Shipping address fields', 'Select the fields for a new shipping address when checking out.');
+$GLOBALS['TL_LANG']['tl_iso_config']['shipping_country'] = array('Shipping default country', 'Select a default country for new shipping addresses.');
$GLOBALS['TL_LANG']['tl_iso_config']['billing_countries'] = array('Billing countries', 'Select the countries you want to allow for checkout billing address.');
$GLOBALS['TL_LANG']['tl_iso_config']['billing_fields'] = array('Billing address fields', 'Select the fields for a new billing address when checking out.');
+$GLOBALS['TL_LANG']['tl_iso_config']['billing_country'] = array('Billing default country', 'Select a default country for new billing addresses.');
$GLOBALS['TL_LANG']['tl_iso_config']['orderPrefix'] = array('Order number prefix', 'You can add a prefix (eg. fiscal year) to the auto-incrementing order number.');
$GLOBALS['TL_LANG']['tl_iso_config']['orderDigits'] = array('Order number length', 'Select the minimum length of the order number (not including order prefix).');
$GLOBALS['TL_LANG']['tl_iso_config']['templateGroup'] = array('Templates folder', 'Here you can select a templates folder to search before every other template folder.');

0 comments on commit a235a64

Please sign in to comment.