Merge branch 'release/2.1.0'

isotope · Mar 31, 2014 · aa21bc8 · aa21bc8
2 parents 7180489 + 69e4075
commit aa21bc8
Show file tree

Hide file tree

Showing 94 changed files with 5,910 additions and 227 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,4 @@ system/*
 system/drivers/*
 !system/modules
 system/modules/*
-!system/modules/isotope/
-!system/modules/isotope_reports/
-!system/modules/isotope_rules/
+!system/modules/isotope*
diff --git a/system/modules/isotope/assets/css/backend.css b/system/modules/isotope/assets/css/backend.css
@@ -256,6 +256,16 @@ table.multicolumnwizard .operations {
     height: 50px;
 }
 
+.tl_listing_container .col_order_status {
+    padding: 0;
+}
+
+.tl_listing_container .col_order_status span {
+    display: block;
+    padding: 2px 5px 3px;
+    border-radius: 2px;
+}
+
 .iso_operations {
     width: 110px;
     white-space: normal;

diff --git a/system/modules/isotope/assets/css/backend.min.css b/system/modules/isotope/assets/css/backend.min.css
diff --git a/system/modules/isotope/assets/js/backend.min.js b/system/modules/isotope/assets/js/backend.min.js
diff --git a/system/modules/isotope/config/autoload.php b/system/modules/isotope/config/autoload.php
@@ -15,6 +15,7 @@
  * Register PSR-0 namespace
  */
 NamespaceClassLoader::add('Isotope', 'system/modules/isotope/library');
+NamespaceClassLoader::add('UnitedPrototype', 'system/modules/isotope/library');
 
 
 /**
@@ -36,6 +37,7 @@
     'be_iso_introduction'               => 'system/modules/isotope/templates/backend',
     'be_iso_overview'                   => 'system/modules/isotope/templates/backend',
     'be_iso_old'                        => 'system/modules/isotope/templates/backend',
+    'be_iso_upgrade'                    => 'system/modules/isotope/templates/backend',
     'iso_checkout_address'              => 'system/modules/isotope/templates/checkout',
     'iso_checkout_order_conditions'     => 'system/modules/isotope/templates/checkout',
     'iso_checkout_order_info'           => 'system/modules/isotope/templates/checkout',

diff --git a/system/modules/isotope/config/config.php b/system/modules/isotope/config/config.php
@@ -272,12 +272,10 @@
     'cart_html',
     'cart_text',
     'document',
-    'billing_*', // All the billing address model fields
-    'billing_address', // Billing address as HTML
-    'billing_address_text', // Billing address as text
-    'shipping_*', // All the shipping address model fields
-    'shipping_address', // Shipping address as HTML
-    'shipping_address_text', // Shipping address as text
+    'billing_address', // Formatted billing address
+    'billing_address_*', // All the billing address model fields
+    'shipping_address', // Formatted shipping address
+    'shipping_address_*', // All the shipping address model fields
     'form_*', // All the order condition form fields
     'payment_id', // Payment method ID
     'payment_label', // Payment method label
@@ -290,7 +288,7 @@
 );
 $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['isotope']['iso_order_status_change']['email_subject'] = &$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['isotope']['iso_order_status_change']['email_text'];
 $GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['isotope']['iso_order_status_change']['email_html'] = &$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['isotope']['iso_order_status_change']['email_text'];
-
+$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['isotope']['iso_order_status_change']['email_replyTo'] = &$GLOBALS['NOTIFICATION_CENTER']['NOTIFICATION_TYPE']['isotope']['iso_order_status_change']['recipients'];
 
 /**
  * Models

diff --git a/system/modules/isotope/config/hooks.php b/system/modules/isotope/config/hooks.php
@@ -26,6 +26,7 @@
 $GLOBALS['TL_HOOKS']['generateBreadcrumb'][]            = array('Isotope\Frontend', 'addProductToBreadcrumb');
 $GLOBALS['ISO_HOOKS']['buttons'][]                      = array('Isotope\Isotope', 'defaultButtons');
 $GLOBALS['ISO_HOOKS']['findSurchargesForCollection'][]  = array('Isotope\Frontend', 'findShippingAndPaymentSurcharges');
+$GLOBALS['ISO_HOOKS']['postCheckout'][]                 = array('Isotope\Analytics', 'trackOrder');
 
 if (TL_MODE == 'FE') {
     // Only limit countries in FE

diff --git a/system/modules/isotope/dca/tl_iso_config.php b/system/modules/isotope/dca/tl_iso_config.php
@@ -32,6 +32,7 @@
         'onsubmit_callback' => array
         (
             array('Isotope\Backend', 'truncateProductCache'),
+            array('Isotope\Backend\Config\Callback', 'convertCurrencies'),
         ),
         'sql' => array
         (
@@ -116,7 +117,7 @@
     // Palettes
     'palettes' => array
     (
-        '__selector__'              => array('currencySymbol', 'currencyAutomator'),
+        '__selector__'              => array('currencySymbol', 'currencyAutomator', 'ga_enable'),
         'default'                   => '
             {name_legend},name,label,fallback;
             {address_legend:hide},firstname,lastname,company,vat_no,street_1,street_2,street_3,postal,city,country,subdivision,email,phone;
@@ -125,14 +126,16 @@
             {converter_legend:hide},priceCalculateFactor,priceCalculateMode,currencyAutomator;
             {order_legend:hide},orderPrefix,orderDigits,orderstatus_new,orderstatus_error;
             {config_legend},templateGroup,cartMinSubtotal;
-            {products_legend},newProductPeriod',
+            {products_legend},newProductPeriod;
+            {analytics_legend},ga_enable',
     ),
 
     // Subpalettes
     'subpalettes' => array
     (
         'currencySymbol'            => 'currencySpace',
         'currencyAutomator'         => 'currencyOrigin,currencyProvider',
+        'ga_enable'                 => 'ga_account,ga_member',
     ),
 
     // Fields
@@ -496,6 +499,9 @@
             'exclude'               => true,
             'inputType'             => 'checkbox',
             'eval'                  => array('submitOnChange'=>true, 'tl_class'=>'clr', 'helpwizard'=>true),
+            'save_callback'         => array(
+                array('Isotope\Backend\Config\Callback', 'checkNeedToConvertCurrencies')
+            ),
             'sql'                   => "char(1) NOT NULL default ''",
         ),
         'currencyOrigin' => array
@@ -505,6 +511,9 @@
             'inputType'             => 'select',
             'options'               => &$GLOBALS['TL_LANG']['CUR'],
             'eval'                  => array('includeBlankOption'=>true, 'mandatory'=>true, 'tl_class'=>'w50'),
+            'save_callback'         => array(
+                array('Isotope\Backend\Config\Callback', 'checkNeedToConvertCurrencies')
+            ),
             'sql'                   => "varchar(3) NOT NULL default ''",
         ),
         'currencyProvider' => array
@@ -515,6 +524,9 @@
             'options'               => array('ecb.int', 'admin.ch'),
             'reference'             => &$GLOBALS['TL_LANG']['tl_iso_config'],
             'eval'                  => array('mandatory'=>true, 'tl_class'=>'w50'),
+            'save_callback'         => array(
+                array('Isotope\Backend\Config\Callback', 'checkNeedToConvertCurrencies')
+            ),
             'sql'                   => "varchar(32) NOT NULL default ''",
         ),
         'orderPrefix' => array
@@ -570,14 +582,38 @@
         ),
         'newProductPeriod' => array
         (
-            'label'                     => &$GLOBALS['TL_LANG']['tl_iso_config']['newProductPeriod'],
-            'exclude'                   => true,
-            'default'                   => array('unit'=>'days'),
-            'inputType'                 => 'timePeriod',
-            'options'                   => array('minutes', 'hours', 'days', 'weeks', 'months', 'years'),
-            'reference'                 => &$GLOBALS['TL_LANG']['MSC']['timePeriod'],
-            'eval'                      => array('rgxp'=>'digit', 'maxlength'=>5, 'tl_class'=>'w50'),
-            'sql'                       => "varchar(255) NOT NULL default ''"
+            'label'                 => &$GLOBALS['TL_LANG']['tl_iso_config']['newProductPeriod'],
+            'exclude'               => true,
+            'default'               => array('unit'=>'days'),
+            'inputType'             => 'timePeriod',
+            'options'               => array('minutes', 'hours', 'days', 'weeks', 'months', 'years'),
+            'reference'             => &$GLOBALS['TL_LANG']['MSC']['timePeriod'],
+            'eval'                  => array('rgxp'=>'digit', 'maxlength'=>5, 'tl_class'=>'w50'),
+            'sql'                   => "varchar(255) NOT NULL default ''"
+        ),
+        'ga_enable' => array
+        (
+            'label'                 => &$GLOBALS['TL_LANG']['tl_iso_config']['ga_enable'],
+            'exclude'               => true,
+            'inputType'             => 'checkbox',
+            'eval'                  => array('submitOnChange'=>true, 'doNotCopy'=>true, 'tl_class'=>'clr'),
+            'sql'                   => "char(1) NOT NULL default ''",
+        ),
+        'ga_account' => array
+        (
+            'label'                 => &$GLOBALS['TL_LANG']['tl_iso_config']['ga_account'],
+            'exclude'               => true,
+            'inputType'             => 'text',
+            'eval'                  => array('mandatory'=>true, 'unique'=>true, 'maxlength'=>64, 'tl_class'=>'w50'),
+            'sql'                   => "varchar(64) NOT NULL default ''",
+        ),
+        'ga_member' => array
+        (
+            'label'                 => &$GLOBALS['TL_LANG']['tl_iso_config']['ga_member'],
+            'exclude'               => true,
+            'inputType'             => 'text',
+            'eval'                  => array('maxlength'=>255, 'decodeEntities'=>true, 'tl_class'=>'w50'),
+            'sql'                   => "varchar(255) NOT NULL default ''",
         ),
     )
 );